From 389e83f7eb68c43f6f0313b20acde547aef12442 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Thu, 23 Mar 2023 11:24:16 +0800
Subject: [PATCH 01/12] Improve `<SvgIcon>` to make it output `svg` node and
 optimize performance (#23570)

Before, the Vue `<SvgIcon>` always outputs DOM nodes like:

```html
<span class="outer-class">
    <svg class="class-name-defined" ...></svg>
</span>
```

The `span` is redundant and I guess such layout and the inconsistent
`class/class-name` attributes would cause bugs sooner or later.

This PR makes the `<SvgIcon>` clear, and it's faster than before,
because it doesn't need to parse the whole SVG string.

Before:

<details>

![image](https://user-images.githubusercontent.com/2114189/226156474-ce2c57cd-b869-486a-b75b-1eebdac8cdf7.png)

</details>

After:

![image](https://user-images.githubusercontent.com/2114189/226155774-108f49ed-7512-40c3-94a2-a6e8da18063d.png)

---------

Co-authored-by: silverwind <me@silverwind.io>
---
 templates/projects/view.tmpl              |  2 +-
 templates/repo/projects/view.tmpl         |  2 +-
 templates/user/settings/keys_gpg.tmpl     |  2 +-
 templates/user/settings/keys_ssh.tmpl     |  2 +-
 web_src/css/base.css                      | 12 -----
 web_src/js/components/ActionRunStatus.vue |  4 +-
 web_src/js/components/ContextPopup.vue    |  2 +-
 web_src/js/svg.js                         | 53 +++++++++++++++++++++--
 web_src/js/svg.test.js                    | 22 +++++++++-
 9 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index b776f89efa39c..b778e0a242d67 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -224,7 +224,7 @@
 							{{- range index $.LinkedPRs .ID}}
 							<div class="meta gt-my-2">
 								<a href="{{$.RepoLink}}/pulls/{{.Index}}">
-									<span class="gt-m-0 {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span>
+									<span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span>
 									<span class="gt-vm">{{.Title}} <span class="text light grey">#{{.Index}}</span></span>
 								</a>
 							</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 0248b9c6d2c7a..99831f3dd9c33 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -235,7 +235,7 @@
 							{{- range index $.LinkedPRs .ID}}
 							<div class="meta gt-my-2">
 								<a href="{{$.RepoLink}}/pulls/{{.Index}}">
-									<span class="gt-m-0 {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span>
+									<span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span>
 									<span class="gt-vm">{{.Title}} <span class="text light grey">#{{.Index}}</span></span>
 								</a>
 							</div>
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index ddb4960642d50..d143d5ed99721 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -54,7 +54,7 @@
 					{{end}}
 				</div>
 				<div class="left floated content">
-					<span class="{{if or .ExpiredUnix.IsZero ($.PageStartTime.Before .ExpiredUnix.AsTime)}}green{{end}}">{{svg "octicon-key" 32}}</span>
+					<span class="text {{if or .ExpiredUnix.IsZero ($.PageStartTime.Before .ExpiredUnix.AsTime)}}green{{end}}">{{svg "octicon-key" 32}}</span>
 				</div>
 				<div class="content">
 					{{if .Verified}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 262b6e0d739ce..71b9b6a86b68b 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -47,7 +47,7 @@
 
 				</div>
 				<div class="left floated content">
-					<span class="tooltip{{if .HasRecentActivity}} green{{end}}" {{if .HasRecentActivity}}data-content="{{$.locale.Tr "settings.key_state_desc"}}"{{end}}>{{svg "octicon-key" 32}}</span>
+					<span class="tooltip text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.locale.Tr "settings.key_state_desc"}}"{{end}}>{{svg "octicon-key" 32}}</span>
 				</div>
 				<div class="content">
 						{{if .Verified}}
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 1077a0eebd022..e3b3fece377b5 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -2420,18 +2420,6 @@ a.ui.basic.label:hover {
   height: 2.1666em !important;
 }
 
-span.green .svg {
-  color: var(--color-green);
-}
-
-span.red .svg {
-  color: var(--color-red);
-}
-
-span.purple .svg {
-  color: var(--color-purple);
-}
-
 .migrate .svg.gitea-git {
   color: var(--color-git);
 }
diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue
index 3717b64956617..b72dfb1aa699e 100644
--- a/web_src/js/components/ActionRunStatus.vue
+++ b/web_src/js/components/ActionRunStatus.vue
@@ -1,10 +1,10 @@
 <template>
-  <SvgIcon name="octicon-check-circle-fill" class="green" :size="size" :class-name="className" v-if="status === 'success'"/>
+  <SvgIcon name="octicon-check-circle-fill" class="ui text green" :size="size" :class-name="className" v-if="status === 'success'"/>
   <SvgIcon name="octicon-skip" class="ui text grey" :size="size" :class-name="className" v-else-if="status === 'skipped'"/>
   <SvgIcon name="octicon-clock" class="ui text yellow" :size="size" :class-name="className" v-else-if="status === 'waiting'"/>
   <SvgIcon name="octicon-blocked" class="ui text yellow" :size="size" :class-name="className" v-else-if="status === 'blocked'"/>
   <SvgIcon name="octicon-meter" class="ui text yellow" :size="size" :class-name="'job-status-rotate ' + className" v-else-if="status === 'running'"/>
-  <SvgIcon name="octicon-x-circle-fill" class="red" :size="size" v-else/>
+  <SvgIcon name="octicon-x-circle-fill" class="ui text red" :size="size" v-else/>
 </template>
 
 <script>
diff --git a/web_src/js/components/ContextPopup.vue b/web_src/js/components/ContextPopup.vue
index ad305b23a9100..98f9db51f91dc 100644
--- a/web_src/js/components/ContextPopup.vue
+++ b/web_src/js/components/ContextPopup.vue
@@ -3,7 +3,7 @@
     <div v-if="loading" class="ui active centered inline loader"/>
     <div v-if="!loading && issue !== null">
       <p><small>{{ issue.repository.full_name }} on {{ createdAt }}</small></p>
-      <p><svg-icon :name="icon" :class="[color]" /> <strong>{{ issue.title }}</strong> #{{ issue.number }}</p>
+      <p><svg-icon :name="icon" :class="['text', color]" /> <strong>{{ issue.title }}</strong> #{{ issue.number }}</p>
       <p>{{ body }}</p>
       <div>
         <div
diff --git a/web_src/js/svg.js b/web_src/js/svg.js
index e431ca57e643e..6fa79b8e9b3a1 100644
--- a/web_src/js/svg.js
+++ b/web_src/js/svg.js
@@ -105,13 +105,32 @@ export function svg(name, size = 16, className = '') {
 
   const document = parser.parseFromString(svgs[name], 'image/svg+xml');
   const svgNode = document.firstChild;
-  if (size !== 16) svgNode.setAttribute('width', String(size));
-  if (size !== 16) svgNode.setAttribute('height', String(size));
-  // filter array to remove empty string
+  if (size !== 16) {
+    svgNode.setAttribute('width', String(size));
+    svgNode.setAttribute('height', String(size));
+  }
   if (className) svgNode.classList.add(...className.split(/\s+/).filter(Boolean));
   return serializer.serializeToString(svgNode);
 }
 
+export function svgParseOuterInner(name) {
+  const svgStr = svgs[name];
+  if (!svgStr) throw new Error(`Unknown SVG icon: ${name}`);
+
+  // parse the SVG string to 2 parts
+  // * svgInnerHtml: the inner part of the SVG, will be used as the content of the <svg> VNode
+  // * svgOuter: the outer part of the SVG, including attributes
+  // the builtin SVG contents are clean, so it's safe to use `indexOf` to split the content:
+  // eg: <svg outer-attributes>${svgInnerHtml}</svg>
+  const p1 = svgStr.indexOf('>'), p2 = svgStr.lastIndexOf('<');
+  if (p1 === -1 || p2 === -1) throw new Error(`Invalid SVG icon: ${name}`);
+  const svgInnerHtml = svgStr.slice(p1 + 1, p2);
+  const svgOuterHtml = svgStr.slice(0, p1 + 1) + svgStr.slice(p2);
+  const svgDoc = parser.parseFromString(svgOuterHtml, 'image/svg+xml');
+  const svgOuter = svgDoc.firstChild;
+  return {svgOuter, svgInnerHtml};
+}
+
 export const SvgIcon = {
   name: 'SvgIcon',
   props: {
@@ -120,6 +139,32 @@ export const SvgIcon = {
     className: {type: String, default: ''},
   },
   render() {
-    return h('span', {innerHTML: svg(this.name, this.size, this.className)});
+    const {svgOuter, svgInnerHtml} = svgParseOuterInner(this.name);
+    // https://vuejs.org/guide/extras/render-function.html#creating-vnodes
+    // the `^` is used for attr, set SVG attributes like 'width', `aria-hidden`, `viewBox`, etc
+    const attrs = {};
+    for (const attr of svgOuter.attributes) {
+      if (attr.name === 'class') continue;
+      attrs[`^${attr.name}`] = attr.value;
+    }
+    attrs[`^width`] = this.size;
+    attrs[`^height`] = this.size;
+
+    // make the <SvgIcon class="foo" class-name="bar"> classes work together
+    const classes = [];
+    for (const cls of svgOuter.classList) {
+      classes.push(cls);
+    }
+    // TODO: drop the `className/class-name` prop in the future, only use "class" prop
+    if (this.className) {
+      classes.push(...this.className.split(/\s+/).filter(Boolean));
+    }
+
+    // create VNode
+    return h('svg', {
+      ...attrs,
+      class: classes,
+      innerHTML: svgInnerHtml,
+    });
   },
 };
diff --git a/web_src/js/svg.test.js b/web_src/js/svg.test.js
index c5d6d07535c7b..5db2f65ac8d68 100644
--- a/web_src/js/svg.test.js
+++ b/web_src/js/svg.test.js
@@ -1,8 +1,28 @@
 import {expect, test} from 'vitest';
-import {svg} from './svg.js';
+import {svg, SvgIcon, svgParseOuterInner} from './svg.js';
+import {createApp, h} from 'vue';
 
 test('svg', () => {
   expect(svg('octicon-repo')).toMatch(/^<svg/);
   expect(svg('octicon-repo', 16)).toContain('width="16"');
   expect(svg('octicon-repo', 32)).toContain('width="32"');
 });
+
+test('svgParseOuterInner', () => {
+  const {svgOuter, svgInnerHtml} = svgParseOuterInner('octicon-repo');
+  expect(svgOuter.nodeName).toMatch('svg');
+  expect(svgOuter.classList.contains('octicon-repo')).toBeTruthy();
+  expect(svgInnerHtml).toContain('<path');
+});
+
+test('SvgIcon', () => {
+  const root = document.createElement('div');
+  createApp({render: () => h(SvgIcon, {name: 'octicon-link', size: 24, class: 'base', className: 'extra'})}).mount(root);
+  const node = root.firstChild;
+  expect(node.nodeName).toEqual('svg');
+  expect(node.getAttribute('width')).toEqual('24');
+  expect(node.getAttribute('height')).toEqual('24');
+  expect(node.classList.contains('octicon-link')).toBeTruthy();
+  expect(node.classList.contains('base')).toBeTruthy();
+  expect(node.classList.contains('extra')).toBeTruthy();
+});

From e7f0bcf8847330d646300b60d9fda119da7e97dc Mon Sep 17 00:00:00 2001
From: Zettat123 <zettat123@gmail.com>
Date: Thu, 23 Mar 2023 12:04:15 +0800
Subject: [PATCH 02/12] Improve workflow event triggers (#23613)

Follow #23037
Fix [#22598
comment](https://github.com/go-gitea/gitea/issues/22958#issuecomment-1475763042)

Workflows with `pull_request` trigger event can't be triggered by
`pull_request_sync` event. This PR adds the `canGithubEventMatch`
function to check if a Github event can match any Gitea event. If the
Github event matches a Gitea event, the related workflows should be
triggered.

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
---
 modules/actions/github.go      |  53 ++++++++++++----
 modules/actions/github_test.go | 113 +++++++++++++++++++++++++++++++++
 modules/actions/workflows.go   |   2 +-
 3 files changed, 155 insertions(+), 13 deletions(-)
 create mode 100644 modules/actions/github_test.go

diff --git a/modules/actions/github.go b/modules/actions/github.go
index bcde9a0f552ec..1148554139cd1 100644
--- a/modules/actions/github.go
+++ b/modules/actions/github.go
@@ -5,8 +5,6 @@ package actions
 
 import (
 	webhook_module "code.gitea.io/gitea/modules/webhook"
-
-	"github.com/nektos/act/pkg/jobparser"
 )
 
 const (
@@ -25,17 +23,48 @@ const (
 	githubEventPullRequestComment       = "pull_request_comment"
 )
 
-func convertFromGithubEvent(evt *jobparser.Event) string {
-	switch evt.Name {
-	case githubEventPullRequest, githubEventPullRequestTarget, githubEventPullRequestReview,
-		githubEventPullRequestReviewComment:
-		return string(webhook_module.HookEventPullRequest)
+// canGithubEventMatch check if the input Github event can match any Gitea event.
+func canGithubEventMatch(eventName string, triggedEvent webhook_module.HookEventType) bool {
+	switch eventName {
 	case githubEventRegistryPackage:
-		return string(webhook_module.HookEventPackage)
-	case githubEventCreate, githubEventDelete, githubEventFork, githubEventPush,
-		githubEventIssues, githubEventIssueComment, githubEventRelease, githubEventPullRequestComment:
-		fallthrough
+		return triggedEvent == webhook_module.HookEventPackage
+
+	case githubEventIssues:
+		switch triggedEvent {
+		case webhook_module.HookEventIssues,
+			webhook_module.HookEventIssueAssign,
+			webhook_module.HookEventIssueLabel,
+			webhook_module.HookEventIssueMilestone:
+			return true
+
+		default:
+			return false
+		}
+
+	case githubEventPullRequest, githubEventPullRequestTarget:
+		switch triggedEvent {
+		case webhook_module.HookEventPullRequest,
+			webhook_module.HookEventPullRequestSync,
+			webhook_module.HookEventPullRequestAssign,
+			webhook_module.HookEventPullRequestLabel:
+			return true
+
+		default:
+			return false
+		}
+
+	case githubEventPullRequestReview:
+		switch triggedEvent {
+		case webhook_module.HookEventPullRequestReviewApproved,
+			webhook_module.HookEventPullRequestReviewComment,
+			webhook_module.HookEventPullRequestReviewRejected:
+			return true
+
+		default:
+			return false
+		}
+
 	default:
-		return evt.Name
+		return eventName == string(triggedEvent)
 	}
 }
diff --git a/modules/actions/github_test.go b/modules/actions/github_test.go
new file mode 100644
index 0000000000000..e7f4158ae2d1e
--- /dev/null
+++ b/modules/actions/github_test.go
@@ -0,0 +1,113 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package actions
+
+import (
+	"testing"
+
+	webhook_module "code.gitea.io/gitea/modules/webhook"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCanGithubEventMatch(t *testing.T) {
+	testCases := []struct {
+		desc           string
+		eventName      string
+		triggeredEvent webhook_module.HookEventType
+		expected       bool
+	}{
+		// registry_package event
+		{
+			"registry_package matches",
+			githubEventRegistryPackage,
+			webhook_module.HookEventPackage,
+			true,
+		},
+		{
+			"registry_package cannot match",
+			githubEventRegistryPackage,
+			webhook_module.HookEventPush,
+			false,
+		},
+		// issues event
+		{
+			"issue matches",
+			githubEventIssues,
+			webhook_module.HookEventIssueLabel,
+			true,
+		},
+		{
+			"issue cannot match",
+			githubEventIssues,
+			webhook_module.HookEventIssueComment,
+			false,
+		},
+		// issue_comment event
+		{
+			"issue_comment matches",
+			githubEventIssueComment,
+			webhook_module.HookEventIssueComment,
+			true,
+		},
+		{
+			"issue_comment cannot match",
+			githubEventIssueComment,
+			webhook_module.HookEventIssues,
+			false,
+		},
+		// pull_request event
+		{
+			"pull_request matches",
+			githubEventPullRequest,
+			webhook_module.HookEventPullRequestSync,
+			true,
+		},
+		{
+			"pull_request cannot match",
+			githubEventPullRequest,
+			webhook_module.HookEventPullRequestComment,
+			false,
+		},
+		// pull_request_target event
+		{
+			"pull_request_target matches",
+			githubEventPullRequest,
+			webhook_module.HookEventPullRequest,
+			true,
+		},
+		{
+			"pull_request_target cannot match",
+			githubEventPullRequest,
+			webhook_module.HookEventPullRequestComment,
+			false,
+		},
+		// pull_request_review event
+		{
+			"pull_request_review matches",
+			githubEventPullRequestReview,
+			webhook_module.HookEventPullRequestReviewComment,
+			true,
+		},
+		{
+			"pull_request_review cannot match",
+			githubEventPullRequestReview,
+			webhook_module.HookEventPullRequestComment,
+			false,
+		},
+		// other events
+		{
+			"create event",
+			githubEventCreate,
+			webhook_module.HookEventCreate,
+			true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.desc, func(t *testing.T) {
+			assert.Equalf(t, tc.expected, canGithubEventMatch(tc.eventName, tc.triggeredEvent), "canGithubEventMatch(%v, %v)", tc.eventName, tc.triggeredEvent)
+		})
+	}
+}
diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go
index 67c3b12427adb..738026142b94f 100644
--- a/modules/actions/workflows.go
+++ b/modules/actions/workflows.go
@@ -99,7 +99,7 @@ func DetectWorkflows(commit *git.Commit, triggedEvent webhook_module.HookEventTy
 }
 
 func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType, payload api.Payloader, evt *jobparser.Event) bool {
-	if convertFromGithubEvent(evt) != string(triggedEvent) {
+	if !canGithubEventMatch(evt.Name, triggedEvent) {
 		return false
 	}
 

From 9be90a58754061171bbd5025d85d2b891364efd3 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Thu, 23 Mar 2023 17:56:15 +0800
Subject: [PATCH 03/12] Use a general approach to show tooltip, fix temporary
 tooltip bug (#23574)

## TLDR

* Improve performance: lazy creating the tippy instances.
* Transparently support all "tooltip" elements, no need to call
`initTooltip` again and again.
* Fix a temporary tooltip re-entrance bug, which causes showing temp
content forever.
* Upgrade vue3-calendar-heatmap to 2.0.2 with lazy tippy init
(initHeatmap time decreases from 100ms to 50ms)

## Details

### The performance

Creating a lot of tippy tooltip instances is expensive. This PR doesn't
create all tippy tooltip instances, instead, it only adds "mouseover"
event listener to necessary elements, and then switches to the tippy
tooltip

### The general approach for all tooltips

Before, dynamically generated tooltips need to be called with
`initTooltip`.

After, use MutationObserver to:

* Attach the event listeners to newly created tooltip elements, work for
Vue (easier than before)
* Catch changed attributes and update the tooltip content (better than
before)

It does help a lot, eg:

https://github.com/go-gitea/gitea/blob/1a4efa0ee9a49d48549be7479a46be133b9bc260/web_src/js/components/PullRequestMergeForm.vue#L33-L36

### Temporary tooltip re-entrance bug

To reproduce, on try.gitea.io, click the "copy clone url" quickly, then
the tooltip will be "Copied!" forever.

After this PR, with the help of `attachTippyTooltip`, the tooltip
content could be reset to the default correctly.

### Other changes

* `data-tooltip-content` is preferred from now on, the old
`data-content` may cause conflicts with other modules.
* `data-placement` was only used for tooltip, so it's renamed to
`data-tooltip-placement`, and removed from `createTippy`.
---
 package-lock.json                             |  12 +-
 package.json                                  |   2 +-
 .../repo/issue/view_content/sidebar.tmpl      |   4 +-
 templates/repo/sub_menu.tmpl                  |   2 +-
 web_src/js/components/DashboardRepoList.vue   |   4 -
 web_src/js/components/DiffFileList.vue        |  12 --
 web_src/js/components/DiffFileTreeItem.vue    |   2 +-
 web_src/js/features/common-global.js          |   7 --
 web_src/js/features/contextpopup.js           |   1 +
 web_src/js/features/repo-diff.js              |   5 -
 web_src/js/features/repo-issue.js             |   5 +-
 web_src/js/index.js                           |   2 +-
 web_src/js/modules/tippy.js                   | 117 +++++++++++++++---
 13 files changed, 111 insertions(+), 64 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 353e0ab655e2a..2f277f180f307 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
         "vue": "3.2.47",
         "vue-bar-graph": "2.0.0",
         "vue-loader": "17.0.1",
-        "vue3-calendar-heatmap": "2.0.0",
+        "vue3-calendar-heatmap": "2.0.2",
         "webpack": "5.76.2",
         "webpack-cli": "5.0.1",
         "workbox-routing": "6.5.4",
@@ -9425,17 +9425,17 @@
       }
     },
     "node_modules/vue3-calendar-heatmap": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vue3-calendar-heatmap/-/vue3-calendar-heatmap-2.0.0.tgz",
-      "integrity": "sha512-BchyC33WiZryYatFINj3LWqgyE6X82Huzf7abA23tsF/IbaRZVwZzie8SmGaYvezEBiPXhJogQ3dtxIuXFjkBw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vue3-calendar-heatmap/-/vue3-calendar-heatmap-2.0.2.tgz",
+      "integrity": "sha512-ev0rNbOGhzX1YcNhFE0xSmJQUzK96wubBLdzaUKtKf0GhjYE8QAwzmWYcYrugolLgDj2vKzHQ/9gA3O9S26WOA==",
       "dependencies": {
         "tippy.js": "^6.3.7"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=16"
       },
       "peerDependencies": {
-        "vue": "^3.2.24"
+        "vue": "^3.2.29"
       }
     },
     "node_modules/w3c-xmlserializer": {
diff --git a/package.json b/package.json
index db7cf1154bfb5..e5f346f207b92 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "vue": "3.2.47",
     "vue-bar-graph": "2.0.0",
     "vue-loader": "17.0.1",
-    "vue3-calendar-heatmap": "2.0.0",
+    "vue3-calendar-heatmap": "2.0.2",
     "webpack": "5.76.2",
     "webpack-cli": "5.0.1",
     "workbox-routing": "6.5.4",
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index cef1e3a02ec89..fb7c77f4eb43f 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -661,9 +661,9 @@
 			{{if and (not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName)) .CanWriteToHeadRepo}}
 				<div class="ui divider"></div>
 				<div class="inline field">
-					<div class="ui checkbox" id="allow-edits-from-maintainers"
+					<div class="ui checkbox tooltip" id="allow-edits-from-maintainers"
 							data-url="{{.Issue.Link}}"
-							data-prompt-tip="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"
+							data-tooltip-content="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"
 							data-prompt-error="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_err"}}"
 						>
 						<label><strong>{{.locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl
index 5c1688d019689..adb1e3079fc3c 100644
--- a/templates/repo/sub_menu.tmpl
+++ b/templates/repo/sub_menu.tmpl
@@ -40,7 +40,7 @@
 	</div>
 	<a class="ui segment language-stats">
 		{{range .LanguageStats}}
-		<div class="bar tooltip" style="width: {{.Percentage}}%; background-color: {{.Color}}" data-placement="top" data-content={{.Language}}>&nbsp;</div>
+		<div class="bar tooltip" style="width: {{.Percentage}}%; background-color: {{.Color}}" data-tooltip-placement="top" data-tooltip-content={{.Language}}>&nbsp;</div>
 		{{end}}
 	</a>
 	{{end}}
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index 075af65af38c0..a97cfb02babe6 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -147,7 +147,6 @@
 <script>
 import {createApp, nextTick} from 'vue';
 import $ from 'jquery';
-import {initTooltip} from '../modules/tippy.js';
 import {SvgIcon} from '../svg.js';
 
 const {appSubUrl, assetUrlPrefix, pageData} = window.config;
@@ -238,9 +237,6 @@ const sfc = {
   mounted() {
     const el = document.getElementById('dashboard-repo-list');
     this.changeReposFilter(this.reposFilter);
-    for (const elTooltip of el.querySelectorAll('.tooltip')) {
-      initTooltip(elTooltip);
-    }
     $(el).find('.dropdown').dropdown();
     nextTick(() => {
       this.$refs.search.focus();
diff --git a/web_src/js/components/DiffFileList.vue b/web_src/js/components/DiffFileList.vue
index 32919156b8ddd..86444f2b21995 100644
--- a/web_src/js/components/DiffFileList.vue
+++ b/web_src/js/components/DiffFileList.vue
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-import {initTooltip} from '../modules/tippy.js';
 import {doLoadMoreFiles} from '../features/repo-diff.js';
 
 const {pageData} = window.config;
@@ -30,17 +29,6 @@ export default {
   data: () => {
     return pageData.diffFileInfo;
   },
-  watch: {
-    fileListIsVisible(newValue) {
-      if (newValue === true) {
-        this.$nextTick(() => {
-          for (const el of this.$refs.root.querySelectorAll('.tooltip')) {
-            initTooltip(el);
-          }
-        });
-      }
-    }
-  },
   mounted() {
     document.getElementById('show-file-list-btn').addEventListener('click', this.toggleFileList);
   },
diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
index f0a3d909b9fc7..4084dee51d244 100644
--- a/web_src/js/components/DiffFileTreeItem.vue
+++ b/web_src/js/components/DiffFileTreeItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="show" class="tooltip" :title="item.name">
+  <div v-show="show" :title="item.name">
     <!--title instead of tooltip above as the tooltip needs too much work with the current methods, i.e. not being loaded or staying open for "too long"-->
     <div class="item" :class="item.isFile ? 'filewrapper gt-p-1' : ''">
       <!-- Files -->
diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js
index 113ff2e1f1592..d533877c27e0e 100644
--- a/web_src/js/features/common-global.js
+++ b/web_src/js/features/common-global.js
@@ -5,7 +5,6 @@ import {createDropzone} from './dropzone.js';
 import {initCompColorPicker} from './comp/ColorPicker.js';
 import {showGlobalErrorMessage} from '../bootstrap.js';
 import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
-import {initTooltip} from '../modules/tippy.js';
 import {svg} from '../svg.js';
 import {hideElem, showElem, toggleElem} from '../utils/dom.js';
 
@@ -66,12 +65,6 @@ export function initGlobalButtonClickOnEnter() {
   });
 }
 
-export function initGlobalTooltips() {
-  for (const el of document.getElementsByClassName('tooltip')) {
-    initTooltip(el);
-  }
-}
-
 export function initGlobalCommon() {
   // Undo Safari emoji glitch fix at high enough zoom levels
   if (navigator.userAgent.match('Safari')) {
diff --git a/web_src/js/features/contextpopup.js b/web_src/js/features/contextpopup.js
index 8e0ef92bd3ae8..c685d93db04a3 100644
--- a/web_src/js/features/contextpopup.js
+++ b/web_src/js/features/contextpopup.js
@@ -30,6 +30,7 @@ export function initContextPopups() {
 
     createTippy(this, {
       content: el,
+      placement: 'top-start',
       interactive: true,
       interactiveBorder: 5,
       onShow: () => {
diff --git a/web_src/js/features/repo-diff.js b/web_src/js/features/repo-diff.js
index 56ebe4fc991ef..458f11c6f2b30 100644
--- a/web_src/js/features/repo-diff.js
+++ b/web_src/js/features/repo-diff.js
@@ -3,7 +3,6 @@ import {initCompReactionSelector} from './comp/ReactionSelector.js';
 import {initRepoIssueContentHistory} from './repo-issue-content.js';
 import {validateTextareaNonEmpty} from './comp/EasyMDE.js';
 import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles} from './pull-view-file.js';
-import {initTooltip} from '../modules/tippy.js';
 
 const {csrfToken} = window.config;
 
@@ -60,10 +59,6 @@ export function initRepoDiffConversationForm() {
     const $newConversationHolder = $(await $.post($form.attr('action'), formDataString));
     const {path, side, idx} = $newConversationHolder.data();
 
-    $newConversationHolder.find('.tooltip').each(function () {
-      initTooltip(this);
-    });
-
     $form.closest('.conversation-holder').replaceWith($newConversationHolder);
     if ($form.closest('tr').data('line-type') === 'same') {
       $(`[data-path="${path}"] a.add-code-comment[data-idx="${idx}"]`).addClass('invisible');
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index e49b1b2726f2d..767f07115158c 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -4,7 +4,7 @@ import {attachTribute} from './tribute.js';
 import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
 import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
 import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
-import {initTooltip, showTemporaryTooltip, createTippy} from '../modules/tippy.js';
+import {showTemporaryTooltip, createTippy} from '../modules/tippy.js';
 import {hideElem, showElem, toggleElem} from '../utils/dom.js';
 import {setFileFolding} from './file-fold.js';
 
@@ -280,10 +280,7 @@ export function initRepoPullRequestAllowMaintainerEdit() {
   const $checkbox = $('#allow-edits-from-maintainers');
   if (!$checkbox.length) return;
 
-  const promptTip = $checkbox.attr('data-prompt-tip');
   const promptError = $checkbox.attr('data-prompt-error');
-
-  initTooltip($checkbox[0], {content: promptTip});
   $checkbox.checkbox({
     'onChange': () => {
       const checked = $checkbox.checkbox('is checked');
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 7d74ee6b944c4..84ffe8e5db757 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -56,7 +56,6 @@ import {
   initGlobalFormDirtyLeaveConfirm,
   initGlobalLinkActions,
   initHeadNavbarContentToggle,
-  initGlobalTooltips,
 } from './features/common-global.js';
 import {initRepoTopicBar} from './features/repo-home.js';
 import {initAdminEmails} from './features/admin/emails.js';
@@ -91,6 +90,7 @@ import {initCaptcha} from './features/captcha.js';
 import {initRepositoryActionView} from './components/RepoActionView.vue';
 import {initAriaCheckboxPatch} from './modules/aria/checkbox.js';
 import {initAriaDropdownPatch} from './modules/aria/dropdown.js';
+import {initGlobalTooltips} from './modules/tippy.js';
 
 // Run time-critical code as soon as possible. This is safe to do because this
 // script appears at the end of <body> and rendered HTML is accessible at that point.
diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index 4872608ecd99f..98d0ff84b6062 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -3,7 +3,6 @@ import tippy from 'tippy.js';
 export function createTippy(target, opts = {}) {
   const instance = tippy(target, {
     appendTo: document.body,
-    placement: target.getAttribute('data-placement') || 'top-start',
     animation: false,
     allowHTML: false,
     hideOnClick: false,
@@ -25,38 +24,116 @@ export function createTippy(target, opts = {}) {
   return instance;
 }
 
-export function initTooltip(el, props = {}) {
-  const content = el.getAttribute('data-content') || props.content;
+/**
+ * Attach a tooltip tippy to the given target element.
+ * If the target element already has a tooltip tippy attached, the tooltip will be updated with the new content.
+ * If the target element has no content, then no tooltip will be attached, and it returns null.
+ *
+ * Note: "tooltip" doesn't equal to "tippy". "tooltip" means a auto-popup content, it just uses tippy as the implementation.
+ *
+ * @param target {HTMLElement}
+ * @param content {null|string}
+ * @returns {null|tippy}
+ */
+function attachTooltip(target, content = null) {
+  content = content ?? getTooltipContent(target);
   if (!content) return null;
-  if (!el.hasAttribute('aria-label')) el.setAttribute('aria-label', content);
-  return createTippy(el, {
+
+  const props = {
     content,
     delay: 100,
     role: 'tooltip',
-    ...(el.getAttribute('data-tooltip-interactive') === 'true' ? {interactive: true} : {}),
-    ...props,
-  });
-}
+    placement: target.getAttribute('data-tooltip-placement') || 'top-start',
+    ...(target.getAttribute('data-tooltip-interactive') === 'true' ? {interactive: true} : {}),
+  };
 
-export function showTemporaryTooltip(target, content) {
-  let tippy, oldContent;
-  if (target._tippy) {
-    tippy = target._tippy;
-    oldContent = tippy.props.content;
+  if (!target._tippy) {
+    createTippy(target, props);
   } else {
-    tippy = initTooltip(target, {content});
+    target._tippy.setProps(props);
+  }
+  return target._tippy;
+}
+
+/**
+ * Creating tooltip tippy instance is expensive, so we only create it when the user hovers over the element
+ * According to https://www.w3.org/TR/DOM-Level-3-Events/#events-mouseevent-event-order , mouseover event is fired before mouseenter event
+ * Some old browsers like Pale Moon doesn't support "mouseenter(capture)"
+ * The tippy by default uses "mouseenter" event to show, so we use "mouseover" event to switch to tippy
+ * @param e {Event}
+ */
+function lazyTooltipOnMouseHover(e) {
+  e.target.removeEventListener('mouseover', lazyTooltipOnMouseHover, true);
+  attachTooltip(this);
+}
+
+function getTooltipContent(target) {
+  // prefer to always use the "[data-tooltip-content]" attribute
+  // for backward compatibility, we also support the ".tooltip[data-content]" attribute
+  // in next PR, refactor all the ".tooltip[data-content]" to "[data-tooltip-content]"
+  let content = target.getAttribute('data-tooltip-content');
+  if (!content && target.classList.contains('tooltip')) {
+    content = target.getAttribute('data-content');
+  }
+  return content;
+}
+
+/**
+ * Activate the tooltip for all children elements
+ * And if the element has no aria-label, use the tooltip content as aria-label
+ * @param target {HTMLElement}
+ */
+function attachChildrenLazyTooltip(target) {
+  // the selector must match the logic in getTippyTooltipContent
+  for (const el of target.querySelectorAll('[data-tooltip-content], .tooltip[data-content]')) {
+    el.addEventListener('mouseover', lazyTooltipOnMouseHover, true);
+
+    // meanwhile, if the element has no aria-label, use the tooltip content as aria-label
+    if (!el.hasAttribute('aria-label')) {
+      const content = getTooltipContent(el);
+      if (content) {
+        el.setAttribute('aria-label', content);
+      }
+    }
   }
+}
 
+export function initGlobalTooltips() {
+  // use MutationObserver to detect new elements added to the DOM, or attributes changed
+  const observer = new MutationObserver((mutationList) => {
+    for (const mutation of mutationList) {
+      if (mutation.type === 'childList') {
+        // mainly for Vue components and AJAX rendered elements
+        for (const el of mutation.addedNodes) {
+          // handle all "tooltip" elements in added nodes which have 'querySelectorAll' method, skip non-related nodes (eg: "#text")
+          if ('querySelectorAll' in el) {
+            attachChildrenLazyTooltip(el);
+          }
+        }
+      } else if (mutation.type === 'attributes') {
+        // sync the tooltip content if the attributes change
+        attachTooltip(mutation.target);
+      }
+    }
+  });
+  observer.observe(document, {
+    subtree: true,
+    childList: true,
+    attributeFilter: ['data-tooltip-content', 'data-content'],
+  });
+
+  attachChildrenLazyTooltip(document.documentElement);
+}
+
+export function showTemporaryTooltip(target, content) {
+  const tippy = target._tippy ?? attachTooltip(target, content);
   tippy.setContent(content);
   if (!tippy.state.isShown) tippy.show();
   tippy.setProps({
     onHidden: (tippy) => {
-      if (oldContent) {
-        tippy.setContent(oldContent);
-        tippy.setProps({onHidden: undefined});
-      } else {
+      // reset the default tooltip content, if no default, then this temporary tooltip could be destroyed
+      if (!attachTooltip(target)) {
         tippy.destroy();
-        // after destroy, the `_tippy` is detached, it can't do "setProps (etc...)" anymore
       }
     },
   });

From df411819ebe4d3e6852997ce41fadf837d5d4ea0 Mon Sep 17 00:00:00 2001
From: Zettat123 <zettat123@gmail.com>
Date: Thu, 23 Mar 2023 20:30:28 +0800
Subject: [PATCH 04/12] Check LFS/Packages settings in dump and doctor command
 (#23631)

Close #23622

As described in the issue, disabling the LFS/Package settings will cause
errors when running `gitea dump` or `gitea doctor`. We need to check the
settings and the related operations should be skipped if the settings
are disabled.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
---
 cmd/dump.go               | 4 ++++
 modules/doctor/storage.go | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/cmd/dump.go b/cmd/dump.go
index 00d279b99187d..19589caa75d86 100644
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -250,6 +250,8 @@ func runDump(ctx *cli.Context) error {
 
 		if ctx.IsSet("skip-lfs-data") && ctx.Bool("skip-lfs-data") {
 			log.Info("Skip dumping LFS data")
+		} else if !setting.LFS.StartServer {
+			log.Info("LFS isn't enabled. Skip dumping LFS data")
 		} else if err := storage.LFS.IterateObjects("", func(objPath string, object storage.Object) error {
 			info, err := object.Stat()
 			if err != nil {
@@ -364,6 +366,8 @@ func runDump(ctx *cli.Context) error {
 
 	if ctx.IsSet("skip-package-data") && ctx.Bool("skip-package-data") {
 		log.Info("Skip dumping package data")
+	} else if !setting.Packages.Enabled {
+		log.Info("Packages isn't enabled. Skip dumping package data")
 	} else if err := storage.Packages.IterateObjects("", func(objPath string, object storage.Object) error {
 		info, err := object.Stat()
 		if err != nil {
diff --git a/modules/doctor/storage.go b/modules/doctor/storage.go
index c20566d67593d..f3385378646eb 100644
--- a/modules/doctor/storage.go
+++ b/modules/doctor/storage.go
@@ -16,6 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/log"
 	packages_module "code.gitea.io/gitea/modules/packages"
+	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
 	"code.gitea.io/gitea/modules/util"
 )
@@ -111,6 +112,10 @@ func checkStorage(opts *checkStorageOptions) func(ctx context.Context, logger lo
 		}
 
 		if opts.LFS || opts.All {
+			if !setting.LFS.StartServer {
+				logger.Info("LFS isn't enabled (skipped)")
+				return nil
+			}
 			if err := commonCheckStorage(ctx, logger, autofix,
 				&commonStorageCheckOptions{
 					storer: storage.LFS,
@@ -173,6 +178,10 @@ func checkStorage(opts *checkStorageOptions) func(ctx context.Context, logger lo
 		}
 
 		if opts.Packages || opts.All {
+			if !setting.Packages.Enabled {
+				logger.Info("Packages isn't enabled (skipped)")
+				return nil
+			}
 			if err := commonCheckStorage(ctx, logger, autofix,
 				&commonStorageCheckOptions{
 					storer: storage.Packages,

From e8433b7fe6dd1dfa5ecf0633568cc3e34caeb0f9 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 23 Mar 2023 23:18:24 +0800
Subject: [PATCH 05/12] Restructure documentation. Now the documentation has
 installation, administration, usage, development, contributing the 5 main
 parts (#23629)

- **Installation**: includes how to install Gitea and related other
tools, also includes upgrade Gitea
- **Administration**: includes how to configure Gitea, customize Gitea
and manage Gitea instance out of Gitea admin UI
- **Usage**: includes how to use Gitea's functionalities. A sub
documentation is about packages, in future we could also include CI/CD
and others.
- **Development**: includes how to integrate with Gitea's API, how to
develop new features within Gitea
- **Contributing**: includes how to contribute code to Gitea
repositories.

After this is merged, I think we can have a sub-documentation of `Usage`
part named `Actions` to describe how to use Gitea actions

---------

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
---
 Makefile                                      |  3 +-
 docs/Makefile                                 |  2 +-
 docs/config.yaml                              |  5 ++++
 docs/content/doc/administration.en-us.md      | 14 +++++++++
 ...anced.fr-fr.md => administration.fr-fr.md} |  6 ++--
 docs/content/doc/administration.zh-cn.md      | 13 ++++++++
 docs/content/doc/administration.zh-tw.md      | 13 ++++++++
 .../adding-legal-pages.en-us.md               |  4 +--
 .../backup-and-restore.en-us.md               |  2 +-
 .../backup-and-restore.zh-cn.md               |  2 +-
 .../backup-and-restore.zh-tw.md               |  2 +-
 .../cmd-embedded.en-us.md                     |  8 ++---
 .../command-line.en-us.md                     |  4 +--
 .../config-cheat-sheet.en-us.md               |  6 ++--
 .../config-cheat-sheet.zh-cn.md               |  4 +--
 .../customizing-gitea.en-us.md                |  6 ++--
 .../customizing-gitea.zh-cn.md                |  4 +--
 .../email-setup.en-us.md                      |  4 +--
 .../environment-variables.en-us.md            |  4 +--
 .../environment-variables.zh-cn.md            |  4 +--
 .../external-renderers.en-us.md               |  4 +--
 .../fail2ban-setup.en-us.md                   |  2 +-
 .../fail2ban-setup.zh-cn.md                   |  2 +-
 .../git-lfs-support.en-us.md                  |  2 +-
 .../https-support.en-us.md                    |  4 +--
 .../logging-documentation.en-us.md            |  4 +--
 .../mail-templates.en-us.md                   |  2 +-
 .../repo-indexer.en-us.md                     |  2 +-
 .../reverse-proxies.en-us.md                  |  4 +--
 .../reverse-proxies.zh-cn.md                  |  4 +--
 .../search-engines-indexation.en-us.md        |  4 +--
 .../signing.en-us.md                          |  4 +--
 docs/content/doc/advanced.zh-tw.md            | 13 --------
 ...slation.en-us.md => contributing.en-us.md} |  8 ++---
 ...slation.de-de.md => contributing.fr-fr.md} |  4 +--
 ...slation.zh-tw.md => contributing.zh-tw.md} |  8 ++---
 .../guidelines-backend.en-us.md               |  2 +-
 .../guidelines-frontend.en-us.md              |  2 +-
 .../guidelines-refactoring.en-us.md           |  2 +-
 .../localization.en-us.md                     |  2 +-
 .../localization.zh-cn.md                     |  2 +-
 .../localization.zh-tw.md                     |  2 +-
 .../translation.de-de.md}                     |  2 +-
 .../translation.en-us.md}                     |  2 +-
 docs/content/doc/developers.en-us.md          | 13 --------
 docs/content/doc/developers.zh-cn.md          | 13 --------
 docs/content/doc/developers.zh-tw.md          | 13 --------
 docs/content/doc/development.en-us.md         | 13 ++++++++
 ...advanced.en-us.md => development.zh-cn.md} | 10 +++----
 ...advanced.zh-cn.md => development.zh-tw.md} | 10 +++----
 .../api-usage.en-us.md                        |  2 +-
 .../api-usage.zh-cn.md                        |  2 +-
 .../hacking-on-gitea.en-us.md                 |  8 ++---
 .../hacking-on-gitea.zh-cn.md                 |  6 ++--
 .../integrations.en-us.md                     |  2 +-
 .../integrations.zh-tw.md                     |  2 +-
 .../migrations.en-us.md                       |  2 +-
 .../migrations.zh-tw.md                       |  2 +-
 .../oauth2-provider.en-us.md                  |  2 +-
 .../oauth2-provider.zh-tw.md                  |  2 +-
 docs/content/doc/features.en-us.md            | 13 --------
 docs/content/doc/features.zh-cn.md            | 13 --------
 docs/content/doc/features.zh-tw.md            | 13 --------
 docs/content/doc/help.en-us.md                |  2 +-
 docs/content/doc/help.fr-fr.md                |  2 +-
 docs/content/doc/help.zh-cn.md                |  2 +-
 docs/content/doc/help.zh-tw.md                |  2 +-
 docs/content/doc/help/faq.en-us.md            | 30 +++++++++----------
 .../comparison.en-us.md                       |  2 +-
 .../comparison.zh-cn.md                       |  2 +-
 .../comparison.zh-tw.md                       |  2 +-
 .../database-preparation.en-us.md             |  2 +-
 .../doc/installation/from-binary.en-us.md     |  6 ++--
 .../doc/installation/from-binary.zh-cn.md     |  4 +--
 .../doc/installation/from-source.en-us.md     |  4 +--
 .../upgrade-from-gitea.en-us.md}              |  8 ++---
 .../upgrade-from-gogs.en-us.md}               |  6 ++--
 .../upgrade-from-gogs.fr-fr.md}               |  4 +--
 .../upgrade-from-gogs.zh-cn.md}               |  4 +--
 .../upgrade-from-gogs.zh-tw.md}               |  6 ++--
 .../with-docker-rootless.en-us.md             |  2 +-
 .../doc/installation/with-docker.en-us.md     |  2 +-
 .../doc/installation/with-docker.fr-fr.md     |  2 +-
 .../doc/installation/with-docker.zh-cn.md     |  2 +-
 .../doc/installation/with-docker.zh-tw.md     |  2 +-
 docs/content/doc/packages.en-us.md            |  9 +++---
 docs/content/doc/packages/cargo.en-us.md      |  4 +--
 docs/content/doc/packages/chef.en-us.md       |  2 +-
 docs/content/doc/packages/composer.en-us.md   |  4 +--
 docs/content/doc/packages/conan.en-us.md      |  4 +--
 docs/content/doc/packages/conda.en-us.md      |  2 +-
 docs/content/doc/packages/container.en-us.md  |  4 +--
 docs/content/doc/packages/generic.en-us.md    |  6 ++--
 docs/content/doc/packages/helm.en-us.md       |  4 +--
 docs/content/doc/packages/maven.en-us.md      |  4 +--
 docs/content/doc/packages/npm.en-us.md        |  4 +--
 docs/content/doc/packages/nuget.en-us.md      |  6 ++--
 docs/content/doc/packages/overview.en-us.md   |  2 +-
 docs/content/doc/packages/pub.en-us.md        |  4 +--
 docs/content/doc/packages/pypi.en-us.md       |  4 +--
 docs/content/doc/packages/rubygems.en-us.md   |  4 +--
 docs/content/doc/packages/storage.en-us.md    |  6 ++--
 docs/content/doc/packages/swift.en-us.md      |  6 ++--
 docs/content/doc/packages/vagrant.en-us.md    |  4 +--
 docs/content/doc/upgrade.en-us.md             | 13 --------
 docs/content/doc/upgrade.fr-fr.md             | 13 --------
 docs/content/doc/upgrade.zh-cn.md             | 13 --------
 docs/content/doc/upgrade.zh-tw.md             | 13 --------
 docs/content/doc/usage.en-us.md               |  2 +-
 docs/content/doc/usage.zh-cn.md               |  2 +-
 docs/content/doc/usage.zh-tw.md               |  2 +-
 .../authentication.en-us.md                   |  2 +-
 .../authentication.zh-cn.md                   |  2 +-
 .../authentication.zh-tw.md                   |  2 +-
 .../{advanced => usage}/clone-filter.en-us.md |  2 +-
 .../doc/usage/linked-references.en-us.md      |  2 +-
 .../protected-tags.en-us.md                   |  2 +-
 .../content/doc/usage/push-to-create.en-us.md |  2 +-
 .../{advanced => usage}/repo-mirror.en-us.md  |  2 +-
 .../secrets.en-us.md}                         |  8 ++---
 .../doc/{features => usage}/webhooks.en-us.md |  2 +-
 .../doc/{features => usage}/webhooks.zh-cn.md |  2 +-
 .../doc/{features => usage}/webhooks.zh-tw.md |  2 +-
 123 files changed, 261 insertions(+), 346 deletions(-)
 create mode 100644 docs/content/doc/administration.en-us.md
 rename docs/content/doc/{advanced.fr-fr.md => administration.fr-fr.md} (64%)
 create mode 100644 docs/content/doc/administration.zh-cn.md
 create mode 100644 docs/content/doc/administration.zh-tw.md
 rename docs/content/doc/{advanced => administration}/adding-legal-pages.en-us.md (96%)
 rename docs/content/doc/{usage => administration}/backup-and-restore.en-us.md (99%)
 rename docs/content/doc/{usage => administration}/backup-and-restore.zh-cn.md (98%)
 rename docs/content/doc/{usage => administration}/backup-and-restore.zh-tw.md (98%)
 rename docs/content/doc/{advanced => administration}/cmd-embedded.en-us.md (96%)
 rename docs/content/doc/{usage => administration}/command-line.en-us.md (99%)
 rename docs/content/doc/{advanced => administration}/config-cheat-sheet.en-us.md (99%)
 rename docs/content/doc/{advanced => administration}/config-cheat-sheet.zh-cn.md (99%)
 rename docs/content/doc/{advanced => administration}/customizing-gitea.en-us.md (97%)
 rename docs/content/doc/{advanced => administration}/customizing-gitea.zh-cn.md (99%)
 rename docs/content/doc/{usage => administration}/email-setup.en-us.md (97%)
 rename docs/content/doc/{advanced => administration}/environment-variables.en-us.md (97%)
 rename docs/content/doc/{advanced => administration}/environment-variables.zh-cn.md (97%)
 rename docs/content/doc/{advanced => administration}/external-renderers.en-us.md (99%)
 rename docs/content/doc/{usage => administration}/fail2ban-setup.en-us.md (99%)
 rename docs/content/doc/{usage => administration}/fail2ban-setup.zh-cn.md (99%)
 rename docs/content/doc/{usage => administration}/git-lfs-support.en-us.md (95%)
 rename docs/content/doc/{usage => administration}/https-support.en-us.md (97%)
 rename docs/content/doc/{advanced => administration}/logging-documentation.en-us.md (99%)
 rename docs/content/doc/{advanced => administration}/mail-templates.en-us.md (99%)
 rename docs/content/doc/{advanced => administration}/repo-indexer.en-us.md (98%)
 rename docs/content/doc/{usage => administration}/reverse-proxies.en-us.md (99%)
 rename docs/content/doc/{usage => administration}/reverse-proxies.zh-cn.md (98%)
 rename docs/content/doc/{advanced => administration}/search-engines-indexation.en-us.md (90%)
 rename docs/content/doc/{advanced => administration}/signing.en-us.md (99%)
 delete mode 100644 docs/content/doc/advanced.zh-tw.md
 rename docs/content/doc/{translation.en-us.md => contributing.en-us.md} (52%)
 rename docs/content/doc/{translation.de-de.md => contributing.fr-fr.md} (75%)
 rename docs/content/doc/{translation.zh-tw.md => contributing.zh-tw.md} (55%)
 rename docs/content/doc/{developers => contributing}/guidelines-backend.en-us.md (99%)
 rename docs/content/doc/{developers => contributing}/guidelines-frontend.en-us.md (99%)
 rename docs/content/doc/{developers => contributing}/guidelines-refactoring.en-us.md (98%)
 rename docs/content/doc/{features => contributing}/localization.en-us.md (97%)
 rename docs/content/doc/{features => contributing}/localization.zh-cn.md (97%)
 rename docs/content/doc/{features => contributing}/localization.zh-tw.md (97%)
 rename docs/content/doc/{translation/guidelines.de-de.md => contributing/translation.de-de.md} (98%)
 rename docs/content/doc/{translation/guidelines.en-us.md => contributing/translation.en-us.md} (93%)
 delete mode 100644 docs/content/doc/developers.en-us.md
 delete mode 100644 docs/content/doc/developers.zh-cn.md
 delete mode 100644 docs/content/doc/developers.zh-tw.md
 create mode 100644 docs/content/doc/development.en-us.md
 rename docs/content/doc/{advanced.en-us.md => development.zh-cn.md} (50%)
 rename docs/content/doc/{advanced.zh-cn.md => development.zh-tw.md} (50%)
 rename docs/content/doc/{developers => development}/api-usage.en-us.md (99%)
 rename docs/content/doc/{developers => development}/api-usage.zh-cn.md (99%)
 rename docs/content/doc/{developers => development}/hacking-on-gitea.en-us.md (98%)
 rename docs/content/doc/{developers => development}/hacking-on-gitea.zh-cn.md (98%)
 rename docs/content/doc/{developers => development}/integrations.en-us.md (97%)
 rename docs/content/doc/{developers => development}/integrations.zh-tw.md (96%)
 rename docs/content/doc/{developers => development}/migrations.en-us.md (98%)
 rename docs/content/doc/{developers => development}/migrations.zh-tw.md (98%)
 rename docs/content/doc/{developers => development}/oauth2-provider.en-us.md (99%)
 rename docs/content/doc/{developers => development}/oauth2-provider.zh-tw.md (99%)
 delete mode 100644 docs/content/doc/features.en-us.md
 delete mode 100644 docs/content/doc/features.zh-cn.md
 delete mode 100644 docs/content/doc/features.zh-tw.md
 rename docs/content/doc/{features => installation}/comparison.en-us.md (99%)
 rename docs/content/doc/{features => installation}/comparison.zh-cn.md (99%)
 rename docs/content/doc/{features => installation}/comparison.zh-tw.md (99%)
 rename docs/content/doc/{upgrade/from-gitea.en-us.md => installation/upgrade-from-gitea.en-us.md} (97%)
 rename docs/content/doc/{upgrade/from-gogs.en-us.md => installation/upgrade-from-gogs.en-us.md} (98%)
 rename docs/content/doc/{upgrade/from-gogs.fr-fr.md => installation/upgrade-from-gogs.fr-fr.md} (98%)
 rename docs/content/doc/{upgrade/from-gogs.zh-cn.md => installation/upgrade-from-gogs.zh-cn.md} (95%)
 rename docs/content/doc/{upgrade/from-gogs.zh-tw.md => installation/upgrade-from-gogs.zh-tw.md} (98%)
 delete mode 100644 docs/content/doc/upgrade.en-us.md
 delete mode 100644 docs/content/doc/upgrade.fr-fr.md
 delete mode 100644 docs/content/doc/upgrade.zh-cn.md
 delete mode 100644 docs/content/doc/upgrade.zh-tw.md
 rename docs/content/doc/{features => usage}/authentication.en-us.md (99%)
 rename docs/content/doc/{features => usage}/authentication.zh-cn.md (98%)
 rename docs/content/doc/{features => usage}/authentication.zh-tw.md (90%)
 rename docs/content/doc/{advanced => usage}/clone-filter.en-us.md (98%)
 rename docs/content/doc/{advanced => usage}/protected-tags.en-us.md (99%)
 rename docs/content/doc/{advanced => usage}/repo-mirror.en-us.md (99%)
 rename docs/content/doc/{secrets/overview.en-us.md => usage/secrets.en-us.md} (91%)
 rename docs/content/doc/{features => usage}/webhooks.en-us.md (99%)
 rename docs/content/doc/{features => usage}/webhooks.zh-cn.md (96%)
 rename docs/content/doc/{features => usage}/webhooks.zh-tw.md (99%)

diff --git a/Makefile b/Makefile
index 58873ccd926c7..462bb657cc423 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ ifeq ($(RACE_ENABLED),true)
 endif
 
 STORED_VERSION_FILE := VERSION
+HUGO_VERSION ?= 0.111.3
 
 ifneq ($(DRONE_TAG),)
 	VERSION ?= $(subst v,,$(DRONE_TAG))
@@ -817,7 +818,7 @@ release-docs: | $(DIST_DIRS) docs
 .PHONY: docs
 docs:
 	@hash hugo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		curl -sL https://github.com/gohugoio/hugo/releases/download/v0.74.3/hugo_0.74.3_Linux-64bit.tar.gz | tar zxf - -C /tmp && mv /tmp/hugo /usr/bin/hugo && chmod +x /usr/bin/hugo; \
+		curl -sL https://github.com/gohugoio/hugo/releases/download/v$(HUGO_VERSION)/hugo_$(HUGO_VERSION)_Linux-64bit.tar.gz | tar zxf - -C /tmp && mv /tmp/hugo /usr/bin/hugo && chmod +x /usr/bin/hugo; \
 	fi
 	cd docs; make trans-copy clean build-offline;
 
diff --git a/docs/Makefile b/docs/Makefile
index 0178cd3587d23..6a5a374845d39 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -2,7 +2,7 @@ THEME := themes/gitea
 PUBLIC := public
 ARCHIVE := https://dl.gitea.com/theme/main.tar.gz
 
-HUGO_PACKAGE := github.com/gohugoio/hugo@v0.82.0
+HUGO_PACKAGE := github.com/gohugoio/hugo@v0.111.3
 
 .PHONY: all
 all: build
diff --git a/docs/config.yaml b/docs/config.yaml
index 26f096b1cf3c7..fbc4bc9a98e2d 100644
--- a/docs/config.yaml
+++ b/docs/config.yaml
@@ -26,6 +26,11 @@ params:
   repo: "https://github.com/go-gitea/gitea"
   docContentPath: "docs/content"
 
+markup:
+  tableOfContents:
+    startLevel: 1
+    endLevel: 9
+
 outputs:
   home:
     - HTML
diff --git a/docs/content/doc/administration.en-us.md b/docs/content/doc/administration.en-us.md
new file mode 100644
index 0000000000000..5d3ba385d951d
--- /dev/null
+++ b/docs/content/doc/administration.en-us.md
@@ -0,0 +1,14 @@
+---
+date: "2016-12-01T16:00:00+02:00"
+title: "Administration"
+slug: "administration"
+weight: 30
+toc: false
+draft: false
+menu:
+  sidebar:
+    name: "Administration"
+    weight: 20
+    collapse: true
+    identifier: "administration"
+---
diff --git a/docs/content/doc/advanced.fr-fr.md b/docs/content/doc/administration.fr-fr.md
similarity index 64%
rename from docs/content/doc/advanced.fr-fr.md
rename to docs/content/doc/administration.fr-fr.md
index 04734a8f81f56..957ff7b1942cb 100644
--- a/docs/content/doc/advanced.fr-fr.md
+++ b/docs/content/doc/administration.fr-fr.md
@@ -1,13 +1,13 @@
 ---
 date: "2017-08-23T09:00:00+02:00"
 title: "Avancé"
-slug: "advanced"
+slug: "administration"
 weight: 30
 toc: false
 draft: false
 menu:
   sidebar:
     name: "Avancé"
-    weight: 40
-    identifier: "advanced"
+    weight: 20
+    identifier: "administration"
 ---
diff --git a/docs/content/doc/administration.zh-cn.md b/docs/content/doc/administration.zh-cn.md
new file mode 100644
index 0000000000000..6e032d3266568
--- /dev/null
+++ b/docs/content/doc/administration.zh-cn.md
@@ -0,0 +1,13 @@
+---
+date: "2016-12-01T16:00:00+02:00"
+title: "运维"
+slug: "administration"
+weight: 30
+toc: false
+draft: false
+menu:
+  sidebar:
+    name: "运维"
+    weight: 20
+    identifier: "administration"
+---
diff --git a/docs/content/doc/administration.zh-tw.md b/docs/content/doc/administration.zh-tw.md
new file mode 100644
index 0000000000000..daf8e3f1052a7
--- /dev/null
+++ b/docs/content/doc/administration.zh-tw.md
@@ -0,0 +1,13 @@
+---
+date: "2016-12-01T16:00:00+02:00"
+title: "運維"
+slug: "administration"
+weight: 30
+toc: false
+draft: false
+menu:
+  sidebar:
+    name: "運維"
+    weight: 20
+    identifier: "administration"
+---
diff --git a/docs/content/doc/advanced/adding-legal-pages.en-us.md b/docs/content/doc/administration/adding-legal-pages.en-us.md
similarity index 96%
rename from docs/content/doc/advanced/adding-legal-pages.en-us.md
rename to docs/content/doc/administration/adding-legal-pages.en-us.md
index 5816fdbf3fabe..9ba8c4fd81c67 100644
--- a/docs/content/doc/advanced/adding-legal-pages.en-us.md
+++ b/docs/content/doc/administration/adding-legal-pages.en-us.md
@@ -7,10 +7,10 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Adding Legal Pages"
     identifier: "adding-legal-pages"
-    weight: 9
+    weight: 110
 ---
 
 Some jurisdictions (such as EU), requires certain legal pages (e.g. Privacy Policy) to be added to website. Follow these steps to add them to your Gitea instance.
diff --git a/docs/content/doc/usage/backup-and-restore.en-us.md b/docs/content/doc/administration/backup-and-restore.en-us.md
similarity index 99%
rename from docs/content/doc/usage/backup-and-restore.en-us.md
rename to docs/content/doc/administration/backup-and-restore.en-us.md
index cae097082e1e2..16e8654b74c5f 100644
--- a/docs/content/doc/usage/backup-and-restore.en-us.md
+++ b/docs/content/doc/administration/backup-and-restore.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "Backup and Restore"
     weight: 11
     identifier: "backup-and-restore"
diff --git a/docs/content/doc/usage/backup-and-restore.zh-cn.md b/docs/content/doc/administration/backup-and-restore.zh-cn.md
similarity index 98%
rename from docs/content/doc/usage/backup-and-restore.zh-cn.md
rename to docs/content/doc/administration/backup-and-restore.zh-cn.md
index 43ad108d95597..602657f4194c9 100644
--- a/docs/content/doc/usage/backup-and-restore.zh-cn.md
+++ b/docs/content/doc/administration/backup-and-restore.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "备份与恢复"
     weight: 11
     identifier: "backup-and-restore"
diff --git a/docs/content/doc/usage/backup-and-restore.zh-tw.md b/docs/content/doc/administration/backup-and-restore.zh-tw.md
similarity index 98%
rename from docs/content/doc/usage/backup-and-restore.zh-tw.md
rename to docs/content/doc/administration/backup-and-restore.zh-tw.md
index 18e244b19c69d..cab95217a38b2 100644
--- a/docs/content/doc/usage/backup-and-restore.zh-tw.md
+++ b/docs/content/doc/administration/backup-and-restore.zh-tw.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "備份與還原"
     weight: 11
     identifier: "backup-and-restore"
diff --git a/docs/content/doc/advanced/cmd-embedded.en-us.md b/docs/content/doc/administration/cmd-embedded.en-us.md
similarity index 96%
rename from docs/content/doc/advanced/cmd-embedded.en-us.md
rename to docs/content/doc/administration/cmd-embedded.en-us.md
index 63ab83bd36b2a..cad0de9787fe9 100644
--- a/docs/content/doc/advanced/cmd-embedded.en-us.md
+++ b/docs/content/doc/administration/cmd-embedded.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Embedded data extraction tool"
-    weight: 40
+    weight: 20
     identifier: "cmd-embedded"
 ---
 
@@ -21,7 +21,7 @@ menu:
 
 Gitea's executable contains all the resources required to run: templates, images, style-sheets
 and translations. Any of them can be overridden by placing a replacement in a matching path
-inside the `custom` directory (see [Customizing Gitea]({{< relref "doc/advanced/customizing-gitea.en-us.md" >}})).
+inside the `custom` directory (see [Customizing Gitea]({{< relref "doc/administration/customizing-gitea.en-us.md" >}})).
 
 To obtain a copy of the embedded resources ready for editing, the `embedded` command from the CLI
 can be used from the OS shell interface.
@@ -85,7 +85,7 @@ The default is the current directory.
 The `--custom` flag tells Gitea to extract the files directly into the `custom` directory.
 For this to work, the command needs to know the location of the `app.ini` configuration
 file (`--config`) and, depending of the configuration, be ran from the directory where
-Gitea normally starts. See [Customizing Gitea]({{< relref "doc/advanced/customizing-gitea.en-us.md" >}}) for details.
+Gitea normally starts. See [Customizing Gitea]({{< relref "doc/administration/customizing-gitea.en-us.md" >}}) for details.
 
 The `--overwrite` flag allows any existing files in the destination directory to be overwritten.
 
diff --git a/docs/content/doc/usage/command-line.en-us.md b/docs/content/doc/administration/command-line.en-us.md
similarity index 99%
rename from docs/content/doc/usage/command-line.en-us.md
rename to docs/content/doc/administration/command-line.en-us.md
index 70efebd203618..3dfad62f3d88f 100644
--- a/docs/content/doc/usage/command-line.en-us.md
+++ b/docs/content/doc/administration/command-line.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "Command Line"
-    weight: 10
+    weight: 1
     identifier: "command-line"
 ---
 
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md
similarity index 99%
rename from docs/content/doc/advanced/config-cheat-sheet.en-us.md
rename to docs/content/doc/administration/config-cheat-sheet.en-us.md
index aca591787e91b..886aa11186c49 100644
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Config Cheat Sheet"
-    weight: 20
+    weight: 30
     identifier: "config-cheat-sheet"
 ---
 
@@ -753,7 +753,7 @@ and
 - `FORCE_TRUST_SERVER_CERT`: **false**: If set to `true`, completely ignores server certificate validation errors. This option is unsafe. Consider adding the certificate to the system trust store instead.
 - `USER`: **\<empty\>**: Username of mailing user (usually the sender's e-mail address).
 - `PASSWD`: **\<empty\>**: Password of mailing user.  Use \`your password\` for quoting if you use special characters in the password.
-  - Please note: authentication is only supported when the SMTP server communication is encrypted with TLS (this can be via `STARTTLS`) or SMTP host is localhost. See [Email Setup]({{< relref "doc/usage/email-setup.en-us.md" >}}) for more information.
+  - Please note: authentication is only supported when the SMTP server communication is encrypted with TLS (this can be via `STARTTLS`) or SMTP host is localhost. See [Email Setup]({{< relref "doc/administration/email-setup.en-us.md" >}}) for more information.
 - `ENABLE_HELO`: **true**: Enable HELO operation.
 - `HELO_HOSTNAME`: **(retrieved from system)**: HELO hostname.
 - `FROM`: **\<empty\>**: Mail from address, RFC 5322. This can be just an email address, or the "Name" \<email@example.com\> format.
diff --git a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md b/docs/content/doc/administration/config-cheat-sheet.zh-cn.md
similarity index 99%
rename from docs/content/doc/advanced/config-cheat-sheet.zh-cn.md
rename to docs/content/doc/administration/config-cheat-sheet.zh-cn.md
index 84186d0e9af1b..9a32238c1a894 100644
--- a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md
+++ b/docs/content/doc/administration/config-cheat-sheet.zh-cn.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "配置说明"
-    weight: 20
+    weight: 30
     identifier: "config-cheat-sheet"
 ---
 
diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/administration/customizing-gitea.en-us.md
similarity index 97%
rename from docs/content/doc/advanced/customizing-gitea.en-us.md
rename to docs/content/doc/administration/customizing-gitea.en-us.md
index 4c0235c04aca5..9a4c5639a3c3a 100644
--- a/docs/content/doc/advanced/customizing-gitea.en-us.md
+++ b/docs/content/doc/administration/customizing-gitea.en-us.md
@@ -7,10 +7,10 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Customizing Gitea"
     identifier: "customizing-gitea"
-    weight: 9
+    weight: 100
 ---
 
 # Customizing Gitea
@@ -84,7 +84,7 @@ directory at the top of this document).
 Every single page of Gitea can be changed. Dynamic content is generated using [go templates](https://golang.org/pkg/html/template/),
 which can be modified by placing replacements below the `$GITEA_CUSTOM/templates` directory.
 
-To obtain any embedded file (including templates), the [`gitea embedded` tool]({{< relref "doc/advanced/cmd-embedded.en-us.md" >}}) can be used. Alternatively, they can be found in the [`templates`](https://github.com/go-gitea/gitea/tree/main/templates) directory of Gitea source (Note: the example link is from the `main` branch. Make sure to use templates compatible with the release you are using).
+To obtain any embedded file (including templates), the [`gitea embedded` tool]({{< relref "doc/administration/cmd-embedded.en-us.md" >}}) can be used. Alternatively, they can be found in the [`templates`](https://github.com/go-gitea/gitea/tree/main/templates) directory of Gitea source (Note: the example link is from the `main` branch. Make sure to use templates compatible with the release you are using).
 
 Be aware that any statement contained inside `{{` and `}}` are Gitea's template syntax and
 shouldn't be touched without fully understanding these components.
diff --git a/docs/content/doc/advanced/customizing-gitea.zh-cn.md b/docs/content/doc/administration/customizing-gitea.zh-cn.md
similarity index 99%
rename from docs/content/doc/advanced/customizing-gitea.zh-cn.md
rename to docs/content/doc/administration/customizing-gitea.zh-cn.md
index bb55f35e178f9..200f958245ce1 100644
--- a/docs/content/doc/advanced/customizing-gitea.zh-cn.md
+++ b/docs/content/doc/administration/customizing-gitea.zh-cn.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "自定义 Gitea 配置"
-    weight: 9
+    weight: 100
     identifier: "customizing-gitea"
 ---
 
diff --git a/docs/content/doc/usage/email-setup.en-us.md b/docs/content/doc/administration/email-setup.en-us.md
similarity index 97%
rename from docs/content/doc/usage/email-setup.en-us.md
rename to docs/content/doc/administration/email-setup.en-us.md
index 6d6b18786ccbc..27ecb0d2f2edf 100644
--- a/docs/content/doc/usage/email-setup.en-us.md
+++ b/docs/content/doc/administration/email-setup.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "Email setup"
     weight: 12
     identifier: "email-setup"
@@ -58,7 +58,7 @@ Restart Gitea for the configuration changes to take effect.
 
 To send a test email to validate the settings, go to Gitea > Site Administration > Configuration > SMTP Mailer Configuration.
 
-For the full list of options check the [Config Cheat Sheet]({{< relref "doc/advanced/config-cheat-sheet.en-us.md" >}})
+For the full list of options check the [Config Cheat Sheet]({{< relref "doc/administration/config-cheat-sheet.en-us.md" >}})
 
 Please note: authentication is only supported when the SMTP server communication is encrypted with TLS or `HOST=localhost`. TLS encryption can be through:
 
diff --git a/docs/content/doc/advanced/environment-variables.en-us.md b/docs/content/doc/administration/environment-variables.en-us.md
similarity index 97%
rename from docs/content/doc/advanced/environment-variables.en-us.md
rename to docs/content/doc/administration/environment-variables.en-us.md
index 288358f69dbe8..17a02501644e2 100644
--- a/docs/content/doc/advanced/environment-variables.en-us.md
+++ b/docs/content/doc/administration/environment-variables.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Environment variables"
-    weight: 20
+    weight: 10
     identifier: "environment-variables"
 ---
 
diff --git a/docs/content/doc/advanced/environment-variables.zh-cn.md b/docs/content/doc/administration/environment-variables.zh-cn.md
similarity index 97%
rename from docs/content/doc/advanced/environment-variables.zh-cn.md
rename to docs/content/doc/administration/environment-variables.zh-cn.md
index 3de8dcfbc7418..c8a8fcba7188c 100644
--- a/docs/content/doc/advanced/environment-variables.zh-cn.md
+++ b/docs/content/doc/administration/environment-variables.zh-cn.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "环境变量清单"
-    weight: 20
+    weight: 10
     identifier: "environment-variables"
 ---
 
diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/administration/external-renderers.en-us.md
similarity index 99%
rename from docs/content/doc/advanced/external-renderers.en-us.md
rename to docs/content/doc/administration/external-renderers.en-us.md
index 244fcd7c83983..da2f493c71a66 100644
--- a/docs/content/doc/advanced/external-renderers.en-us.md
+++ b/docs/content/doc/administration/external-renderers.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "External renderers"
-    weight: 40
+    weight: 60
     identifier: "external-renderers"
 ---
 
diff --git a/docs/content/doc/usage/fail2ban-setup.en-us.md b/docs/content/doc/administration/fail2ban-setup.en-us.md
similarity index 99%
rename from docs/content/doc/usage/fail2ban-setup.en-us.md
rename to docs/content/doc/administration/fail2ban-setup.en-us.md
index f00551e3efa92..746222420a925 100644
--- a/docs/content/doc/usage/fail2ban-setup.en-us.md
+++ b/docs/content/doc/administration/fail2ban-setup.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "Fail2ban setup"
     weight: 16
     identifier: "fail2ban-setup"
diff --git a/docs/content/doc/usage/fail2ban-setup.zh-cn.md b/docs/content/doc/administration/fail2ban-setup.zh-cn.md
similarity index 99%
rename from docs/content/doc/usage/fail2ban-setup.zh-cn.md
rename to docs/content/doc/administration/fail2ban-setup.zh-cn.md
index 446d192aa619f..37a0838b24aec 100644
--- a/docs/content/doc/usage/fail2ban-setup.zh-cn.md
+++ b/docs/content/doc/administration/fail2ban-setup.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "设置 Fail2ban"
     weight: 16
     identifier: "fail2ban-setup"
diff --git a/docs/content/doc/usage/git-lfs-support.en-us.md b/docs/content/doc/administration/git-lfs-support.en-us.md
similarity index 95%
rename from docs/content/doc/usage/git-lfs-support.en-us.md
rename to docs/content/doc/administration/git-lfs-support.en-us.md
index 8b2c997bf9693..86cc3a5028921 100644
--- a/docs/content/doc/usage/git-lfs-support.en-us.md
+++ b/docs/content/doc/administration/git-lfs-support.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "Git LFS setup"
     weight: 12
     identifier: "git-lfs-setup"
diff --git a/docs/content/doc/usage/https-support.en-us.md b/docs/content/doc/administration/https-support.en-us.md
similarity index 97%
rename from docs/content/doc/usage/https-support.en-us.md
rename to docs/content/doc/administration/https-support.en-us.md
index 7c9024743d965..fd7badc64aa02 100644
--- a/docs/content/doc/usage/https-support.en-us.md
+++ b/docs/content/doc/administration/https-support.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "HTTPS setup"
     weight: 12
     identifier: "https-setup"
@@ -24,7 +24,7 @@ menu:
 Before you enable HTTPS, make sure that you have valid SSL/TLS certificates.
 You could use self-generated certificates for evaluation and testing. Please run `gitea cert --host [HOST]` to generate a self signed certificate.
 
-If you are using Apache or nginx on the server, it's recommended to check the [reverse proxy guide]({{< relref "doc/usage/reverse-proxies.en-us.md" >}}).
+If you are using Apache or nginx on the server, it's recommended to check the [reverse proxy guide]({{< relref "doc/administration/reverse-proxies.en-us.md" >}}).
 
 To use Gitea's built-in HTTPS support, you must change your `app.ini` file:
 
diff --git a/docs/content/doc/advanced/logging-documentation.en-us.md b/docs/content/doc/administration/logging-documentation.en-us.md
similarity index 99%
rename from docs/content/doc/advanced/logging-documentation.en-us.md
rename to docs/content/doc/administration/logging-documentation.en-us.md
index 145c8c320c78d..8d49ff3f14ef6 100644
--- a/docs/content/doc/advanced/logging-documentation.en-us.md
+++ b/docs/content/doc/administration/logging-documentation.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Logging Configuration"
-    weight: 55
+    weight: 40
     identifier: "logging-configuration"
 ---
 
diff --git a/docs/content/doc/advanced/mail-templates.en-us.md b/docs/content/doc/administration/mail-templates.en-us.md
similarity index 99%
rename from docs/content/doc/advanced/mail-templates.en-us.md
rename to docs/content/doc/administration/mail-templates.en-us.md
index bd419a617b856..a4dc7453eea3b 100644
--- a/docs/content/doc/advanced/mail-templates.en-us.md
+++ b/docs/content/doc/administration/mail-templates.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Mail templates"
     weight: 45
     identifier: "mail-templates"
diff --git a/docs/content/doc/advanced/repo-indexer.en-us.md b/docs/content/doc/administration/repo-indexer.en-us.md
similarity index 98%
rename from docs/content/doc/advanced/repo-indexer.en-us.md
rename to docs/content/doc/administration/repo-indexer.en-us.md
index 4b81bd27e988d..11ce547a0d7a2 100644
--- a/docs/content/doc/advanced/repo-indexer.en-us.md
+++ b/docs/content/doc/administration/repo-indexer.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Repository indexer"
     weight: 45
     identifier: "repo-indexer"
diff --git a/docs/content/doc/usage/reverse-proxies.en-us.md b/docs/content/doc/administration/reverse-proxies.en-us.md
similarity index 99%
rename from docs/content/doc/usage/reverse-proxies.en-us.md
rename to docs/content/doc/administration/reverse-proxies.en-us.md
index b8cebee574bbf..7b30ab78aa662 100644
--- a/docs/content/doc/usage/reverse-proxies.en-us.md
+++ b/docs/content/doc/administration/reverse-proxies.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "Reverse Proxies"
     weight: 16
     identifier: "reverse-proxies"
@@ -48,7 +48,7 @@ server {
     server_name git.example.com;
 
     # Note: Trailing slash
-    location /git/ { 
+    location /git/ {
         # Note: Trailing slash
         proxy_pass http://localhost:3000/;
         proxy_set_header Host $host;
diff --git a/docs/content/doc/usage/reverse-proxies.zh-cn.md b/docs/content/doc/administration/reverse-proxies.zh-cn.md
similarity index 98%
rename from docs/content/doc/usage/reverse-proxies.zh-cn.md
rename to docs/content/doc/administration/reverse-proxies.zh-cn.md
index f6d92e2a610e8..1355d09e8a6ff 100644
--- a/docs/content/doc/usage/reverse-proxies.zh-cn.md
+++ b/docs/content/doc/administration/reverse-proxies.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "usage"
+    parent: "administration"
     name: "反向代理"
     weight: 16
     identifier: "reverse-proxies"
@@ -48,7 +48,7 @@ server {
     server_name git.example.com;
 
     # 注意: /git/ 最后需要有一个路径符号
-    location /git/ { 
+    location /git/ {
         # 注意: 反向代理后端 URL 的最后需要有一个路径符号
         proxy_pass http://localhost:3000/;
         proxy_set_header Host $host;
diff --git a/docs/content/doc/advanced/search-engines-indexation.en-us.md b/docs/content/doc/administration/search-engines-indexation.en-us.md
similarity index 90%
rename from docs/content/doc/advanced/search-engines-indexation.en-us.md
rename to docs/content/doc/administration/search-engines-indexation.en-us.md
index ec367b74deac9..cabedb3a5d4f0 100644
--- a/docs/content/doc/advanced/search-engines-indexation.en-us.md
+++ b/docs/content/doc/administration/search-engines-indexation.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "Search Engines Indexation"
     weight: 60
     identifier: "search-engines-indexation"
@@ -21,7 +21,7 @@ If you don't want your repository to be visible for search engines read further.
 ## Block search engines indexation using robots.txt
 
 To make Gitea serve a custom `robots.txt` (default: empty 404) for top level installations,
-create a file called `robots.txt` in the [`custom` folder or `CustomPath`]({{< relref "doc/advanced/customizing-gitea.en-us.md" >}})
+create a file called `robots.txt` in the [`custom` folder or `CustomPath`]({{< relref "doc/administration/customizing-gitea.en-us.md" >}})
 
 Examples on how to configure the `robots.txt` can be found at [https://moz.com/learn/seo/robotstxt](https://moz.com/learn/seo/robotstxt).
 
diff --git a/docs/content/doc/advanced/signing.en-us.md b/docs/content/doc/administration/signing.en-us.md
similarity index 99%
rename from docs/content/doc/advanced/signing.en-us.md
rename to docs/content/doc/administration/signing.en-us.md
index 83a8b386b9a27..8dd4ffdfb7092 100644
--- a/docs/content/doc/advanced/signing.en-us.md
+++ b/docs/content/doc/administration/signing.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "administration"
     name: "GPG Commit Signatures"
-    weight: 20
+    weight: 50
     identifier: "signing"
 ---
 
diff --git a/docs/content/doc/advanced.zh-tw.md b/docs/content/doc/advanced.zh-tw.md
deleted file mode 100644
index ebfe519780f5b..0000000000000
--- a/docs/content/doc/advanced.zh-tw.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "進階"
-slug: "advanced"
-weight: 30
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "進階"
-    weight: 40
-    identifier: "advanced"
----
diff --git a/docs/content/doc/translation.en-us.md b/docs/content/doc/contributing.en-us.md
similarity index 52%
rename from docs/content/doc/translation.en-us.md
rename to docs/content/doc/contributing.en-us.md
index c281088503aec..6cc96d91b29d4 100644
--- a/docs/content/doc/translation.en-us.md
+++ b/docs/content/doc/contributing.en-us.md
@@ -1,13 +1,13 @@
 ---
 date: "2021-01-22T00:00:00+02:00"
-title: "Translation"
-slug: "translation"
+title: "Contributing"
+slug: "contributing"
 weight: 35
 toc: false
 draft: false
 menu:
   sidebar:
-    name: "Translation"
+    name: "Contributing"
     weight: 50
-    identifier: "translation"
+    identifier: "contributing"
 ---
diff --git a/docs/content/doc/translation.de-de.md b/docs/content/doc/contributing.fr-fr.md
similarity index 75%
rename from docs/content/doc/translation.de-de.md
rename to docs/content/doc/contributing.fr-fr.md
index 3470faa59b4c4..3175668329335 100644
--- a/docs/content/doc/translation.de-de.md
+++ b/docs/content/doc/contributing.fr-fr.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-01-22T00:00:00+02:00"
 title: "Übersetzung"
-slug: "translation"
+slug: "contributing"
 weight: 35
 toc: false
 draft: false
@@ -9,5 +9,5 @@ menu:
   sidebar:
     name: "Übersetzung"
     weight: 50
-    identifier: "translation"
+    identifier: "contributing"
 ---
diff --git a/docs/content/doc/translation.zh-tw.md b/docs/content/doc/contributing.zh-tw.md
similarity index 55%
rename from docs/content/doc/translation.zh-tw.md
rename to docs/content/doc/contributing.zh-tw.md
index 5374e87e891c8..73a3f94a7c945 100644
--- a/docs/content/doc/translation.zh-tw.md
+++ b/docs/content/doc/contributing.zh-tw.md
@@ -1,13 +1,13 @@
 ---
 date: "2021-01-22T00:00:00+02:00"
-title: "翻譯"
-slug: "translation"
+title: "貢獻"
+slug: "contributing"
 weight: 35
 toc: false
 draft: false
 menu:
   sidebar:
-    name: "翻譯"
+    name: "貢獻"
     weight: 50
-    identifier: "translation"
+    identifier: "contributing"
 ---
diff --git a/docs/content/doc/developers/guidelines-backend.en-us.md b/docs/content/doc/contributing/guidelines-backend.en-us.md
similarity index 99%
rename from docs/content/doc/developers/guidelines-backend.en-us.md
rename to docs/content/doc/contributing/guidelines-backend.en-us.md
index f35111522fa63..6ae0ba517d326 100644
--- a/docs/content/doc/developers/guidelines-backend.en-us.md
+++ b/docs/content/doc/contributing/guidelines-backend.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "contributing"
     name: "Guidelines for Backend"
     weight: 20
     identifier: "guidelines-backend"
diff --git a/docs/content/doc/developers/guidelines-frontend.en-us.md b/docs/content/doc/contributing/guidelines-frontend.en-us.md
similarity index 99%
rename from docs/content/doc/developers/guidelines-frontend.en-us.md
rename to docs/content/doc/contributing/guidelines-frontend.en-us.md
index e2bdc7adcb596..36c88739ecb4b 100644
--- a/docs/content/doc/developers/guidelines-frontend.en-us.md
+++ b/docs/content/doc/contributing/guidelines-frontend.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "contributing"
     name: "Guidelines for Frontend"
     weight: 20
     identifier: "guidelines-frontend"
diff --git a/docs/content/doc/developers/guidelines-refactoring.en-us.md b/docs/content/doc/contributing/guidelines-refactoring.en-us.md
similarity index 98%
rename from docs/content/doc/developers/guidelines-refactoring.en-us.md
rename to docs/content/doc/contributing/guidelines-refactoring.en-us.md
index 29025f25f7528..913ce8d9bb501 100644
--- a/docs/content/doc/developers/guidelines-refactoring.en-us.md
+++ b/docs/content/doc/contributing/guidelines-refactoring.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "contributing"
     name: "Guidelines for Refactoring"
     weight: 20
     identifier: "guidelines-refactoring"
diff --git a/docs/content/doc/features/localization.en-us.md b/docs/content/doc/contributing/localization.en-us.md
similarity index 97%
rename from docs/content/doc/features/localization.en-us.md
rename to docs/content/doc/contributing/localization.en-us.md
index e57233a62255c..3006ca599b507 100644
--- a/docs/content/doc/features/localization.en-us.md
+++ b/docs/content/doc/contributing/localization.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "contributing"
     name: "Localization"
     weight: 20
     identifier: "localization"
diff --git a/docs/content/doc/features/localization.zh-cn.md b/docs/content/doc/contributing/localization.zh-cn.md
similarity index 97%
rename from docs/content/doc/features/localization.zh-cn.md
rename to docs/content/doc/contributing/localization.zh-cn.md
index dd2dc1fa90f68..10df44042fc41 100644
--- a/docs/content/doc/features/localization.zh-cn.md
+++ b/docs/content/doc/contributing/localization.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "contributing"
     name: "本地化"
     weight: 20
     identifier: "localization"
diff --git a/docs/content/doc/features/localization.zh-tw.md b/docs/content/doc/contributing/localization.zh-tw.md
similarity index 97%
rename from docs/content/doc/features/localization.zh-tw.md
rename to docs/content/doc/contributing/localization.zh-tw.md
index 7bb3a6e6a2ddf..562aa4ecaf1e4 100644
--- a/docs/content/doc/features/localization.zh-tw.md
+++ b/docs/content/doc/contributing/localization.zh-tw.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "contributing"
     name: "在地化"
     weight: 20
     identifier: "localization"
diff --git a/docs/content/doc/translation/guidelines.de-de.md b/docs/content/doc/contributing/translation.de-de.md
similarity index 98%
rename from docs/content/doc/translation/guidelines.de-de.md
rename to docs/content/doc/contributing/translation.de-de.md
index 3fa7185562fbc..16cb2679311c4 100644
--- a/docs/content/doc/translation/guidelines.de-de.md
+++ b/docs/content/doc/contributing/translation.de-de.md
@@ -6,7 +6,7 @@ toc: true
 draft: false
 menu:
   sidebar:
-    parent: "translation"
+    parent: "contributing"
     name: "Übersetzungsrichtlinien"
     weight: 70
     identifier: "translation-guidelines"
diff --git a/docs/content/doc/translation/guidelines.en-us.md b/docs/content/doc/contributing/translation.en-us.md
similarity index 93%
rename from docs/content/doc/translation/guidelines.en-us.md
rename to docs/content/doc/contributing/translation.en-us.md
index f995743627dbe..23ff18a5b21a6 100644
--- a/docs/content/doc/translation/guidelines.en-us.md
+++ b/docs/content/doc/contributing/translation.en-us.md
@@ -6,7 +6,7 @@ toc: true
 draft: false
 menu:
   sidebar:
-    parent: "translation"
+    parent: "contributing"
     name: "Translation Guidelines"
     weight: 70
     identifier: "translation-guidelines"
diff --git a/docs/content/doc/developers.en-us.md b/docs/content/doc/developers.en-us.md
deleted file mode 100644
index 917049e5dfa1e..0000000000000
--- a/docs/content/doc/developers.en-us.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "Developers"
-slug: "developers"
-weight: 40
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "Developers"
-    weight: 55
-    identifier: "developers"
----
diff --git a/docs/content/doc/developers.zh-cn.md b/docs/content/doc/developers.zh-cn.md
deleted file mode 100644
index 97fb3a97826fb..0000000000000
--- a/docs/content/doc/developers.zh-cn.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "开发者"
-slug: "developers"
-weight: 40
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "开发者"
-    weight: 55
-    identifier: "developers"
----
diff --git a/docs/content/doc/developers.zh-tw.md b/docs/content/doc/developers.zh-tw.md
deleted file mode 100644
index c9ce6634ada83..0000000000000
--- a/docs/content/doc/developers.zh-tw.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "開發人員"
-slug: "developers"
-weight: 40
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "開發人員"
-    weight: 55
-    identifier: "developers"
----
diff --git a/docs/content/doc/development.en-us.md b/docs/content/doc/development.en-us.md
new file mode 100644
index 0000000000000..e9e8b9c8167bd
--- /dev/null
+++ b/docs/content/doc/development.en-us.md
@@ -0,0 +1,13 @@
+---
+date: "2016-12-01T16:00:00+02:00"
+title: "Development"
+slug: "development"
+weight: 40
+toc: false
+draft: false
+menu:
+  sidebar:
+    name: "Development"
+    weight: 40
+    identifier: "development"
+---
diff --git a/docs/content/doc/advanced.en-us.md b/docs/content/doc/development.zh-cn.md
similarity index 50%
rename from docs/content/doc/advanced.en-us.md
rename to docs/content/doc/development.zh-cn.md
index de2bfeed6f2d3..bbdaec4d1d38b 100644
--- a/docs/content/doc/advanced.en-us.md
+++ b/docs/content/doc/development.zh-cn.md
@@ -1,13 +1,13 @@
 ---
 date: "2016-12-01T16:00:00+02:00"
-title: "Advanced"
-slug: "advanced"
-weight: 30
+title: "开发"
+slug: "development"
+weight: 40
 toc: false
 draft: false
 menu:
   sidebar:
-    name: "Advanced"
+    name: "开发"
     weight: 40
-    identifier: "advanced"
+    identifier: "development"
 ---
diff --git a/docs/content/doc/advanced.zh-cn.md b/docs/content/doc/development.zh-tw.md
similarity index 50%
rename from docs/content/doc/advanced.zh-cn.md
rename to docs/content/doc/development.zh-tw.md
index 1f7ebf81e723a..a0fbbf219f7ab 100644
--- a/docs/content/doc/advanced.zh-cn.md
+++ b/docs/content/doc/development.zh-tw.md
@@ -1,13 +1,13 @@
 ---
 date: "2016-12-01T16:00:00+02:00"
-title: "进阶"
-slug: "advanced"
-weight: 30
+title: "開發"
+slug: "development"
+weight: 40
 toc: false
 draft: false
 menu:
   sidebar:
-    name: "进阶"
+    name: "開發"
     weight: 40
-    identifier: "advanced"
+    identifier: "development"
 ---
diff --git a/docs/content/doc/developers/api-usage.en-us.md b/docs/content/doc/development/api-usage.en-us.md
similarity index 99%
rename from docs/content/doc/developers/api-usage.en-us.md
rename to docs/content/doc/development/api-usage.en-us.md
index a7b87f8f084ba..641012607bf3d 100644
--- a/docs/content/doc/developers/api-usage.en-us.md
+++ b/docs/content/doc/development/api-usage.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "API Usage"
     weight: 40
     identifier: "api-usage"
diff --git a/docs/content/doc/developers/api-usage.zh-cn.md b/docs/content/doc/development/api-usage.zh-cn.md
similarity index 99%
rename from docs/content/doc/developers/api-usage.zh-cn.md
rename to docs/content/doc/development/api-usage.zh-cn.md
index c998361115de9..b0821039ffd14 100644
--- a/docs/content/doc/developers/api-usage.zh-cn.md
+++ b/docs/content/doc/development/api-usage.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "API 使用指南"
     weight: 40
     identifier: "api-usage"
diff --git a/docs/content/doc/developers/hacking-on-gitea.en-us.md b/docs/content/doc/development/hacking-on-gitea.en-us.md
similarity index 98%
rename from docs/content/doc/developers/hacking-on-gitea.en-us.md
rename to docs/content/doc/development/hacking-on-gitea.en-us.md
index 3283240c980e6..da38d238ac8e5 100644
--- a/docs/content/doc/developers/hacking-on-gitea.en-us.md
+++ b/docs/content/doc/development/hacking-on-gitea.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "Hacking on Gitea"
     weight: 10
     identifier: "hacking-on-gitea"
@@ -177,7 +177,7 @@ server as mentioned above.
 
 ### Working on JS and CSS
 
-Frontend development should follow [Guidelines for Frontend Development]({{< relref "doc/developers/guidelines-frontend.en-us.md" >}})
+Frontend development should follow [Guidelines for Frontend Development]({{< relref "doc/contributing/guidelines-frontend.en-us.md" >}})
 
 To build with frontend resources, either use the `watch-frontend` target mentioned above or just build once:
 
@@ -264,8 +264,8 @@ OpenAPI 3 documentation.
 When creating new configuration options, it is not enough to add them to the
 `modules/setting` files. You should add information to `custom/conf/app.ini`
 and to the
-<a href='{{< relref "doc/advanced/config-cheat-sheet.en-us.md" >}}'>configuration cheat sheet</a>
-found in `docs/content/doc/advanced/config-cheat-sheet.en-us.md`
+<a href='{{< relref "doc/administration/config-cheat-sheet.en-us.md" >}}'>configuration cheat sheet</a>
+found in `docs/content/doc/administer/config-cheat-sheet.en-us.md`
 
 ### Changing the logo
 
diff --git a/docs/content/doc/developers/hacking-on-gitea.zh-cn.md b/docs/content/doc/development/hacking-on-gitea.zh-cn.md
similarity index 98%
rename from docs/content/doc/developers/hacking-on-gitea.zh-cn.md
rename to docs/content/doc/development/hacking-on-gitea.zh-cn.md
index 9c9141bf50cd4..c63d0c4685d8d 100644
--- a/docs/content/doc/developers/hacking-on-gitea.zh-cn.md
+++ b/docs/content/doc/development/hacking-on-gitea.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "玩转 Gitea"
     weight: 10
     identifier: "hacking-on-gitea"
@@ -166,7 +166,7 @@ make lint-backend
 
 ### 处理 JS 和 CSS
 
-前端开发应遵循 [Guidelines for Frontend Development]({{ < 相关参考 "doc/developers/guidelines-frontend.en-us.md" > }})
+前端开发应遵循 [Guidelines for Frontend Development]({{ < 相关参考 "doc/development/guidelines-frontend.en-us.md" > }})
 
 要使用前端资源构建，请使用上面提到的“watch-frontend”目标或只构建一次：
 
@@ -247,7 +247,7 @@ make swagger-check
 ### 创建新的配置选项
 
 创建新的配置选项时，将它们添加到 `modules/setting` 的对应文件。您应该将信息添加到 `custom/conf/app.ini`
-并到 <a href = '{{ < relref "doc/advanced/config-cheat-sheet.en-us.md" > }}'>配置备忘单</a>
+并到 <a href = '{{ < relref "doc/administration/config-cheat-sheet.en-us.md" > }}'>配置备忘单</a>
 在 `docs/content/doc/advanced/config-cheat-sheet.en-us.md` 中找到
 
 ### 更改Logo
diff --git a/docs/content/doc/developers/integrations.en-us.md b/docs/content/doc/development/integrations.en-us.md
similarity index 97%
rename from docs/content/doc/developers/integrations.en-us.md
rename to docs/content/doc/development/integrations.en-us.md
index 15d5e7e59e396..c6321e2d07daf 100644
--- a/docs/content/doc/developers/integrations.en-us.md
+++ b/docs/content/doc/development/integrations.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "Integrations"
     weight: 65
     identifier: "integrations"
diff --git a/docs/content/doc/developers/integrations.zh-tw.md b/docs/content/doc/development/integrations.zh-tw.md
similarity index 96%
rename from docs/content/doc/developers/integrations.zh-tw.md
rename to docs/content/doc/development/integrations.zh-tw.md
index 6991ec4ae8860..eb828592b41ad 100644
--- a/docs/content/doc/developers/integrations.zh-tw.md
+++ b/docs/content/doc/development/integrations.zh-tw.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "整合"
     weight: 65
     identifier: "integrations"
diff --git a/docs/content/doc/developers/migrations.en-us.md b/docs/content/doc/development/migrations.en-us.md
similarity index 98%
rename from docs/content/doc/developers/migrations.en-us.md
rename to docs/content/doc/development/migrations.en-us.md
index 168af1f7fa00a..8647bdbc4bce3 100644
--- a/docs/content/doc/developers/migrations.en-us.md
+++ b/docs/content/doc/development/migrations.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "Migrations Interfaces"
     weight: 55
     identifier: "migrations-interfaces"
diff --git a/docs/content/doc/developers/migrations.zh-tw.md b/docs/content/doc/development/migrations.zh-tw.md
similarity index 98%
rename from docs/content/doc/developers/migrations.zh-tw.md
rename to docs/content/doc/development/migrations.zh-tw.md
index 173c01a464cd7..09af350d35272 100644
--- a/docs/content/doc/developers/migrations.zh-tw.md
+++ b/docs/content/doc/development/migrations.zh-tw.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "遷移介面"
     weight: 55
     identifier: "migrations-interfaces"
diff --git a/docs/content/doc/developers/oauth2-provider.en-us.md b/docs/content/doc/development/oauth2-provider.en-us.md
similarity index 99%
rename from docs/content/doc/developers/oauth2-provider.en-us.md
rename to docs/content/doc/development/oauth2-provider.en-us.md
index 1ef30a7f0e4a2..7be7a42934e47 100644
--- a/docs/content/doc/developers/oauth2-provider.en-us.md
+++ b/docs/content/doc/development/oauth2-provider.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "OAuth2 Provider"
     weight: 41
     identifier: "oauth2-provider"
diff --git a/docs/content/doc/developers/oauth2-provider.zh-tw.md b/docs/content/doc/development/oauth2-provider.zh-tw.md
similarity index 99%
rename from docs/content/doc/developers/oauth2-provider.zh-tw.md
rename to docs/content/doc/development/oauth2-provider.zh-tw.md
index 179c6342cdd6a..b28e48d61e8db 100644
--- a/docs/content/doc/developers/oauth2-provider.zh-tw.md
+++ b/docs/content/doc/development/oauth2-provider.zh-tw.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "developers"
+    parent: "development"
     name: "OAuth2 提供者"
     weight: 41
     identifier: "oauth2-provider"
diff --git a/docs/content/doc/features.en-us.md b/docs/content/doc/features.en-us.md
deleted file mode 100644
index 9cc90b46a0d17..0000000000000
--- a/docs/content/doc/features.en-us.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "Features"
-slug: "features"
-weight: 20
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "Features"
-    weight: 30
-    identifier: "features"
----
diff --git a/docs/content/doc/features.zh-cn.md b/docs/content/doc/features.zh-cn.md
deleted file mode 100644
index 68d2f71b11f6b..0000000000000
--- a/docs/content/doc/features.zh-cn.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "特性"
-slug: "features"
-weight: 20
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "特性"
-    weight: 30
-    identifier: "features"
----
diff --git a/docs/content/doc/features.zh-tw.md b/docs/content/doc/features.zh-tw.md
deleted file mode 100644
index 889e0df88213a..0000000000000
--- a/docs/content/doc/features.zh-tw.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "功能"
-slug: "features"
-weight: 20
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "功能"
-    weight: 30
-    identifier: "features"
----
diff --git a/docs/content/doc/help.en-us.md b/docs/content/doc/help.en-us.md
index 635cb8931e342..03c9a27818d97 100644
--- a/docs/content/doc/help.en-us.md
+++ b/docs/content/doc/help.en-us.md
@@ -8,6 +8,6 @@ draft: false
 menu:
   sidebar:
     name: "Help"
-    weight: 5
+    weight: 100
     identifier: "help"
 ---
diff --git a/docs/content/doc/help.fr-fr.md b/docs/content/doc/help.fr-fr.md
index ab0cedccfc355..42e01009ce823 100644
--- a/docs/content/doc/help.fr-fr.md
+++ b/docs/content/doc/help.fr-fr.md
@@ -8,6 +8,6 @@ draft: false
 menu:
   sidebar:
     name: "Aide"
-    weight: 5
+    weight: 100
     identifier: "help"
 ---
diff --git a/docs/content/doc/help.zh-cn.md b/docs/content/doc/help.zh-cn.md
index 9465cd5464cea..e8c0bd260b30a 100644
--- a/docs/content/doc/help.zh-cn.md
+++ b/docs/content/doc/help.zh-cn.md
@@ -8,6 +8,6 @@ draft: false
 menu:
   sidebar:
     name: "帮助"
-    weight: 5
+    weight: 100
     identifier: "help"
 ---
diff --git a/docs/content/doc/help.zh-tw.md b/docs/content/doc/help.zh-tw.md
index a9c3cea9e53e4..270a4ed8a749d 100644
--- a/docs/content/doc/help.zh-tw.md
+++ b/docs/content/doc/help.zh-tw.md
@@ -8,6 +8,6 @@ draft: false
 menu:
   sidebar:
     name: "幫助"
-    weight: 5
+    weight: 100
     identifier: "help"
 ---
diff --git a/docs/content/doc/help/faq.en-us.md b/docs/content/doc/help/faq.en-us.md
index c8327de7fe577..60e11d4459f20 100644
--- a/docs/content/doc/help/faq.en-us.md
+++ b/docs/content/doc/help/faq.en-us.md
@@ -43,7 +43,7 @@ On the other hand, 1.x.x downloads should never change.
 
 To migrate from Gogs to Gitea:
 
-- [Gogs version 0.9.146 or less]({{< relref "doc/upgrade/from-gogs.en-us.md" >}})
+- [Gogs version 0.9.146 or less]({{< relref "doc/installation/upgrade-from-gogs.en-us.md" >}})
 - [Gogs version 0.11.46.0418](https://github.com/go-gitea/gitea/issues/4286)
 
 To migrate from GitHub to Gitea, you can use Gitea's built-in migration form.
@@ -90,7 +90,7 @@ https://github.com/loganinak/MigrateGitlabToGogs
 
 There are a few places that could make this show incorrectly.
 
-1. If using a reverse proxy, make sure you have followed the correction directions in the [reverse proxy guide]({{< relref "doc/usage/reverse-proxies.en-us.md" >}})
+1. If using a reverse proxy, make sure you have followed the correction directions in the [reverse proxy guide]({{< relref "doc/administration/reverse-proxies.en-us.md" >}})
 2. Make sure you have correctly set `ROOT_URL` in the `server` section of your `app.ini`
 
 If certain clone options aren't showing up (HTTP/S or SSH), the following options can be checked in your `app.ini`
@@ -103,7 +103,7 @@ If certain clone options aren't showing up (HTTP/S or SSH), the following option
 
 This error occurs when the reverse proxy limits the file upload size.
 
-See the [reverse proxy guide]({{< relref "doc/usage/reverse-proxies.en-us.md" >}}) for a solution with nginx.
+See the [reverse proxy guide]({{< relref "doc/administration/reverse-proxies.en-us.md" >}}) for a solution with nginx.
 
 ## Custom Templates not loading or working incorrectly
 
@@ -116,7 +116,7 @@ The correct path for the template(s) will be relative to the `CustomPath`
     If that doesn't exist, you can try `echo $GITEA_CUSTOM`
 
 2. If you are still unable to find a path, the default can be [calculated above](#where-does-gitea-store-what-file)
-3. Once you have figured out the correct custom path, you can refer to the [customizing Gitea]({{< relref "doc/advanced/customizing-gitea.en-us.md" >}}) page to add your template to the correct location.
+3. Once you have figured out the correct custom path, you can refer to the [customizing Gitea]({{< relref "doc/administration/customizing-gitea.en-us.md" >}}) page to add your template to the correct location.
 
 ## Active user vs login prohibited user
 
@@ -126,7 +126,7 @@ A "login prohibited" user is a user that is not allowed to log in to Gitea anymo
 
 ## Setting up logging
 
-- [Official Docs]({{< relref "doc/advanced/logging-documentation.en-us.md" >}})
+- [Official Docs]({{< relref "doc/administration/logging-documentation.en-us.md" >}})
 
 ## What is Swagger?
 
@@ -134,7 +134,7 @@ A "login prohibited" user is a user that is not allowed to log in to Gitea anymo
 
 All Gitea instances have the built-in API and there is no way to disable it completely.
 You can, however, disable showing its documentation by setting `ENABLE_SWAGGER` to `false` in the `api` section of your `app.ini`.
-For more information, refer to Gitea's [API docs]({{< relref "doc/developers/api-usage.en-us.md" >}}).
+For more information, refer to Gitea's [API docs]({{< relref "doc/development/api-usage.en-us.md" >}}).
 
 You can see the latest API (for example) on <https://try.gitea.io/api/swagger>.
 
@@ -149,7 +149,7 @@ There are multiple things you can combine to prevent spammers.
 1. By whitelisting or blocklisting certain email domains
 2. By only whitelisting certain domains with OpenID (see below)
 3. Setting `ENABLE_CAPTCHA` to `true` in your `app.ini` and properly configuring `RECAPTCHA_SECRET` and `RECAPTCHA_SITEKEY`
-4. Settings `DISABLE_REGISTRATION` to `true` and creating new users via the [CLI]({{< relref "doc/usage/command-line.en-us.md" >}}), [API]({{< relref "doc/developers/api-usage.en-us.md" >}}), or Gitea's Admin UI
+4. Settings `DISABLE_REGISTRATION` to `true` and creating new users via the [CLI]({{< relref "doc/administration/command-line.en-us.md" >}}), [API]({{< relref "doc/development/api-usage.en-us.md" >}}), or Gitea's Admin UI
 
 ### Only allow/block certain email domains
 
@@ -175,7 +175,7 @@ At some point, a customer or third party needs access to a specific repo and onl
 
 ### Enable Fail2ban
 
-Use [Fail2Ban]({{< relref "doc/usage/fail2ban-setup.en-us.md" >}}) to monitor and stop automated login attempts or other malicious behavior based on log patterns
+Use [Fail2Ban]({{< relref "doc/administration/fail2ban-setup.en-us.md" >}}) to monitor and stop automated login attempts or other malicious behavior based on log patterns
 
 ## How to add/use custom themes
 
@@ -328,24 +328,24 @@ You may want to set this value to `60m` or `120m`.
 
 ## How can I create users before starting Gitea
 
-Gitea provides a sub-command `gitea migrate` to initialize the database, after which you can use the [admin CLI commands]({{< relref "doc/usage/command-line.en-us.md#admin" >}}) to add users like normal.
+Gitea provides a sub-command `gitea migrate` to initialize the database, after which you can use the [admin CLI commands]({{< relref "doc/administration/command-line.en-us.md#admin" >}}) to add users like normal.
 
 ## How can I enable password reset
 
-There is no setting for password resets. It is enabled when a [mail service]({{< relref "doc/usage/email-setup.en-us.md" >}}) is configured, and disabled otherwise.
+There is no setting for password resets. It is enabled when a [mail service]({{< relref "doc/administration/email-setup.en-us.md" >}}) is configured, and disabled otherwise.
 
 ## How can a user's password be changed
 
 - As an **admin**, you can change any user's password (and optionally force them to change it on next login)...
   - By navigating to your `Site Administration -> User Accounts` page and editing a user.
-  - By using the [admin CLI commands]({{< relref "doc/usage/command-line.en-us.md#admin" >}}).
+  - By using the [admin CLI commands]({{< relref "doc/administration/command-line.en-us.md#admin" >}}).
 
-    Keep in mind most commands will also need a [global flag]({{< relref "doc/usage/command-line.en-us.md#global-options" >}}) to point the CLI at the correct configuration.
+    Keep in mind most commands will also need a [global flag]({{< relref "doc/administration/command-line.en-us.md#global-options" >}}) to point the CLI at the correct configuration.
 - As a **user** you can change it...
   - In your account `Settings -> Account` page (this method **requires** you to know your current password).
   - By using the `Forgot Password` link.
 
-    If the `Forgot Password/Account Recovery` page is disabled, please contact your administrator to configure a [mail service]({{< relref "doc/usage/email-setup.en-us.md" >}}).
+    If the `Forgot Password/Account Recovery` page is disabled, please contact your administrator to configure a [mail service]({{< relref "doc/administration/email-setup.en-us.md" >}}).
 
 ## Why is my markdown broken
 
@@ -457,6 +457,6 @@ If you are using Cloudflare, turn off the auto-minify option in the dashboard.
   - You can also check `<ROOT_URL>/admin/config` for the repository root path.
 - Ensure that the user/org exists that you want to adopt repositories for.
 - As an admin, go to `<ROOT_URL>/admin/repos/unadopted` and search.
-  - Users can also be given similar permissions via config [`ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES`]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#repository" >}}).
+  - Users can also be given similar permissions via config [`ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES`]({{< relref "doc/administration/config-cheat-sheet.en-us.md#repository" >}}).
 - If the above steps are done correctly, you should be able to select repositories to adopt.
-  - If no repositories are found, enable [debug logging]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#repository" >}}) to check for any specific errors.
+  - If no repositories are found, enable [debug logging]({{< relref "doc/administration/config-cheat-sheet.en-us.md#repository" >}}) to check for any specific errors.
diff --git a/docs/content/doc/features/comparison.en-us.md b/docs/content/doc/installation/comparison.en-us.md
similarity index 99%
rename from docs/content/doc/features/comparison.en-us.md
rename to docs/content/doc/installation/comparison.en-us.md
index 5b68aed9b6051..819af95be957a 100644
--- a/docs/content/doc/features/comparison.en-us.md
+++ b/docs/content/doc/installation/comparison.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
     name: "Comparison"
     weight: 5
+    parent: installation
     identifier: "comparison"
 ---
 
diff --git a/docs/content/doc/features/comparison.zh-cn.md b/docs/content/doc/installation/comparison.zh-cn.md
similarity index 99%
rename from docs/content/doc/features/comparison.zh-cn.md
rename to docs/content/doc/installation/comparison.zh-cn.md
index 55014dab7bf5b..b254cf749636b 100644
--- a/docs/content/doc/features/comparison.zh-cn.md
+++ b/docs/content/doc/installation/comparison.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "installation"
     name: "横向对比"
     weight: 5
     identifier: "comparison"
diff --git a/docs/content/doc/features/comparison.zh-tw.md b/docs/content/doc/installation/comparison.zh-tw.md
similarity index 99%
rename from docs/content/doc/features/comparison.zh-tw.md
rename to docs/content/doc/installation/comparison.zh-tw.md
index bde17794412e7..f918fbad75242 100644
--- a/docs/content/doc/features/comparison.zh-tw.md
+++ b/docs/content/doc/installation/comparison.zh-tw.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "installation"
     name: "比較"
     weight: 5
     identifier: "comparison"
diff --git a/docs/content/doc/installation/database-preparation.en-us.md b/docs/content/doc/installation/database-preparation.en-us.md
index b8ad5d6859fb0..e8ab02caa9aec 100644
--- a/docs/content/doc/installation/database-preparation.en-us.md
+++ b/docs/content/doc/installation/database-preparation.en-us.md
@@ -9,7 +9,7 @@ menu:
   sidebar:
     parent: "installation"
     name: "Database preparation"
-    weight: 20
+    weight: 5
     identifier: "database-prep"
 ---
 
diff --git a/docs/content/doc/installation/from-binary.en-us.md b/docs/content/doc/installation/from-binary.en-us.md
index 6f71b0b91e2a5..fc17373ea5c88 100644
--- a/docs/content/doc/installation/from-binary.en-us.md
+++ b/docs/content/doc/installation/from-binary.en-us.md
@@ -64,7 +64,7 @@ despite warnings like `This key is not certified with a trusted signature!`.
 
 ## Recommended server configuration
 
-**NOTE:** Many of the following directories can be configured using [Environment Variables]({{< relref "doc/advanced/environment-variables.en-us.md" >}}) as well!
+**NOTE:** Many of the following directories can be configured using [Environment Variables]({{< relref "doc/administration/environment-variables.en-us.md" >}}) as well!
 Of note, configuring `GITEA_WORK_DIR` will tell Gitea where to base its working directory, as well as ease installation.
 
 ### Prepare environment
@@ -113,7 +113,7 @@ If you don't want the web installer to be able to write to the config file, it i
 * Ensure that the `SECRET_KEY` and `INTERNAL_TOKEN` values are set. (You may want to use the `gitea generate secret` to generate these secret keys.)
 * Ensure that any other secret keys you need are set.
 
-See the [command line documentation]({{< relref "doc/usage/command-line.en-us.md" >}}) for information on using `gitea generate secret`.
+See the [command line documentation]({{< relref "doc/administration/command-line.en-us.md" >}}) for information on using `gitea generate secret`.
 
 ### Configure Gitea's working directory
 
@@ -158,7 +158,7 @@ GITEA_WORK_DIR=/var/lib/gitea/ /usr/local/bin/gitea web -c /etc/gitea/app.ini
 You can update to a new version of Gitea by stopping Gitea, replacing the binary at `/usr/local/bin/gitea` and restarting the instance.
 The binary file name should not be changed during the update to avoid problems in existing repositories.
 
-It is recommended that you make a [backup]({{< relref "doc/usage/backup-and-restore.en-us.md" >}}) before updating your installation.
+It is recommended that you make a [backup]({{< relref "doc/administration/backup-and-restore.en-us.md" >}}) before updating your installation.
 
 If you have carried out the installation steps as described above, the binary should
 have the generic name `gitea`. Do not change this, i.e. to include the version number.
diff --git a/docs/content/doc/installation/from-binary.zh-cn.md b/docs/content/doc/installation/from-binary.zh-cn.md
index 5e28cf0f21d23..ad14c2d6251d9 100644
--- a/docs/content/doc/installation/from-binary.zh-cn.md
+++ b/docs/content/doc/installation/from-binary.zh-cn.md
@@ -59,7 +59,7 @@ gpg --verify gitea-{{< version >}}-linux-amd64.asc gitea-{{< version >}}-linux-a
 
 ## 服务器设置
 
-**提示：** `GITEA_WORK_DIR` 表示 Gitea 工作的路径。以下路径可以通过 [环境变量]({{< relref "doc/advanced/environment-variables.zh-cn.md" >}}) 初始化。
+**提示：** `GITEA_WORK_DIR` 表示 Gitea 工作的路径。以下路径可以通过 [环境变量]({{< relref "doc/administration/environment-variables.zh-cn.md" >}}) 初始化。
 
 ### 准备环境
 
@@ -141,7 +141,7 @@ GITEA_WORK_DIR=/var/lib/gitea/ /usr/local/bin/gitea web -c /etc/gitea/app.ini
 
 您可以通过停止程序，替换 `/usr/local/bin/gitea` 并重启来更新到新版本。直接替换可执行程序时不要更改或使用新的文件名称，以避免数据出错。
 
-建议您在更新之前进行[备份]({{< relref "doc/usage/backup-and-restore.zh-cn.md" >}})。
+建议您在更新之前进行[备份]({{< relref "doc/administration/backup-and-restore.zh-cn.md" >}})。
 
 ### 1. 使用 systemd 重新启动 Gitea（推荐）
 
diff --git a/docs/content/doc/installation/from-source.en-us.md b/docs/content/doc/installation/from-source.en-us.md
index d0db639b0a4fe..6bb13d1056715 100644
--- a/docs/content/doc/installation/from-source.en-us.md
+++ b/docs/content/doc/installation/from-source.en-us.md
@@ -33,7 +33,7 @@ executable path, you will have to manage this yourself.
 
 **Note 2**: Go version {{< min-go-version >}} or higher is required. However, it is recommended to
 obtain the same version as our continuous integration, see the advice given in
-<a href='{{< relref "doc/developers/hacking-on-gitea.en-us.md" >}}'>Hacking on
+<a href='{{< relref "doc/development/hacking-on-gitea.en-us.md" >}}'>Hacking on
 Gitea</a>
 
 **Table of Contents**
@@ -87,7 +87,7 @@ To build from source, the following programs must be present on the system:
 
 - `go` {{< min-go-version >}} or higher, see [here](https://golang.org/dl/)
 - `node` {{< min-node-version >}} or higher with `npm`, see [here](https://nodejs.org/en/download/)
-- `make`, see [here]({{< relref "doc/developers/hacking-on-gitea.en-us.md" >}}#installing-make)
+- `make`, see [here]({{< relref "doc/development/hacking-on-gitea.en-us.md" >}}#installing-make)
 
 Various [make tasks](https://github.com/go-gitea/gitea/blob/main/Makefile)
 are provided to keep the build process as simple as possible.
diff --git a/docs/content/doc/upgrade/from-gitea.en-us.md b/docs/content/doc/installation/upgrade-from-gitea.en-us.md
similarity index 97%
rename from docs/content/doc/upgrade/from-gitea.en-us.md
rename to docs/content/doc/installation/upgrade-from-gitea.en-us.md
index 4dc47b05a4c35..5f958876c3453 100644
--- a/docs/content/doc/upgrade/from-gitea.en-us.md
+++ b/docs/content/doc/installation/upgrade-from-gitea.en-us.md
@@ -1,17 +1,15 @@
 ---
 date: "2021-09-02T16:00:00+08:00"
 title: "Upgrade from an old Gitea"
-aliases:
-  - /en-us/upgrade/
 slug: "upgrade-from-gitea"
 weight: 10
 toc: false
 draft: false
 menu:
   sidebar:
-    parent: "upgrade"
-    name: "From Gitea"
-    weight: 10
+    parent: "installation"
+    name: "Upgrade From Old Gitea"
+    weight: 100
     identifier: "upgrade-from-gitea"
 ---
 
diff --git a/docs/content/doc/upgrade/from-gogs.en-us.md b/docs/content/doc/installation/upgrade-from-gogs.en-us.md
similarity index 98%
rename from docs/content/doc/upgrade/from-gogs.en-us.md
rename to docs/content/doc/installation/upgrade-from-gogs.en-us.md
index f0bfe96050efb..7ac83367ccdbd 100644
--- a/docs/content/doc/upgrade/from-gogs.en-us.md
+++ b/docs/content/doc/installation/upgrade-from-gogs.en-us.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "upgrade"
-    name: "From Gogs"
-    weight: 10
+    parent: "installation"
+    name: "Upgrade From Gogs"
+    weight: 101
     identifier: "upgrade-from-gogs"
 ---
 
diff --git a/docs/content/doc/upgrade/from-gogs.fr-fr.md b/docs/content/doc/installation/upgrade-from-gogs.fr-fr.md
similarity index 98%
rename from docs/content/doc/upgrade/from-gogs.fr-fr.md
rename to docs/content/doc/installation/upgrade-from-gogs.fr-fr.md
index 98a8edc1a3401..066002bcc1522 100644
--- a/docs/content/doc/upgrade/from-gogs.fr-fr.md
+++ b/docs/content/doc/installation/upgrade-from-gogs.fr-fr.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "upgrade"
+    parent: "installation"
     name: "Depuis Gogs"
-    weight: 10
+    weight: 101
     identifier: "upgrade-from-gogs"
 ---
 
diff --git a/docs/content/doc/upgrade/from-gogs.zh-cn.md b/docs/content/doc/installation/upgrade-from-gogs.zh-cn.md
similarity index 95%
rename from docs/content/doc/upgrade/from-gogs.zh-cn.md
rename to docs/content/doc/installation/upgrade-from-gogs.zh-cn.md
index 7d391ae822b04..eac4f24f533b7 100644
--- a/docs/content/doc/upgrade/from-gogs.zh-cn.md
+++ b/docs/content/doc/installation/upgrade-from-gogs.zh-cn.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "upgrade"
+    parent: "installation"
     name: "从 Gogs 升级"
-    weight: 10
+    weight: 101
     identifier: "upgrade-from-gogs"
 ---
 
diff --git a/docs/content/doc/upgrade/from-gogs.zh-tw.md b/docs/content/doc/installation/upgrade-from-gogs.zh-tw.md
similarity index 98%
rename from docs/content/doc/upgrade/from-gogs.zh-tw.md
rename to docs/content/doc/installation/upgrade-from-gogs.zh-tw.md
index 793d74df88e02..3b98b5f8f04d6 100644
--- a/docs/content/doc/upgrade/from-gogs.zh-tw.md
+++ b/docs/content/doc/installation/upgrade-from-gogs.zh-tw.md
@@ -7,9 +7,9 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "upgrade"
-    name: "從 Gogs"
-    weight: 10
+    parent: "installation"
+    name: "從 Gogs 升級"
+    weight: 101
     identifier: "upgrade-from-gogs"
 ---
 
diff --git a/docs/content/doc/installation/with-docker-rootless.en-us.md b/docs/content/doc/installation/with-docker-rootless.en-us.md
index 7e1a0e6fe061a..36ecf6277a97e 100644
--- a/docs/content/doc/installation/with-docker-rootless.en-us.md
+++ b/docs/content/doc/installation/with-docker-rootless.en-us.md
@@ -9,7 +9,7 @@ menu:
   sidebar:
     parent: "installation"
     name: "With Docker Rootless"
-    weight: 10
+    weight: 48
     identifier: "install-with-docker-rootless"
 ---
 
diff --git a/docs/content/doc/installation/with-docker.en-us.md b/docs/content/doc/installation/with-docker.en-us.md
index 90c6e7b5f3ea2..396bc67bd39b2 100644
--- a/docs/content/doc/installation/with-docker.en-us.md
+++ b/docs/content/doc/installation/with-docker.en-us.md
@@ -9,7 +9,7 @@ menu:
   sidebar:
     parent: "installation"
     name: "With Docker"
-    weight: 10
+    weight: 49
     identifier: "install-with-docker"
 ---
 
diff --git a/docs/content/doc/installation/with-docker.fr-fr.md b/docs/content/doc/installation/with-docker.fr-fr.md
index 176abf7a129d8..4db26405b173a 100644
--- a/docs/content/doc/installation/with-docker.fr-fr.md
+++ b/docs/content/doc/installation/with-docker.fr-fr.md
@@ -9,7 +9,7 @@ menu:
   sidebar:
     parent: "installation"
     name: "Docker"
-    weight: 10
+    weight: 49
     identifier: "install-with-docker"
 ---
 
diff --git a/docs/content/doc/installation/with-docker.zh-cn.md b/docs/content/doc/installation/with-docker.zh-cn.md
index cae28c70b866c..e89fb762bbf05 100644
--- a/docs/content/doc/installation/with-docker.zh-cn.md
+++ b/docs/content/doc/installation/with-docker.zh-cn.md
@@ -9,7 +9,7 @@ menu:
   sidebar:
     parent: "installation"
     name: "使用 Docker 安装"
-    weight: 10
+    weight: 49
     identifier: "install-with-docker"
 ---
 
diff --git a/docs/content/doc/installation/with-docker.zh-tw.md b/docs/content/doc/installation/with-docker.zh-tw.md
index 0fd8626149f64..f432957d87e98 100644
--- a/docs/content/doc/installation/with-docker.zh-tw.md
+++ b/docs/content/doc/installation/with-docker.zh-tw.md
@@ -9,7 +9,7 @@ menu:
   sidebar:
     parent: "installation"
     name: "Docker 安裝"
-    weight: 10
+    weight: 49
     identifier: "install-with-docker"
 ---
 
diff --git a/docs/content/doc/packages.en-us.md b/docs/content/doc/packages.en-us.md
index e613b6b250e27..e4a87bdebf621 100644
--- a/docs/content/doc/packages.en-us.md
+++ b/docs/content/doc/packages.en-us.md
@@ -1,12 +1,13 @@
 ---
-date: "2021-07-20T00:00:00+00:00"
-title: "Package Registry"
+date: "2016-12-27T16:00:00+02:00"
+title: "Packages"
 slug: "packages"
+weight: 35
 toc: false
 draft: false
 menu:
   sidebar:
-    name: "Package Registry"
-    weight: 45
+    name: "Usage - Packages"
+    weight: 30
     identifier: "packages"
 ---
diff --git a/docs/content/doc/packages/cargo.en-us.md b/docs/content/doc/packages/cargo.en-us.md
index 1f90d939d1f7e..62c8c41aaed8f 100644
--- a/docs/content/doc/packages/cargo.en-us.md
+++ b/docs/content/doc/packages/cargo.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2022-11-20T00:00:00+00:00"
 title: "Cargo Packages Repository"
-slug: "packages/cargo"
+slug: "usage/packages/cargo"
 draft: false
 toc: false
 menu:
@@ -73,7 +73,7 @@ token = "Bearer {token}"
 
 | Parameter | Description |
 | --------- | ----------- |
-| `token`   | Your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) |
+| `token`   | Your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) |
 
 ## Publish a package
 
diff --git a/docs/content/doc/packages/chef.en-us.md b/docs/content/doc/packages/chef.en-us.md
index ecc774d7928ba..67322fdbf2d69 100644
--- a/docs/content/doc/packages/chef.en-us.md
+++ b/docs/content/doc/packages/chef.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2023-01-20T00:00:00+00:00"
 title: "Chef Packages Repository"
-slug: "packages/chef"
+slug: "usage/packages/chef"
 draft: false
 toc: false
 menu:
diff --git a/docs/content/doc/packages/composer.en-us.md b/docs/content/doc/packages/composer.en-us.md
index 47b03781f06e5..dba3f31364d54 100644
--- a/docs/content/doc/packages/composer.en-us.md
+++ b/docs/content/doc/packages/composer.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "Composer Packages Repository"
-slug: "packages/composer"
+slug: "usage/packages/composer"
 draft: false
 toc: false
 menu:
@@ -60,7 +60,7 @@ curl --user your_username:your_password_or_token \
      https://gitea.example.com/api/packages/testuser/composer?version=1.0.3
 ```
 
-If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password.
+If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password.
 
 The server responds with the following HTTP Status codes.
 
diff --git a/docs/content/doc/packages/conan.en-us.md b/docs/content/doc/packages/conan.en-us.md
index fb104f34f43b2..c40bb583e673c 100644
--- a/docs/content/doc/packages/conan.en-us.md
+++ b/docs/content/doc/packages/conan.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "Conan Packages Repository"
-slug: "packages/conan"
+slug: "usage/packages/conan"
 draft: false
 toc: false
 menu:
@@ -37,7 +37,7 @@ conan user --remote {remote} --password {password} {username}
 | -----------| ----------- |
 | `remote`   | The remote name. |
 | `username` | Your Gitea username. |
-| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
+| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. |
 | `owner`    | The owner of the package. |
 
 For example:
diff --git a/docs/content/doc/packages/conda.en-us.md b/docs/content/doc/packages/conda.en-us.md
index 8b828475904e0..5fca9997de104 100644
--- a/docs/content/doc/packages/conda.en-us.md
+++ b/docs/content/doc/packages/conda.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2022-12-28T00:00:00+00:00"
 title: "Conda Packages Repository"
-slug: "packages/conda"
+slug: "usage/packages/conda"
 draft: false
 toc: false
 menu:
diff --git a/docs/content/doc/packages/container.en-us.md b/docs/content/doc/packages/container.en-us.md
index 77dbbafd02cb5..732249529db9c 100644
--- a/docs/content/doc/packages/container.en-us.md
+++ b/docs/content/doc/packages/container.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "Container Registry"
-slug: "packages/container"
+slug: "usage/packages/container"
 draft: false
 toc: false
 menu:
@@ -34,7 +34,7 @@ To push an image or if the image is in a private registry, you have to authentic
 docker login gitea.example.com
 ```
 
-If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password.
+If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password.
 
 ## Image naming convention
 
diff --git a/docs/content/doc/packages/generic.en-us.md b/docs/content/doc/packages/generic.en-us.md
index dd0f5653fff8a..ce6661a87c19c 100644
--- a/docs/content/doc/packages/generic.en-us.md
+++ b/docs/content/doc/packages/generic.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "Generic Packages Repository"
-slug: "packages/generic"
+slug: "usage/packages/generic"
 draft: false
 toc: false
 menu:
@@ -22,7 +22,7 @@ Publish generic files, like release binaries or other output, for your user or o
 
 ## Authenticate to the package registry
 
-To authenticate to the Package Registry, you need to provide [custom HTTP headers or use HTTP Basic authentication]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}).
+To authenticate to the Package Registry, you need to provide [custom HTTP headers or use HTTP Basic authentication]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}).
 
 ## Publish a package
 
@@ -48,7 +48,7 @@ curl --user your_username:your_password_or_token \
      https://gitea.example.com/api/packages/testuser/generic/test_package/1.0.0/file.bin
 ```
 
-If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password.
+If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password.
 
 The server reponds with the following HTTP Status codes.
 
diff --git a/docs/content/doc/packages/helm.en-us.md b/docs/content/doc/packages/helm.en-us.md
index 89b929f9bc848..01352237668a7 100644
--- a/docs/content/doc/packages/helm.en-us.md
+++ b/docs/content/doc/packages/helm.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2022-04-14T00:00:00+00:00"
 title: "Helm Chart Registry"
-slug: "packages/helm"
+slug: "usage/packages/helm"
 draft: false
 toc: false
 menu:
@@ -42,7 +42,7 @@ helm cm-push ./{chart_file}.tgz {repo}
 | Parameter    | Description |
 | ------------ | ----------- |
 | `username`   | Your Gitea username. |
-| `password`   | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
+| `password`   | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. |
 | `repo`       | The name for the repository. |
 | `chart_file` | The Helm Chart archive. |
 | `owner`      | The owner of the package. |
diff --git a/docs/content/doc/packages/maven.en-us.md b/docs/content/doc/packages/maven.en-us.md
index 2ec5ca2ab710c..4e5090c7eead9 100644
--- a/docs/content/doc/packages/maven.en-us.md
+++ b/docs/content/doc/packages/maven.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "Maven Packages Repository"
-slug: "packages/maven"
+slug: "usage/packages/maven"
 draft: false
 toc: false
 menu:
@@ -70,7 +70,7 @@ Afterwards add the following sections to your project `pom.xml` file:
 
 | Parameter      | Description |
 | -------------- | ----------- |
-| `access_token` | Your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). |
+| `access_token` | Your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). |
 | `owner`        | The owner of the package. |
 
 ### Gradle variant
diff --git a/docs/content/doc/packages/npm.en-us.md b/docs/content/doc/packages/npm.en-us.md
index decb3f743c419..f6ca9fb93f176 100644
--- a/docs/content/doc/packages/npm.en-us.md
+++ b/docs/content/doc/packages/npm.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "npm Packages Repository"
-slug: "packages/npm"
+slug: "usage/packages/npm"
 draft: false
 toc: false
 menu:
@@ -41,7 +41,7 @@ npm config set -- '//gitea.example.com/api/packages/{owner}/npm/:_authToken' "{t
 | ------------ | ----------- |
 | `scope`      | The scope of the packages. |
 | `owner`      | The owner of the package. |
-| `token`      | Your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). |
+| `token`      | Your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). |
 
 For example:
 
diff --git a/docs/content/doc/packages/nuget.en-us.md b/docs/content/doc/packages/nuget.en-us.md
index 670abca7fd594..c40461cf8c926 100644
--- a/docs/content/doc/packages/nuget.en-us.md
+++ b/docs/content/doc/packages/nuget.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "NuGet Packages Repository"
-slug: "packages/nuget"
+slug: "usage/packages/nuget"
 draft: false
 toc: false
 menu:
@@ -38,7 +38,7 @@ dotnet nuget add source --name {source_name} --username {username} --password {p
 | ------------- | ----------- |
 | `source_name` | The desired source name. |
 | `username`    | Your Gitea username. |
-| `password`    | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
+| `password`    | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. |
 | `owner`       | The owner of the package. |
 
 For example:
@@ -47,7 +47,7 @@ For example:
 dotnet nuget add source --name gitea --username testuser --password password123 https://gitea.example.com/api/packages/testuser/nuget/index.json
 ```
 
-You can add the source without credentials and use the [`--api-key`](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-nuget-push) parameter when publishing packages. In this case you need to provide a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}).
+You can add the source without credentials and use the [`--api-key`](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-nuget-push) parameter when publishing packages. In this case you need to provide a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}).
 
 ## Publish a package
 
diff --git a/docs/content/doc/packages/overview.en-us.md b/docs/content/doc/packages/overview.en-us.md
index 08da8ced4844e..436514bfa7bc9 100644
--- a/docs/content/doc/packages/overview.en-us.md
+++ b/docs/content/doc/packages/overview.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "Package Registry"
-slug: "packages/overview"
+slug: "usage/packages/overview"
 draft: false
 toc: false
 menu:
diff --git a/docs/content/doc/packages/pub.en-us.md b/docs/content/doc/packages/pub.en-us.md
index 4d37662208332..ef7be1be59273 100644
--- a/docs/content/doc/packages/pub.en-us.md
+++ b/docs/content/doc/packages/pub.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2022-07-31T00:00:00+00:00"
 title: "Pub Packages Repository"
-slug: "packages/pub"
+slug: "usage/packages/pub"
 draft: false
 toc: false
 menu:
@@ -38,7 +38,7 @@ dart pub token add https://gitea.example.com/api/packages/{owner}/pub
 | ------------ | ----------- |
 | `owner`      | The owner of the package. |
 
-You need to provide your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}).
+You need to provide your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}).
 
 ## Publish a package
 
diff --git a/docs/content/doc/packages/pypi.en-us.md b/docs/content/doc/packages/pypi.en-us.md
index ec2475aea346f..f99dfb5acc281 100644
--- a/docs/content/doc/packages/pypi.en-us.md
+++ b/docs/content/doc/packages/pypi.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "PyPI Packages Repository"
-slug: "packages/pypi"
+slug: "usage/packages/pypi"
 draft: false
 toc: false
 menu:
@@ -42,7 +42,7 @@ password = {password}
 | ------------ | ----------- |
 | `owner`      | The owner of the package. |
 | `username`   | Your Gitea username. |
-| `password`   | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
+| `password`   | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. |
 
 ## Publish a package
 
diff --git a/docs/content/doc/packages/rubygems.en-us.md b/docs/content/doc/packages/rubygems.en-us.md
index d4ae30bbcecc1..a7aa36aef474c 100644
--- a/docs/content/doc/packages/rubygems.en-us.md
+++ b/docs/content/doc/packages/rubygems.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2021-07-20T00:00:00+00:00"
 title: "RubyGems Packages Repository"
-slug: "packages/rubygems"
+slug: "usage/packages/rubygems"
 draft: false
 toc: false
 menu:
@@ -36,7 +36,7 @@ https://gitea.example.com/api/packages/{owner}/rubygems: Bearer {token}
 | Parameter     | Description |
 | ------------- | ----------- |
 | `owner`       | The owner of the package. |
-| `token`       | Your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). |
+| `token`       | Your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). |
 
 For example:
 
diff --git a/docs/content/doc/packages/storage.en-us.md b/docs/content/doc/packages/storage.en-us.md
index 8b05b8a45fb4b..000752b774ab7 100644
--- a/docs/content/doc/packages/storage.en-us.md
+++ b/docs/content/doc/packages/storage.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2022-11-01T00:00:00+00:00"
 title: "Storage"
-slug: "packages/storage"
+slug: "usage/packages/storage"
 draft: false
 toc: false
 menu:
@@ -31,7 +31,7 @@ Whenever a package gets deleted only the references to the underlaying blobs are
 The blobs get not removed at this moment, so they still require space on the filesystem.
 When a new package gets uploaded the existing blobs may get referenced again.
 
-These unreferenced blobs get deleted by a [clean up job]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#cron---cleanup-expired-packages-croncleanup_packages" >}}).
+These unreferenced blobs get deleted by a [clean up job]({{< relref "doc/administration/config-cheat-sheet.en-us.md#cron---cleanup-expired-packages-croncleanup_packages" >}}).
 The config setting `OLDER_THAN` configures how long unreferenced blobs are kept before they get deleted.
 
 ## Cleanup Rules
@@ -71,7 +71,7 @@ The patterns are case-insensitive which matches the behaviour of the package reg
 
 ### How the cleanup rules work
 
-The cleanup rules are part of the [clean up job]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#cron---cleanup-expired-packages-croncleanup_packages" >}}) and run periodically.
+The cleanup rules are part of the [clean up job]({{< relref "doc/administration/config-cheat-sheet.en-us.md#cron---cleanup-expired-packages-croncleanup_packages" >}}) and run periodically.
 
 The cleanup rule:
 
diff --git a/docs/content/doc/packages/swift.en-us.md b/docs/content/doc/packages/swift.en-us.md
index 61a4c9a55d42c..c7c7ae4bd5254 100644
--- a/docs/content/doc/packages/swift.en-us.md
+++ b/docs/content/doc/packages/swift.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2023-01-10T00:00:00+00:00"
 title: "Swift Packages Repository"
-slug: "packages/swift"
+slug: "usage/packages/swift"
 draft: false
 toc: false
 menu:
@@ -36,7 +36,7 @@ swift package-registry set https://gitea.example.com/api/packages/{owner}/swift
 | ------------ | ----------- |
 | `owner`      | The owner of the package. |
 | `username`   | Your Gitea username. |
-| `password`   | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
+| `password`   | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. |
 
 The login is optional and only needed if the package registry is private.
 
@@ -61,7 +61,7 @@ curl -X PUT --user {username}:{password} \
 | Placeholder | Description |
 | ----------- | ----------- |
 | `username`  | Your Gitea username. |
-| `password`  | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
+| `password`  | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. |
 | `owner`     | The owner of the package. |
 | `scope`     | The package scope. |
 | `name`      | The package name. |
diff --git a/docs/content/doc/packages/vagrant.en-us.md b/docs/content/doc/packages/vagrant.en-us.md
index 1e6d7a772147c..4cd066feca739 100644
--- a/docs/content/doc/packages/vagrant.en-us.md
+++ b/docs/content/doc/packages/vagrant.en-us.md
@@ -1,7 +1,7 @@
 ---
 date: "2022-08-23T00:00:00+00:00"
 title: "Vagrant Packages Repository"
-slug: "packages/vagrant"
+slug: "usage/packages/vagrant"
 draft: false
 toc: false
 menu:
@@ -69,7 +69,7 @@ vagrant box add "https://gitea.example.com/api/packages/testuser/vagrant/test_sy
 ```
 
 This will install the latest version of the package. To add a specific version, use the `--box-version` parameter.
-If the registry is private you can pass your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) in the `VAGRANT_CLOUD_TOKEN` environment variable.
+If the registry is private you can pass your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) in the `VAGRANT_CLOUD_TOKEN` environment variable.
 
 ## Supported commands
 
diff --git a/docs/content/doc/upgrade.en-us.md b/docs/content/doc/upgrade.en-us.md
deleted file mode 100644
index 9623ff9f1eaf7..0000000000000
--- a/docs/content/doc/upgrade.en-us.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "Upgrade"
-slug: "upgrade"
-weight: 10
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "Upgrade"
-    weight: 20
-    identifier: "upgrade"
----
diff --git a/docs/content/doc/upgrade.fr-fr.md b/docs/content/doc/upgrade.fr-fr.md
deleted file mode 100644
index ca08daf9c096b..0000000000000
--- a/docs/content/doc/upgrade.fr-fr.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2017-08-23T09:00:00+02:00"
-title: "Mise à jour"
-slug: "upgrade"
-weight: 10
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "Mise à jour"
-    weight: 20
-    identifier: "upgrade"
----
diff --git a/docs/content/doc/upgrade.zh-cn.md b/docs/content/doc/upgrade.zh-cn.md
deleted file mode 100644
index d12e150b9cbce..0000000000000
--- a/docs/content/doc/upgrade.zh-cn.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "升级"
-slug: "upgrade"
-weight: 10
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "升级"
-    weight: 20
-    identifier: "upgrade"
----
diff --git a/docs/content/doc/upgrade.zh-tw.md b/docs/content/doc/upgrade.zh-tw.md
deleted file mode 100644
index b57fccbdd578e..0000000000000
--- a/docs/content/doc/upgrade.zh-tw.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "升級"
-slug: "upgrade"
-weight: 10
-toc: false
-draft: false
-menu:
-  sidebar:
-    name: "升級"
-    weight: 20
-    identifier: "upgrade"
----
diff --git a/docs/content/doc/usage.en-us.md b/docs/content/doc/usage.en-us.md
index 6be9769d64603..47a4fdc1d7d43 100644
--- a/docs/content/doc/usage.en-us.md
+++ b/docs/content/doc/usage.en-us.md
@@ -8,6 +8,6 @@ draft: false
 menu:
   sidebar:
     name: "Usage"
-    weight: 35
+    weight: 30
     identifier: "usage"
 ---
diff --git a/docs/content/doc/usage.zh-cn.md b/docs/content/doc/usage.zh-cn.md
index c533df662481e..026bef86e9917 100644
--- a/docs/content/doc/usage.zh-cn.md
+++ b/docs/content/doc/usage.zh-cn.md
@@ -8,6 +8,6 @@ draft: false
 menu:
   sidebar:
     name: "使用指南"
-    weight: 35
+    weight: 30
     identifier: "usage"
 ---
diff --git a/docs/content/doc/usage.zh-tw.md b/docs/content/doc/usage.zh-tw.md
index b74bfe0175e03..a95e973991ba5 100644
--- a/docs/content/doc/usage.zh-tw.md
+++ b/docs/content/doc/usage.zh-tw.md
@@ -8,6 +8,6 @@ draft: false
 menu:
   sidebar:
     name: "使用"
-    weight: 35
+    weight: 30
     identifier: "usage"
 ---
diff --git a/docs/content/doc/features/authentication.en-us.md b/docs/content/doc/usage/authentication.en-us.md
similarity index 99%
rename from docs/content/doc/features/authentication.en-us.md
rename to docs/content/doc/usage/authentication.en-us.md
index c27a09b00bf32..5478ee94f6812 100644
--- a/docs/content/doc/features/authentication.en-us.md
+++ b/docs/content/doc/usage/authentication.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "usage"
     name: "Authentication"
     weight: 10
     identifier: "authentication"
diff --git a/docs/content/doc/features/authentication.zh-cn.md b/docs/content/doc/usage/authentication.zh-cn.md
similarity index 98%
rename from docs/content/doc/features/authentication.zh-cn.md
rename to docs/content/doc/usage/authentication.zh-cn.md
index aeb099f760b8e..403c3f43ce171 100644
--- a/docs/content/doc/features/authentication.zh-cn.md
+++ b/docs/content/doc/usage/authentication.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "usage"
     name: "认证"
     weight: 10
     identifier: "authentication"
diff --git a/docs/content/doc/features/authentication.zh-tw.md b/docs/content/doc/usage/authentication.zh-tw.md
similarity index 90%
rename from docs/content/doc/features/authentication.zh-tw.md
rename to docs/content/doc/usage/authentication.zh-tw.md
index da257409a2aed..958c498fc6bb0 100644
--- a/docs/content/doc/features/authentication.zh-tw.md
+++ b/docs/content/doc/usage/authentication.zh-tw.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "usage"
     name: "認證"
     weight: 10
     identifier: "authentication"
diff --git a/docs/content/doc/advanced/clone-filter.en-us.md b/docs/content/doc/usage/clone-filter.en-us.md
similarity index 98%
rename from docs/content/doc/advanced/clone-filter.en-us.md
rename to docs/content/doc/usage/clone-filter.en-us.md
index 58675d2e941df..7d4ba2d9a8766 100644
--- a/docs/content/doc/advanced/clone-filter.en-us.md
+++ b/docs/content/doc/usage/clone-filter.en-us.md
@@ -7,7 +7,7 @@ draft: false
 toc: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "usage"
     name: "Clone filters"
     weight: 25
     identifier: "clone-filters"
diff --git a/docs/content/doc/usage/linked-references.en-us.md b/docs/content/doc/usage/linked-references.en-us.md
index df2813792868a..721c2cf13e2a5 100644
--- a/docs/content/doc/usage/linked-references.en-us.md
+++ b/docs/content/doc/usage/linked-references.en-us.md
@@ -96,7 +96,7 @@ Sometimes a commit or pull request may fix or bring back a problem documented
 in a particular issue. Gitea supports closing and reopening the referenced
 issues by preceding the reference with a particular _keyword_. Common keywords
 include "closes", "fixes", "reopens", etc. This list can be
-[customized]({{< ref "/doc/advanced/config-cheat-sheet.en-us.md" >}}) by the
+[customized]({{< ref "doc/administration/config-cheat-sheet.en-us.md" >}}) by the
 site administrator.
 
 Example:
diff --git a/docs/content/doc/advanced/protected-tags.en-us.md b/docs/content/doc/usage/protected-tags.en-us.md
similarity index 99%
rename from docs/content/doc/advanced/protected-tags.en-us.md
rename to docs/content/doc/usage/protected-tags.en-us.md
index 8ed2afc418320..f7404d32cb0d1 100644
--- a/docs/content/doc/advanced/protected-tags.en-us.md
+++ b/docs/content/doc/usage/protected-tags.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "usage"
     name: "Protected tags"
     weight: 45
     identifier: "protected-tags"
diff --git a/docs/content/doc/usage/push-to-create.en-us.md b/docs/content/doc/usage/push-to-create.en-us.md
index 7ed3f563687df..27b26b16a944c 100644
--- a/docs/content/doc/usage/push-to-create.en-us.md
+++ b/docs/content/doc/usage/push-to-create.en-us.md
@@ -19,7 +19,7 @@ Push to create is a feature that allows you to push to a repository that does no
 
 ## Enabling Push To Create
 
-In the `app.ini` file, set `ENABLE_PUSH_CREATE_USER` to `true` and `ENABLE_PUSH_CREATE_ORG` to `true` if you want to allow users to create repositories in their own user account and in organizations they are a member of respectively. Restart Gitea for the changes to take effect. You can read more about these two options in the [Configuration Cheat Sheet]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#repository-repository" >}}).
+In the `app.ini` file, set `ENABLE_PUSH_CREATE_USER` to `true` and `ENABLE_PUSH_CREATE_ORG` to `true` if you want to allow users to create repositories in their own user account and in organizations they are a member of respectively. Restart Gitea for the changes to take effect. You can read more about these two options in the [Configuration Cheat Sheet]({{< relref "doc/administration/config-cheat-sheet.en-us.md#repository-repository" >}}).
 
 ## Using Push To Create
 
diff --git a/docs/content/doc/advanced/repo-mirror.en-us.md b/docs/content/doc/usage/repo-mirror.en-us.md
similarity index 99%
rename from docs/content/doc/advanced/repo-mirror.en-us.md
rename to docs/content/doc/usage/repo-mirror.en-us.md
index e95dfa0d6346e..9a52282bb3c9a 100644
--- a/docs/content/doc/advanced/repo-mirror.en-us.md
+++ b/docs/content/doc/usage/repo-mirror.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "advanced"
+    parent: "usage"
     name: "Repository Mirror"
     weight: 45
     identifier: "repo-mirror"
diff --git a/docs/content/doc/secrets/overview.en-us.md b/docs/content/doc/usage/secrets.en-us.md
similarity index 91%
rename from docs/content/doc/secrets/overview.en-us.md
rename to docs/content/doc/usage/secrets.en-us.md
index 1b63d179d7895..341ccbae1279b 100644
--- a/docs/content/doc/secrets/overview.en-us.md
+++ b/docs/content/doc/usage/secrets.en-us.md
@@ -1,15 +1,15 @@
 ---
 date: "2022-12-19T21:26:00+08:00"
 title: "Secrets"
-slug: "secrets/overview"
+slug: "usage/secrets"
 draft: false
 toc: false
 menu:
   sidebar:
-    parent: "secrets"
-    name: "Overview"
+    parent: "usage"
+    name: "Secrets"
     weight: 1
-    identifier: "secrets-overview"
+    identifier: "usage-secrets"
 ---
 
 # Secrets
diff --git a/docs/content/doc/features/webhooks.en-us.md b/docs/content/doc/usage/webhooks.en-us.md
similarity index 99%
rename from docs/content/doc/features/webhooks.en-us.md
rename to docs/content/doc/usage/webhooks.en-us.md
index ecbe13c3adb21..2cf60cc9cd1b7 100644
--- a/docs/content/doc/features/webhooks.en-us.md
+++ b/docs/content/doc/usage/webhooks.en-us.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "usage"
     name: "Webhooks"
     weight: 30
     identifier: "webhooks"
diff --git a/docs/content/doc/features/webhooks.zh-cn.md b/docs/content/doc/usage/webhooks.zh-cn.md
similarity index 96%
rename from docs/content/doc/features/webhooks.zh-cn.md
rename to docs/content/doc/usage/webhooks.zh-cn.md
index 76139460c0a22..00ebd7aa9dd02 100644
--- a/docs/content/doc/features/webhooks.zh-cn.md
+++ b/docs/content/doc/usage/webhooks.zh-cn.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "usage"
     name: "Webhooks"
     weight: 30
     identifier: "webhooks"
diff --git a/docs/content/doc/features/webhooks.zh-tw.md b/docs/content/doc/usage/webhooks.zh-tw.md
similarity index 99%
rename from docs/content/doc/features/webhooks.zh-tw.md
rename to docs/content/doc/usage/webhooks.zh-tw.md
index 20fec3d62d876..9e918739a4772 100644
--- a/docs/content/doc/features/webhooks.zh-tw.md
+++ b/docs/content/doc/usage/webhooks.zh-tw.md
@@ -7,7 +7,7 @@ toc: false
 draft: false
 menu:
   sidebar:
-    parent: "features"
+    parent: "usage"
     name: "Webhook"
     weight: 30
     identifier: "webhooks"

From 378d6b849130b539d11a1317d630d4a632a191c5 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 24 Mar 2023 00:52:20 +0800
Subject: [PATCH 06/12] Fix incorrect `show-modal` and `show-panel` class
 (#23660)

That's incorrect code caused by Copy&Paste.

`show-modal` / `show-panel` are used by JS to show something, but these
links have `href`, they should navigate to new page.

Close #23657
---
 templates/repo/projects/view.tmpl         | 2 +-
 templates/repo/settings/lfs.tmpl          | 6 +++---
 templates/repo/settings/lfs_file.tmpl     | 2 +-
 templates/repo/settings/lfs_pointers.tmpl | 2 +-
 templates/user/settings/keys_gpg.tmpl     | 2 +-
 templates/user/settings/keys_ssh.tmpl     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 99831f3dd9c33..07895b68158c1 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -8,7 +8,7 @@
 			</div>
 			<div class="column right aligned">
 				{{if and .CanWriteProjects (not .Repository.IsArchived)}}
-					<a class="ui green button show-modal item" href="{{$.RepoLink}}/issues/new/choose?project={{$.Project.ID}}">{{.locale.Tr "repo.issues.new"}}</a>
+					<a class="ui green button item" href="{{$.RepoLink}}/issues/new/choose?project={{$.Project.ID}}">{{.locale.Tr "repo.issues.new"}}</a>
 					<a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a>
 				{{end}}
 				<div class="ui small modal new-board-modal" id="new-board-item">
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 9a38d32345739..77421154f88c6 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -7,8 +7,8 @@
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
-				<a class="ui tiny show-panel button" href="{{.Link}}/locks">{{.locale.Tr "repo.settings.lfs_locks"}}</a>
-				<a class="ui primary tiny show-panel button" href="{{.Link}}/pointers">&nbsp;{{.locale.Tr "repo.settings.lfs_findpointerfiles"}}</a>
+				<a class="ui tiny button" href="{{.Link}}/locks">{{.locale.Tr "repo.settings.lfs_locks"}}</a>
+				<a class="ui primary tiny button" href="{{.Link}}/pointers">&nbsp;{{.locale.Tr "repo.settings.lfs_findpointerfiles"}}</a>
 			</div>
 		</h4>
 		<table id="lfs-files-table" class="ui attached segment single line table">
@@ -25,7 +25,7 @@
 						<td>{{FileSize .Size}}</td>
 						<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
 						<td class="right aligned">
-							<a class="ui primary show-panel button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+							<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
 							<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
 								<span class="btn-octicon btn-octicon-danger tooltip"  data-content="{{$.locale.Tr "repo.editor.delete_this_file"}}" data-position="bottom center">{{svg "octicon-trash"}}</span>
 							</button>
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index 450601dc9be52..7a1e3e9421c0e 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -12,7 +12,7 @@
 						<a class="ui mini basic button unescape-button gt-hidden">{{.locale.Tr "repo.unescape_control_characters"}}</a>
 						<a class="ui mini basic button escape-button">{{.locale.Tr "repo.escape_control_characters"}}</a>
 					{{end}}
-					<a class="ui primary show-panel button" href="{{.LFSFilesLink}}/find?oid={{.LFSFile.Oid}}&size={{.LFSFile.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+					<a class="ui primary button" href="{{.LFSFilesLink}}/find?oid={{.LFSFile.Oid}}&size={{.LFSFile.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
 				</div>
 			</h4>
 			<div class="ui attached table unstackable segment">
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index 67021ba6cda6b..db7ee77985b29 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -56,7 +56,7 @@
 								</span>
 							</td>
 							<td>
-								<a class="ui primary show-panel button" href="{{$.LFSFilesLink}}/find?oid={{.Oid}}&size={{.Size}}&sha={{.SHA}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+								<a class="ui primary button" href="{{$.LFSFilesLink}}/find?oid={{.Oid}}&size={{.Size}}&sha={{.SHA}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
 							</td>
 							<td>{{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
 							<td>{{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index d143d5ed99721..7f1604bdca567 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -50,7 +50,7 @@
 						{{$.locale.Tr "settings.delete_key"}}
 					</button>
 					{{if and (not .Verified) (ne $.VerifyingID .KeyID)}}
-						<a class="ui primary tiny show-panel button" href="{{$.Link}}?verify_gpg={{.KeyID}}">{{$.locale.Tr "settings.gpg_key_verify"}}</a>
+						<a class="ui primary tiny button" href="{{$.Link}}?verify_gpg={{.KeyID}}">{{$.locale.Tr "settings.gpg_key_verify"}}</a>
 					{{end}}
 				</div>
 				<div class="left floated content">
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 71b9b6a86b68b..01b79a9e71bd6 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -42,7 +42,7 @@
 						{{$.locale.Tr "settings.delete_key"}}
 					</button>
 					{{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}}
-						<a class="ui primary tiny show-panel button" href="{{$.Link}}?verify_ssh={{.Fingerprint}}">{{$.locale.Tr "settings.ssh_key_verify"}}</a>
+						<a class="ui primary tiny button" href="{{$.Link}}?verify_ssh={{.Fingerprint}}">{{$.locale.Tr "settings.ssh_key_verify"}}</a>
 					{{end}}
 
 				</div>

From 95818adb715eb234545889bf51331b80b18bb226 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 24 Mar 2023 01:27:03 +0800
Subject: [PATCH 07/12] A tool to help to backport locales, changes source
 strings to fix other broken translations (#23633)

It use old en-US locales as reference, fill the old other locales with
new locales.

----

## More broken translations

Many translations are still broken. The reason is: at the last time
restoring the ini to crowdin, many semicolon are treated as comments.

Two kinds of broken strings:

### Some translations can be re-translated

<details>

```
skipping options/locale/locale_si-LK.ini org teams.add_nonexistent_repo
skipping options/locale/locale_tr-TR.ini repo commits.search.tooltip
skipping options/locale/locale_es-ES.ini repo settings.trust_model.committer.desc
skipping options/locale/locale_es-ES.ini admin dashboard.new_version_hint
skipping options/locale/locale_pt-PT.ini org teams.add_nonexistent_repo
skipping options/locale/locale_hu-HU.ini install require_sign_in_view_popup
skipping options/locale/locale_hu-HU.ini repo migrate.invalid_local_path
skipping options/locale/locale_id-ID.ini repo migrate.invalid_local_path
skipping options/locale/locale_id-ID.ini org teams.add_nonexistent_repo
skipping options/locale/locale_de-DE.ini repo settings.protect_protected_file_patterns_desc
```

</details>

So this PR also does some small changes on them, to trigger the
re-translation.

### The `locale_el-GR.ini` contains many broken tranlsations

I guess we should reset them from crowdin side, then translators can
re-translate them.

----

Update: in latest main, the strings have been fixed.

## TODO

Update: the el-GR translators have done great job and fixes these broken
translations.


<details>

Merge this PR ASAP and upload `locale_el-GR.ini` to crowdin to remove
broken strings.


Out-dated, fixed in main.


![image](https://user-images.githubusercontent.com/2114189/226954531-36e14527-278a-41a1-8ddb-2b2b27bfc746.png)

</details>

---------

Co-authored-by: delvh <dev.lh@web.de>
---
 build/backport-locales.go       | 89 +++++++++++++++++++++++++++++++++
 options/locale/locale_en-US.ini | 37 +++++++-------
 2 files changed, 107 insertions(+), 19 deletions(-)
 create mode 100644 build/backport-locales.go

diff --git a/build/backport-locales.go b/build/backport-locales.go
new file mode 100644
index 0000000000000..efaae52bd4aed
--- /dev/null
+++ b/build/backport-locales.go
@@ -0,0 +1,89 @@
+//go:build ignore
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"gopkg.in/ini.v1"
+)
+
+func main() {
+	if len(os.Args) != 2 {
+		println("usage: backport-locales <to-ref>")
+		println("eg: backport-locales release/v1.19")
+		os.Exit(1)
+	}
+
+	ini.PrettyFormat = false
+	mustNoErr := func(err error) {
+		if err != nil {
+			panic(err)
+		}
+	}
+	collectInis := func(ref string) map[string]*ini.File {
+		inis := map[string]*ini.File{}
+		err := filepath.WalkDir("options/locale", func(path string, d os.DirEntry, err error) error {
+			if err != nil {
+				return err
+			}
+			if d.IsDir() || !strings.HasSuffix(d.Name(), ".ini") {
+				return nil
+			}
+			cfg, err := ini.LoadSources(ini.LoadOptions{
+				IgnoreInlineComment:         true,
+				UnescapeValueCommentSymbols: true,
+			}, path)
+			mustNoErr(err)
+			inis[path] = cfg
+			fmt.Printf("collecting: %s @ %s\n", path, ref)
+			return nil
+		})
+		mustNoErr(err)
+		return inis
+	}
+
+	// collect new locales from current working directory
+	inisNew := collectInis("HEAD")
+
+	// switch to the target ref, and collect the old locales
+	cmd := exec.Command("git", "checkout", os.Args[1])
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	mustNoErr(cmd.Run())
+	inisOld := collectInis(os.Args[1])
+
+	// use old en-US as the base, and copy the new translations to the old locales
+	enUsOld := inisOld["options/locale/locale_en-US.ini"]
+	for path, iniOld := range inisOld {
+		if iniOld == enUsOld {
+			continue
+		}
+		iniNew := inisNew[path]
+		if iniNew == nil {
+			continue
+		}
+		for _, secEnUS := range enUsOld.Sections() {
+			secOld := iniOld.Section(secEnUS.Name())
+			secNew := iniNew.Section(secEnUS.Name())
+			for _, keyEnUs := range secEnUS.Keys() {
+				if secNew.HasKey(keyEnUs.Name()) {
+					oldStr := secOld.Key(keyEnUs.Name()).String()
+					newStr := secNew.Key(keyEnUs.Name()).String()
+					// A bug: many of new translations with ";" are broken in Crowdin (due to last messy restoring)
+					// As the broken strings are gradually fixed, this workaround check could be removed (in a few months?)
+					if strings.Contains(oldStr, ";") && !strings.Contains(newStr, ";") {
+						println("skip potential broken string", path, secEnUS.Name(), keyEnUs.Name())
+						continue
+					}
+					secOld.Key(keyEnUs.Name()).SetValue(newStr)
+				}
+			}
+		}
+		mustNoErr(iniOld.SaveTo(path))
+	}
+}
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index da4ad47620209..6d839edc10229 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -219,7 +219,7 @@ openid_signup_popup = Enable OpenID-based user self-registration.
 enable_captcha = Enable registration CAPTCHA
 enable_captcha_popup = Require a CAPTCHA for user self-registration.
 require_sign_in_view = Require Sign-In to View Pages
-require_sign_in_view_popup = Limit page access to signed-in users. Visitors will only see the 'sign in' and registration pages.
+require_sign_in_view_popup = Limit page access to signed-in users. Visitors will only see the sign-in and registration pages.
 admin_setting_desc = Creating an administrator account is optional. The first registered user will automatically become an administrator.
 admin_title = Administrator Account Settings
 admin_name = Administrator Username
@@ -249,7 +249,7 @@ no_reply_address = Hidden Email Domain
 no_reply_address_helper = Domain name for users with a hidden email address. For example, the username 'joe' will be logged in Git as 'joe@noreply.example.org' if the hidden email domain is set to 'noreply.example.org'.
 password_algorithm = Password Hash Algorithm
 invalid_password_algorithm = Invalid password hash algorithm
-password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strength. `argon2` whilst having good characteristics uses a lot of memory and may be inappropriate for small systems.
+password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strength. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems.
 enable_update_checker = Enable Update Checker
 enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io.
 
@@ -521,14 +521,14 @@ invalid_ssh_key = Cannot verify your SSH key: %s
 invalid_gpg_key = Cannot verify your GPG key: %s
 invalid_ssh_principal = Invalid principal: %s
 must_use_public_key = The key you provided is a private key. Please do not upload your private key anywhere. Use your public key instead.
-unable_verify_ssh_key = "Cannot verify the SSH key; double-check it for mistakes."
+unable_verify_ssh_key = "Cannot verify the SSH key, double-check it for mistakes."
 auth_failed = Authentication failed: %v
 
-still_own_repo = "Your account owns one or more repositories; delete or transfer them first."
-still_has_org = "Your account is a member of one or more organizations; leave them first."
-still_own_packages = "Your account owns one or more packages; delete them first."
-org_still_own_repo = "This organization still owns one or more repositories; delete or transfer them first."
-org_still_own_packages = "This organization still owns one or more packages; delete them first."
+still_own_repo = "Your account owns one or more repositories, delete or transfer them first."
+still_has_org = "Your account is a member of one or more organizations, leave them first."
+still_own_packages = "Your account owns one or more packages, delete them first."
+org_still_own_repo = "This organization still owns one or more repositories, delete or transfer them first."
+org_still_own_packages = "This organization still owns one or more packages, delete them first."
 
 target_branch_not_exist = Target branch does not exist.
 
@@ -993,7 +993,7 @@ migrate.github_token_desc = You can put one or more tokens with comma separated
 migrate.clone_local_path = or a local server path
 migrate.permission_denied = You are not allowed to import local repositories.
 migrate.permission_denied_blocked = You cannot import from disallowed hosts, please ask the admin to check ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS settings.
-migrate.invalid_local_path = "The local path is invalid. It does not exist or is not a directory."
+migrate.invalid_local_path = "The local path is invalid. It doesn't exist or is not a directory."
 migrate.invalid_lfs_endpoint = The LFS endpoint is not valid.
 migrate.failed = Migration failed: %v
 migrate.migrate_items_options = Access Token is required to migrate additional items
@@ -1175,7 +1175,7 @@ commits.commits = Commits
 commits.no_commits = No commits in common. '%s' and '%s' have entirely different histories.
 commits.nothing_to_compare = These branches are equal.
 commits.search = Search commits…
-commits.search.tooltip = You can prefix keywords with "author:", "committer:", "after:", or "before:", e.g. "revert author:Alice before:2019-04-01".
+commits.search.tooltip = You can prefix keywords with "author:", "committer:", "after:", or "before:", e.g. "revert author:Alice before:2019-01-13".
 commits.find = Search
 commits.search_all = All Branches
 commits.author = Author
@@ -1635,7 +1635,6 @@ pulls.merge_conflict = Merge Failed: There was a conflict whilst merging. Hint:
 pulls.merge_conflict_summary = Error Message
 pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %[1]s. Hint: Try a different strategy
 pulls.rebase_conflict_summary = Error Message
-; </summary><code>%[2]s<br>%[3]s</code></details>
 pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy
 pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again.
 pulls.head_out_of_date = Merge Failed: Whilst generating the merge, the head was updated. Hint: Try again.
@@ -1935,7 +1934,7 @@ settings.trust_model.collaborator.long = Collaborator: Trust signatures by colla
 settings.trust_model.collaborator.desc = Valid signatures by collaborators of this repository will be marked "trusted" - (whether they match the committer or not). Otherwise, valid signatures will be marked "untrusted" if the signature matches the committer and "unmatched" if not.
 settings.trust_model.committer = Committer
 settings.trust_model.committer.long = Committer: Trust signatures that match committers (This matches GitHub and will force Gitea signed commits to have Gitea as the committer)
-settings.trust_model.committer.desc = Valid signatures will only be marked "trusted" if they match the committer, otherwise they will be marked "unmatched". This will force Gitea to be the committer on signed commits with the actual committer marked as Co-authored-by: and Co-committed-by: trailer in the commit. The default Gitea key must match a User in the database.
+settings.trust_model.committer.desc = Valid signatures will only be marked "trusted" if they match the committer, otherwise they will be marked "unmatched". This forces Gitea to be the committer on signed commits with the actual committer marked as Co-authored-by: and Co-committed-by: trailer in the commit. The default Gitea key must match a User in the database.
 settings.trust_model.collaboratorcommitter = Collaborator+Committer
 settings.trust_model.collaboratorcommitter.long = Collaborator+Committer: Trust signatures by collaborators which match the committer
 settings.trust_model.collaboratorcommitter.desc = Valid signatures by collaborators of this repository will be marked "trusted" if they match the committer. Otherwise, valid signatures will be marked "untrusted" if the signature matches the committer and "unmatched" otherwise. This will force Gitea to be marked as the committer on signed commits with the actual committer marked as Co-Authored-By: and Co-Committed-By: trailer in the commit. The default Gitea key must match a User in the database.
@@ -2135,10 +2134,10 @@ settings.dismiss_stale_approvals_desc = When new commits that change the content
 settings.require_signed_commits = Require Signed Commits
 settings.require_signed_commits_desc = Reject pushes to this branch if they are unsigned or unverifiable.
 settings.protect_branch_name_pattern = Protected Branch Name Pattern
-settings.protect_protected_file_patterns = Protected file patterns (separated using semicolon '\;'):
-settings.protect_protected_file_patterns_desc = Protected files that are not allowed to be changed directly even if user has rights to add, edit, or delete files in this branch. Multiple patterns can be separated using semicolon ('\;'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.
-settings.protect_unprotected_file_patterns = Unprotected file patterns (separated using semicolon '\;'):
-settings.protect_unprotected_file_patterns_desc = Unprotected files that are allowed to be changed directly if user has write access, bypassing push restriction. Multiple patterns can be separated using semicolon ('\;'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.
+settings.protect_protected_file_patterns = `Protected file patterns (separated using semicolon ';'):`
+settings.protect_protected_file_patterns_desc = `Protected files are not allowed to be changed directly even if user has rights to add, edit, or delete files in this branch. Multiple patterns can be separated using semicolon (';'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.`
+settings.protect_unprotected_file_patterns = `Unprotected file patterns (separated using semicolon ';'):`
+settings.protect_unprotected_file_patterns_desc = `Unprotected files that are allowed to be changed directly if user has write access, bypassing push restriction. Multiple patterns can be separated using semicolon (';'). See <a href="https://pkg.go.dev/github.com/gobwas/glob#Compile">github.com/gobwas/glob</a> documentation for pattern syntax. Examples: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.`
 settings.add_protected_branch = Enable protection
 settings.delete_protected_branch = Disable protection
 settings.update_protect_branch_success = Branch protection for rule '%s' has been updated.
@@ -2481,7 +2480,7 @@ teams.remove_all_repos_title = Remove all team repositories
 teams.remove_all_repos_desc = This will remove all repositories from the team.
 teams.add_all_repos_title = Add all repositories
 teams.add_all_repos_desc = This will add all the organization's repositories to the team.
-teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first."
+teams.add_nonexistent_repo = "The repository you're trying to add doesn't exist, please create it first."
 teams.add_duplicate_users = User is already a team member.
 teams.repos.none = No repositories could be accessed by this team.
 teams.members.none = No members on this team.
@@ -2511,7 +2510,7 @@ first_page = First
 last_page = Last
 total = Total: %d
 
-dashboard.new_version_hint = Gitea %s is now available, you are running %s. Check the <a target="_blank" rel="noreferrer" href="https://blog.gitea.io">blog</a> for more details.
+dashboard.new_version_hint = Gitea %s is now available, you are running %s. Check <a target="_blank" rel="noreferrer" href="https://blog.gitea.io">the blog</a> for more details.
 dashboard.statistic = Summary
 dashboard.operations = Maintenance Operations
 dashboard.system_status = System Status
@@ -2631,7 +2630,7 @@ users.still_own_repo = This user still owns one or more repositories. Delete or
 users.still_has_org = This user is a member of an organization. Remove the user from any organizations first.
 users.purge = Purge User
 users.purge_help = Forcibly delete user and any repositories, organizations, and packages owned by the user. All comments will be deleted too.
-users.still_own_packages = This user still owns one or more packages. Delete these packages first.
+users.still_own_packages = This user still owns one or more packages, delete these packages first.
 users.deletion_success = The user account has been deleted.
 users.reset_2fa = Reset 2FA
 users.list_status_filter.menu_text = Filter

From 9cefb7be737c6564668d95d8a43b4425e9a03d13 Mon Sep 17 00:00:00 2001
From: Hester Gong <hestergong@gmail.com>
Date: Fri, 24 Mar 2023 02:07:04 +0800
Subject: [PATCH 08/12] Fix new issue/pull request btn margin when it is next
 to sort (#23647)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Close #23627

Added margin left to the button when it is next to the svg, which has a
margin-right of `-0.5rem`

And here it might be better if `white-space: nowrap;` is added because
otherwise it might look like below on pull requests page on smaller
screen

<img width="945" alt="截屏2023-03-23 09 57 41"
src="https://user-images.githubusercontent.com/17645053/227079613-71c696ab-55ec-4641-acb9-622a8baebb31.png">

After:
<img width="936" alt="截屏2023-03-23 10 08 27"
src="https://user-images.githubusercontent.com/17645053/227080971-6bf2588e-40dd-4770-b0d1-45d7c63e0f48.png">

Pull Request on smaller screen
<img width="922" alt="截屏2023-03-23 10 25 16"
src="https://user-images.githubusercontent.com/17645053/227084144-0c2ed3e6-5c11-4252-bba2-b5f971b70f4a.png">
---
 templates/user/dashboard/issues.tmpl | 6 +++---
 web_src/css/helpers.css              | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 29023d921a086..c7065557bdf20 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -88,7 +88,7 @@
 					<div class="column right aligned gt-df gt-ac gt-je">
 						<!-- Sort -->
 						<div class="ui dropdown type jump item">
-							<span class="text">
+							<span class="text gt-whitespace-nowrap">
 								{{.locale.Tr "repo.issues.filter_sort"}}
 								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 							</span>
@@ -105,9 +105,9 @@
 						</div>
 						{{if .SingleRepoLink}}
 							{{if eq .SingleRepoAction "issue"}}
-								<a class="ui green button" href="{{.SingleRepoLink}}/issues/new/choose">{{.locale.Tr "repo.issues.new"}}</a>
+								<a class="ui green button gt-ml-4" href="{{.SingleRepoLink}}/issues/new/choose">{{.locale.Tr "repo.issues.new"}}</a>
 							{{else if eq .SingleRepoAction "pull"}}
-								<a class="ui green button" href="{{.SingleRepoLink}}/compare">{{.locale.Tr "repo.pulls.new"}}</a>
+								<a class="ui green button gt-ml-4" href="{{.SingleRepoLink}}/compare">{{.locale.Tr "repo.pulls.new"}}</a>
 							{{end}}
 						{{end}}
 					</div>
diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css
index 1c02de2d7a0b8..4756d31becff8 100644
--- a/web_src/css/helpers.css
+++ b/web_src/css/helpers.css
@@ -197,6 +197,8 @@
 
 .gt-content-center { align-content: center !important; }
 
+.gt-whitespace-nowrap { white-space: nowrap !important; }
+
 @media (max-width: 767px) {
   .gt-db-small { display: block !important; }
   .gt-w-100-small { width: 100% !important; }

From 9f39def9910f0373a1c3a60dea001c681e3906fb Mon Sep 17 00:00:00 2001
From: Jason Song <i@wolfogre.com>
Date: Fri, 24 Mar 2023 03:01:55 +0800
Subject: [PATCH 09/12] Drop migration for ForeignReference (#23605)

Fix
https://github.com/go-gitea/gitea/issues/21086#issuecomment-1476560381

Related to #21721
---
 models/migrations/v1_17/v211.go | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/models/migrations/v1_17/v211.go b/models/migrations/v1_17/v211.go
index 16ec51849366d..9b72c8610b6ea 100644
--- a/models/migrations/v1_17/v211.go
+++ b/models/migrations/v1_17/v211.go
@@ -4,22 +4,9 @@
 package v1_17 //nolint
 
 import (
-	"fmt"
-
 	"xorm.io/xorm"
 )
 
-func CreateForeignReferenceTable(x *xorm.Engine) error {
-	type ForeignReference struct {
-		// RepoID is the first column in all indices. now we only need 2 indices: (repo, local) and (repo, foreign, type)
-		RepoID       int64  `xorm:"UNIQUE(repo_foreign_type) INDEX(repo_local)" `
-		LocalIndex   int64  `xorm:"INDEX(repo_local)"` // the resource key inside Gitea, it can be IssueIndex, or some model ID.
-		ForeignIndex string `xorm:"INDEX UNIQUE(repo_foreign_type)"`
-		Type         string `xorm:"VARCHAR(16) INDEX UNIQUE(repo_foreign_type)"`
-	}
-
-	if err := x.Sync2(new(ForeignReference)); err != nil {
-		return fmt.Errorf("Sync2: %w", err)
-	}
-	return nil
+func CreateForeignReferenceTable(_ *xorm.Engine) error {
+	return nil // This table was dropped in v1_19/v237.go
 }

From 0fd7e373c823f8cd88dbb480c1da867f160a289b Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Thu, 23 Mar 2023 21:42:22 +0100
Subject: [PATCH 10/12] Fix codeblocks in the cheat sheet (#23664)

---
 .../config-cheat-sheet.en-us.md               | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md
index 886aa11186c49..7f31a27f15066 100644
--- a/docs/content/doc/administration/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md
@@ -994,7 +994,7 @@ Default templates for project boards:
 
 ### Extended cron tasks (not enabled by default)
 
-#### Cron - Garbage collect all repositories ('cron.git_gc_repos')
+#### Cron - Garbage collect all repositories (`cron.git_gc_repos`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
@@ -1003,42 +1003,42 @@ Default templates for project boards:
 - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices.
 - `ARGS`: **\<empty\>**: Arguments for command `git gc`, e.g. `--aggressive --auto`. The default value is same with [git] -> GC_ARGS
 
-#### Cron - Update the '.ssh/authorized_keys' file with Gitea SSH keys ('cron.resync_all_sshkeys')
+#### Cron - Update the '.ssh/authorized_keys' file with Gitea SSH keys (`cron.resync_all_sshkeys`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
 - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices.
 - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
 
-#### Cron - Resynchronize pre-receive, update and post-receive hooks of all repositories ('cron.resync_all_hooks')
+#### Cron - Resynchronize pre-receive, update and post-receive hooks of all repositories (`cron.resync_all_hooks`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
 - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices.
 - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
 
-#### Cron - Reinitialize all missing Git repositories for which records exist ('cron.reinit_missing_repos')
+#### Cron - Reinitialize all missing Git repositories for which records exist (`cron.reinit_missing_repos`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
 - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices.
 - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
 
-#### Cron - Delete all repositories missing their Git files ('cron.delete_missing_repos')
+#### Cron - Delete all repositories missing their Git files (`cron.delete_missing_repos`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
 - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices.
 - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
 
-#### Cron -  Delete generated repository avatars ('cron.delete_generated_repository_avatars')
+#### Cron -  Delete generated repository avatars (`cron.delete_generated_repository_avatars`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
 - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices.
 - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`.
 
-#### Cron -  Delete all old actions from database ('cron.delete_old_actions')
+#### Cron -  Delete all old actions from database (`cron.delete_old_actions`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
@@ -1046,7 +1046,7 @@ Default templates for project boards:
 - `SCHEDULE`: **@every 168h**: Cron syntax to set how often to check.
 - `OLDER_THAN`: **@every 8760h**: any action older than this expression will be deleted from database, suggest using `8760h` (1 year) because that's the max length of heatmap.
 
-#### Cron -  Check for new Gitea versions ('cron.update_checker')
+#### Cron -  Check for new Gitea versions (`cron.update_checker`)
 
 - `ENABLED`: **true**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
@@ -1054,7 +1054,7 @@ Default templates for project boards:
 - `SCHEDULE`: **@every 168h**: Cron syntax for scheduling a work, e.g. `@every 168h`.
 - `HTTP_ENDPOINT`: **https://dl.gitea.io/gitea/version.json**: the endpoint that Gitea will check for newer versions
 
-#### Cron -  Delete all old system notices from database ('cron.delete_old_system_notices')
+#### Cron -  Delete all old system notices from database (`cron.delete_old_system_notices`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).
@@ -1062,7 +1062,7 @@ Default templates for project boards:
 - `SCHEDULE`: **@every 168h**: Cron syntax to set how often to check.
 - `OLDER_THAN`: **@every 8760h**: any system notice older than this expression will be deleted from database.
 
-#### Cron -  Garbage collect LFS pointers in repositories ('cron.gc_lfs')
+#### Cron -  Garbage collect LFS pointers in repositories (`cron.gc_lfs`)
 
 - `ENABLED`: **false**: Enable service.
 - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED).

From 4acf0214b1bbee1430b753cd2ca45527d61555e9 Mon Sep 17 00:00:00 2001
From: GiteaBot <teabot@gitea.io>
Date: Fri, 24 Mar 2023 00:16:34 +0000
Subject: [PATCH 11/12] [skip ci] Updated translations via Crowdin

---
 options/locale/locale_pt-PT.ini | 1 +
 options/locale/locale_zh-CN.ini | 1 +
 options/locale/locale_zh-TW.ini | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index d1e0744bfe0d3..7e4311bc85446 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -84,6 +84,7 @@ add=Adicionar
 add_all=Adicionar tudo
 remove=Remover
 remove_all=Remover tudo
+remove_label_str=`Remover item "%s"`
 edit=Editar
 
 enabled=Habilitado
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 3417308648a24..8479356dde2d6 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -84,6 +84,7 @@ add=添加
 add_all=添加所有
 remove=移除
 remove_all=移除所有
+remove_label_str=`删除标签 "%s"`
 edit=编辑
 
 enabled=启用
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index a9969646b7bb0..7f488ef7963f0 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -2265,7 +2265,9 @@ diff.review.header=送出審核
 diff.review.placeholder=審核意見
 diff.review.comment=留言
 diff.review.approve=核可
+diff.review.self_reject=合併請求的作者不能對自己的合併請求要求變更
 diff.review.reject=請求變更
+diff.review.self_approve=合併請求的作者不能核可自己的合併請求
 diff.committed_by=提交者
 diff.protected=受保護
 diff.image.side_by_side=並列

From 9e04627acaaa853e5269f98f53f2615077cfb028 Mon Sep 17 00:00:00 2001
From: Zettat123 <zettat123@gmail.com>
Date: Fri, 24 Mar 2023 13:13:04 +0800
Subject: [PATCH 12/12] Fix incorrect `HookEventType` of pull request review
 comments (#23650)

`HookEventType` of pull request review comments should be
`HookEventPullRequestReviewComment` but some event types are
`HookEventPullRequestComment` now.
---
 services/actions/notifier.go | 2 +-
 services/webhook/discord.go  | 4 ++--
 services/webhook/msteams.go  | 2 +-
 services/webhook/notifier.go | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/services/actions/notifier.go b/services/actions/notifier.go
index cdf9087fef168..90eed83eff5e1 100644
--- a/services/actions/notifier.go
+++ b/services/actions/notifier.go
@@ -264,7 +264,7 @@ func (n *actionsNotifier) NotifyPullRequestReview(ctx context.Context, pr *issue
 	case issues_model.ReviewTypeApprove:
 		reviewHookType = webhook_module.HookEventPullRequestReviewApproved
 	case issues_model.ReviewTypeComment:
-		reviewHookType = webhook_module.HookEventPullRequestComment
+		reviewHookType = webhook_module.HookEventPullRequestReviewComment
 	case issues_model.ReviewTypeReject:
 		reviewHookType = webhook_module.HookEventPullRequestReviewRejected
 	default:
diff --git a/services/webhook/discord.go b/services/webhook/discord.go
index 014d409ce7326..02f0fb8720533 100644
--- a/services/webhook/discord.go
+++ b/services/webhook/discord.go
@@ -209,7 +209,7 @@ func (d *DiscordPayload) Review(p *api.PullRequestPayload, event webhook_module.
 			color = greenColor
 		case webhook_module.HookEventPullRequestReviewRejected:
 			color = redColor
-		case webhook_module.HookEventPullRequestComment:
+		case webhook_module.HookEventPullRequestReviewComment:
 			color = greyColor
 		default:
 			color = yellowColor
@@ -277,7 +277,7 @@ func parseHookPullRequestEventType(event webhook_module.HookEventType) (string,
 		return "approved", nil
 	case webhook_module.HookEventPullRequestReviewRejected:
 		return "rejected", nil
-	case webhook_module.HookEventPullRequestComment:
+	case webhook_module.HookEventPullRequestReviewComment:
 		return "comment", nil
 
 	default:
diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go
index 03d92821b9eb3..60ef334ded9ac 100644
--- a/services/webhook/msteams.go
+++ b/services/webhook/msteams.go
@@ -223,7 +223,7 @@ func (m *MSTeamsPayload) Review(p *api.PullRequestPayload, event webhook_module.
 			color = greenColor
 		case webhook_module.HookEventPullRequestReviewRejected:
 			color = redColor
-		case webhook_module.HookEventPullRequestComment:
+		case webhook_module.HookEventPullRequestReviewComment:
 			color = greyColor
 		default:
 			color = yellowColor
diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go
index b023717cd258e..1f7cb8d988a38 100644
--- a/services/webhook/notifier.go
+++ b/services/webhook/notifier.go
@@ -685,7 +685,7 @@ func (m *webhookNotifier) NotifyPullRequestReview(ctx context.Context, pr *issue
 	case issues_model.ReviewTypeApprove:
 		reviewHookType = webhook_module.HookEventPullRequestReviewApproved
 	case issues_model.ReviewTypeComment:
-		reviewHookType = webhook_module.HookEventPullRequestComment
+		reviewHookType = webhook_module.HookEventPullRequestReviewComment
 	case issues_model.ReviewTypeReject:
 		reviewHookType = webhook_module.HookEventPullRequestReviewRejected
 	default: