diff --git a/docs/content/doc/advanced/hacking-on-gitea.zh-cn.md b/docs/content/doc/advanced/hacking-on-gitea.zh-cn.md
deleted file mode 100644
index 7ad8019c5e6..00000000000
--- a/docs/content/doc/advanced/hacking-on-gitea.zh-cn.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-date: "2016-12-01T16:00:00+02:00"
-title: "加入 Gitea 开源"
-slug: "hacking-on-gitea"
-weight: 10
-toc: false
-draft: false
-menu:
-  sidebar:
-    parent: "advanced"
-    name: "加入 Gitea 开源"
-    weight: 10
-    identifier: "hacking-on-gitea"
----
-
-# Hacking on Gitea
-
-首先你需要一些运行环境，这和 [从源代码安装]({{< relref "from-source.zh-cn.md" >}}) 相同，如果你还没有设置好，可以先阅读那个章节。
-
-如果你想为 Gitea 贡献代码，你需要 Fork 这个项目并且以 `master` 为开发分支。Gitea 使用 Govendor
-来管理依赖，因此所有依赖项都被工具自动 copy 在 vendor 子目录下。用下面的命令来下载源码：
-
-```
-go get -d code.gitea.io/gitea
-```
-
-然后你可以在 Github 上 fork [Gitea 项目](https://github.com/go-gitea/gitea)，之后可以通过下面的命令进入源码目录：
-
-```
-cd $GOPATH/src/code.gitea.io/gitea
-```
-
-要创建 pull requests 你还需要在源码中新增一个 remote 指向你 Fork 的地址，直接推送到 origin 的话会告诉你没有写权限：
-
-```
-git remote rename origin upstream
-git remote add origin git@github.com:<USERNAME>/gitea.git
-git fetch --all --prune
-```
-
-然后你就可以开始开发了。你可以看一下 `Makefile` 的内容。`make test` 可以运行测试程序， `make build` 将生成一个 `gitea` 可运行文件在根目录。如果你的提交比较复杂，尽量多写一些单元测试代码。
-
-好了，到这里你已经设置好了所有的开发 Gitea 所需的环境。欢迎成为 Gitea 的 Contributor。
diff --git a/docs/content/doc/advanced/mail-templates-us.md b/docs/content/doc/advanced/mail-templates.en-us.md
similarity index 100%
rename from docs/content/doc/advanced/mail-templates-us.md
rename to docs/content/doc/advanced/mail-templates.en-us.md
diff --git a/docs/content/doc/advanced/make.fr-fr.md b/docs/content/doc/advanced/make.fr-fr.md
deleted file mode 100644
index f30b709f0ef..00000000000
--- a/docs/content/doc/advanced/make.fr-fr.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-date: "2017-08-23T09:00:00+02:00"
-title: "Make"
-slug: "make"
-weight: 10
-toc: false
-draft: false
-menu:
-  sidebar:
-    parent: "advanced"
-    name: "Make"
-    weight: 30
-    identifier: "make"
----
-
-# Make
-
-Gitea fait largement usage de Make pour automatiser les tâches et avoir un développement plus rapide. Ce guide explique comment installer Make.
-
-### Linux
-
-Vous pouvez installer Make avec votre gestionnaire de paquetages
-
-Depuis Ubuntu/Debian:
-
-```bash
-sudo apt-get install build-essential
-```
-
-Depuis Fedora/RHEL/CentOS:
-
-```bash
-sudo yum install make
-```
-
-### Windows
-
-Si vous utilisez Windows, vous pouvez télécharger une des versions suivantes de Make:
-
-- [Simple binaire](http://www.equation.com/servlet/equation.cmd?fa=make). Copiez-le quelque part et mettez à jour `PATH`.
-  - [32-bits version](ftp://ftp.equation.com/make/32/make.exe)
-  - [64-bits version](ftp://ftp.equation.com/make/64/make.exe)
-- [MinGW](http://www.mingw.org/) inclut un _build_. Le fichier binaire est nommé `mingw32-make.exe` plutôt que `make.exe`. Ajoutez le dossier `bin` à votre `PATH`.
-- [Chocolatey package](https://chocolatey.org/packages/make). Exécutez `choco install make`.
diff --git a/docs/content/doc/advanced/make.zh-cn.md b/docs/content/doc/advanced/make.zh-cn.md
deleted file mode 100644
index 2491dbe2319..00000000000
--- a/docs/content/doc/advanced/make.zh-cn.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-date: "2017-01-14T11:00:00-02:00"
-title: "Make 安装"
-slug: "make"
-weight: 10
-toc: false
-draft: false
-menu:
-  sidebar:
-    parent: "advanced"
-    name: "Make 安装"
-    weight: 30
-    identifier: "make"
----
-
-# 安装 Make
-
-Gitea 大量使用了 Make 工具来自动执行任务并改进开发，本文将介绍如何安装 Make。
-
-### 在 Linux 环境下
-
-可以使用包管理工具来安装 Make。
-
-Ubuntu/Debian 环境，执行以下命令：
-
-```bash
-sudo apt-get install make
-```
-
-Fedora/RHEL/CentOS，执行以下命令：
-
-```bash
-sudo yum install make
-```
-
-### 在 Windows 环境下
-
-您可以参照以下三种方案在 Windows 环境安装 Make：
-
-- 直接使用 [exe文件](http://www.equation.com/servlet/equation.cmd?fa=make)：将适合您系统的exe文件拷贝到某处并添加至环境变量 `PATH` 中。
-  - [32 位版本](ftp://ftp.equation.com/make/32/make.exe)
-  - [64 位版本](ftp://ftp.equation.com/make/64/make.exe)
-- 使用 [MinGW](http://www.mingw.org/) 工具：
-  - 此处使用二进制文件 `mingw32-make.exe` 替代前面提到的 `make.exe`文件。同样您需要将包含此exe文件的 `bin` 目录添加至环境变量 `PATH`中。
-- 通过 [Chocolatey](https://chocolatey.org/packages/make) 安装： 执行 `choco install make` 命令即可。
diff --git a/docs/content/doc/advanced/third-party-tools.zh-cn.md b/docs/content/doc/advanced/third-party-tools.zh-cn.md
deleted file mode 100644
index e961e9ec1fa..00000000000
--- a/docs/content/doc/advanced/third-party-tools.zh-cn.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-date: "2019-03-11T21:45:00+00:00"
-title: "高级: 第三方工具"
-slug: "third-party-tools"
-weight: 50
-toc: false
-draft: false
-menu:
-  sidebar:
-    parent: "advanced"
-    name: "第三方工具"
-    weight: 50
-    identifier: "third-party-tools"
----
-
-# 第三方工具列表
-
-**注意:** 这些工具并没有经过Gitea的检验，在这里列出它们只是为了便捷.
-
-*此列表并不是完整的列表，可以随时咨询如何添加!*
-
-### 持续集成
-
-[BuildKite 连接器](https://github.com/techknowlogick/gitea-buildkite-connector)
-[Jenkins 插件](https://github.com/jenkinsci/gitea-plugin)
-[Gitea搭配Drone](https://docs.drone.io/installation/gitea)
-
-### 迁移
-
-[Gitea安装脚本](https://git.coolaj86.com/coolaj86/gitea-installer.sh)
-[GitHub迁移](https://gitea.com/gitea/migrator)
-
-### 移动端
-
-[安卓客户端GitNex](https://gitlab.com/mmarif4u/gitnex)
-
-### 编辑器扩展
-
-- [Gitea的Visual Studio扩展](https://github.com/maikebing/Gitea.VisualStudio)    从   [Visual Studio 扩展市场](https://marketplace.visualstudio.com/items?itemName=MysticBoy.GiteaExtensionforVisualStudio) 下载
diff --git a/docs/content/doc/developers.zh-cn.md b/docs/content/doc/developers.zh-cn.md
index 0a873102bc5..97fb3a97826 100644
--- a/docs/content/doc/developers.zh-cn.md
+++ b/docs/content/doc/developers.zh-cn.md
@@ -8,6 +8,6 @@ draft: false
 menu:
   sidebar:
     name: "开发者"
-    weight: 50
+    weight: 55
     identifier: "developers"
 ---
diff --git a/docs/content/doc/developers/guidelines-backend.md b/docs/content/doc/developers/guidelines-backend.en-us.md
similarity index 100%
rename from docs/content/doc/developers/guidelines-backend.md
rename to docs/content/doc/developers/guidelines-backend.en-us.md
diff --git a/docs/content/doc/developers/oauth2-provider.md b/docs/content/doc/developers/oauth2-provider.en-us.md
similarity index 100%
rename from docs/content/doc/developers/oauth2-provider.md
rename to docs/content/doc/developers/oauth2-provider.en-us.md
diff --git a/docs/content/doc/installation/from-source.en-us.md b/docs/content/doc/installation/from-source.en-us.md
index 660f996b1e7..0be5673be47 100644
--- a/docs/content/doc/installation/from-source.en-us.md
+++ b/docs/content/doc/installation/from-source.en-us.md
@@ -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 <a href='{{< relref "doc/developers/hacking-on-gitea.en-us.md" >}}#installing-make'>here</a>
+- `make`, see [here]({{< relref "doc/developers/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/installation/from-source.fr-fr.md b/docs/content/doc/installation/from-source.fr-fr.md
index 00f67eab55f..6ff4853a22c 100644
--- a/docs/content/doc/installation/from-source.fr-fr.md
+++ b/docs/content/doc/installation/from-source.fr-fr.md
@@ -53,7 +53,7 @@ git checkout pr-xyz
 
 ## Compilation
 
-Comme nous regroupons déjà toutes les bibliothèques requises pour compiler Gitea, vous pouvez continuer avec le processus de compilation lui-même. Nous fournissons diverses [tâches Make](https://github.com/go-gitea/gitea/blob/master/Makefile) pour rendre le processus de construction aussi simple que possible. <a href='{{< relref "doc/advanced/make.fr-fr.md" >}}'>Voyez ici comment obtenir Make</a>. Selon vos besoins, vous pourrez éventuellement ajouter diverses options de compilation, vous pouvez choisir entre ces options :
+Comme nous regroupons déjà toutes les bibliothèques requises pour compiler Gitea, vous pouvez continuer avec le processus de compilation lui-même. Nous fournissons diverses [tâches Make](https://github.com/go-gitea/gitea/blob/master/Makefile) pour rendre le processus de construction aussi simple que possible. [Voyez ici comment obtenir Make]({{< relref "doc/developers/hacking-on-gitea.fr-fr.md" >}}#installing-make). Selon vos besoins, vous pourrez éventuellement ajouter diverses options de compilation, vous pouvez choisir entre ces options :
 
 * `bindata`: Intègre toutes les ressources nécessaires à l'exécution d'une instance de Gitea, ce qui rend un déploiement facile car il n'est pas nécessaire de se préoccuper des fichiers supplémentaires.
 * `sqlite sqlite_unlock_notify`: Active la prise en charge d'une base de données [SQLite3](https://sqlite.org/), ceci n'est recommandé que pour les petites installations de Gitea.
diff --git a/docs/content/doc/installation/from-source.zh-cn.md b/docs/content/doc/installation/from-source.zh-cn.md
index 008566e57db..659c992346c 100644
--- a/docs/content/doc/installation/from-source.zh-cn.md
+++ b/docs/content/doc/installation/from-source.zh-cn.md
@@ -54,7 +54,7 @@ git checkout v{{< version >}}
 
 - `go` {{< min-go-version >}} 或以上版本, 详见[这里](https://golang.google.cn/doc/install)
 - `node` {{< min-node-version >}} 或以上版本，并且安装 `npm`, 详见[这里](https://nodejs.org/zh-cn/download/)
-- `make`, 详见[这里]({{< relref "make.zh-cn.md" >}})</a>
+- `make`, 详见[这里]({{< relref "doc/developers/hacking-on-gitea.zh-cn.md" >}})</a>
 
 各种可用的 [make 任务](https://github.com/go-gitea/gitea/blob/main/Makefile)
 可以用来使编译过程更方便。
diff --git a/docs/content/doc/installation/on-cloud-provider.md b/docs/content/doc/installation/on-cloud-provider.en-us.md
similarity index 100%
rename from docs/content/doc/installation/on-cloud-provider.md
rename to docs/content/doc/installation/on-cloud-provider.en-us.md
diff --git a/docs/content/doc/usage/git-lfs-support.md b/docs/content/doc/usage/git-lfs-support.en-us.md
similarity index 100%
rename from docs/content/doc/usage/git-lfs-support.md
rename to docs/content/doc/usage/git-lfs-support.en-us.md
diff --git a/docs/content/doc/usage/https-support.md b/docs/content/doc/usage/https-support.en-us.md
similarity index 100%
rename from docs/content/doc/usage/https-support.md
rename to docs/content/doc/usage/https-support.en-us.md
diff --git a/docs/content/doc/usage/template-repositories.md b/docs/content/doc/usage/template-repositories.en-us.md
similarity index 100%
rename from docs/content/doc/usage/template-repositories.md
rename to docs/content/doc/usage/template-repositories.en-us.md
diff --git a/docs/static/_redirects b/docs/static/_redirects
index 676181b61f9..39bd09f9ba5 100644
--- a/docs/static/_redirects
+++ b/docs/static/_redirects
@@ -9,7 +9,10 @@ https://gitea-docs.netlify.com/* https://docs.gitea.io/:splat 302!
 
 /en-us/ci-cd/ /en-us/integrations/ 302!
 /en-us/third-party-tools/ /en-us/integrations/ 302!
+/zh-cn/third-party-tools/ /zh-cn/integrations/ 302!
 /en-us/make/ /en-us/hacking-on-gitea/ 302!
+/zh-cn/make/ /zh-cn/hacking-on-gitea/ 302!
+/fr-fr/make/ /fr-fr/hacking-on-gitea/ 302!
 /en-us/upgrade/ /en-us/upgrade-from-gitea/ 302!
 /fr-fr/upgrade/ /fr-fr/upgrade-from-gitea/ 302!
 /zh-cn/upgrade/ /zh-cn/upgrade-from-gitea/ 302!