diff --git a/TOC.ini b/TOC.ini
index 333fa19d..b307869d 100644
--- a/TOC.ini
+++ b/TOC.ini
@@ -6,7 +6,6 @@
 
 [intro]
 -: README
--: change_log
 -: troubleshooting
 -: faqs
 
@@ -25,16 +24,14 @@
 
 [features]
 -: README
--: custome_template
+-: custom_template
 -: webhook
 -: authentication
 -: i18n
 
-[advanced]
--: README
--: configuration_cheat_sheet
--: hacking_on_gogs
--: configuration_for_source_builds
+; [advanced]
+; -: README
+; -: configuration_cheat_sheet
 
 [pages]
 -: donate
diff --git a/de-DE/advanced/configuration_cheat_sheet.md b/de-DE/advanced/configuration_cheat_sheet.md
index b9192307..c7855c69 100644
--- a/de-DE/advanced/configuration_cheat_sheet.md
+++ b/de-DE/advanced/configuration_cheat_sheet.md
@@ -8,7 +8,7 @@ Das hier ist ein Cheat-Sheet für die Gogs-Konfigurations-Datei. Es hilft dir et
 
 Bevor du anfängst: Stelle sicher, dass du alle Änderungen in der `custom/conf/app.ini` oder dem entsprechenden Pfad machst, nicht in der `conf/app.ini`
 
-Alle Standard-Einstellungen können in [app.ini](https://github.com/gogits/gogs/blob/master/conf/app.ini) nachgesehen werden. Wenn du etwas siehst wie `%(X)s`: Das ist ein Feature von [ini](https://github.com/go-ini/ini/tree/v1#recursive-values) um Werte rekursiv einzulesen.
+Alle Standard-Einstellungen können in [app.ini](https://github.com/gogs/gogs/blob/main/conf/app.ini) nachgesehen werden. Wenn du etwas siehst wie `%(X)s`: Das ist ein Feature von [ini](https://github.com/go-ini/ini/tree/v1#recursive-values) um Werte rekursiv einzulesen.
 
 Jede Konfiguration, die mit :exclamation: markiert ist, solltest du auf dem Standard-Wert lassen. bis du **wirklich** verstehst was sie tut.
 
@@ -91,7 +91,7 @@ Jede Konfiguration, die mit :exclamation: markiert ist, solltest du auf dem Stan
 - `REQUIRE_SIGNIN_VIEW`: Aktiviere das, um Nutzer zu zwingen sich einzuloggen um andere Seiten zu sehen.
 - `ENABLE_CACHE_AVATAR`: Aktivieren, um Gravatars lokal zwischenzuspeichern.
 - `ENABLE_NOTIFY_MAIL`: Aktivieren, um bei Ereignissen e-Mails an die Nutzer zu schicken (z.B. beim Issue schließen). `Mailer` muss dafür aktiviert sein.
-- `ENABLE_REVERSE_PROXY_AUTHENTICATION`: Aktivieren, um Reverse Proxy Authentication zu erlauben. Details: https://github.com/gogits/gogs/issues/165
+- `ENABLE_REVERSE_PROXY_AUTHENTICATION`: Aktivieren, um Reverse Proxy Authentication zu erlauben. Details: https://github.com/gogs/gogs/issues/165
 - `ENABLE_REVERSE_PROXY_AUTO_REGISTRATION`: Aktivieren, um Auto-Registrierung für Reverse Authentication zu erlauben.
 - `DISABLE_MINIMUM_KEY_SIZE_CHECK`: Überprüfe nicht die minimale Schlüssellänge für den Schlüsseltyp.
 - `ENABLE_CAPTCHA`: Aktivieren, um ein Captcha bei der Registrierung einzublenden.
@@ -154,7 +154,7 @@ Hinweis: Gogs unterstützt nur SMTP mit STARTTLS.
 
 ## Cron (`cron`)
 
-- `ENABLED`: Aktivieren, um Cron Tasks peridioschen auszuführen.
+- `ENABLED`: Aktivieren, um Cron Tasks periodisch auszuführen.
 - `RUN_AT_START`: Aktivieren, um Cron Tasks beim Start auszuführen.
 
 ### Cron - Update Mirrors (`cron.update_mirrors`)
diff --git a/de-DE/advanced/configuration_for_source_builds.md b/de-DE/advanced/configuration_for_source_builds.md
index 6f392a41..7aae656b 100644
--- a/de-DE/advanced/configuration_for_source_builds.md
+++ b/de-DE/advanced/configuration_for_source_builds.md
@@ -14,7 +14,7 @@ Für den Rest dieses Dokuments werden wir folgendes annehmen:
 - `postgresql` ist dein Datenbankserver
 - Du möchtest, dass alle deine Git-URL wie `git.example.com` aussehen.
 
-Wie schon in [Konfiguration und Start](/docs/installation/configuration_and_run) erwähnt, solltest du deine eigene Konfigurationsdatei in `$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini` anlegen.
+Wie schon in [Konfiguration und Start](/docs/installation/configuration_and_run) erwähnt, solltest du deine eigene Konfigurationsdatei in `$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini` anlegen.
 
 Als ersten Schritt legen wir einige Ordner an:
 
@@ -23,25 +23,25 @@ sudo mkdir -p /var/log/gogs
 sudo chown git:git /var/log/gogs
 sudo su - git
 cd ~
-mkdir -p $GOPATH/src/github.com/gogits/gogs/custom/conf
+mkdir -p $GOPATH/src/github.com/gogs/gogs/custom/conf
 mkdir -p ~/gogs-repositories
 ```
 
 Kopiere jetzt die Standard-Konfigurationsdatei, sodass du sie editieren kannst:
 
 ```bash
-cd $GOPATH/src/github.com/gogits/gogs
+cd $GOPATH/src/github.com/gogs/gogs
 cp conf/app.ini custom/conf/
 ```
 
 Öffne jetzt in deinem Editor die Datei
 
-`$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini`
+`$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini`
 
 Zum Beispiel:
 
 ```bash
-vim $GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini
+vim $GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini
 ```
 
 ## Server aufsetzen
@@ -116,7 +116,7 @@ sudo -u git -H psql -d gogs_production
 gogs_production> \q
 ```
 
-Jetzt können wir `app.ini` anpassen. öffne also `$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini` in deinem Editor und ändere das folgende (stelle dabei sicher, dass du gerade der User `git` bist, falls nicht, gib vorher noch `sudo su - git` ein):
+Jetzt können wir `app.ini` anpassen. öffne also `$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini` in deinem Editor und ändere das folgende (stelle dabei sicher, dass du gerade der User `git` bist, falls nicht, gib vorher noch `sudo su - git` ein):
 
 ### `[database]` Sektion
 
@@ -168,7 +168,7 @@ Danach:
 
 ```bash
 sudo su - git
-cd $GOPATH/src/github.com/gogits/gogs
+cd $GOPATH/src/github.com/gogs/gogs
 ./gogs web
 ```
 
@@ -186,14 +186,14 @@ Grundsätzlich bist du an dieser stelle fertig, die nächsten Schritte beschreib
 
 Diese Sektion beschreibt, wie man *Gogs* startet, wenn das Linux-System neu gestartet wird. Für andere Plattformen gucke die Dokumentation durch, um herauszufinden, wie du das tun kannst. Für Mac OSX schaue dir [dieses Dokument](/docs/installation/install_gogs_on_mac#run-gogs-server) um Autostart-Programme zu verwalten
 
-Wenn du den vorherigen Schritten gefolgt bist, kannst du jetzt das automatische Starten von gogs aktivieren. Unter `Debian`/`Ubuntu` werden wir das Skript aus `$GOPATH/src/githb.com/gogits/gogs/scripts/init/debian/gogs` benutzen.
+Wenn du den vorherigen Schritten gefolgt bist, kannst du jetzt das automatische Starten von gogs aktivieren. Unter `Debian`/`Ubuntu` werden wir das Skript aus `$GOPATH/src/githb.com/gogs/gogs/scripts/init/debian/gogs` benutzen.
 
 Kopieren wir also die Datei und verändern sie:
 
 ```bash
 sudo su - git
 cd ~
-cp $GOPATH/src/github.com/gogits/gogs/scripts/init/debian/gogs ./gogs.init
+cp $GOPATH/src/github.com/gogs/gogs/scripts/init/debian/gogs ./gogs.init
 ```
 
 Editiere jetzt die Datei `~/gogs.init` wie folgt:
@@ -215,7 +215,7 @@ zu
 Weiter unten in der gleichen Datei setze den Pfad, sodass `init.d` unsere `gogs`-Installation finden kann, indem wir die `WORKING_DIR` Zeile ändern zu:
 
 ```ini
-WORKINGDIR=/home/git/go/src/github.com/gogits/gogs
+WORKINGDIR=/home/git/go/src/github.com/gogs/gogs
 ```
 
 Verschiebe die Datei nach `/etc/init.d` und update es:
diff --git a/de-DE/advanced/hacking_on_gogs.md b/de-DE/advanced/hacking_on_gogs.md
index 20cbc2f8..85c557fa 100644
--- a/de-DE/advanced/hacking_on_gogs.md
+++ b/de-DE/advanced/hacking_on_gogs.md
@@ -10,10 +10,10 @@ Du musst also das Go tool austricksen, sodass es denkt, du hättest einen Klon d
 
 Starte mit dem Download des Quellcodes, wie du es normalerweise tun würdest:
 
-    $ go get github.com/gogits/gogs
+    $ go get github.com/gogs/gogs
 
 Forke jetzt das Projekt auf Github und gehe dann in das Oberverzeichnis deines gogs Quellcode-Verzeichnisses:
-    $ cd $GOPATH/src/github.com/gogits
+    $ cd $GOPATH/src/github.com/gogs
 
 Lösche das gogs Repository und klone deinen Fork anstelle:
 
diff --git a/de-DE/features/custom_template.md b/de-DE/features/custom_template.md
new file mode 100644
index 00000000..77b6405f
--- /dev/null
+++ b/de-DE/features/custom_template.md
@@ -0,0 +1,19 @@
+---
+name: Eigenes Template
+---
+
+# Eigenes Template
+
+Du kannst deinen eigenen Head- oder Footerinhalt zu Gogs hinzufügen, ohne den Quellcode des Hauptrepos anzufassen. Dies ist hilfreich, wenn du analytics code oder eigene statische Quellen hinzufügen möchtest.
+
+Lese mehr über "[inject custom head and footer](https://discuss.gogs.io/t/how-to-inject-custom-head-and-footer/943)".
+
+## Eigene CSS Datei laden
+
+Hier ist ein Beispiel, wie du deine eigene CSS Datei zu deiner Gogs Instanz hinzufügen kannst. Namen und Ordner sind nur zur Demonstration. Du kannst deine Dateien überall speichern, solange sie von Netzwerkanfragen gelesen werden können.
+
+1. Erstelle eine Datei namens `custom.css` im `public/css` Verzeichnis.
+2. Erstelle deine CSS Regeln in der Datei.
+3. Editiere `custom/templates/inject/head.tmpl` und füge die Zeile `<link rel="stylesheet" href="/css/custom.css">` hinzu.
+4. Starte Gogs neu
+5. Weiteres Bearbeiten der eigenen CSS Datei erfordert keinen Neustart von Gogs
diff --git a/de-DE/installation/README.md b/de-DE/installation/README.md
index 1590a402..a6d9bff9 100644
--- a/de-DE/installation/README.md
+++ b/de-DE/installation/README.md
@@ -5,9 +5,10 @@ name: Installation
 ## Abhängigkeiten:
 
 - Datenbank (wähle eine der folgenden)
-    - [MySQL](http://dev.mysql.com): Version >= 5.5.3
+    - [MySQL](http://dev.mysql.com): Version >= 5.7
     - [PostgreSQL](http://www.postgresql.org/)
-    - oder **KEINE** mit SQLite3 or TiDB (experimentell)
+    - [TiDB](https://github.com/pingcap/tidb) (experimentell, verbunden durch das MySQL Protokoll)
+    - oder **KEINE** mit SQLite3
 - [Git](http://git-scm.com/) (bash):
     - Version >= 1.7.1 sowohl für den Server als auch für Clients
     - Am besten die neuste Version für Windows benutzen
diff --git a/de-DE/installation/configuration_and_run.md b/de-DE/installation/configuration_and_run.md
index 9400fb22..ab2c07b9 100644
--- a/de-DE/installation/configuration_and_run.md
+++ b/de-DE/installation/configuration_and_run.md
@@ -14,32 +14,32 @@ Die Standard-Konfiguration ist in `conf/app.ini` gespeichert. Du brauchst diese
 
 Wie macht man nun eigene Änderungen, wenn man die `conf/app.ini` nicht verändern darf? Erstelle einfach eine `custom/conf/app.ini`! Die entsprechenden Schlüssel in den entsprechenden Sektionen werden die Werte aus `conf/app.ini` überschreiben.
 
-Zum Beispiel kann man, um denn Wurzelpfad, in dem die Repository-Rohdaten gespeichert werden, zu verändern, eine Zeile wie die folgende hinzufügen:
+Zum Beispiel kann man, um den Wurzelpfad, in dem die Repository-Rohdaten gespeichert werden, zu verändern, eine Zeile wie die folgende hinzufügen:
 
 ```
 [repository]
 ROOT = /home/jiahuachen/gogs-repositories
 ```
 
-Natürlich kann man auch die Datenbank-Einstellungen ändern
+Natürlich kann man auch die Datenbankeinstellungen ändern
 
 ```
 [database]
-PASSWD = root
+PASSWORD = root
 ```
 
 ### Warum tun wir das?
 
 Ja, warum nicht einfach `conf/app.ini` verändern? Der Grund ist, die eigene Konfiguration sicher zu speichern:
 
-- Alle, die das Programm aus der Binärdateien installieren, können jedes mal, wenn eine neue Version rauskommt, die Dateien einfach in den Ordner kopieren, ohne etwas neu konfigurieren zu müssen.
+- Alle, die das Programm aus der Binärdateien installieren, können jedes Mal, wenn eine neue Version rauskommt, die Dateien einfach in den Ordner kopieren, ohne etwas neu konfigurieren zu müssen.
 - Für alle, die das Programm aus den Quelldateien installieren, haben wir die `custom/conf/app.ini` in der `.gitignore` aus der Versionskontrolle ausgenommen, sodass es keine neue Version erzeugt, wenn man Konfigurationsänderungen macht oder eine neue Version herunterlädt.
 
 ## Gogs Server starten
 
 ### Für Entwickler
 
-- Setze den Schlüssel `security -> INSTALL_LOCK` auf `true` in der `custom/conf/app.ini` um Gogs aus den Quelldateien zu starten
+- Setze den Schlüssel `security -> INSTALL_LOCK` auf `true` in der `custom/conf/app.ini`, um Gogs aus den Quelldateien zu starten
 - Du kannst Live-Compiling anschalten mit `bra run` im Gogs Quell-Ordner
 	- Installation von [bra](https://github.com/Unknwon/bra): ` go get -u github.com/Unknwon/bra`
 
@@ -49,5 +49,5 @@ Ja, warum nicht einfach `conf/app.ini` verändern? Der Grund ist, die eigene Kon
 
 - Es gibt einige Wege, Gogs zu starten:
 	- Einfach: Nutze einfach `./gogs web`
-	- Daemons: siehe [scripts](https://github.com/gogits/gogs/tree/master/scripts) Ordner
-- gucke in `/install` um die erste Konfiguration zu erstellen.
+	- Daemons: siehe [scripts](https://github.com/gogs/gogs/tree/main/scripts) Ordner
+- Sieh in `/install` nach, um die erste Konfiguration zu erstellen.
diff --git a/de-DE/installation/install_from_binary.md b/de-DE/installation/install_from_binary.md
index 6e8cff7e..b25fbcf3 100644
--- a/de-DE/installation/install_from_binary.md
+++ b/de-DE/installation/install_from_binary.md
@@ -4,7 +4,7 @@ name: durch Download
 
 # Installation durch Download
 
-Lade dir bei [GitHub die aktuellste Version von Gogs](https://github.com/gogits/gogs/releases) für dein Betriebssystem herunter.
+Lade dir bei [GitHub die aktuellste Version von Gogs](https://github.com/gogs/gogs/releases) für dein Betriebssystem herunter.
 
 ## Hinweis
 - Alle Versionen ab v0.7.33 unterstützen **MySQL** und **PostgreSQL** sowie **selbstsignierte Zertifikate**.
diff --git a/de-DE/installation/install_from_packages.md b/de-DE/installation/install_from_packages.md
index dccb7fe4..a1d38bf8 100644
--- a/de-DE/installation/install_from_packages.md
+++ b/de-DE/installation/install_from_packages.md
@@ -6,9 +6,9 @@ name: aus Paketquellen
 
 ### Packager.io
 
-- Aktuell für Ubuntu 12.04 und 14.04, CentOS 6/7 und Debian 7+8.
-- Aktuelle Pakete sind verfügbar von [packager.io](https://packager.io/gh/pkgr/gogs).
-- Hinweis: Die Pakete von Packager.io unterstützen derzeit nicht SQLite3, siehe [https://github.com/gogits/gogs/issues/2457](https://github.com/gogits/gogs/issues/2457).
+- Aktuell für Ubuntu 14.04, 16.04 und 18.04, CentOS 6/7 und Debian 8/9/10.
+- Aktuelle Pakete sind verfügbar von [packager.io](https://packager.io/gh/gogs/gogs).
+- Hinweis: Die Pakete von Packager.io unterstützen derzeit nicht SQLite3, siehe [https://github.com/gogs/gogs/issues/2457](https://github.com/gogs/gogs/issues/2457).
 
 ### Arch Linux
 
diff --git a/de-DE/installation/install_from_source.md b/de-DE/installation/install_from_source.md
index 97063879..837d4e24 100644
--- a/de-DE/installation/install_from_source.md
+++ b/de-DE/installation/install_from_source.md
@@ -8,7 +8,7 @@ name: aus Quelldateien
 
 ### Allgemein
 
-- [Go Programming Language](http://golang.org): Version >= 1.6
+- [Go Programming Language](http://golang.org): Version >= 1.21
 
 Wir erstellen einen neuen Benutzer mit dem Namen `git` und installieren alles unter diesem Benutzer:
 
@@ -18,7 +18,7 @@ sudo adduser --disabled-login --gecos 'Gogs' git
 
 ### Drittanbieter-Software
 
-Wenn dich interessiert, welche Drittanbieter-Pakete wir benutzen, schaue dir das [gopmfile](https://github.com/gogits/gogs/blob/master/.gopmfile). Möglicherweise brauchst du das, wenn du Pakete für Gogs erstellst.
+Wenn dich interessiert, welche Drittanbieter-Pakete wir benutzen, schaue dir das [gopmfile](https://github.com/gogs/gogs/blob/main/.gopmfile). Möglicherweise brauchst du das, wenn du Pakete für Gogs erstellst.
 
 ## Go-Installation
 
@@ -60,33 +60,23 @@ Der allgemeine Weg um Go zu installieren:
 
 ```sh
 # Abhängigkeiten herunterladen und installieren
-$ go get -u github.com/gogits/gogs
+$ go get -u github.com/gogs/gogs
 
 # Hauptprogramm erstellen
-$ cd $GOPATH/src/github.com/gogits/gogs
+$ cd $GOPATH/src/github.com/gogs/gogs
 $ go build
 ```
 
-Wenn du gopm installiert hast, kannst du Gogs auch wie folgt installieren:
-
-```sh
-# gopm auf Updates überprüfen
-$ gopm update -v
-
-# Herunterladen und erstellen der Binärdatei
-$ gopm bin -u -v gogs -d path/to/anywhere
-```
-
 ### Build aus dem `develop`-Branch
 
 Falls du den `develop`-branch ausprobieren möchtest:
 
 ```sh
-$ mkdir -p $GOPATH/src/github.com/gogits
-$ cd $GOPATH/src/github.com/gogits
+$ mkdir -p $GOPATH/src/github.com/gogs
+$ cd $GOPATH/src/github.com/gogs
 
-# Sicherstellen dass du nicht "https://github.com/gogits/gogs.git" benutzt
-$ git clone --depth=1 -b develop https://github.com/gogits/gogs
+# Sicherstellen dass du nicht "https://github.com/gogs/gogs.git" benutzt
+$ git clone --depth=1 -b develop https://github.com/gogs/gogs
 $ cd gogs
 $ go get -u ./...
 $ go build
@@ -97,7 +87,7 @@ $ go build
 Um zu testen, ob Gogs funktioniert:
 
 ```sh
-cd $GOPATH/src/github.com/gogits/gogs
+cd $GOPATH/src/github.com/gogs/gogs
 ./gogs web
 ```
 
@@ -109,19 +99,16 @@ Einige Dinge sind nicht automatisch bei Gogs mit dabei, du musst Gogs mit den en
 
 Verfügbare Build-Tags sind:
 
-- `sqlite3`/`tidb`: SQLite3/TiDB-Datenbank-Unterstützung
 - `pam`: PAM-Authentifizierungs-Support
 - `cert`: Unterstützung für selbst-signierte Zertifikate
-- `miniwinsvc`: Eingebauter Windows Service Support (alternativ NSSM nutzen um den Service zu erstellen)
-
-**Hinweis** Solltest du TiDB verwenden wollen, folge bitte dieser [Anleitung](https://github.com/pingcap/tidb/blob/master/docs/QUICKSTART.md#pre-requirement)
+- `minwinsvc`: Eingebauter Windows Service Support (alternativ NSSM nutzen um den Service zu erstellen)
 
-Beispiel: Wenn du alles mit dabei haben willst, lösche zuerst den Ordner `$GOPATH/pkg/${GOOS}_$GOARCH}/github.com/gogits/gogs` und führe dann folgende Befehle aus:
+Beispiel: Wenn du alles mit dabei haben willst, lösche zuerst den Ordner `$GOPATH/pkg/${GOOS}_$GOARCH}/github.com/gogs/gogs` und führe dann folgende Befehle aus:
 
 ```sh
-$ go get -u -tags "sqlite tidb pam cert" github.com/gogits/gogs
-$ cd $GOPATH/src/github.com/gogits/gogs
-$ go build -tags "sqlite tidb pam cert"
+$ go get -u -tags "pam cert" github.com/gogs/gogs
+$ cd $GOPATH/src/github.com/gogs/gogs
+$ go build -tags "pam cert"
 ```
 
 ## Weitere Schritte
diff --git a/de-DE/intro/README.md b/de-DE/intro/README.md
index b945e1d1..7116a97a 100644
--- a/de-DE/intro/README.md
+++ b/de-DE/intro/README.md
@@ -29,4 +29,5 @@ Das Ziel dieses Projektes ist es, eine einfache, schnelle und unkomplizierte Mö
     - [github.com/go-sql-driver/mysql](https://github.com/go-sql-driver/mysql)
     - [github.com/lib/pq](https://github.com/lib/pq)
     - [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3)
+    - [github.com/denisenkom/go-mssqldb](https://github.com/denisenkom/go-mssqldb)
 - Und alle anderen Go-Paket-Abhängigkeiten
diff --git a/de-DE/intro/faqs.md b/de-DE/intro/faqs.md
index 5987b1a6..5ce1636b 100644
--- a/de-DE/intro/faqs.md
+++ b/de-DE/intro/faqs.md
@@ -71,8 +71,8 @@ ROOT_URL = http://git.domain.tld/
     ...
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / http://127.0.0.1:3000/
-    ProxyPassReverse / http://127.0.0.1:3000/
+    ProxyPass / http://127.0.0.1:3000
+    ProxyPassReverse / http://127.0.0.1:3000
 </VirtualHost>
 ```
 
@@ -91,8 +91,8 @@ ROOT_URL = http://domain.tld/git
 <VirtualHost *:80>
     ...
     <Proxy *>
-         Order allow,deny
-         Allow from all
+         Require all denied
+         Require ip 10.0.0.0/24 192.168.0.0/24 ...
     </Proxy>
 
     ProxyPass /git http://127.0.0.1:3000
@@ -102,19 +102,23 @@ ROOT_URL = http://domain.tld/git
 
 Wichtig ist hier, den Schrägstrich nach 3000 wegzulassen.
 
-##### Wie erstelle ich eine Sub-URL mit lighttpd?
+#### Wie benutze ich lighttpd mit Reverse Proxy?
+
+```
+server.modules  += ( "mod_proxy" )
+$HTTP["host"] == "git.example.com" {
+    proxy.server = ( "" => ( ( "host" => "127.0.0.1", "port" => "3000" ) ) )
+}
+```
 
-Benutze die folgende Konfigurations-Vorlage:
+##### Wie erstelle ich eine Sub-URL mit lighttpd?
 
 ```
-server.modules  += ( "mod_proxy_backend_http" )
-$HTTP["url"] =~ "^/gogs" {
-    proxy-core.protocol = "http"
-    proxy-core.backends = ( "localhost:3000" )
-    proxy-core.rewrite-request = (
-      "_uri" => ( "^/gogs/?(.*)" => "/$1" ),
-      "Host" => ( ".*" => "localhost:3000" ),
-    )
+# requires lighttpd 1.4.46 or later
+server.modules  += ( "mod_proxy" )
+$HTTP["url"] =~ "^/gogs/" {
+    proxy.server = ( "" => ( ( "host" => "localhost", "port" => "3000" ) ) )
+    proxy.header = ( "map-urlpath" => ( "/gogs/" => "/" ) )
 }
 ```
 
@@ -148,13 +152,13 @@ Erstelle eine Datei mit dem Namem `robots.txt` im Ordner `custom`
 
 Gogs hat einige Drittanbieter-Skripte, die das Starten von Gogs als Daemon unterstützen:
 
-- [init.d/centos](https://github.com/gogits/gogs/blob/master/scripts/init/centos/gogs)
-- [init.d/debian](https://github.com/gogits/gogs/blob/master/scripts/init/debian/gogs)
+- [init.d/centos](https://github.com/gogs/gogs/blob/main/scripts/init/centos/gogs)
+- [init.d/debian](https://github.com/gogs/gogs/blob/main/scripts/init/debian/gogs)
 - Systemd in der folgenden Sektion.
 
 #### Wie kann ich Gogs mit Systemd starten?
 
-Es gibt eine [systemd-Vorlage-Datei](https://github.com/gogits/gogs/blob/master/scripts/systemd/gogs.service) im Gogs GitHub Repository. Es benötigt einige Anpassungen um für deine Installation lauffähig zu sein:
+Es gibt eine [systemd-Vorlage-Datei](https://github.com/gogs/gogs/blob/main/scripts/systemd/gogs.service) im Gogs GitHub Repository. Es benötigt einige Anpassungen um für deine Installation lauffähig zu sein:
 
 1. Ersetze den `start.sh`-Pfad in `ExecStart` mit dem Pfad zu deiner Gogs-Installation.
 2. Ersetze auch den Pfad in `WorkingDirectory` mit diesem Pfad.
diff --git a/de-DE/intro/troubleshooting.md b/de-DE/intro/troubleshooting.md
index 165ee816..fb78dc72 100644
--- a/de-DE/intro/troubleshooting.md
+++ b/de-DE/intro/troubleshooting.md
@@ -6,7 +6,7 @@ name: Troubleshooting
 
 ## Installation
 
-- Fehler: `../gosrc/src/github.com/gogits/gogs/cmd/cert.go:79: undefined: elliptic.P224`
+- Fehler: `../gosrc/src/github.com/gogs/gogs/cmd/cert.go:79: undefined: elliptic.P224`
 - Grund: Das golang-Paket in RHEL/CentOS unterstützt elliptische Kurven in Verschlüsselungen nicht, da es patentiert ist und es wurde speziell aus CentOS/RHEL entfernt.
 - Lösung: Downloade und installiere Go von [golang.org/dl](http://golang.org/dl).
 
@@ -47,7 +47,7 @@ name: Troubleshooting
 - Fehler: `cache: unknown adaptername "memcache" (forgotten import?)`
 - Grund: Um unnötige Paket-Importe zu vermeiden benutzen wir Build-Tags um diese zu spezifizieren, wenn wir sie brauchen.
 - Lösung:
-	- Download: `go get -tags memcache github.com/gogits/gogs`
+	- Download: `go get -tags memcache github.com/gogs/gogs`
 	- Erstellen: `go build -tags memcache`
 	- Die gleichen Schritte für `redis` ausführen, wenn das der Cache-Adapter sein soll.
 
@@ -68,10 +68,12 @@ Danach gehe auf [http://localhost:3000/install](http://localhost:3000/install).
 
 - Fehler: `Database setting is not correct: This server only supports the insecure old password authentication. If you still want to use it, please add 'allowOldPasswords=1' to your DSN. See also https://github.com/go-sql-driver/mysql/wiki/old_passwords`
 - Grund: Es wurden nur Passwörter für @localhost erneuert -- es gab einen zweiten Eintrag in der User-Tabelle, in dem @% immer noch das alte Passwort hat.
-- Lösung: [GitHub Kommentare](https://github.com/gogits/gogs/issues/385#issuecomment-54357073)
+- Lösung: [GitHub Kommentare](https://github.com/gogs/gogs/issues/385#issuecomment-54357073)
 
 ## Mailer
 
+#### Probleme mit Gmail
+
 - Fehler: Gmail mit Fehler 534: `Please log in via your web browser and then try again`
 - Grund: Das passiert, da Google deinem Server nicht vertraut.
 - Lösung:
@@ -80,6 +82,12 @@ Danach gehe auf [http://localhost:3000/install](http://localhost:3000/install).
 	- Kopiere den Link, der in etwa so aussieht (Ausgabe in Gogs Server Log): https://accounts.google.com/ContinueSignIn?sarp=1&scc=1&plt=AKgnsbvPPN_E_25__nyS*******f18O9uuLNtz0Imw und logge dich noch einmal ein.
 	- Jetzt sollte es klappen. Last but not least, du solltest den Spam-Ordner überprüfen, falls der Mail-Anbieter denkt, deine GMail ist ein Spam-Konto.
 
+#### Authentifizierung fehlgeschlagen
+
+- Fehler: `gomail: could not send email 1: Auth: 535`
+- Grund: Das Passwort enthält Sonderzeichen
+- Lösung: Setze das Passwort in einfache Anführungszeichen: `PASSWD = 'P4§$w0rd'`
+
 ## Windows
 
 - Fehler:
diff --git a/de-DE/upgrade/upgrade_from_source.md b/de-DE/upgrade/upgrade_from_source.md
index 3e20bb8e..ede7bc9c 100644
--- a/de-DE/upgrade/upgrade_from_source.md
+++ b/de-DE/upgrade/upgrade_from_source.md
@@ -8,9 +8,9 @@ Der allgemeine Weg um Gogs zu aktualisieren:
 
 ```bash
 # Upgrade source and install dependencies
-$ go get -u github.com/gogits/gogs
+$ go get -u github.com/gogs/gogs
 
-$ cd $GOPATH/src/github.com/gogits/gogs
+$ cd $GOPATH/src/github.com/gogs/gogs
 
 # Remove old build
 $ rm gogs
diff --git a/en-US/advanced/configuration_cheat_sheet.md b/en-US/advanced/configuration_cheat_sheet.md
index 384d4afe..72580ab6 100644
--- a/en-US/advanced/configuration_cheat_sheet.md
+++ b/en-US/advanced/configuration_cheat_sheet.md
@@ -8,43 +8,44 @@ This is a cheat sheet for the Gogs configuration file. It is helpful for more fu
 
 Before getting started, make sure you know that any change to the configuration should be made in `custom/conf/app.ini` or any corresponding location.
 
-All **default settings** can be found in [app.ini](https://github.com/gogits/gogs/blob/master/conf/app.ini). If you see anything which looks like `%(X)s`, it is a feature powered by [ini](https://github.com/go-ini/ini/#recursive-values) for reading values recursively.
+All **default settings** can be found in [app.ini](https://github.com/gogs/gogs/blob/main/conf/app.ini). If you see anything which looks like `%(X)s`, it is a feature powered by [ini](https://ini.unknwon.io/docs/howto/work_with_values#recursive-values) for reading values recursively.
 
 ### Overall (`DEFAULT`)
 
 Name|Description
 ----|-----------
 `APP_NAME`|Application name, can be your company or team name.
-`RUN_USER`|The name of the system user that runs Gogs. The best practice is to user `git`; however, change this to whatever your username is if you run Gogs on your personal computer. Gogs may crash if this value is not set properly.
+`RUN_USER`|The name of the system user that runs Gogs. The best practice is to use `git`; however, change this to whatever your username is if you run Gogs on your personal computer. Gogs may crash if this value is not set properly.
 `RUN_MODE`|For performance and other purposes, change this to `prod` when deployed to a production environment. The installation process will set this to `prod` automatically.
 
 ### Server (`server`)
 
 Name|Description
 ----|-----------
-`PROTOCOL`|Either `http` or `https`.
+`PROTOCOL`|Either `http`, `https`, `unix` or `fcgi`.
 `DOMAIN`|Domain name of your server.
 `ROOT_URL`|Full public URL of Gogs server.
-`HTTP_ADDR`|HTTP listen address.
+`HTTP_ADDR`|HTTP listen address or path to UNIX socket.
 `HTTP_PORT`|HTTP listen port.
 `UNIX_SOCKET_PERMISSION`|Permission for unix socket.
-`LOCAL_ROOT_URL`|Local (DMZ) URL for Gogs workers (such as SSH update) accessing web service. In most cases you do not need to change the default value. Alter it only if your SSH server node is not the same as HTTP node.
+`LOCAL_ROOT_URL`|Local (DMZ) URL for Gogs workers (such as SSH update) accessing web service. In most cases you do not need to change the default value. Alter it only if your SSH server node is not the same as the HTTP node.
 `DISABLE_SSH`|Disables SSH feature when it's not available.
 `START_SSH_SERVER`|Starts built-in SSH server when enabled.
-`SSH_DOMAIN`|Domain name to be exposed in SSH clone URL. The domain name that public network can access to your standalone SSH server.
-`SSH_PORT`|Port number to be exposed in SSH clone URL. The port number that public network can access to your standalone SSH server, usually is the standard SSH port `22`.
-`SSH_LISTEN_HOST`|Network interface builtin SSH server listens on.
-`SSH_LISTEN_PORT`|Port number builtin SSH server listens on.
-`SSH_ROOT_PATH`|Root path of SSH directory, default is `~/.ssh`, but you have to use `/home/git/.ssh`.
-`SSH_KEY_TEST_PATH`|Directory to create temporary files when test publick key using ssh-keygen, default is system temporary directory.
-`SSH_KEYGEN_PATH`|Path to ssh-keygen, default is `ssh-keygen` and let shell find out which one to call.
-`MINIMUM_KEY_SIZE_CHECK`|Indicate whether to check minimum key size with corresponding type.
-`OFFLINE_MODE`|Disables use of CDN for static files and Gravatar for profile pictures.
+`SSH_DOMAIN`|Domain name to be exposed in the SSH clone URL. This is the domain name that public networks can access for your standalone SSH server.
+`SSH_PORT`|Port number to be exposed in the SSH clone URL. This is the port number that public networks can access for your standalone SSH server, usually the default SSH port `22`.
+`SSH_LISTEN_HOST`|Network interface which the built-in SSH server listens on.
+`SSH_LISTEN_PORT`|Port number which the built-in SSH server listens on.
+`SSH_ROOT_PATH`|Root path of the SSH directory. The default is `~/.ssh`, but you have to use `/home/git/.ssh`.
+`REWRITE_AUTHORIZED_KEYS_AT_START`|Indicate whether to rewrite `authorized_keys` at startup (ignored when using the built-in SSH server).
+`SSH_KEY_TEST_PATH`|Directory to create temporary files when the test public key is using ssh-keygen. The default is the system temporary directory.
+`SSH_KEYGEN_PATH`|The path to ssh-keygen. The default is `ssh-keygen` which lets the shell find out which to call.
+`MINIMUM_KEY_SIZE_CHECK`|Indicate whether to check minimum key size with its corresponding type.
+`OFFLINE_MODE`|Disables use of a CDN for static files and Gravatar for profile pictures.
 `DISABLE_ROUTER_LOG`|Mutes printing of the router log.
 `CERT_FILE`|Cert file path used for HTTPS.
 `KEY_FILE`|Key file path used for HTTPS.
-`STATIC_ROOT_PATH`|Upper level of template and static files path, default is the path where Gogs is located.
-`APP_DATA_PATH`|Default path for App data.
+`STATIC_ROOT_PATH`|Upper level of the templates and static files path. The default is the path where Gogs is located.
+`APP_DATA_PATH`|Default path for app data.
 `ENABLE_GZIP`|Enables application-level GZIP support.
 `LANDING_PAGE`|Non-logged-in users' landing page, either `home` or `explore`.
 
@@ -53,25 +54,26 @@ Name|Description
 Name|Description
 ----|-----------
 `ROOT`|Root path for storing all users' repository data. It must be an absolute path. The default is `~/<username>/gogs-repositories`.
-`SCRIPT_TYPE`|The script type your server supports, usually this is `bash`, but some customers report that they only have `sh`.
+`SCRIPT_TYPE`|The script type your server supports. Usually this is `bash`, but some customers report that they only have `sh`.
 `ANSI_CHARSET`|The default charset for an unrecognized charset.
 `FORCE_PRIVATE`|Force every new repository to be private.
-`MAX_CREATION_LIMIT`|Global maximum creation limit of repositories per user, `-1` means no limit.
-`PREFERRED_LICENSES`|Preferred Licenses to place at the top of the list.
+`MAX_CREATION_LIMIT`|Global maximum creation limit of repositories per user (`-1` means no limit).
+`PREFERRED_LICENSES`|Preferred licenses to place at the top of the list.
 `DISABLE_HTTP_GIT`|Indicates whether or not to disable Git clone through HTTP/HTTPS. When disabled, users can only perform Git operations via SSH.
-`ENABLE_LOCAL_PATH_MIGRATION`|Indicates whether or not to disable migrate repository by local path. When enabled, user still needs to be a site admin or get permission from site admin in order to use this feature.
+`ENABLE_LOCAL_PATH_MIGRATION`|Indicates whether or not to enable migrate repository by local path. When enabled, the user must still be a site admin or get permission from one in order to use this feature.
+`ENABLE_RAW_FILE_RENDER_MODE`|Indicates whether or not to enable the renderer when viewing raw files. Note that rendering actual HTML pages could have potential security issues.
 
 #### Repository - Editor (`repository.editor`)
 
 Name|Description
 ----|-----------
-`LINE_WRAP_EXTENSIONS`|List of file extensions that should have line wraps in the CodeMirror editor. Separate extensions with a comma. To line wrap files without extension, just put a comma, e.g. `.txt,`.
+`LINE_WRAP_EXTENSIONS`|List of file extensions that should have line wraps in the CodeMirror editor. Separate extensions with a comma. To line wrap files without an extension, just add a comma, e.g. `.txt,`.
 
 #### Repository - Upload (`repository.upload`)
 
 Name|Description
 ----|-----------
-`ENABLED`|Indicates whether or not to enable repository file upload feature.
+`ENABLED`|Indicates whether or not to enable the repository file upload feature.
 `TEMP_PATH`|Path to temporarily store uploads. Use the default or system temporary path.
 `ALLOWED_TYPES`|File types that are allowed to be uploaded (e.g. "image/jpeg\|image/png"). Leave empty means allow any file type.
 `FILE_MAX_SIZE`|Maximum size of each file in MB.
@@ -81,11 +83,11 @@ Name|Description
 
 Name|Description
 ----|-----------
-`ENABLED`|Indicates whether or not to enable release attachment feature.
+`ENABLED`|Indicates whether or not to enable the release attachment feature.
 `PATH`|Path to store attachments.
-`ALLOWED_TYPES`|Allowed MIME types, e.g. "image/jpeg\|image/png", use `*/*` for all types.
-`MAX_SIZE`|Maximum size in MB, e.g. `32`
-`MAX_FILES`|Maximum number of attachments can be uploaded at once, e.g. `10`.
+`ALLOWED_TYPES`|Allowed MIME types (e.g. `image/jpeg\|image/png`). Use `*/*` for all types.
+`MAX_SIZE`|Maximum size in MB, e.g. `32`.
+`MAX_FILES`|Maximum number of attachments that can be uploaded at once, e.g. `10`.
 
 ### Markdown (`markdown`)
 
@@ -93,19 +95,19 @@ Name|Description
 ----|-----------
 `ENABLE_HARD_LINE_BREAK`|Whether or not to enable the hard line break extension.
 `CUSTOM_URL_SCHEMES`|List of custom URL-Schemes that are allowed as links when rendering Markdown, for example `git` (for `git://`) and `magnet` (for `magnet://`).
-`FILE_EXTENSIONS`|List of file extensions that should be rendered/edited as Markdown. Separate extensions with a comma. To render files without extension as Markdown, just put a comma.
+`FILE_EXTENSIONS`|List of file extensions that should be rendered/edited as Markdown. Separate extensions with a comma. To render files without an extension as Markdown, just add a comma.
 
 ### Smartypants (`smartypants`)
 
 Name|Description
 ----|-----------
-`ENABLED`|Indicates whether or not to enable Smartypants extension.
+`ENABLED`|Indicates whether or not to enable the Smartypants extension.
 
 ### HTTP (`http`)
 
 Name|Description
 ----|-----------
-`ACCESS_CONTROL_ALLOW_ORIGIN`|Value for `Access-Control-Allow-Origin` header, default is not to present.
+`ACCESS_CONTROL_ALLOW_ORIGIN`|Value for the `Access-Control-Allow-Origin` header. The default is not to present.
 
 ### Database (`database`)
 
@@ -117,13 +119,13 @@ Name|Description
 `USER`|Database username.
 `PASSWD`|Database user password.
 `SSL_MODE`|For PostgreSQL only.
-`PATH`|For SQLite3 only, the database file path.
+`PATH`|For SQLite3 only: the database file path.
 
 ### Admin (`admin`)
 
 Name|Description
 ----|-----------
-`DISABLE_REGULAR_ORG_CREATION`|Disable regular (non-admin) users to create organizations.
+`DISABLE_REGULAR_ORG_CREATION`|Disallow regular (non-admin) users from creating organizations.
 
 ### Security (`security`)
 
@@ -148,7 +150,7 @@ Name|Description
 `REQUIRE_SIGNIN_VIEW`|Enable this to force users to log in to view any page.
 `ENABLE_CACHE_AVATAR`|Enable this to cache avatar from Gravatar.
 `ENABLE_NOTIFY_MAIL`|Enable this to send e-mail to watchers of repository when something happens like creating issues, requires `Mailer` to be enabled.
-`ENABLE_REVERSE_PROXY_AUTHENTICATION`|Enable this to allow reverse proxy authentication, more detail|https://github.com/gogits/gogs/issues/165
+`ENABLE_REVERSE_PROXY_AUTHENTICATION`|Enable this to allow reverse proxy authentication, more detail on [#165](https://github.com/gogs/gogs/issues/165)
 `ENABLE_REVERSE_PROXY_AUTO_REGISTRATION`|Enable this to allow auto-registration for reverse authentication.
 `DISABLE_MINIMUM_KEY_SIZE_CHECK`|Do not check minimum key size with corresponding type.
 `ENABLE_CAPTCHA`|Enable this to use captcha validation for registration.
@@ -157,7 +159,8 @@ Name|Description
 
 Name|Description
 ----|-----------
-`TYPES`|Types are enabled for users to use, can be `gogs`, `slack` or `discord`.
+`TYPES`|Types are enabled for users to use, can be `gogs`, `slack`、`discord` or `dingtalk`.
+`QUEUE_LENGTH`|The length of the Webhook queue, increase if webhook shooting starts hanging
 `DELIVER_TIMEOUT`|Delivery timeout in seconds for shooting webhooks.
 `SKIP_TLS_VERIFY`|Indicate whether to allow insecure certification or not.
 `PAGING_NUM`|Number of webhook history that are shown in one page.
@@ -167,13 +170,14 @@ Name|Description
 Name|Description
 ----|-----------
 `ENABLED`|Enable this to use a mail service.
+`SUBJECT_PREFIX`|Prefix prepended to the subject line.
+`HOST`|SMTP mail host address and port (example: smtp.gogs.io:587).
 `DISABLE_HELO`|Disable HELO operation.
 `HELO_HOSTNAME`|Custom hostname for HELO operation.
-`HOST`|SMTP mail host address and port (example: smtp.gogs.io:587).
+`SKIP_VERIFY`|Do not verify the self-signed certificates.
 `FROM`|Mail from address, RFC 5322. This can be just an email address, or the `"Name" <email@example.com>` format.
 `USER`|Username of mailer (usually just your e-mail address).
 `PASSWD`|Password of mailer.
-`SKIP_VERIFY`|Do not verify the self-signed certificates.
 `USE_PLAIN_TEXT`|Indicate whether to use `text/plain` as format of content or not.
 
 Note: Gogs supports only SMTP with STARTTLS.
@@ -204,7 +208,7 @@ Name|Description
 `AVATAR_UPLOAD_PATH`|Path to store user uploaded avatars.
 `GRAVATAR_SOURCE`|Can be `gravatar`, `duoshuo` or anything like `http://cn.gravatar.com/avatar/`.
 `DISABLE_GRAVATAR`|Enable this to use local avatars only.
-`ENABLE_FEDERATED_AVATAR`|Indicate whether to enable for federated avatars (see http://www.libravatar.org). This value will be forced to be false in offline mode or Gravatar is disbaled.
+`ENABLE_FEDERATED_AVATAR`|Indicate whether to enable for federated avatars (see http://www.libravatar.org). This value will be forced to be false in offline mode or Gravatar is disabled.
 
 ### Attachment (`attachment`)
 
@@ -241,7 +245,7 @@ Name|Description
 Name|Description
 ----|-----------
 `LEVEL`|File log level, leave empty to inherit.
-`LOG_RORATE`|Enable this to have file rotation.
+`LOG_ROTATE`|Enable this to have file rotation.
 `DAILY_ROTATE`|Enable this to segment log file daily.
 `MAX_SIZE_SHIFT`|Max size shift of single file for rotation, default is 28 means 1 << 28, 256MB.
 `MAX_LINES`|Max line number of single file for rotation, default is `1000000`.
@@ -254,6 +258,14 @@ Name|Description
 `LEVEL`|Slack log level, leave empty to inherit.
 `URL`|Slack webhook URL.
 
+#### Log - Discord (`log.discord`)
+
+Name|Description
+----|-----------
+`LEVEL`|Discord log level, leave empty to inherit.
+`URL`|Discord webhook URL.
+`USERNAME`|Username displayed in webhook.
+
 ### Cron (`cron`)
 
 Name|Description
@@ -335,6 +347,15 @@ Name|Description
 ----|-----------
 `REPO_PAGING_NUM`|Number of repos that are showed in one page for user related pages.
 
+#### Prometheus (`prometheus`)
+
+Name|Description
+----|-----------
+`ENABLED`|Indicate whether or not to enable Prometheus metrics, default is `true`.
+`ENABLE_BASIC_AUTH`|Indicate whether or not to enable HTTP Basic Authentication to protect metrics data, default is `false`.
+`BASIC_AUTH_USERNAME`|Username for HTTP Basic Authentication.
+`BASIC_AUTH_PASSWORD`|Password for HTTP Basic Authentication.
+
 ### Other (`other`)
 
 Name|Description
diff --git a/en-US/advanced/configuration_for_source_builds.md b/en-US/advanced/configuration_for_source_builds.md
index 4669a710..07f4d2b5 100644
--- a/en-US/advanced/configuration_for_source_builds.md
+++ b/en-US/advanced/configuration_for_source_builds.md
@@ -7,14 +7,14 @@ name: Detailed Config From Source
 Following the instruction of building [from source](/docs/installation/install_from_source), you should now have a local user `git` and a working setup of `go` and [Gogs](http://gogs.io/).
 We are going to setup Gogs along with **Nginx**. This way, we can take advantage of Nginx. This is useful for servers that already have an Nginx running.
 
-For the rest fo this document, we'll assume the following:
+For the rest of this document, we'll assume the following:
 
 - You want to serve 'Gogs' on `example.com` domain
 - Nginx is your webserver
 - `postgresql` is your database server
-- and you want your git repository URLs look like `git.example.com`
+- You want your git repository URLs to look like `git.example.com`
 
-As mentioned in [Configuration and run](/docs/installation/configuration_and_run), you should create your own configuration file in `$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini`
+As mentioned in [Configuration and run](/docs/installation/configuration_and_run), you should create your own configuration file in `$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini`
 
 Let's first setup some directories:
 
@@ -23,25 +23,25 @@ sudo mkdir -p /var/log/gogs
 sudo chown git:git /var/log/gogs
 sudo su - git
 cd ~
-mkdir -p $GOPATH/src/github.com/gogits/gogs/custom/conf
+mkdir -p $GOPATH/src/github.com/gogs/gogs/custom/conf
 mkdir -p ~/gogs-repositories
 ```
 
 Now copy the base configuration file so we can edit it:
 
 ```bash
-cd $GOPATH/src/github.com/gogits/gogs
+cd $GOPATH/src/github.com/gogs/gogs
 cp conf/app.ini custom/conf/
 ```
 
 Using your editor, open the configuration file:
 
-`$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini`
+`$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini`
 
 for example:
 
 ```bash
-vi $GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini
+vi $GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini
 ```
 
 ## Setting up server
@@ -116,7 +116,7 @@ sudo -u git -H psql -d gogs_production
 gogs_production> \q
 ```
 
-Now we can update `app.ini`, again open `$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini` in your editor and change the following (make sure you are the user `git`, if not enter `sudo su - git`):
+Now we can update `app.ini`, again open `$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini` in your editor and change the following (make sure you are the user `git`, if not enter `sudo su - git`):
 
 ### `[database]` section
 
@@ -168,7 +168,7 @@ and then:
 
 ```bash
 sudo su - git
-cd $GOPATH/src/github.com/gogits/gogs
+cd $GOPATH/src/github.com/gogs/gogs
 ./gogs web
 ```
 
@@ -186,7 +186,7 @@ You are basically done here, the next step outlines how to make Gogs start when
 
 This section describes how to properly start *Gogs* when your linux system reboots. For other platforms, consult the documentation to see how you can do this. For Mac OSX see [this document](/docs/installation/install_gogs_on_mac#run-gogs-server) to control app start-ups.
 
-If you followed previous steps, you can now enable automatic start of gogs. Under `debian`/`ubuntu`, we will use the script from `$GOPATH/src/github.com/gogits/gogs/scripts/init/debian/gogs`.
+If you followed previous steps, you can now enable automatic start of gogs. Under `debian`/`ubuntu`, we will use the script from `$GOPATH/src/github.com/gogs/gogs/scripts/init/debian/gogs`.
 
 Let's copy the script and modify it:
 
@@ -194,7 +194,7 @@ Let's copy the script and modify it:
 # change to 'git' user
 sudo su - git
 cd ~
-cp $GOPATH/src/github.com/gogits/gogs/scripts/init/debian/gogs ./gogs.init
+cp $GOPATH/src/github.com/gogs/gogs/scripts/init/debian/gogs ./gogs.init
 ```
 
 Using your editor open `~/gogs.init` and modify it such as:
@@ -216,7 +216,7 @@ to
 Further down in the same file, set the location so `init.d` can find our `gogs` installation by changing `WORKING_DIR` line to:
 
 ```ini
-WORKINGDIR=/home/git/go/src/github.com/gogits/gogs
+WORKINGDIR=/home/git/go/src/github.com/gogs/gogs
 ```
 
 Move the file to `/etc/init.d` and update it:
diff --git a/en-US/advanced/hacking_on_gogs.md b/en-US/advanced/hacking_on_gogs.md
deleted file mode 100644
index d4148cc1..00000000
--- a/en-US/advanced/hacking_on_gogs.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: Hacking on Gogs
----
-
-# Hacking on Gogs
-
-If you want to contribute to Gogs you should fork the project and work on the dev branch.
-There is a catch though; some internal packages are referenced by their Github url. So
-you have to trick the Go tool to think that you work on a clone of the official repository.
-
-Start by downloading the source code as you normally would:
-
-    $ go get github.com/gogits/gogs
-
-Now fork the project on Github and then go to gogs' source directory:
-
-    $ cd $GOPATH/src/github.com/gogits/gogs
-
-Configure the gogs repository to be a clone of your fork:
-
-    $ git remote set-url origin git@github.com:<USERNAME>/gogs.git
-    $ git fetch
-
-Checkout the develop branch and use `go get -u ./...` again to fetch any new dependencies:
-
-    $ git checkout develop
-    $ go get -u ./...
-
-Gogs have a test suite that can be run with the `make test` command. Writing
-test cases is not mandatory to contribute, but we will be happy if you do.
-More information about writing tests in Go can be found on
-[the official documentation](https://golang.org/pkg/testing/).
-
-That's it! You are ready to hack on Gogs. Test your changes, push them to your repository and open a pull request.
diff --git a/en-US/advanced/release_and_tips_blogs.md b/en-US/advanced/release_and_tips_blogs.md
deleted file mode 100644
index 8fa97878..00000000
--- a/en-US/advanced/release_and_tips_blogs.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Release notes and tips
----
-
-# Release notes and tips
-
-## Releases
-
-- `v0.2`: [Gogs: Binary is what called real deployment](http://obahua.com/gogs-binary-is-what-called-real-deployment/)
-- `v0.3`: [Setup your private Git hosting with Gogs](http://obahua.com/setup-your-private-git-hosting-with-gogs/)
-- `v0.4`: [Use Gogs to work collaboratively](http://obahua.com/use-gogs-to-work-collaboratively/)
-- `v0.5`: [Organize your teams with Gogs organization](http://obahua.com/organize-your-teams-with-gogs-organization/)
-
-## Tips
-
-- [Login Gogs with OAuth](http://obahua.com/login-gogs-with-oauth/)
diff --git a/en-US/donate.md b/en-US/donate.md
index c141ebdd..26919d2f 100644
--- a/en-US/donate.md
+++ b/en-US/donate.md
@@ -5,34 +5,39 @@ name: Donation
 # Donation
 
 <h4>
-	<b><font color="red">We will continue to work hard with your support!</font></b>
+	<b><font color="red">Due to VISA constraints, we no longer accept donations via PayPal.</font></b>
 </h4>
 
-<h4>
-	<b>Donate through PayPal:</b>
-	<p>
-		<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-			<input type="hidden" name="cmd" value="_s-xclick">
-			<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHNwYJKoZIhvcNAQcEoIIHKDCCByQCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYANC0CcgPhoFIJnI3Ap6FBq8kSn/WqGaTkOjRDkXF38f1EeBfo7LRBYMdwFbhwRnfD9/znIQNyhtlvBqzqxuAc00ovkk3f1jAl1VnCOmCq7v+lJAORuG+LnFbJM60TzqPibSdFvsMs/OHb2/YJEQeVqldveOuPO4mW654JvRsLvZjELMAkGBSsOAwIaBQAwgbQGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQI3Aa1Js6xeEKAgZDVoU6N799qIlgVhIFAyxbw8oZXxqSBJvWmJDWZlyyEgtRpbFBbKis6mzr+rCxSz0d75jBMTRSKZMYzrHZ0D9j6HuCnPPgzm1MYN+FkmEUftv1bsPCMg2/if7w7Vj3lAXRtl7uYfcK5C5ky9Md8rIPs+jNrWib/o//nlc+pEUSTmhaVjMGt8pSF2wxeKvigVZSgggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS+Ndl72T7oKJ4u4uw+6awntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe/hJl66/RGqrj5rFb08sAABNTzDTiqqNpJeBsYs/c2aiGozptX2RlnBktH+SUNpAajW724Nv2Wvhif6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7BgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIFfOlaagFrl71+jq6OKidbWFSE+Q4FqROvdgIONth+8kSK//Y/4ihuE4Ymvzn5ceE3S/iBSQQMjyvb+s2TWbQYDwcp129OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa+u4qectsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNDA0MzAwNzU2NTdaMCMGCSqGSIb3DQEJBDEWBBQ8fG9Jf/n4Sc5kprmdqBZJ19odmzANBgkqhkiG9w0BAQEFAASBgFYTDAFseILcOXH6CJoY9HISlKdxjEm7O7Dnu6LDZRkCg9NpeoAXWtFIUWYpij/ry5tbGCr/JRcwuFaP8Lt2YqOp8yzmEpwNZbGy+kbciGJgUUjfI2+275lQddfntECDNNX2NLAMiTbY/3Q3ZzENb4kwaY7pagrO0sgQsEvW/e9u-----END PKCS7-----
-			">
-			<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-			<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-		</form>
-	</p>
-</h4>
-
-### Your donation will be used for:
+<!-- ### Your donation will be used for:
 
 - Supporting the development of Gogs
 - Supporting and maintaining the community
 - Upgrading to better servers
 - Awarding outstanding contributors
-- Holding community activities and lectures
+- Holding community activities and lectures -->
 
 ### Donations List (descending, by time of donation)
 
 | Donated at       | Donator    | Amount   |
 | ---------------- |:---------:| --------:|
+| 2019-03-12 | Francisco | $15.00 |
+| 2019-02-02 | Mr Roberts | $10.00 |
+| 2019-01-17 | Mr. Presley | $20.00 |
+| 2019-01-11 | Mr. Wanichthanarak | $10.00 |
+| 2018-09-27 | Mr. Presley | $20.00 |
+| 2018-09-20 | Mr. Potapov | $20.00 |
+| 2018-08-28 | Mr. Forceno | $5.00 |
+| 2018-07-12 | Mr. Medved | $10.00 |
+| 2018-07-26 | ozzi | $10.00 |
+| 2018-07-06 | omlinux.com | $10.00 |
+| 2018-07-04 | Mr. Levy | $25.00 |
+| 2018-06-19 | Mr. MacGee | $15.00 |
+| 2018-06-17 | Mr. Jongh | €20.00 |
+| 2018-06-07 | Mr. Rensink | $25.00 |
+| 2018-05-03 | Mr. Warnotte | $1000.00 |
+| 2018-03-04 | Mr. Carr | $1000.00 |
+| 2018-02-23 | Mr. Weber | $5.00 |
+| 2018-01-31 | Mr. Hellsten | $10.00 |
 | 2017-10-25 | Mr. Pfäffle | $20.00 |
 | 2017-10-11 | Mr. Roś | $13.37 |
 | 2017-09-30 | Mr. Ali | $2.00 |
diff --git a/en-US/features/authentication.md b/en-US/features/authentication.md
index 774bb2c5..350c49ea 100644
--- a/en-US/features/authentication.md
+++ b/en-US/features/authentication.md
@@ -4,37 +4,75 @@ name: Authentication
 
 # Authentication
 
-## LDAP
+Gogs supports authentication by various external sources.  Currently supported are: LDAP, SMTP, PAM, and GitHub.  Sources can be configured in **Admin Panel - Authentication Sources**, or (starting from `0.11.45.0412`) using configuration files in `custom/conf/auth.d`.  
 
-Both the LDAP via BindDN and the simple auth LDAP share the following fields:
+## Using configuration files
 
-- Authorization Name **(required)**
-  - A name to assign to the new method of authorization.
+Since version `0.11.45.0412`, files with the suffix `.conf` under `custom/conf/auth.d` will be recognized as authentication sources.  An example for each of the supported sources can be found [here](https://github.com/gogs/gogs/tree/main/conf/auth.d).
+
+Authentication sources defined via configuration files appear in the **Admin Panel - Authentication Sources** just like sources created via the web interface.
+
+![](/docs/images/auth_sources.png)
+
+Configuration files are read once when Gogs starts.  To edit them while Gogs is running, use the web interface.
+
+## Configuration
+
+### LDAP
+
+There are two variants for LDAP authentication: with or without a separate Bind DN.  In both cases authentication is performed by attempting to bind to the LDAP with the User DN and password.  The difference is that with the Bind DN, a query is first performed (by the Bind DN) to find the User DN.
+
+The Bind DN mechanism has these advantages:
+
+- It may be more secure than blindy attempting to bind with a possibly non-existent User DN
+- It supports login with e.g. email address or phone number.  The preliminary search could look up the User DN using their `mail` or `mobile` attribute (but see the FreeIPA section further down: features in Gogs may have obsoleted the need for this)
+- A Bind DN is required when the LDAP does not allow the User DN to query its own attributes or group memberships
+
+The downside to the Bind DN mechanism is that, unless the LDAP allows anonymous queries, it requires a bind DN to be defined in the LDAP, and Gogs needs to store its credentials.  Gogs currently does not encrypt these.
+
+In the ideal situation, the LDAP allows anonymous queries (at least in the "user container") and the Bind DN mechanism can be used without a Bind DN and password.  The options available to you depend on how the LDAP in your organisation has been configured.
+
+**Shared configuration fields** between _Bind DN_ and _Simple Auth_ authentication
+
+- Authentication Name **(required)**
+  - A friendly name to assign to the new authentication source
+
+- Security Protocol **(required)**
+  - Unencrypted (0), LDAPS (1), StartTLS (2)
 
 - Host **(required)**
   - The address where the LDAP server can be reached.
-  - Example: `mydomain.com`
+  - Example: `ldap.mydomain.com`
 
 - Port **(required)**
   - The port to use when connecting to the server.
-  - Example: `636`
+  - Usually `389` for the LDAP and StartTLS protocols, `636` for LDAPS protocol.
 
-- Enable TLS Encryption (optional)
-  - Whether to use TLS when connecting to the LDAP server.
+- User Filter **(required)**
+  - An LDAP filter declaring which users should be allowed to log in.  Used as the
+    initial search query in the Bind DN authenticator.  Applied "on top of" the
+    authenticated user context in Simple Authentication. The `%s` matching parameter
+    will be substituted with the login name given on the sign-in form.
+    - Example: `(&(objectClass=posixAccount)(uid=%s))`
+  - Can be used to filter on group membership if the User DN object has `memberOf`
+    attributes:
+    - `(&(objectClass=posixAccount)(uid=%s)(memberOf=cn=gogs_users,cn=groups,...)`
+  - In the Bind DN authenticator can be used to retrieve the user account using any
+    of a number of user attributes:
+    - Example: `(&(objectClass=Person)(|(uid=%s)(mail=%s)(mobile=%s)))`
 
 - Admin Filter (optional)
-  - An LDAP filter specifying if a user should be given administrator
-    privileges. If a user accounts passes the filter, the user will be
-    privileged as an administrator.
-  - Example: `(objectClass=adminAccount)`
+  - An LDAP filter which is applied to the User DN context to determine whether the
+    user should have Gogs administrator privileges.
+  - Example: `(objectClass=adminAccount)` or `(memberOf=cn=admins,cn=groups,...)`
 
 - Username attribute (optional)
-  - The attribute of the user's LDAP record containing the user name. Given
-    attribute value will be used for new Gogs account user name after first
-    successful sign-in. Leave empty to use login name given on sign-in form.
-  - This is useful when supplied login name is matched against multiple
-    attributes, but only single specific attribute should be used for Gogs
-    account name, see "User Filter".
+  - The attribute of the user's LDAP record containing the user name. The given
+    attribute value will be used for a new Gogs account user name after the first
+    successful sign-in. Leave empty to use the login name given on the sign-in form.
+  - This is useful when the supplied login name is matched against multiple
+    attributes, but only a single specific attribute should be used for the Gogs
+    account name (see "User Filter").
   - Example: `uid`
 
 - First name attribute (optional)
@@ -43,15 +81,23 @@ Both the LDAP via BindDN and the simple auth LDAP share the following fields:
   - Example: `givenName`
 
 - Surname attribute (optional)
-  - The attribute of the user's LDAP record containing the user's surname.
+  - The attribute of the user's LDAP record containing the user's last name.
     This will be used to populate their account information.
   - Example: `sn`
 
-- E-mail attribute **(required)**
+- Email attribute **(required)**
   - The attribute of the user's LDAP record containing the user's email
     address. This will be used to populate their account information.
   - Example: `mail`
 
+**LDAP using Simple Auth** adds the following field:
+
+- User DN **(required)**
+  - The template to use as the user's DN. The `%s` matching parameter will be
+    substituted with the login name given on the sign-in form.
+  - Example: `cn=%s,ou=Users,dc=mydomain,dc=com`
+  - Example: `uid=%s,ou=Users,dc=mydomain,dc=com`
+
 **LDAP via BindDN** adds the following fields:
 
 - Bind DN (optional)
@@ -60,70 +106,50 @@ Both the LDAP via BindDN and the simple auth LDAP share the following fields:
   - Example: `cn=Search,dc=mydomain,dc=com`
 
 - Bind Password (optional)
-  - The password for the Bind DN specified above, if any. _Note: The password
-    is stored in plaintext at the server. As such, ensure that your Bind DN
-    has as few privileges as possible._
+  - The password for the Bind DN specified above, if any. *Note: The password
+    is stored in plaintext on the server. As such, ensure that your Bind DN
+    has as few privileges as possible.*
 
 - User Search Base **(required)**
-  - The LDAP base at which user accounts will be searched for.
+  - The LDAP base below which the user account will be searched.
   - Example: `ou=Users,dc=mydomain,dc=com`
 
-- User Filter **(required)**
-  - An LDAP filter declaring how to find the user record that is attempting to
-    authenticate. The `%s` matching parameter will be substituted with login
-    name given on sign-in form.
-  - Example: `(&(objectClass=posixAccount)(uid=%s))`
-  - To substitute more than once `%[1]s` should be used instead, eg. when
-    matching supplied login name against multiple attributes such as user
-    identifier, email or even phone number.
-  - Example: `(&(objectClass=Person)(|(uid=%[1]s)(mail=%[1]s)(mobile=%[1]s)))`
-
-**LDAP using simple auth** adds the following fields:
-
-- User DN **(required)**
-  - A template to use as the user's DN. The `%s` matching parameter will be substituted with login name given on sign-in form.
-  - Example: `cn=%s,ou=Users,dc=mydomain,dc=com`
-  - Example: `uid=%s,ou=Users,dc=mydomain,dc=com`
-
-- User Filter **(required)**
-  - An LDAP filter declaring when a user should be allowed to log in. The `%s`
-    matching parameter will be substituted with login name given on sign-in
-    form.
-  - Example: `(&(objectClass=posixAccount)(cn=%s))`
-  - Example: `(&(objectClass=posixAccount)(uid=%s))`
+- Fetch attributes in Bind DN context (optional)
+  - By default user attributes are retrieved while bound as the User DN; tick this
+    box to retrieve them while bound as the Bind DN
 
 **Verify group membership in LDAP** uses the following fields:
 
-* Group Search Base (optional)
-    * The LDAP DN used for groups.
-    * Example: `ou=group,dc=mydomain,dc=com`
+- Group Search Base DN (optional)
+  - The LDAP base below which groups will be searched
+  - Example: `ou=group,dc=mydomain,dc=com`
 
-* Group Name Filter (optional)
-    * An LDAP filter declaring how to find valid groups in the above DN.
-    * Example: `(|(cn=gogs_users)(cn=admins))`
+- Group Filter (optional)
+  - An LDAP filter declaring the groups that entitle the user to have access
+  - Example: `(|(cn=gogs_users)(cn=admins))`
 
-* User Attribute in Group (optional)
-    * Which user LDAP attribute is listed in the group.
-    * Example: `uid`
+- Group Attribute Containing List of users (optional)
+  - Which multi-valued attribute has the group's members
+  - Example: `memberUid` or `member`
 
-* Group Attribute for User (optional)
-    * Which group LDAP attribute contains an array above user attribute names.
-    * Example: `memberUid`
+- User Attribute Listed in Group (optional)
+  - Which user attribute is listed in the membership attributes on the group
+  - Example: `uid` or `dn`
 
-## PAM
+### PAM
 
-To configure this you just need to set the 'PAM Service Name' to a filename in `/etc/pam.d/`.
+To configure this you just need to set the **PAM Service Name** to a file name in `/etc/pam.d/`.
 If you want it to work with normal Linux passwords, the user running Gogs must have read access to `/etc/shadow`.
 
-## SMTP
+### SMTP
 
 This option allows Gogs to log in to your SMTP host as a Gogs user. To configure this, simply set the fields below:
 
 - Authentication Name **(required)**
-  - A name to assign to the new method of authorization.
+  - A name to assign to the new method of authentication.
 
 - SMTP Authentication Type **(required)**
-  - Type of authentication for use on your SMTP host, PLAIN or LOGIN.
+  - Type of authentication for use on your SMTP host: `PLAIN` or `LOGIN`.
 
 - Host **(required)**
   - The address where the SMTP host can be reached.
@@ -132,8 +158,9 @@ This option allows Gogs to log in to your SMTP host as a Gogs user. To configure
 - Port **(required)**
   - The port to use when connecting to the server.
   - Example: `587`
+
 - Allowed Domains
-  - Restrict what domains can log in if you're using public SMTP host or SMTP host with multiple domains.
+  - Restrict what domains can log in if you're using a public SMTP host or an SMTP host with multiple domains.
   - Example: `gogs.io,mydomain.com,mydomain2.com`
 
 - Enable TLS Encryption
@@ -142,37 +169,50 @@ This option allows Gogs to log in to your SMTP host as a Gogs user. To configure
 - Skip TLS Verify
   - Disable TLS verify on authentication.
   
-- This authentication is activate
-  - Enable or disable this auth.
-
-## Freeipa
-
-- In order to login to the Gogs using FreeIPA credentials, you need to create a bind account for Gogs to use:
-
--  On the FreeIPA server, create a `gogs.ldif` file, replacing dc=example,dc=com with your DN, and providing an appropriately secure password:
-```
-  dn: uid=gogs,cn=sysaccounts,cn=etc,dc=example,dc=com
-  changetype: add
-  objectclass: account
-  objectclass: simplesecurityobject
-  uid: gogs
-  userPassword: secure password
-  passwordExpirationTime: 20380119031407Z
-  nsIdleTimeout: 0
-```
-
-- Import the LDIF (change localhost to an IPA server if needed), you’ll be prompted for your Directory Manager password:
-```
-  ldapmodify -h localhost -p 389 -x -D \
-  "cn=Directory Manager" -W -f gogs.ldif
-```
--  Add an IPA group for gogs_users :
-```
-  ipa group-add --desc="Gogs Users" gogs_users
-```
--  Note! if you get error about ipa credentials please run kinit admin and give your admin accound password.
-
--  Now login to the gogs as an Admin, click on “Authentication” under Admin Panel. Then click New LDAP Source and fill in the details, changing all where appropriate to your own domain as photo below:
-
-![Freeipa-Gogs](https://raw.githubusercontent.com/Karen09/docs/master/images/Freeipa-Gogs.png)
+- This authentication is activated
+  - Enable or disable this auth method.
+
+### FreeIPA
+
+It is possible to use either Bind DN or Simple Auth with FreeIPA.  Below are
+the relevant parts of sample configurations.  These assume that your domain is
+`domain.com`, and that users must be a member of group `gogs_users` to get access.
+
+**Using Simple Auth**
+
+Setting up access using Simple Auth is trivial:
+
+    user_dn            = uid=%s,cn=users,cn=accounts,dc=domain,dc=com
+    filter             = (&(objectClass=posixAccount)(memberOf=cn=gogs_users,cn=groups,cn=accounts,dc=domain,dc=com))
+    attribute_username = uid
+    attribute_name     = givenName
+    attribute_surname  = sn
+    attribute_mail     = mail
+    admin_filter       = (memberOf=cn=admins,cn=groups,cn=accounts,dc=domain,dc=com)
+    group_enabled      = false
+
+**Using Bind DN**
+
+If you want to allow login by email address, you run into the issue that IPA by
+default does not grant anonymous search access to the `mail` attribute.  This can
+be changed easily in IPA:
+
+    ipa permission-mod --includedattrs=mail 'System: Read User Standard Attributes'
+
+Alternatively, you could ask your LDAP administrators (who will not be keen on exposing
+email addresses to unauthenticated LDAP clients) for a bind user account.
+
+**However** all this is probably not necessary any more, as Gogs translates email
+logins to the corresponding user ID\* before it makes the authentication call to the
+backend LDAP.
+
+All that is required is that the user's _first login_ is with their user ID,
+After that they can use user ID and email address.
+
+---
+
+**Footnotes**
+
+\*) To be precise: it maps their login name onto their "Authentication Login Name",
+    which administrators can edit on the User's "Edit Account" page.
 
diff --git a/en-US/features/custom_template.md b/en-US/features/custom_template.md
new file mode 100644
index 00000000..f89df431
--- /dev/null
+++ b/en-US/features/custom_template.md
@@ -0,0 +1,44 @@
+---
+name: Custom template
+---
+
+# Customizing templates
+
+## Override HTML templates
+
+You can override HTML templates (including templates for emails) by creating a customized version under `custom/templates/` directory. Your version of HTML templates will survive code updates, but you may want to keep tabs on them in case functionality changes. Be careful when overriding HTML templates as you may break things in future releases.
+
+An example is to customize the look and contents of the home page:
+
+1. Copy the content of template file `templates/home.tmpl`.
+2. Save edited file as `custom/templates/home.tmpl`.
+
+:warning: Edits to the custom HTML templates **require restarting Gogs**.
+
+:warning: Override for email templates is disabled when `[server] LOAD_ASSETS_FROM_DISK = true`
+
+## Override static files
+
+You can override static files (CSS, JavaScript, images, etc.) by creating a customized version under `custom/public/` directory. Your version of static files will survive code updates, but you may want to keep tabs on them in case functionality changes. Be careful when overriding static files as you may break things in future releases.
+
+For example, you can override the site favicon by putting your version of favicon to `custom/public/img/favicon.png`.
+
+:warning: Edits to the custom static files **DO NOT require restarting Gogs**.
+
+## Inject content into existing templates
+
+You can inject your custom head or footer content to Gogs without touching source code of main repository. This is useful if you want to add analytics code or include custom static resources.
+
+[You can read more about injecting a custom head and footer here.](https://discuss.gogs.io/t/how-to-inject-custom-head-and-footer/943).
+
+This approach is recommended whenever possible because it has the minimum impact on templates.
+
+### Inject custom CSS file
+
+Here is an example of how you can include a custom CSS file in your Gogs instance. Names and directories are just for demonstration, you can put it anywhere as long as it can be accessed via network requests.
+
+1. Create a file named `custom.css` under `custom/public/css/` directory.
+2. Put some CSS rules into the file.
+3. Edit file `custom/templates/inject/head.tmpl` and add a line `<link rel="stylesheet" href="/css/custom.css">`
+4. Restart Gogs.
+5. Future edits to the custom CSS file **DO NOT require restarting Gogs**.
diff --git a/en-US/features/custome_template.md b/en-US/features/custome_template.md
deleted file mode 100644
index a57d3c3b..00000000
--- a/en-US/features/custome_template.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Custom Template
----
-
-# Custom Template
-
-You can inject your custom head or footer content to Gogs without touching source code of main repository. This is useful if you want to add analytics code or include custom static resources.
-
-Read more about [inject custom head and footer](https://discuss.gogs.io/t/how-to-inject-custom-head-and-footer/943).
-
-## Include Custom CSS File
-
-Here is an example of how you can include a custom CSS file to your Gogs instance. Names and directories are just for demonstration, you can put anywhere as long as it can be accessed via network requests.
-
-1. Create a file named `custom.css` under `public/css` directory.
-2. Put some CSS rules into the file.
-3. Edit file `custom/templates/inject/head.tmpl` and add a line `<link rel="stylesheet" href="/css/custom.css">`
-4. Restart Gogs
-5. More editing to the custom CSS file does not require restart Gogs
diff --git a/en-US/features/i18n.md b/en-US/features/i18n.md
index 3c001a68..9107258b 100644
--- a/en-US/features/i18n.md
+++ b/en-US/features/i18n.md
@@ -16,7 +16,7 @@ NAMES = English,简体中文,繁體中文,Deutsch,Français,Nederlands,Latviešu
 
 ## Contribute Translations
 
-Sign up for an account on [Crowdin](https://crowdin.com/project/gogs) and fill untranslated strings.
+Sign up for an account on [Crowdin](https://crowdin.gogs.io/) and fill untranslated strings.
 
 Sometimes, you will find it's quite hard to translate a sentence from English to your language, but don't panic! Just convey the meaning; it doesn't have to be a literal translation matching the exact words of the English version.
 
@@ -24,7 +24,7 @@ In case you want to test your translation, but avoid making changes to your Git
 
 ### Make Corrections
 
-If you found incorrectly translated strings, you can quickly search on [Crowdin](https://crowdin.com/project/gogs) by typing the key name in the search box.
+If you found incorrectly translated strings, you can quickly search on [Crowdin](https://crowdin.gogs.io/) by typing the key name in the search box.
 
 For example, suppose you think `Home` is an incorrect translation. Rather than searching `Home`, instead search for its key name `home`. Similarly, search something like `home:uname_holder` for keys under a section.
 
diff --git a/en-US/features/webhook.md b/en-US/features/webhook.md
index 59347da7..d869da8e 100644
--- a/en-US/features/webhook.md
+++ b/en-US/features/webhook.md
@@ -4,11 +4,11 @@ name: Webhook
 
 # Webhook
 
-Gogs supports web hooks for repository events, you can find it in settings page(`/:username/:reponame/settings/hooks`). All event pushes are POST requests, and we currently support three versions of formats: Gogs, Slack, and Discord.
+Gogs supports web hooks for repository events; you can find it in the settings page (`/:username/:reponame/settings/hooks`). All event pushes are POST requests, and we currently support three versions of formats: Gogs, Slack, and Discord.
 
 ### Event information
 
-Following shows an example of event information that will be sent by Gogs to Payload URL:
+The following shows an example of event information that will be sent by Gogs to the Payload URL:
 
 
 ```
diff --git a/en-US/installation/README.md b/en-US/installation/README.md
index 1d0e5623..74e4e5b3 100644
--- a/en-US/installation/README.md
+++ b/en-US/installation/README.md
@@ -5,18 +5,18 @@ name: Installation
 ## Prerequisites
 
 - Database (choose one of the following):
-    - [MySQL](http://dev.mysql.com): Version >= 5.5.3
+    - [MySQL](http://dev.mysql.com): Version >= 5.7
     - [PostgreSQL](http://www.postgresql.org/)
-    - [MSSQL](https://en.wikipedia.org/wiki/Microsoft_SQL_Server)
     - [TiDB](https://github.com/pingcap/tidb) (experimental, connect via the MySQL protocol)
     - or **NOTHING** with SQLite3
 - [Git](http://git-scm.com/) (bash):
-    - Version >= 1.7.1 for both server and client sides
+    - Version >= 1.8.3 for both server and client sides
     - Best to use latest version for Windows
 - A functioning SSH server:
     - **Ignore this if you're only going to use HTTP/HTTPS**
     - For using builtin SSH server on Windows, make sure you added `ssh-keygen` to your `%PATH%` environment variable.
     - For using standalone SSH server, recommend [Cygwin OpenSSH](http://docs.oracle.com/cd/E24628_01/install.121/e22624/preinstall_req_cygwin_ssh.htm) or [Copssh](https://www.itefix.net/copssh) for Windows.
+    - For Windows servers, please make sure Bash is the default shell not PowerShell.
 
 ### Install database
 
@@ -45,6 +45,21 @@ $ sudo apt-get update
 $ sudo apt-get install git
 ```
 
+#### Fedora
+
+```sh
+$ sudo dnf update
+$ sudo dnf install git
+```
+
+#### RHEL/CentOS
+
+```sh
+$ sudo yum update
+$ sudo yum install git
+```
+
+
 #### Windows
 
 [Download and install Git](http://git-scm.com/downloads)
diff --git a/en-US/installation/configuration_and_run.md b/en-US/installation/configuration_and_run.md
index 84fcb9bf..3100f4fd 100644
--- a/en-US/installation/configuration_and_run.md
+++ b/en-US/installation/configuration_and_run.md
@@ -25,7 +25,7 @@ Of course, you want to change the database setting as well:
 
 ```
 [database]
-PASSWD = `root`
+PASSWORD = `root`
 ```
 
 Note: please quote passwords using `` ` ``
@@ -55,5 +55,51 @@ $ ./gogs web
 
 - There are many ways to start:
 	- Plain: just use `./gogs web`
-	- Daemons: see [scripts](https://github.com/gogits/gogs/tree/master/scripts) folder
+	- Daemons: see [scripts](https://github.com/gogs/gogs/tree/main/scripts) folder
 - Go to `/install` to do your first-time run configuration.
+
+### Running as daemon via init (eg. openrc)
+
+- Create a file named `/etc/init.d/gogs` as follows, assuming gogs is installed in the `/home/git` user:
+
+```
+#!/sbin/openrc-run
+
+SVCNAME=gogs
+GOGS_PIDFILE=/var/run/gogs.pid
+GOGS_USER=git
+GOGS_HOME=/home/$GOGS_USER
+GOGS_PATH=$GOGS_HOME/go/src/github.com/gogs/gogs
+COMMAND="${GOGS_PATH}/gogs"
+ARGS="web"
+
+depend() {
+    need net
+    use dns logger mysql
+}
+
+checkconfig() {
+    if [ ! -d "$GOGS_PATH" ] ; then
+        eerror "gogs not installed" || return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --quiet --background \
+        --make-pidfile --pidfile "${GOGS_PIDFILE}" \
+        --user "${GOGS_USER}" \
+        -d ${GOGS_PATH} \
+        --exec "${COMMAND}" "${ARGS}"
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --quiet --pidfile $GOGS_PIDFILE
+    eend $?
+}
+```
diff --git a/en-US/installation/install_from_binary.md b/en-US/installation/install_from_binary.md
index 689a6494..0b062952 100644
--- a/en-US/installation/install_from_binary.md
+++ b/en-US/installation/install_from_binary.md
@@ -4,67 +4,55 @@ name: From binary
 
 # Install from binary
 
-**Downloads are only available for latest releases, older downloads can be found at [releases](https://github.com/gogits/gogs/releases).**
+All downloads come with support for **MySQL**, **PostgreSQL**, and **TiDB**, and support self-signed certificates (build tag `cert`).
 
-All downloads come with **MySQL**, **PostgreSQL**, **MSSQL** and **TiDB** (via MySQL protocol) support, and build **with tags `cert`**. Keep in mind that support status may be different from older releases, please follow the instructions on older Gogs instances.
-
-## Notes
-
-- `mws` means builtin Windows service support. Please use the other one if you're using NSSM.
+The Windows downloads with "mws" have built-in Windows service support; if you use NSSM, pick the alternative Windows download.
 
 ## How to use downloads?
 
+0. Check that [prerequisites are installed](/docs/installation)
 1. Extract the archive.
-2. `cd` into the directory just created.
-3. Execute `./gogs web` and you're done.
+2. `cd` into the directory that was just created.
+3. Execute `./gogs web`.
+4. Gogs will start up a HTTP service at port `3000` as default. Browse `/install` for initial configuration (e.g. http://localhost:3000/install).
 
-### 0.11.34 @ 2017-11-22
+To go further, see [Configuration and run](/docs/installation/configuration_and_run.html).
 
-|System|Type|SQLite|PAM|Download ([GitHub](https://github.com/gogits/gogs/releases/tag/v0.11.34))|
-|------|----|------|---|--------|
-|Linux|386|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.11.34/linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.34/linux_386.tar.gz) - CDN: [ZIP](https://cdn.gogs.io/0.11.34/linux_386.zip) \| [TAR.GZ](https://cdn.gogs.io/0.11.34/linux_386.tar.gz)|
-|Linux|amd64|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.11.34/linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.34/linux_amd64.tar.gz) - CDN: [ZIP](https://cdn.gogs.io/0.11.34/linux_amd64.zip) \| [TAR.GZ](https://cdn.gogs.io/0.11.34/linux_amd64.tar.gz)|
-|Linux|armv5|❌|❌|LOCAL: [ZIP](https://dl.gogs.io/0.11.34/linux_armv5.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.34/linux_armv5.zip)|
-|Raspberry Pi|v2/v3 / armv6|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.11.34/raspi2_armv6.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.34/raspi2_armv6.zip)|
-|Windows|386|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.11.34/windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.34/windows_386_mws.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.34/windows_386.zip) \| [ZIP w/mws](https://cdn.gogs.io/0.11.34/windows_386_mws.zip)|
-|Windows|amd64|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.11.34/windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.34/windows_amd64_mws.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.34/windows_amd64.zip) \| [ZIP w/ mws](https://cdn.gogs.io/0.11.34/windows_amd64_mws.zip)|
-|Mac OS|amd64|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.11.34/darwin_amd64.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.34/darwin_amd64.zip)|
+## Downloads
 
-### 0.11.29 @ 2017-08-15
+Below are links to downloads for the latest releases. Older downloads can be found at [releases](https://github.com/gogs/gogs/releases).
 
-|System|Type|SQLite|PAM|Download ([GitHub](https://github.com/gogits/gogs/releases/tag/v0.11.29))|
+### 0.13.3 @ 2025-06-08
+
+|System|Type|SQLite|PAM|Download ([GitHub](https://github.com/gogs/gogs/releases/tag/v0.13.3))|
 |------|----|------|---|--------|
-|Linux|386|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.11.29/linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.29/linux_386.tar.gz) - CDN: [ZIP](https://cdn.gogs.io/0.11.29/linux_386.zip) \| [TAR.GZ](https://cdn.gogs.io/0.11.29/linux_386.tar.gz)|
-|Linux|amd64|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.11.29/linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.29/linux_amd64.tar.gz) - CDN: [ZIP](https://cdn.gogs.io/0.11.29/linux_amd64.zip) \| [TAR.GZ](https://cdn.gogs.io/0.11.29/linux_amd64.tar.gz)|
-|Linux|armv5|❌|❌|LOCAL: [ZIP](https://dl.gogs.io/0.11.29/linux_armv5.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.29/linux_armv5.zip)|
-|Raspberry Pi|v2 / armv6|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.11.29/raspi2_armv6.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.29/raspi2_armv6.zip)|
-|Windows|386|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.11.29/windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.29/windows_386_mws.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.29/windows_386.zip) \| [ZIP w/mws](https://cdn.gogs.io/0.11.29/windows_386_mws.zip)|
-|Windows|amd64|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.11.29/windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.29/windows_amd64_mws.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.29/windows_amd64.zip) \| [ZIP w/ mws](https://cdn.gogs.io/0.11.29/windows_amd64_mws.zip)|
-|Mac OS|amd64|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.11.29/darwin_amd64.zip) - CDN: [ZIP](https://cdn.gogs.io/0.11.29/darwin_amd64.zip)|
+|Linux|amd64|✅|❌|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_linux_amd64.zip) \| [TAR.GZ](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_linux_amd64.tar.gz)|
+|Linux|armv8|✅|❌|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_linux_armv8.zip) \| [TAR.GZ](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_linux_armv8.tar.gz)|
+|Windows|amd64|✅|❌|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_windows_amd64.zip) \| [ZIP w/ mws](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_windows_amd64_mws.zip)|
+|macOS|amd64|✅|❌|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_darwin_amd64.zip)|
+|macOS|arm64|✅|❌|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_darwin_arm64.zip)|
 
-### 0.10.18 @ 2017-03-14
+### 0.12.11 @ 2023-02-25
 
-|System|Type|SQLite|PAM|Download ([GitHub](https://github.com/gogits/gogs/releases/tag/v0.10.18))|
+|System|Type|SQLite|PAM|Download ([GitHub](https://github.com/gogs/gogs/releases/tag/v0.12.11))|
 |------|----|------|---|--------|
-|Linux|386|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.10.18/linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.10.18/linux_386.tar.gz) - CDN: [ZIP](https://cdn.gogs.io/0.10.18/linux_386.zip) \| [TAR.GZ](https://cdn.gogs.io/0.10.18/linux_386.tar.gz)|
-|Linux|amd64|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.10.18/linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.10.18/linux_amd64.tar.gz) - CDN: [ZIP](https://cdn.gogs.io/0.10.18/linux_amd64.zip) \| [TAR.GZ](https://cdn.gogs.io/0.10.18/linux_amd64.tar.gz)|
-|Linux|armv5|❌|❌|LOCAL: [ZIP](https://dl.gogs.io/0.10.18/linux_armv5.zip) - CDN: [ZIP](https://cdn.gogs.io/0.10.18/linux_armv5.zip)|
-|Raspberry Pi|v2 / armv6|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/0.10.18/raspi2_armv6.zip) - CDN: [ZIP](https://cdn.gogs.io/0.10.18/raspi2_armv6.zip)|
-|Windows|386|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.10.18/windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.10.18/windows_386_mws.zip) - CDN: [ZIP](https://cdn.gogs.io/0.10.18/windows_386.zip) \| [ZIP w/mws](https://cdn.gogs.io/0.10.18/windows_386_mws.zip)|
-|Windows|amd64|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.10.18/windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.10.18/windows_amd64_mws.zip) - CDN: [ZIP](https://cdn.gogs.io/0.10.18/windows_amd64.zip) \| [ZIP w/ mws](https://cdn.gogs.io/0.10.18/windows_amd64_mws.zip)|
-|Mac OS|amd64|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/0.10.18/darwin_amd64.zip) - CDN: [ZIP](https://cdn.gogs.io/0.10.18/darwin_amd64.zip)|
+|Linux|386|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_386.tar.gz)|
+|Linux|amd64|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_amd64.tar.gz)|
+|Linux|armv7|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_armv7.zip) \| [TAR.GZ](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_armv7.tar.gz)|
+|Linux|armv8|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_armv8.zip) \| [TAR.GZ](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_armv8.tar.gz)|
+|Windows|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.12.11/gogs_0.12.11_windows_amd64_mws.zip)|
+|macOS|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_darwin_amd64.zip)|
+|macOS|arm64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_darwin_arm64.zip)|
 
-### v0.9.141 @ 2017-02-11
+### 0.11.91 @ 2019-08-11
 
-|System|Type|SQLite|PAM|Download ([GitHub](https://github.com/gogits/gogs/releases/tag/v0.9.141))|
+|System|Type|SQLite|PAM|Download ([GitHub](https://github.com/gogs/gogs/releases/tag/v0.11.91))|
 |------|----|------|---|--------|
-|Linux|386|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/gogs_v0.9.141_linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/gogs_v0.9.141_linux_386.tar.gz) - CDN: [ZIP](https://cdn.gogs.io/gogs_v0.9.141_linux_386.zip) \| [TAR.GZ](https://cdn.gogs.io/gogs_v0.9.141_linux_386.tar.gz)|
-|Linux|amd64|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/gogs_v0.9.141_linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/gogs_v0.9.141_linux_amd64.tar.gz) - CDN: [ZIP](https://cdn.gogs.io/gogs_v0.9.141_linux_amd64.zip) \| [TAR.GZ](https://cdn.gogs.io/gogs_v0.9.141_linux_amd64.tar.gz)|
-|Linux|armv5|❌|❌|LOCAL: [ZIP](https://dl.gogs.io/gogs_v0.9.141_linux_armv5.zip) - CDN: [ZIP](https://cdn.gogs.io/gogs_v0.9.141_linux_armv5.zip)|
-|Linux|armv6|❌|❌|LOCAL: [ZIP](https://dl.gogs.io/gogs_v0.9.141_linux_armv6.zip) - CDN: [ZIP](https://cdn.gogs.io/gogs_v0.9.141_linux_armv6.zip)|
-|Raspberry Pi|v2|✅|✅|LOCAL: [ZIP](https://dl.gogs.io/gogs_v0.9.141_raspi2_armv6.zip) - CDN: [ZIP](https://cdn.gogs.io/gogs_v0.9.141_raspi2_armv6.zip)|
-|Windows|386|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/gogs_v0.9.141_windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/gogs_v0.9.141_windows_386_mws.zip) - CDN: [ZIP](https://cdn.gogs.io/gogs_v0.9.141_windows_386.zip) \| [ZIP w/mws](https://cdn.gogs.io/gogs_v0.9.141_windows_386_mws.zip)|
-|Windows|amd64|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/gogs_v0.9.141_windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/gogs_v0.9.141_windows_amd64_mws.zip) - CDN: [ZIP](https://cdn.gogs.io/gogs_v0.9.141_windows_amd64.zip) \| [ZIP w/ mws](https://cdn.gogs.io/gogs_v0.9.141_windows_amd64_mws.zip)|
-|Mac OS|amd64|✅|❌|LOCAL: [ZIP](https://dl.gogs.io/gogs_v0.9.141_darwin_amd64.zip) - CDN: [ZIP](https://cdn.gogs.io/gogs_v0.9.141_darwin_amd64.zip)|
-
-See [Configuration and run](/docs/installation/configuration_and_run.html) to go further.
\ No newline at end of file
+|Linux|386|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_386.tar.gz)|
+|Linux|amd64|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_amd64.tar.gz)|
+|Linux|armv5|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_armv5.zip)|
+|Linux|armv6|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_armv6.zip)|
+|Raspberry Pi|v2/v3 / armv7|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_raspi_armv7.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.91/gogs_0.11.91_raspi_armv7.tar.gz)|
+|Windows|386|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.91/gogs_0.11.91_windows_386_mws.zip)|
+|Windows|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.91/gogs_0.11.91_windows_amd64_mws.zip)|
+|macOS|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_darwin_amd64.zip)|
diff --git a/en-US/installation/install_from_packages.md b/en-US/installation/install_from_packages.md
index d114f585..d503d5a9 100644
--- a/en-US/installation/install_from_packages.md
+++ b/en-US/installation/install_from_packages.md
@@ -8,8 +8,8 @@ name: From packages
 
 ### Packager.io
 
-- Currently enabled for Ubuntu 12.04 + 14.04 + 16.04, CentOS 6 + 7, and Debian 7 + 8.
-- Current packages available from [packager.io](https://packager.io/gh/pkgr/gogs) (the custom config for packager.io is sometimes in `/etc/default/gogs`).
+- Currently enabled for Ubuntu 14.04, 16.04, and 18.04, CentOS 6 and 7, and Debian 8, 9, and 10.
+- Current packages available from [packager.io](https://packager.io/gh/gogs/gogs) (the custom config for packager.io is sometimes in `/etc/default/gogs`).
 
 ### Arch Linux
 
@@ -24,4 +24,4 @@ Information for installation and configuration on Arch Linux can be found at thi
 
 - Installation for ARM, x386 and amd64
 
-https://github.com/davidmullerz/gogs-spk/releases/tag/1.1
+https://github.com/davidmullerz/gogs_synology
diff --git a/en-US/installation/install_from_source.md b/en-US/installation/install_from_source.md
index 9918b8bf..0647341d 100644
--- a/en-US/installation/install_from_source.md
+++ b/en-US/installation/install_from_source.md
@@ -4,109 +4,51 @@ name: From source
 
 # Install from source
 
-## Dependencies
-
-### Overall
-
-- [Go Programming Language](http://golang.org): Version >= 1.6
-
-We are going to create a new user called `git` and install/setup everything under that user:
-
-```sh
-$ sudo adduser --disabled-login --gecos 'Gogs' git
-```
-
-### Third-party Packages
-
-If you're interested in which third-party packages we are using, see [gopmfile](https://github.com/gogits/gogs/blob/master/.gopmfile). You may need this when you are making build package for Gogs.
-
 ## Installing Go
 
-If your system's Go matches the requirements, please skip this section.
+Gogs requires Go 1.21 to compile, please refer to the [official documentation](https://golang.org/doc/install) for how to install Go in your system.
 
-### Download
+## Set Up the Environment
 
-Install Go in `/home/git/local/go` so it wouldn't interfere with future updates of your system's package manager:
+We are going to create a new user called `git` and set up everything under that user:
 
 ```sh
-$ sudo su - git
-$ cd ~
-# create a folder to install 'go'
-$ mkdir local
-# Download go (change go$VERSION.$OS-$ARCH.tar.gz to the latest release)
-$ wget https://storage.googleapis.com/golang/go$VERSION.$OS-$ARCH.tar.gz
-# expand it to ~/local
-$ tar -C /home/git/local -xzf go$VERSION.$OS-$ARCH.tar.gz
+sudo adduser --disabled-login --gecos 'Gogs' git
 ```
 
-### Set Up the Environment
-
-Set the paths that correspond to your system:
+## Compile Gogs
 
 ```sh
-$ sudo su - git
-$ cd ~
-$ echo 'export GOROOT=$HOME/local/go' >> $HOME/.bashrc
-$ echo 'export GOPATH=$HOME/go' >> $HOME/.bashrc
-$ echo 'export PATH=$PATH:$GOROOT/bin:$GOPATH/bin' >> $HOME/.bashrc
-$ source $HOME/.bashrc
+# Clone the repository to the "gogs" subdirectory
+git clone --depth 1 https://github.com/gogs/gogs.git gogs
+# Change working directory
+cd gogs
+# Compile the main program, dependencies will be downloaded at this step
+go build -o gogs
 ```
 
-## Install Gogs
-
-The general way to install Gogs:
-
-```sh
-# Download and install dependencies
-$ go get -u github.com/gogits/gogs
-
-# Build main program
-$ cd $GOPATH/src/github.com/gogits/gogs
-$ go build
-```
-
-### Build from `develop` branch
-
-In case you want to try `develop` (or any other) branch:
-
-```sh
-$ mkdir -p $GOPATH/src/github.com/gogits
-$ cd $GOPATH/src/github.com/gogits
-
-# Make sure you don't use "https://github.com/gogits/gogs.git"
-$ git clone --depth=1 -b develop https://github.com/gogits/gogs
-$ cd gogs
-$ go build
-```
-
-### Test Installation
+## Test Installation
 
 To make sure Gogs is working:
 
 ```sh
-$ cd $GOPATH/src/github.com/gogits/gogs
-$ ./gogs web
+./gogs web
 ```
 
 If you do not see any error messages, hit `Ctrl-C` to stop Gogs.
 
-### Build with Tags
+## Build with Tags
 
 A couple of things do not come with Gogs automatically, you need to compile Gogs with corresponding [build tags](https://golang.org/pkg/go/build/#hdr-Build_Constraints).
 
 Available build tags are:
 
-- `sqlite3`: SQLite3 database support
 - `pam`: PAM authentication support
 - `cert`: Generate self-signed certificates support
-- `miniwinsvc`: Builtin windows service support (or you can use NSSM to create a service)
-
-For example, you want to support all of them, first delete directory `$GOPATH/pkg/${GOOS}_${GOARCH}/github.com/gogits/gogs` and then do:
+- `minwinsvc`: Builtin windows service support (or you can use NSSM to create a service)
 
 ```sh
-$ go get -u -tags "sqlite pam cert" github.com/gogits/gogs
-$ cd $GOPATH/src/github.com/gogits/gogs
-$ go build -tags "sqlite pam cert"
+go build -tags "pam cert" -o gogs
 ```
 
 If you get error: `fatal error: security/pam_appl.h: No such file or directory`, then install missing package via `sudo apt-get install libpam0g-dev`.
@@ -114,4 +56,3 @@ If you get error: `fatal error: security/pam_appl.h: No such file or directory`,
 ## Next steps
 
 - See [Configuration and run](/docs/installation/configuration_and_run) to go further.
-- For more detailed instructions including setting webserver and database see [the detailed steps](/docs/advanced/configuration_for_source_builds).
diff --git a/en-US/installation/run_as_windows_service.md b/en-US/installation/run_as_windows_service.md
index bc8faf12..404e8fea 100644
--- a/en-US/installation/run_as_windows_service.md
+++ b/en-US/installation/run_as_windows_service.md
@@ -8,8 +8,8 @@ name: Run As Windows Service
 
 To run Gogs as a service, you will need one of:
 
-1. Use `miniwinsvc` build tags to have builtin Windows service support.
-2. Do not use `miniwinsvc` build tags and use [NSSM](http://nssm.cc/).
+1. Use `minwinsvc` build tags to have builtin Windows service support.
+2. Do not use `minwinsvc` build tags and use [NSSM](http://nssm.cc/).
 
 First of all, you may choose to lock down file and directory permissions. Just keep in mind the paths to which Gogs requires write access, which includes the Gogs repository `ROOT`.
 
@@ -30,7 +30,7 @@ PROTOCOL = http
 HTTP_ADDR = 127.0.1.1
 HTTP_PORT = 80
 OFFLINE_MODE = true
-ROOT_URL = http://gogs/
+EXTERNAL_URL = http://gogs/
 ```
 
 Moves Gogs' listen port to 80 on the local interface subnet, and tells the Gogs HTTPd that its virtual host is the "gogs" domain.
@@ -74,7 +74,8 @@ The gogs service was started successfully.
 
 Windows services usualy run with under ``%WINDIR%\System32``, and to ensure correct function, specify absolute paths for server data, database files, and other paths in ``app.ini``. For example:
 
-Add ``APP_DATA_PATH`` to ``[server]`` where Gogs stores server data and cache:
+Update where Gogs stores server data and cache:
+
 ```
 [server]
 APP_DATA_PATH = c:/gogs/data
@@ -108,7 +109,7 @@ Application tab:
 
 Details tab:
 
-- Display name: `Go Gits Service`
+- Display name: `Gogs`
 - Description: `Gogs is a painless self-hosted Git service.`
 - Startup type: `Automatic (Delayed Start)`
 
diff --git a/en-US/intro/README.md b/en-US/intro/README.md
index 02e3db16..c82b2143 100644
--- a/en-US/intro/README.md
+++ b/en-US/intro/README.md
@@ -6,9 +6,9 @@ name: Introduction
 
 Gogs is a painless self-hosted Git service.
 
-## Purpose
+## Vision
 
-The goal of this project is to make the easiest, fastest, and most painless way of setting up a self-hosted Git service. With Go, this can be done with an independent binary distribution across **ALL platforms** that Go supports, including Linux, Mac OS X, Windows and ARM.
+This project aims to build a simple, stable and extensible self-hosted Git service that can be setup in the most painless way. With Go, this can be done with an independent binary distribution across ALL platforms that Go supports, including Linux, macOS, Windows and ARM.
 
 ## Open Source Components
 
diff --git a/en-US/intro/change_log.md b/en-US/intro/change_log.md
deleted file mode 100644
index ae5b4945..00000000
--- a/en-US/intro/change_log.md
+++ /dev/null
@@ -1,125 +0,0 @@
----
-name: Changelog
----
-
-# Changelog
-
-### 0.11.34 @ 2017-11-22
-
-#### Bug fixes
-
-- *Regression*: Pull request is not working between different repositories [#4890](https://github.com/gogits/gogs/issues/4890)
-
-### 0.11.33 @ 2017-11-19
-
-#### Bug fixes
-
-- Some security fixes
-- Wrong commit ID in webhook payload after merging pull request [#4442](https://github.com/gogits/gogs/issues/4442)
-- Meta tag go-import does not response correct value [#4832](https://github.com/gogits/gogs/issues/4832)
-
-#### Features
-
-- Add Dingtalk webhook support [#4773](https://github.com/gogits/gogs/pull/4773)
-- Allow rebase and merge pull request [#4798](https://github.com/gogits/gogs/issues/4798)
-
-#### Improvements
-
-- Add placeholder '%s' for username in LDAP BindDN [#2526](https://github.com/gogits/gogs/issues/2526)
-- Allow UID for git user in Docker container to be specified via ENV variable [#3520](https://github.com/gogits/gogs/issues/3520)
-- Add repository setting to ignore whitespace when check pull request conflict [#4834](https://github.com/gogits/gogs/issues/4834)
-
-#### Others
-
-- Add new language support: Slovak
-
-### 0.11.29 @ 2017-08-15
-
-#### Bug fixes
-
-- Private repository activity shown in "Public activity" tab, if the repository was once public [#4414](https://github.com/gogits/gogs/issues/4414)
-- Webhooks refuse IPv6 URLs as invalid [#4428](https://github.com/gogits/gogs/issues/4428)
-- No email notification if issue closed by commit [#4430](https://github.com/gogits/gogs/issues/4430)
-- Explore page incorrect paging [#4441](https://github.com/gogits/gogs/issues/4441)
-- `/api/v1/repos/search` returns empty values [#4522](https://github.com/gogits/gogs/issues/4522)
-- Panic after created a pull request [#4572](https://github.com/gogits/gogs/issues/4572)
-
-### 0.11.19 @ 2017-06-10
-
-#### Bug fixes
-
-- Unable to go get subpkg [#1878](https://github.com/gogits/gogs/issues/1878)
-- Does not set as admin after first LDAP login [#2855](https://github.com/gogits/gogs/issues/2855)
-- Panic when login via PAM [#4216](https://github.com/gogits/gogs/issues/4216)
-- Unique constraint violation after backup restored for PostgreSQL [#4357](https://github.com/gogits/gogs/issues/4357)
-- Images in IPython notebook are not displayed [#4366](https://github.com/gogits/gogs/issues/4366)
-- Broken relative path for image link in edit file preview [#4368](https://github.com/gogits/gogs/issues/4368)
-- Emoji not rendered on commits view [#4439](https://github.com/gogits/gogs/issues/4439)
-- High CPU when view single commit contains file mode change [#4475](https://github.com/gogits/gogs/issues/4475)
-- Cannot change permissions of collaborators [#4512](https://github.com/gogits/gogs/issues/4512)
-
-#### Features
-
-- Support two-factor authentication [#945](https://github.com/gogits/gogs/issues/945)
-- Support filter by group membership for LDAP [#4398](https://github.com/gogits/gogs/pull/4398)
-
-#### Improvements
-
-- Installation checks port for SMTP host [#2243](https://github.com/gogits/gogs/issues/2243)
-- Remain updated time unchanged if no new commits fetched for mirrors [#4341](https://github.com/gogits/gogs/issues/4341)
-- Support IPython notebook as README [#4367](https://github.com/gogits/gogs/issues/4367)
-- Configurable TLS Support [#4450](https://github.com/gogits/gogs/issues/4450)
-
-### 0.11.4 @ 2017-04-05
-
-#### Bug fixes
-
-- Client is not informed to provide credentials during HTTP/HTTPS push/pull
-- Mirror credentials are not URL encoded [#4014](https://github.com/gogits/gogs/issues/4014)
-- Create pull request buttons are showed on branches page when pull request is disabled [#4377](https://github.com/gogits/gogs/issues/4377)
-- Panic if user has vaildation error on installation [#4383](https://github.com/gogits/gogs/issues/4383)
-
-### 0.11 @ 2017-04-03
-
-#### Bug fixes
-
-- Profile editing looses changes on validation error [#1123](https://github.com/gogits/gogs/issues/1123)
-- Wrong repository count in organization dashboard [#4351](https://github.com/gogits/gogs/issues/4351)
-- Fail to migrate from version prior to 0.10 [#4355](https://github.com/gogits/gogs/issues/4355)
-- Private repository with public issues didn't handle anonymous visit properly [#4359](https://github.com/gogits/gogs/issues/4359)
-
-### 0.11 RC @ 2017-03-27
-
-#### Bug fixes
-
-- Incorrect file permission for session files [#3363](https://github.com/gogits/gogs/issues/3363)
-- API: Repository Permission object returns incorrect values [#4309](https://github.com/gogits/gogs/issues/4309)
-- Unable to update non-local user profile [#4313](https://github.com/gogits/gogs/issues/4313)
-- Redirect to random issue if index does not exist [#4315](https://github.com/gogits/gogs/issues/4315)
-- Unable to propose pull request from secondary fork [#4324](https://github.com/gogits/gogs/issues/4324)
-- Unable to update protect branch whitelist [#4333](https://github.com/gogits/gogs/issues/4333)
-- Repository size does not update for fork, migrate and mirror [#4336](https://github.com/gogits/gogs/issues/4336)
-
-#### Features
-
-- Support private repository with public issues [#649](https://github.com/gogits/gogs/issues/649)
-- Support private repository with public wiki [#2157](https://github.com/gogits/gogs/issues/2157)
-- Able to retrigger webhook history [#2187](https://github.com/gogits/gogs/issues/2187)
-- API: Add sync for mirror repository [#2235](https://github.com/gogits/gogs/issues/2235)
-- Able to load more feeds on dashboard [#2511](https://github.com/gogits/gogs/issues/2511)
-- Add config option to set a cookie value indicates login status [#2885](https://github.com/gogits/gogs/issues/2885)
-- Able to backup and restore [#2924](https://github.com/gogits/gogs/issues/2924)
-- Able to use issues and wiki for bare repository [#4104](https://github.com/gogits/gogs/issues/4104)
-- Custom page size for commits page [#4230](https://github.com/gogits/gogs/issues/4230)
-- Add repositories panel to user settings [#4277](https://github.com/gogits/gogs/issues/4277)
-
-#### Improvements
-
-- Include private but accessible repositories in explore page [#3088](https://github.com/gogits/gogs/issues/3088)
-- Able to choose console mode for logger [#3119](https://github.com/gogits/gogs/issues/3119)
-- Able to config logger for XORM [#3183](https://github.com/gogits/gogs/issues/3183)
-- Add config option for HTML render mode [#3608](https://github.com/gogits/gogs/issues/3608)
-- Webhook push event provice details about added/removed/modified files [#3897](https://github.com/gogits/gogs/issues/3897)
-- Able to config number of newsfeed showed on Dashboard [#4247](https://github.com/gogits/gogs/issues/4247)
-
-**Older change logs can be found on [GitHub](https://github.com/gogits/gogs/releases?after=v0.11rc).**
diff --git a/en-US/intro/faqs.md b/en-US/intro/faqs.md
index 5aa924ab..f8cbd4eb 100644
--- a/en-US/intro/faqs.md
+++ b/en-US/intro/faqs.md
@@ -45,7 +45,7 @@ server {
 }
 ```
 
-Then set `[server] ROOT_URL = http://git.crystalnetwork.us/gogs/` in your configuration.
+Then set `[server] EXTERNAL_URL = http://git.crystalnetwork.us/gogs/` in your configuration.
 
 ##### Why am I getting errors when uploading large files?
 
@@ -62,7 +62,7 @@ Don't forget to enable apache mods: proxy, proxy_http
 `custom/conf/app.ini`:
 ```
 [server]
-ROOT_URL = http://git.domain.tld/
+EXTERNAL_URL = http://git.domain.tld/
 ...
 ```
 `/etc/apache2/vhost.d/<yourconfig>.conf`:
@@ -71,8 +71,8 @@ ROOT_URL = http://git.domain.tld/
     ...
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / http://127.0.0.1:3000/
-    ProxyPassReverse / http://127.0.0.1:3000/
+    ProxyPass / http://127.0.0.1:3000
+    ProxyPassReverse / http://127.0.0.1:3000
 </VirtualHost>
 ```
 
@@ -83,7 +83,7 @@ Use the following configuration templates:
 `custom/conf/app.ini`:
 ```
 [server]
-ROOT_URL = http://domain.tld/git
+EXTERNAL_URL = http://domain.tld/git
 ...
 ```
 `/etc/apache2/vhost.d/<yourconfig>.conf`:
@@ -102,21 +102,26 @@ ROOT_URL = http://domain.tld/git
 
 It's important to omit a trailing slash after the port number.
 
-##### How do I set up a sub-URL with lighttpd?
+#### How do I use lighttpd with Reverse Proxy?
 
-Use the following configuration template:
+```
+server.modules  += ( "mod_proxy" )
+$HTTP["host"] == "git.example.com" {
+    proxy.server = ( "" => ( ( "host" => "127.0.0.1", "port" => "3000" ) ) )
+}
+```
+
+##### How do I set up a sub-URL with lighttpd?
 
 ```
-server.modules  += ( "mod_proxy_backend_http" )
-$HTTP["url"] =~ "^/gogs" {
-    proxy-core.protocol = "http"
-    proxy-core.backends = ( "localhost:3000" )
-    proxy-core.rewrite-request = (
-      "_uri" => ( "^/gogs/?(.*)" => "/$1" ),
-      "Host" => ( ".*" => "localhost:3000" ),
-    )
+# requires lighttpd 1.4.46 or later
+server.modules  += ( "mod_proxy" )
+$HTTP["url"] =~ "^/gogs/" {
+    proxy.server = ( "" => ( ( "host" => "localhost", "port" => "3000" ) ) )
+    proxy.header = ( "map-urlpath" => ( "/gogs/" => "/" ) )
 }
 ```
+
 #### How do I use Caddy with Reverse Proxy?
 
 Add the following server block to your Caddyfile and reload the configuration:
@@ -138,6 +143,54 @@ git.example.com {
 }
 ```
 
+#### How do I use IIS with Reverse Proxy?
+
+Create a new website in IIS, and use the following `web.config` file:
+
+- Modifiy `git.crystalnetwork.us` to your actual domain name
+- If you don't use or need HTTPS to be handled by IIS, remove the entire `<rule name="RedirectToHttps" ...>` section
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <system.webServer>
+        <rewrite>
+            <rules>
+                <rule name="RedirectToHttps" stopProcessing="true">
+                    <match url=".*" />
+                    <conditions>
+                        <add input="{HTTPS}" pattern="off" ignoreCase="true" />
+                    </conditions>
+                    <action type="Redirect" url="https://{HTTP_HOST}{REQUEST_URI}" redirectType="Permanent" appendQueryString="false" />
+                </rule>
+                <rule name="ReverseProxyInboundRule" stopProcessing="true">
+                    <match url="(.*)" />
+                    <action type="Rewrite" url="http://localhost:3000/{R:1}" />
+                </rule>
+            </rules>
+            <outboundRules>
+                <rule name="ReverseProxyOutboundRule" preCondition="ResponseIsHtml">
+                    <match filterByTags="A, Form, Img" pattern="^http(s)?://localhost:3000/(.*)" />
+                    <action type="Rewrite" value="http{R:1}://git.crystalnetwork.us/{R:2}" />
+                </rule>
+                <preConditions>
+                    <preCondition name="ResponseIsHtml">
+                        <add input="{RESPONSE_CONTENT_TYPE}" pattern="^text/html" />
+                    </preCondition>
+                </preConditions>
+            </outboundRules>
+        </rewrite>
+    </system.webServer>
+</configuration>
+```
+
+Then, change the following configuration options in `custom/conf/app.ini`:
+
+```
+[server]
+EXTERNAL_URL = https://git.example.com/
+```
+
 #### How do I set up HTTPS?
 
 Change the following configuration options in `custom/conf/app.ini` in the section that looks like this sample:
@@ -145,7 +198,7 @@ Change the following configuration options in `custom/conf/app.ini` in the secti
 ```
 [server]
 PROTOCOL = https
-ROOT_URL = https://try.gogs.io/
+EXTERNAL_URL = https://try.gogs.io/
 CERT_FILE = custom/https/unified.cert
 KEY_FILE = custom/https/decryped-private.key
 ```
@@ -168,13 +221,14 @@ Create a file called `robots.txt` in the `custom` directory.
 
 Gogs has some third-party scripts that support running it as a daemon:
 
-- [init.d/centos](https://github.com/gogits/gogs/blob/master/scripts/init/centos/gogs)
-- [init.d/debian](https://github.com/gogits/gogs/blob/master/scripts/init/debian/gogs)
+- [init.d/centos](https://github.com/gogs/gogs/blob/main/scripts/init/centos/gogs)
+- [init.d/debian](https://github.com/gogs/gogs/blob/main/scripts/init/debian/gogs)
+- [openrc/gentoo](https://gogs.io/docs/installation/configuration_and_run#running-as-daemon-via-init-(eg.-openrc))
 - Systemd in the following section.
 
 #### How do I run Gogs at startup with Systemd?
 
-There's a [systemd service template file](https://github.com/gogits/gogs/blob/master/scripts/systemd/gogs.service) in the Gogs GitHub repository and in the installed files at `./scripts/systemd/gogs.service`. You will likely need to modify it for your installation:
+There's a [systemd service template file](https://github.com/gogs/gogs/blob/main/scripts/systemd/gogs.service) in the Gogs GitHub repository and in the installed files at `./scripts/systemd/gogs.service`. You will likely need to modify it for your installation:
 
 1. Update `User`, `Group`, `WorkingDirectory`, `ExecStart`, and
    `Environment` with values appropriate to your Gogs installation.
@@ -190,6 +244,38 @@ You can check the status of the Gogs service with `sudo systemctl status gogs -l
 
 The first registered user with `ID = 1` is an administrator. No e-mail confirmation is required for this (if enabled). The default administrator can log into `Admin` > `Users` and authorize another user. A user will also be an administrator if they register in the install page.
 
+#### Is there a simple way to reset forgotten administrator password?
+
+It's assumed that you're real server admin and you have shell access (local or remote) to your server with appropriate priviledges.
+In such a case, you can do the following steps:
+
+- In shell
+  - log in to the shell of your server
+  - stop gogs
+  - create new temporary user with administrator rights from command line (see below)
+  - start gogs
+- In web browser
+  - log in as new user (using web browser)
+  - set new password to your old administrator account by clicking `Edit` in the `Admin Panel` > `Users`
+  - log out
+  - log in as old administration (with new password)
+  - delete temporary user in the `Admin Panel` > `Users`
+
+Just for example, let's assume that `gogs` is run as user `git` and is installed to `/home/git/gogs` directory.
+
+To create new temporary user from command line you should execute something like that:
+
+```
+$ su git
+$ cd /home/git/gogs
+$ ./gogs admin create-user --name tmpuser --password tmppassword --admin --email email@example.com
+```
+
+Those commands create new admin user `tmpuser` with `tmppassword` password. 
+
+*Remark: I don't really know, is it necessary to keep gogs stopped while creating new user or not. 
+I suppose that it's safer to stop gogs before doing that.*
+
 ### Repository Management
 
 #### How do I give Git Hooks permission to users?
@@ -205,3 +291,10 @@ The current version of Gogs is written in plain text in the file `templates/.VER
 #### Why Gogs isn't collaborating on its own?
 
 When was your last pull request to Gogs?
+
+
+### Wiki
+
+#### Why can't I create a Wiki page for my new repo?
+
+Is your new repo a mirror? Mirrored repos can't have their own Wiki. If you don't see a green button marked "Create the first page" on the "Welcome to Wiki!" page, check that you didn't create your repo as a mirror. If that's what you intended, you'll have to edit the Wiki on the upstream of your mirror. Otherwise, convert your repo to a regular repository under Settings (down in the Danger Zone section).
diff --git a/en-US/intro/troubleshooting.md b/en-US/intro/troubleshooting.md
index 6ed6fe21..5fe0d87f 100644
--- a/en-US/intro/troubleshooting.md
+++ b/en-US/intro/troubleshooting.md
@@ -6,7 +6,7 @@ name: Troubleshooting
 
 ## Installation
 
-- Error: `../gosrc/src/github.com/gogits/gogs/cmd/cert.go:79: undefined: elliptic.P224`
+- Error: `../gosrc/src/github.com/gogs/gogs/cmd/cert.go:79: undefined: elliptic.P224`
 - Causes: golang package in RHEL/CentOS does not support Elliptic Curve cryptography (because it's patented) and it's specifically removed from CentOS/RHEL.
 - Solution: download and install Go from [golang.org/dl](http://golang.org/dl).
 
@@ -58,7 +58,7 @@ This happens more often when you store repositories on a mounted device.
 - Error: `cache: unknown adaptername "memcache" (forgotten import?)`
 - Causes: To prevent unnecessary import of package, we use build tags to specify when needed
 - Solution:
-	- Download: `go get -tags memcache github.com/gogits/gogs`
+	- Download: `go get -tags memcache github.com/gogs/gogs`
 	- Build: `go build -tags memcache`
 	- Same steps for `redis` when you want it to be the cache adapter.
 
@@ -81,7 +81,7 @@ After that, go to [http://localhost:3000/install](http://localhost:3000/install)
 
 - Error: `Database setting is not correct: This server only supports the insecure old password authentication. If you still want to use it, please add 'allowOldPasswords=1' to your DSN. See also https://github.com/go-sql-driver/mysql/wiki/old_passwords`
 - Causes: only updated the password for @localhost -- there was a second entry in the user table where @% still had the old password.
-- Solution: [GitHub comments](https://github.com/gogits/gogs/issues/385#issuecomment-54357073)
+- Solution: [GitHub comments](https://github.com/gogs/gogs/issues/385#issuecomment-54357073)
 
 #### Connect to wrong SQLite3 database
 
@@ -91,6 +91,8 @@ After that, go to [http://localhost:3000/install](http://localhost:3000/install)
 
 ## Mailer
 
+#### Gmail issues
+
 - Error: Gmail with Error 534: `Please log in via your web browser and then try again`
 - Causes: this is because Google does not trust your server
 - Solution:
@@ -99,6 +101,12 @@ After that, go to [http://localhost:3000/install](http://localhost:3000/install)
 	- Now copy the link looks like this(prompt in Gogs server log): https://accounts.google.com/ContinueSignIn?sarp=1&scc=1&plt=AKgnsbvPPN_E_25__nyS*******f18O9uuLNtz0Imw and log in again.
 	- Things should work now. Last but not the least, check your `spam` box in case your mail service provider thinks your gmail is a spammer.
 
+#### Authentication failed
+
+- Error: `gomail: could not send email 1: Auth: 535`
+- Causes: the password contains special characters
+- Solution: put the password into single quotes: `PASSWD = 'P4§$w0rd'`
+
 ## Windows
 
 - Error:
diff --git a/en-US/upgrade/upgrade_from_binary.md b/en-US/upgrade/upgrade_from_binary.md
index eacb4fc6..e53c5674 100644
--- a/en-US/upgrade/upgrade_from_binary.md
+++ b/en-US/upgrade/upgrade_from_binary.md
@@ -30,10 +30,10 @@ Download and unzip the new binary:
 
 ```bash
 # Check for the latest release to download based on the OS and ARCH you are running
-$ wget https://dl.gogs.io/$VERSION/$OS_$ARCH.tar.gz
-$ tar -zxvf $OS_$ARCH.tar.gz
+$ wget https://dl.gogs.io/$VERSION/gogs_${VERSION}_${OS}_${ARCH}.tar.gz
+$ tar -zxvf gogs_${VERSION}_${OS}_${ARCH}.tar.gz
 $ ls
-gogs gogs_old  gogs-repositories $OS_$ARCH.tar.gz
+gogs gogs_old  gogs-repositories gogs_${VERSION}_${OS}_${ARCH}.tar.gz
 ```
 
 Copy `custom`, `data`, and `log` directories to the unzipped directory:
diff --git a/en-US/upgrade/upgrade_from_source.md b/en-US/upgrade/upgrade_from_source.md
index f72c2a4a..29b4a918 100644
--- a/en-US/upgrade/upgrade_from_source.md
+++ b/en-US/upgrade/upgrade_from_source.md
@@ -4,26 +4,14 @@ name: From source
 
 # Upgrade from source
 
-The general way to upgrade Gogs:
+Change working directory to local copy of the repository:
 
 ```bash
-# Upgrade source and install dependencies
-$ go get -u github.com/gogits/gogs
-
-$ cd $GOPATH/src/github.com/gogits/gogs
-
-# Remove old build
-$ rm gogs
-
-# or move old build
-$ mv gogs gogs-$(./gogs -v | awk '{print $3}')
-
-# And rebuild Gogs
-$ go build
+$ git pull
+$ go build -o gogs
 ```
 
 Other operations:
 
-- [Build from `develop` branch](/docs/installation/install_from_source#build-from-develop-branch)
 - [Test Installation](/docs/installation/install_from_source#test-installation)
 - [Build with Tags](/docs/installation/install_from_source#build-with-tags)
diff --git a/fr-FR/advanced/configuration_cheat_sheet.md b/fr-FR/advanced/configuration_cheat_sheet.md
index 9ba69175..76114acf 100644
--- a/fr-FR/advanced/configuration_cheat_sheet.md
+++ b/fr-FR/advanced/configuration_cheat_sheet.md
@@ -9,7 +9,7 @@ Ceci est un aide-mémoire relatif au fichier de configuration de Gogs, il vous a
 
 Avant de commencer, sachez que tout changement de configuration doit être fait dans `custom/conf/app.ini` ou n'importe quel fichier similaire.
 
-Tous les **paramètres par défaut** peuvent être trouvés dans [app.ini](https://github.com/gogits/gogs/blob/master/conf/app.ini). Si vous voyez quelque chose comme `%(X)s`, c'est une fonctionnalité qui est au format [ini](https://github.com/go-ini/ini/tree/v1#recursive-values) pour la lecture recursive de la valeur.
+Tous les **paramètres par défaut** peuvent être trouvés dans [app.ini](https://github.com/gogs/gogs/blob/master/conf/app.ini). Si vous voyez quelque chose comme `%(X)s`, c'est une fonctionnalité qui est au format [ini](https://github.com/go-ini/ini/tree/v1#recursive-values) pour la lecture recursive de la valeur.
 
 ## Global (`DEFAULT`)
 
@@ -81,7 +81,7 @@ Nom |Description
 `REQUIRE_SIGNIN_VIEW`|Activez cette option pour forcer les utilisateurs à se connecter pour visualiser une page spécifique.
 `ENABLE_CACHE_AVATAR`|Activez cette option pour mettre en cache l'avatar à partir Gravatar.
 `ENABLE_NOTIFY_MAIL`|Activez cette option pour envoyer des e-mail aux observateurs de dépôt lors d'évènements comme ticket/problème, exige d'activer `Mailer`.
-`ENABLE_REVERSE_PROXY_AUTHENTICATION`|Activez cette option pour permettre l'authentification avec reverse proxy, plus de détail sur [Github](https://github.com/gogits/gogs/issues/165)
+`ENABLE_REVERSE_PROXY_AUTHENTICATION`|Activez cette option pour permettre l'authentification avec reverse proxy, plus de détail sur [Github](https://github.com/gogs/gogs/issues/165)
 `ENABLE_REVERSE_PROXY_AUTO_REGISTRATION`|Activez cette option pour permettre l'auto-inscription dans le cas de l'authentification avec reverse-proxy.
 `DISABLE_MINIMUM_KEY_SIZE_CHECK`|Ne pas vérifier la taille de clé minimale pour le type correspondant.
 `ENABLE_GIT_HOOKS`|Activez cette option pour permettre l'exécution des git hooks, commandes qui sont situé dans `ROOT/[user name]/[repo name].git/hooks`
diff --git a/fr-FR/advanced/configuration_for_source_builds.md b/fr-FR/advanced/configuration_for_source_builds.md
index 854730c4..62cc3467 100644
--- a/fr-FR/advanced/configuration_for_source_builds.md
+++ b/fr-FR/advanced/configuration_for_source_builds.md
@@ -15,7 +15,7 @@ Pour le reste de ce document, nous posons les hypothèses suivantes :
 - `postgresql` est votre serveur de base de données
 - et vous voulez que votre dépôt ressemblent à URL git `git.example.com`
 
-Comme indiqué dans [Configuration and run](/docs/installation/configuration_and_run), vous devez créer votre propre fichier de configuration dans `$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini`
+Comme indiqué dans [Configuration and run](/docs/installation/configuration_and_run), vous devez créer votre propre fichier de configuration dans `$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini`
 
 Ensuite suivez les commandes suivantes :
 
@@ -24,25 +24,25 @@ sudo mkdir -p /var/log/gogs
 sudo chown git:git /var/log/gogs
 sudo su - git
 cd ~
-mkdir -p $GOPATH/src/github.com/gogits/gogs/custom/conf
+mkdir -p $GOPATH/src/github.com/gogs/gogs/custom/conf
 mkdir -p ~/gogs-repositories
 ```
 
 Maintenant, copiez le fichier de configuration de base afin que nous puissions le modifier :
 
 ```bash
-cd $GOPATH/src/github.com/gogits/gogs
+cd $GOPATH/src/github.com/gogs/gogs
 cp conf/app.ini custom/conf/
 ```
 
 En utilisant votre éditeur préféré, ouvrez le fichier de configuration :
 
-`$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini`
+`$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini`
 
 par exemple :
 
 ```bash
-vi $GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini
+vi $GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini
 ```
 
 ## Configurer un serveur
@@ -109,7 +109,7 @@ sudo -u git -H psql -d gogs_production
 gogs_production> \q
 ```
 
-Maintenant, nous pouvons mettre à jour `app.ini`, ouvrez à nouveau `$GOPATH/src/github.com/gogits/gogs/custom/conf/app.ini` dans votre éditeur et changez ce qui suit (assurez-vous que vous êtes l'utilisateur `git`, sinon faites `sudo su - git`):
+Maintenant, nous pouvons mettre à jour `app.ini`, ouvrez à nouveau `$GOPATH/src/github.com/gogs/gogs/custom/conf/app.ini` dans votre éditeur et changez ce qui suit (assurez-vous que vous êtes l'utilisateur `git`, sinon faites `sudo su - git`):
 
 ### Section `[database]`
 
@@ -159,7 +159,7 @@ sudo service nginx restart
 
 ```bash
 sudo su - git
-cd $GOPATH/src/github.com/gogits/gogs
+cd $GOPATH/src/github.com/gogs/gogs
 ./gogs web
 ```
 
diff --git a/fr-FR/advanced/hacking_on_gogs.md b/fr-FR/advanced/hacking_on_gogs.md
index a5cc6d6e..30738c07 100644
--- a/fr-FR/advanced/hacking_on_gogs.md
+++ b/fr-FR/advanced/hacking_on_gogs.md
@@ -6,17 +6,17 @@ sort: 3
 # Hacker Gogs/Contribuer 
 
 Si vous voulez contribuer à Gogs vous devriez forker le projet et travailler sur la branche `develop`.
-Il y a un problème avec Go cependant, l'arborescence inclue l'URL Github officielle du projet. Vous devez alors faire passer votre fork pour le dépôt officiel.
+Il y a un problème avec Go cependant, l’arborescence inclut l’URL Github officielle du projet. Vous devez alors faire passer votre fork pour le dépôt officiel.
 
 Commencez par télécharger le code source comme vous le feriez normalement :
 
-    $ go get github.com/gogits/gogs
+    $ go get github.com/gogs/gogs
 
-Faites un fork du projet sur Github et puis aller à la source du répertoire de Gogs :
+Faites un fork du projet sur Github et puis allez à la source du répertoire de Gogs :
 
-    $ cd $GOPATH/src/github.com/gogits
+    $ cd $GOPATH/src/github.com/gogs
 
-Suprimmer le dépôt Gogs et cloner votre fork à sa place :
+Supprimez le dépôt Gogs et clonez votre fork à sa place :
 
     $ rm -rf gogs
     $ git clone git@github.com:<USERNAME>/gogs.git gogs
@@ -27,4 +27,4 @@ Allez dans le répertoire de Gogs, faites un checkout de la branche `develop` et
     $ git checkout develop
     $ go get
 
-C'est tout! Vous êtes prêt à travailler sur Gogs. Testez vos modifications, envoyez-les sur votre dépôt et ouvrez un "pull-request" sur Github.
+C’est tout ! Vous êtes prêt à travailler sur Gogs. Testez vos modifications, envoyez-les sur votre dépôt et ouvrez un « pull-request » sur Github.
diff --git a/fr-FR/features/custom_template.md b/fr-FR/features/custom_template.md
index a707208c..c71eddbd 100644
--- a/fr-FR/features/custom_template.md
+++ b/fr-FR/features/custom_template.md
@@ -4,13 +4,13 @@ name: Modèle personnalisé
 
 # Modèle personnalisé
 
-Il est possible d'inclure votre propre contenu header or footer dans Gogs sans toucher au code source original. Ceci est utile pour ajouter du code "analytics" ou pour inclure du contenu statique personnalisé.
+Il est possible d'inclure votre propre contenu header ou footer dans Gogs sans toucher au code source original. Ceci est utile pour ajouter du code "analytics" ou pour inclure du contenu statique personnalisé.
 
 Pour en savoir plus consultez : [inject custom head and footer](https://discuss.gogs.io/t/how-to-inject-custom-head-and-footer/943).
 
 ## Inclure un fichier CSS personnalisé
 
-Voici un example pour inclure un fichier CSS personnalisé dans votre instance Gogs. Les noms et répertoires sont arbitraires, ils peuvent être modifiés à votre guise, l'unique restriction étant qu'ils soient accesible par une requête.
+Voici un exemple pour inclure un fichier CSS personnalisé dans votre instance Gogs. Les noms et répertoires sont arbitraires, ils peuvent être modifiés à votre guise, l'unique restriction étant qu'ils soient accesibles par une requête.
 
 1. Créez un fichier nommé `custom.css` dans le répertoire `public/css`.
 2. Placez des règles CSS dans ce fichier.
diff --git a/fr-FR/installation/README.md b/fr-FR/installation/README.md
index 475b1f04..22330ae9 100644
--- a/fr-FR/installation/README.md
+++ b/fr-FR/installation/README.md
@@ -5,9 +5,8 @@ name: Installation
 ## Prérequis
 
 - Base de données (choisissez en une dans cette liste) :
-    - [MySQL](http://dev.mysql.com) : Version >= 5.5.3
+    - [MySQL](http://dev.mysql.com) : Version >= 5.7
     - [PostgreSQL](http://www.postgresql.org/)
-    - [MSSQL](https://fr.wikipedia.org/wiki/Microsoft_SQL_Server)
     - [TiDB](https://github.com/pingcap/tidb) (expérimental, utilisez le protocole MySQL pour vous connecter)
     - ou **RIEN** avec SQLite3
 - [Git](http://git-scm.com/) (bash) :
diff --git a/fr-FR/installation/configuration_and_run.md b/fr-FR/installation/configuration_and_run.md
index b13b604b..33c24d35 100644
--- a/fr-FR/installation/configuration_and_run.md
+++ b/fr-FR/installation/configuration_and_run.md
@@ -11,7 +11,7 @@ sort: 7
 
 La configuration par défaut est enregistrée dans `conf/app.ini`, vous **n'avez pas** besoin de modifier la totalité. depuis `v0.6.0`, ce fichier est incorporé au binaire.
 
-### Configuration personnalisé
+### Configuration personnalisée
 
 Comment personnaliser la configuration si vous n'êtes pas autorisé à modifier `conf/app.ini` ? Et bien, créez `custom/conf/app.ini` ! Remplacez ensuite les clefs correspondantes dans `custom/conf/app.ini`.
 
@@ -26,14 +26,14 @@ Vous pouvez également changer le mot de passe de la base de données comme ceci
 
 ```
 [database]
-PASSWD = root
+PASSWORD = root
 ```
 
 ### Pourquoi faisons-nous ça ?
 
 Oui, pourquoi ne pas simplement éditer `conf/app.ini` ? C'est pour vous permettre de garder votre configuration personnalisée en sécurité :
 
-- Pour les personnes qui installent le binaire, chaque fois que vous arrêter le programme, vous pouvez tout simplement copier et coller le fichier de configuration sans rien à re-configurer.
+- Pour les personnes qui installent le binaire, chaque fois que vous arrêtez le programme, vous pouvez tout simplement copier et coller le fichier de configuration sans rien à re-configurer.
 - Pour les personnes qui installent depuis les sources, nous avons exclu le `custom/conf/app.ini` dans `.gitignore`, ainsi les modifications de ce fichier ne sont pas prises en compte lors de la mise à jour.
 
 ## Exécuter le serveur Gogs
@@ -54,4 +54,4 @@ Oui, pourquoi ne pas simplement éditer `conf/app.ini` ? C'est pour vous permett
 		- Start: `./scripts/gogs_supervisord.sh start`
 		- Stop: `./scripts/gogs_supervisord.sh stop`
 		- Restart: `./scripts/gogs_supervisord.sh restart`
-- Ouvrez l'URL `/install` pour faire votre créer votre configuration la première fois.
+- Ouvrez l'URL `/install` pour créer votre configuration la première fois.
diff --git a/fr-FR/installation/install_from_packages.md b/fr-FR/installation/install_from_packages.md
index f3bc4693..f1a6a703 100644
--- a/fr-FR/installation/install_from_packages.md
+++ b/fr-FR/installation/install_from_packages.md
@@ -17,10 +17,9 @@ Des informations pour l'installation et la configuration sur Arch Linux peuvent
 
 ### Ubuntu/Debian
 
-- Actuellement disponible pour  Ubuntu 14.04/12.04 et Debian 7.
-- Paquets actuellement disponibles sur [packager.io](https://packager.io/gh/pkgr/gogs).
+- Actuellement disponible pour Ubuntu 14.04/16.04/18.04, Debian 8/9/10, et CentOS 6/7.
+- Paquets actuellement disponibles sur [packager.io](https://packager.io/gh/gogs/gogs).
 - Démo disponible en vidéo [YouTube](http://www.youtube.com/watch?v=xllP7BP_qgs&feature=youtu.be).
-- Construits par [@crohr](https://github.com/crohr)(Cyril Rohr).
 
 ### Synology spk
 
diff --git a/fr-FR/installation/install_from_source.md b/fr-FR/installation/install_from_source.md
index 02165d7a..5e130fef 100644
--- a/fr-FR/installation/install_from_source.md
+++ b/fr-FR/installation/install_from_source.md
@@ -8,7 +8,7 @@ name: A partir des sources
 
 ### Global
 
-- [Go Programming Language](http://golang.org): Version >= 1.6
+- [Go Programming Language](http://golang.org): Version >= 1.21
 
 Nous allons créer un nouvel utilisateur appelé `git` et installer / configurer tout sous cet utilisateur:
 
@@ -16,10 +16,6 @@ Nous allons créer un nouvel utilisateur appelé `git` et installer / configurer
 $ sudo adduser --disabled-login --gecos 'Gogs' git
 ```
 
-### Paquets tiers
-
-Si vous êtes intéressé par les paquets tiers que nous utilisons, vous pouvez les consulter ici : [gopmfile](https://github.com/gogits/gogs/blob/master/.gopmfile). Vous pouvez en avoir besoin quand vous construisez un paquet pour Gogs.
-
 ## Installation de Go
 
 Si la distribution de Go incluse dans votre système correspond aux exigences, veuillez ignorer cette section.
@@ -58,10 +54,10 @@ La façon générale d'installer Gogs :
 
 ```sh
 # Télécharger et installer les dépendances
-$ go get -u github.com/gogits/gogs
+$ go get -u github.com/gogs/gogs
 
 # Compiler le programme principal
-$ cd $GOPATH/src/github.com/gogits/gogs
+$ cd $GOPATH/src/github.com/gogs/gogs
 $ go build
 ```
 
@@ -70,11 +66,11 @@ $ go build
 Dans le cas où vous voulez essayer la branche `develop` :
 
 ```sh
-$ mkdir -p $GOPATH/src/github.com/gogits
-$ cd $GOPATH/src/github.com/gogits
+$ mkdir -p $GOPATH/src/github.com/gogs
+$ cd $GOPATH/src/github.com/gogs
 
-# Assurez vous de ne pas utiliser "https://github.com/gogits/gogs.git"
-$ git clone --depth=1 -b develop https://github.com/gogits/gogs
+# Assurez vous de ne pas utiliser "https://github.com/gogs/gogs.git"
+$ git clone --depth=1 -b develop https://github.com/gogs/gogs
 $ cd gogs
 $ go build
 ```
@@ -84,7 +80,7 @@ $ go build
 Pour vous assurer que Gogs fonctionne correctement :
 
 ```sh
-$ cd $GOPATH/src/github.com/gogits/gogs
+$ cd $GOPATH/src/github.com/gogs/gogs
 $ ./gogs web
 ```
 
@@ -96,17 +92,16 @@ Gogs ne fournit pas par défaut certains supports, vous devez compiler Gogs avec
 
 Liste des tags disponibles :
 
-- `sqlite3`: Support de la base de données SQLite3
 - `pam`: Support de l'authentification PAM
 - `cert`: Support de la génération des certificats auto-signés
-- `miniwinsvc`: Support des services pour Windows (Vous pouvez aussi utiliser NSSM pour créer un service)
+- `minwinsvc`: Support des services pour Windows (Vous pouvez aussi utiliser NSSM pour créer un service)
 
-Par exemple, si vous voulez activer tous les tags de la liste, vous devez commencer par supprimer le repertoire `$GOPATH/pkg/${GOOS}_${GOARCH}/github.com/gogits/gogs` et exécuter les commandes suivantes :
+Par exemple, si vous voulez activer tous les tags de la liste, vous devez commencer par supprimer le repertoire `$GOPATH/pkg/${GOOS}_${GOARCH}/github.com/gogs/gogs` et exécuter les commandes suivantes :
 
 ```sh
-$ go get -u -tags "sqlite pam cert" github.com/gogits/gogs
-$ cd $GOPATH/src/github.com/gogits/gogs
-$ go build -tags "sqlite pam cert"
+$ go get -u -tags "pam cert" github.com/gogs/gogs
+$ cd $GOPATH/src/github.com/gogs/gogs
+$ go build -tags "pam cert"
 ```
 
 Si vous avez l'erreur: `fatal error: security/pam_appl.h: No such file or directory`, installez les paquets en exécutant cette commande : `sudo apt-get install libpam0g-dev`.
diff --git a/fr-FR/intro/README.md b/fr-FR/intro/README.md
index 6e59fac5..03b10a9f 100644
--- a/fr-FR/intro/README.md
+++ b/fr-FR/intro/README.md
@@ -15,8 +15,8 @@ Avec Go, cela peut être fait avec une distribution binaire indépendante à tra
 
 ## Ressources utilisées
 
-- Web Framework : [Macaron](https://github.com/Unknwon/macaron)
-- UI Framework : [Semantic UI](http://semantic-ui.com/) + [GitHub Octicons](https://octicons.github.com/) + [Font Awesome](http://fontawesome.io/)
-- ORM : [Xorm](https://github.com/go-xorm/xorm)
+- Web Framework : [Macaron](https://github.com/go-macaron/macaron)
+- UI Framework : [Semantic UI](https://semantic-ui.com/) + [GitHub Octicons](https://octicons.github.com/) + [Font Awesome](https://fontawesome.com/)
+- ORM : [Xorm](https://gitea.com/xorm/xorm)
 - Database Driver : [github.com/go-sql-driver/mysql](https://github.com/go-sql-driver/mysql) + [github.com/lib/pq](https://github.com/lib/pq) + [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3)
 
diff --git a/fr-FR/intro/faqs.md b/fr-FR/intro/faqs.md
index fd087862..b3c1cc40 100644
--- a/fr-FR/intro/faqs.md
+++ b/fr-FR/intro/faqs.md
@@ -45,7 +45,7 @@ server {
 }
 ```
 
-Ensuite, configurez `[server] ROOT_URL = http://git.crystalnetwork.us/gogs/`.
+Ensuite, configurez `[server] EXTERNAL_URL = http://git.crystalnetwork.us/gogs/`.
 
 ##### Pourquoi y-t-il des erreurs lorsque j'upload de gros fichiers ?
 
@@ -62,7 +62,7 @@ Ne pas oublier d'activer les modules : proxy et proxy_http.
 `custom/conf/app.ini`:
 ```
 [server]
-ROOT_URL = http://git.domain.tld/
+EXTERNAL_URL = http://git.domain.tld/
 ...
 ```
 `/etc/apache2/vhost.d/<yourconfig>.conf`:
@@ -71,8 +71,8 @@ ROOT_URL = http://git.domain.tld/
     ...
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / http://127.0.0.1:3000/
-    ProxyPassReverse / http://127.0.0.1:3000/
+    ProxyPass / http://127.0.0.1:3000
+    ProxyPassReverse / http://127.0.0.1:3000
 </VirtualHost>
 ```
 
@@ -83,7 +83,7 @@ Essayez de suivre le modèle de configuration :
 `custom/conf/app.ini`:
 ```
 [server]
-ROOT_URL = http://domain.tld/git
+EXTERNAL_URL = http://domain.tld/git
 ```
 `etc/apache2/vhost.d/<yourconfig>.conf`:
 ```
@@ -101,19 +101,23 @@ ROOT_URL = http://domain.tld/git
 
 Il est important de ne pas ajouter de / de fin après le port.
 
-##### Comment configurer une sous-URL avec lighttpd?
+##### Comment configurer lighttpd en tant que reverse proxy ?
+
+```
+server.modules  += ( "mod_proxy" )
+$HTTP["host"] == "git.example.com" {
+    proxy.server = ( "" => ( ( "host" => "127.0.0.1", "port" => "3000" ) ) )
+}
+```
 
-Utiliser le modèle de configuration suivant :
+##### Comment configurer une sous-URL avec lighttpd?
 
 ```
-server.modules  += ( "mod_proxy_backend_http" )
-$HTTP["url"] =~ "^/gogs" {
-    proxy-core.protocol = "http"
-    proxy-core.backends = ( "localhost:3000" )
-    proxy-core.rewrite-request = (
-      "_uri" => ( "^/gogs/?(.*)" => "/$1" ),
-      "Host" => ( ".*" => "localhost:3000" ),
-    )
+# requires lighttpd 1.4.46 or later
+server.modules  += ( "mod_proxy" )
+$HTTP["url"] =~ "^/gogs/" {
+    proxy.server = ( "" => ( ( "host" => "localhost", "port" => "3000" ) ) )
+    proxy.header = ( "map-urlpath" => ( "/gogs/" => "/" ) )
 }
 ```
 
@@ -145,7 +149,7 @@ Modifier les options de configuration suivantes dans le fichier `custom/conf/app
 ```
 [server]
 PROTOCOL = https
-ROOT_URL = https://try.gogs.io/
+EXTERNAL_URL = https://try.gogs.io/
 CERT_FILE = custom/https/unified.cert
 KEY_FILE = custom/https/decryped-private.key
 ```
@@ -168,13 +172,13 @@ Créer un fichier `robots.txt` dans le dossier `custom`.
 
 Gogs fourni quelques scripts tiers pour supporter l'exécution en tant que démon :
 
-- [init.d/centos](https://github.com/gogits/gogs/blob/master/scripts/init/centos/gogs)
-- [init.d/debian](https://github.com/gogits/gogs/blob/master/scripts/init/debian/gogs)
+- [init.d/centos](https://github.com/gogs/gogs/blob/main/scripts/init/centos/gogs)
+- [init.d/debian](https://github.com/gogs/gogs/blob/main/scripts/init/debian/gogs)
 - Systemd dans la section suivante.
 
 #### Lancer Gogs au démarrage avec systemd 
 
-Dans le dépôt de Gogs sur GitHub est présent un [modèle de service systemd](https://github.com/gogits/gogs/blob/master/scripts/systemd/gogs.service). Il a besoin d'être adapté à votre installation.
+Dans le dépôt de Gogs sur GitHub est présent un [modèle de service systemd](https://github.com/gogs/gogs/blob/main/scripts/systemd/gogs.service). Il a besoin d'être adapté à votre installation.
 
 1. Mettre à jour `User`, `Group`, `WorkingDirectory`, `ExecStart`, et `Environment` pour correspondre à votre installation.
 2. (Optionnel) Si vous utilisez Gogs avec `MySQL/MariaDB`, `PostgreSQL`, `Redis`, or `memcached`, décommentez les lignes `After` concernées.
diff --git a/fr-FR/intro/troubleshooting.md b/fr-FR/intro/troubleshooting.md
index 699a236c..9e8e3ded 100644
--- a/fr-FR/intro/troubleshooting.md
+++ b/fr-FR/intro/troubleshooting.md
@@ -7,51 +7,51 @@ sort: 2
 
 ## Installation
 
-- Erreur : `../gosrc/src/github.com/gogits/gogs/cmd/cert.go:79: undefined: elliptic.P224`
-- Causes : Le paquet golang dans RHEL/CentOS ne supporte pas la cryptographie à courbe elliptique (car il est breveté), cette fonctionnalité est retirée spécifiquement du build CentOS/RHEL.
-- Solution : Télécharger et installer Go à partir de [golang.org/dl](http://golang.org/dl).
+- Erreur : `../gosrc/src/github.com/gogs/gogs/cmd/cert.go:79: undefined: elliptic.P224`
+- Causes : le paquet golang dans RHEL/CentOS ne supporte pas la cryptographie à courbe elliptique (car il est breveté), cette fonctionnalité est retirée spécifiquement du build CentOS/RHEL.
+- Solution : télécharger et installer Go à partir de [golang.org/dl](http://golang.org/dl).
 
 ## Git
 
 - Erreur : `bash /path/to/gogs: no such file or directory`
-- Causes : Vous avez modifié l'emplacement du serveur Gogs mais l'ancien chemin a été codé en dur dans le fichier `~/.ssh/authorized_keys`.
-- Solution : Exécuter `./gogs fix location <old Gogs path>` depuis le nouveau répertoire Gogs.
+- Causes : vous avez modifié l'emplacement du serveur Gogs mais l'ancien chemin a été codé en dur dans le fichier `~/.ssh/authorized_keys`.
+- Solution : exécuter `./gogs fix location <old Gogs path>` depuis le nouveau répertoire Gogs.
 
 -----
 
 - Erreur :
 	- `fatal: 'XX/XX.git' does not appear to be a git repository`
 	- Commits pushed mais présente toujours comme un dépôt vide
-- Causes : Il y a des clés SSH dupliquées dans le fichier `~/.ssh/authorized_keys`, peut-être utilisez vous (ou avez utilisé) GitLab avec le même utilisateur système.
-- Solution : Supprimer l'ancien fichier `~/.ssh/authorized_keys` et garder seulement la version ajoutée par Gogs.
+- Causes : il y a des clés SSH dupliquées dans le fichier `~/.ssh/authorized_keys`, peut-être utilisez vous (ou avez utilisé) GitLab avec le même utilisateur système.
+- Solution : supprimer l'ancien fichier `~/.ssh/authorized_keys` et garder seulement la version ajoutée par Gogs.
 
 -----
 
 - Erreur : `repo.NewRepoContext(fail to set git user.emil):`
-- Causes : Cela arrive quand les utilisateurs de Windows installent Git Bash sans activer l'option `cmd`.
-- Solution : Réinstaller et activer l'option `cmd`.
+- Causes : cela arrive quand les utilisateurs de Windows installent Git Bash sans activer l'option `cmd`.
+- Solution : réinstaller et activer l'option `cmd`.
 
 ## Validation de formulaire
 
 - Erreur : `Repository/User name contains illegal characters`
-- Causes : Afin d'éviter les exceptions, votre utilisateur / nom du dépôt sera considéré comme illégal si il correspond à l'une des règles suivantes :
-	- Nom parmi `"raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new"`.
-	- Nom ayant le suffix `".git"`.
+- Causes : afin d'éviter les exceptions, votre utilisateur / nom du dépôt sera considéré comme illégal si il correspond à l'une des règles suivantes :
+	- nom parmi `"raw", "install", "api", "avatar", "user", "org", "help", "stars", "issues", "pulls", "commits", "repo", "template", "admin", "new"`.
+	- nom ayant le suffix `".git"`.
 
 ## Cache
 
 - Erreur : `cache: unknown adaptername "memcache" (importation oublié?)`
-- Causes : Pour empêcher l'importation inutiles du paquet, nous des tags à la construction pour spécifier si c'est nécessaire.
+- Causes : pour empêcher l'importation inutiles du paquet, nous des tags à la construction pour spécifier si c'est nécessaire.
 - Solution :
-	- Téléchargement : `go get -tags memcache github.com/gogits.gogs`
-	- Construction : `go build -tags memcache`
-	- Suivre les mêmes étapes pour `redis` quand vous voulez qu'il soit l'adaptateur de cache.
+	- téléchargement : `go get -tags memcache github.com/gogs.gogs`
+	- construction : `go build -tags memcache`
+	- suivre les mêmes étapes pour `redis` quand vous voulez qu'il soit l'adaptateur de cache.
 
 ## MySQL
 
 - Erreur : `Error 1071: Specified key was too long; max key length is 1000 bytes`
-- Causes : Elle est causée par MyISAM.
-- Solution : Une fois fichier `config/mysql.sql` importé connectez-vous à MySQL et lancer :
+- Causes : elle est causée par MyISAM.
+- Solution : une fois fichier `config/mysql.sql` importé connectez-vous à MySQL et lancer :
 
 	```sql
 	use gogs;
@@ -63,18 +63,25 @@ Après cela, allez à [http://localhost:3000/install](http://localhost:3000/inst
 -----
 
 - Erreur : `Database setting is not correct: This server only supports the insecure old password authentication. If you still want to use it, please add 'allowOldPasswords=1' to your DSN. See also https://github.com/go-sql-driver/mysql/wiki/old_passwords`
-- Causes : Le mot de passe a été mis à jour seulement pour l'utilisateur @localhost -- il y a une seconde entrée de la table d'utilisateur @% pour laquelle le mot de passe est encore l'ancien.
-- Solution : [Un commentaire GitHub](https://github.com/gogits/gogs/issues/385#issuecomment-54357073)
+- Causes : le mot de passe a été mis à jour seulement pour l'utilisateur @localhost -- il y a une seconde entrée de la table d'utilisateur @% pour laquelle le mot de passe est encore l'ancien.
+- Solution : [un commentaire GitHub](https://github.com/gogs/gogs/issues/385#issuecomment-54357073)
 
 ## Logiciel de messagerie
 
 - Erreur : Gmail avec erreur 534: `Please log in via your web browser and then try again`
-- Causes : Cela est parce que Google ne fait pas confiance à votre serveur.
+- Causes : cela est parce que Google ne fait pas confiance à votre serveur.
 - Solution :
-	- Visitez https://accounts.google.com et connectez-vous.
-	- Allez sur https://accounts.google.com/DisplayUnlockCaptcha cliquez sur `continue`.
-	- Maintenant copier le lien qui ressemble à ceci (l'invite du journal du serveur Gogs) : https://accounts.google.com/ContinueSignIn?sarp=1&scc=1&plt=AKgnsbvPPN_E_25__nyS*******f18O9uuLNtz0Imw et connectez-vous à nouveau.
-	- Les choses devraient maintenant fonctionner. Enfin, vérifiez votre boîte `spam` dans le cas où votre fournisseur de service de messagerie penserait que gmail est un spammeur.
+	- visitez https://accounts.google.com et connectez-vous.
+	- allez sur https://accounts.google.com/DisplayUnlockCaptcha cliquez sur `continue`.
+	- maintenant copier le lien qui ressemble à ceci (l'invite du journal du serveur Gogs) : https://accounts.google.com/ContinueSignIn?sarp=1&scc=1&plt=AKgnsbvPPN_E_25__nyS*******f18O9uuLNtz0Imw et connectez-vous à nouveau.
+	- les choses devraient maintenant fonctionner. Enfin, vérifiez votre boîte `spam` dans le cas où votre fournisseur de service de messagerie penserait que gmail est un spammeur.
+
+-----
+
+- Erreur : `gomail: could not send email 1: Auth: 535`
+- Causes : le mot de passe contient des caractères spéciaux
+- Solution : mettez le mot de passe entre guillemets simples: `PASSWD = 'P4§$w0rd'`
+
 
 ## Windows
 
@@ -92,28 +99,28 @@ fatal: '/cygdrive/d/svnroot/research/gogs/C:\Users\user\gogs-repositories\unos\t
 fatal: Could not read from remote repository.
 ```
 
-- Causes : Vous installez le système dans un shell qui a une arborescence différente de celle par défaut.
-- Solution : Démarrez Gogs avec les options par défaut de CMD.
+- Causes : vous installez le système dans un shell qui a une arborescence différente de celle par défaut.
+- Solution : démarrez Gogs avec les options par défaut de CMD.
 
 ## Autre
 
-- Erreur : Les pages répondent extrêment lentement, mais le temps indiqué au bas de de l'écran est normal (sous les 100ms)
+- Erreur : les pages répondent extrêment lentement, mais le temps indiqué au bas de de l'écran est normal (sous les 100ms)
 - Causes : elle peut être causée par Nginx qui tente de résoudre l'adresse IPv4 comme une adresse IPv6.
-- Solution : Utiliser un hostname explicite `127.0.0.1` au lieu de `localhost` par exemple.
+- Solution : utiliser un hostname explicite `127.0.0.1` au lieu de `localhost` par exemple.
 
 -----
 
 - Erreur : `Error 1062: Duplicate entry 'Unknown-Mac' pour la clé 'UQE_public_key_name'`
-- Causes : Cette erreur est provoquée par du code ancien, la table `public_key` avait `UQE_public_key_name` comme règle unique pour le nom de la clef SSH dans les premières versions.
-- Solution : Vous pouvez supprimer cette règle manuellement pour résoudre ce problème.
+- Causes : cette erreur est provoquée par du code ancien, la table `public_key` avait `UQE_public_key_name` comme règle unique pour le nom de la clef SSH dans les premières versions.
+- Solution : vous pouvez supprimer cette règle manuellement pour résoudre ce problème.
 
 -----
 
 - Erreur : `GLIBC_2.14 not found`
-- Solution : Exécuter `sudo apt-get -t testing install libc6-dev`.
+- Solution : exécuter `sudo apt-get -t testing install libc6-dev`.
 
 -----
 
 - Erreur : `could not parse line: ; App name that shows on every page title`
-- Causes : Le fichier est enregistré comme `UTF8 with BOM`(ce qui arrive dans Windows).
-- Solution : Changez pour `UTF8`.
+- Causes : le fichier est enregistré comme `UTF8 with BOM`(ce qui arrive dans Windows).
+- Solution : changez pour `UTF8`.
diff --git a/images/auth_sources.png b/images/auth_sources.png
new file mode 100644
index 00000000..4066532a
Binary files /dev/null and b/images/auth_sources.png differ
diff --git a/zh-CN/advanced/configuration_cheat_sheet.md b/zh-CN/advanced/configuration_cheat_sheet.md
index b7298b02..11a8144e 100644
--- a/zh-CN/advanced/configuration_cheat_sheet.md
+++ b/zh-CN/advanced/configuration_cheat_sheet.md
@@ -8,7 +8,7 @@ name: 配置文件手册
 
 请记住，任何修改都是发生在 `custom/conf/app.ini` 自定义配置文件中，该文件的具体位置与您的设置有关。
 
-完整的默认设置可以通过 [app.ini](https://github.com/gogits/gogs/blob/master/conf/app.ini) 文件查看。如果您看到类似 `%(X)s` 字符，这是由 [ini](https://github.com/go-ini/ini/tree/v1#recursive-values) 提供的递归取值的特性。
+完整的默认设置可以通过 [app.ini](https://github.com/gogs/gogs/blob/main/conf/app.ini) 文件查看。如果您看到类似 `%(X)s` 字符，这是由 [ini](https://ini.unknwon.io/docs/howto/work_with_values#recursive-values) 提供的递归取值的特性。
 
 ### 概览
 
@@ -36,10 +36,11 @@ name: 配置文件手册
 `SSH_LISTEN_HOST`|内置 SSH 服务器监听的地址
 `SSH_LISTEN_PORT`|内置 SSH 服务器监听的端口
 `SSH_ROOT_PATH`|SSH 根目录，一般为 `~/.ssh`，但必须填写为 `/home/git/.ssh`
+`REWRITE_AUTHORIZED_KEYS_AT_START`|激活该选项以在应用启动时自动重写 `authorized_keys` 文件，该选项在使用内置 SSH 服务器时将会被自动禁用|
 `SSH_KEY_TEST_PATH`|用于测试 SSH 公钥的临时目录
 `SSH_KEYGEN_PATH`|`ssh-keygen` 程序的路径，默认为 `ssh-keygen` 即通过系统路径查找
 `MINIMUM_KEY_SIZE_CHECK`|指定不同类型的公钥的最小密钥大小
-`OFFLINE_MODE`|D激活该选项来禁止从 CDN 获取静态资源，同时 Gravatar 服务也将被自动禁用
+`OFFLINE_MODE`|激活该选项来禁止从 CDN 获取静态资源，同时 Gravatar 服务也将被自动禁用
 `DISABLE_ROUTER_LOG`|激活该选项来禁止打印路由日志
 `CERT_FILE`|HTTPS 授权文件路径
 `KEY_FILE`|HTTPS 的密钥文件路径
@@ -60,6 +61,7 @@ name: 配置文件手册
 `PREFERRED_LICENSES`|建议用户首选的授权类型
 `DISABLE_HTTP_GIT`|激活该选项来禁止用户通过 HTTP 对 Git 仓库进行交互操作，即用户只能通过 SSH 操作
 `ENABLE_LOCAL_PATH_MIGRATION`|激活该选项来启用本地路径迁移仓库功能。启动后默认只有管理员可以使用，普通用户必须经由管理员授权
+`ENABLE_RAW_FILE_RENDER_MODE`|激活该选项来启用在查看原始数据时对页面进行真实渲染，例如渲染实际的 HTML 页面，有潜在安全隐患
 
 #### 仓库 - 编辑器 (`repository.editor`)
 
@@ -148,7 +150,7 @@ name: 配置文件手册
 `REQUIRE_SIGNIN_VIEW`|激活该选项来要求用户必须登录才能浏览任何页面
 `ENABLE_CACHE_AVATAR`|激活该选项来缓存 Gravatar 的头像
 `ENABLE_NOTIFY_MAIL`|激活该选项来发送通知邮件给关注者，例如创建 issue 时，要求已启用 `Mailer`
-`ENABLE_REVERSE_PROXY_AUTHENTICATION`|激活该选项来开启反向代理用户认证，请从 https://github.com/gogits/gogs/issues/165 了解更多信息
+`ENABLE_REVERSE_PROXY_AUTHENTICATION`|激活该选项来开启反向代理用户认证，请从 [#165](https://github.com/gogs/gogs/issues/165) 了解更多信息
 `ENABLE_REVERSE_PROXY_AUTO_REGISTRATION`|激活该选项来开启反向代理用户认证的自动注册功能
 `DISABLE_MINIMUM_KEY_SIZE_CHECK`|激活该选项来禁止检查响应类型的密钥最小长度
 `ENABLE_CAPTCHA`|激活该选项以在用户注册时要求输入验证码
@@ -157,7 +159,8 @@ name: 配置文件手册
 
 名称|描述
 ----|----
-`TYPES`|启动的 Web 钩子类型，可以是 `gogs`、`slack` 或 `discord`
+`TYPES`|启动的 Web 钩子类型，可以是 `gogs`、`slack`、`discord`或`dingtalk`
+`QUEUE_LENGTH`|Web钩子队列长度，如果发现部分Webhook未能成功触发，可考虑增加该值
 `DELIVER_TIMEOUT`|发送通知的超时时间，以秒为单位
 `SKIP_TLS_VERIFY`|指示是否允许向具有非信任证书的地址发送通知
 `PAGING_NUM`|Web 钩子历史页面每页显示记录条数
@@ -167,13 +170,14 @@ name: 配置文件手册
 名称|描述
 ----|----
 `ENABLED`|启用该选项以激活邮件服务
+`SUBJECT_PREFIX`|邮件标题的前缀
+`HOST`|SMTP 主机地址与端口
 `DISABLE_HELO`|禁用 HELO 操作
 `HELO_HOSTNAME`|HELO 操作的自定义主机名
-`HOST`|SMTP 主机地址与端口
+`SKIP_VERIFY`|不验证自签发证书的有效性
 `FROM`|邮箱的来自地址，遵循 RFC 5322规范，可以是一个单纯的邮箱地址或者 `"名字" <email@example.com>` 的形式
 `USER`|邮箱用户名
 `PASSWD`|邮箱密码
-`SKIP_VERIFY`|不验证自签发证书的有效性
 `USE_PLAIN_TEXT`|使用 `text/plain` 作为邮件内容格式
 
 备注：Gogs 仅支持使用 STARTTLS 的 SMTP 协议
@@ -182,7 +186,7 @@ name: 配置文件手册
 
 名称|描述
 ----|----
-`ADAPTER`|缓存引擎适配器，可以为 `momery`、`redis` 或 `memcache`。如果您使用 `redis` 或 `memcache`，请确保使用 `-tags` 选项重新构建所有依赖，例如：`go build -tags='redis'`
+`ADAPTER`|缓存引擎适配器，可以为 `memory`、`redis` 或 `memcache`。如果您使用 `redis` 或 `memcache`，请确保使用 `-tags` 选项重新构建所有依赖，例如：`go build -tags='redis'`
 `INTERVAL`|仅限内存缓存使用，GC 周期，单位为秒
 `HOST`|仅限 redis 和 memcache 使用，主机地址和端口号
 -|Redis：`network=tcp,addr=127.0.0.1:6379,password=macaron,db=0,pool_size=100,idle_timeout=180`
@@ -240,8 +244,8 @@ name: 配置文件手册
 
 名称|描述
 ----|----
-`LEVEL`|控制台日志级别，留空则继承父值
-`LOG_RORATE`|激活该选项以启用日志文件自转
+`LEVEL`|文件日志级别，留空则继承父值
+`LOG_ROTATE`|激活该选项以启用日志文件自转
 `DAILY_ROTATE`|激活该选项以进行日常自转
 `MAX_SIZE_SHIFT`|自转需要达到的最大文件体积，使用位左移，默认为 28 即 1 << 28，表示 256MB
 `MAX_LINES`|自转需要达到的最大文件行数，默认为 `1000000`
@@ -251,9 +255,17 @@ name: 配置文件手册
 
 名称|描述
 ----|----
-`LEVEL`|控制台日志级别，留空则继承父值
+`LEVEL`|Slack 日志级别，留空则继承父值
 `URL`|Slack Web 钩子 URL
 
+#### 日志 - Discord (`log.discord`)
+
+名称|描述
+----|-----------
+`LEVEL`|Discord 日志级别，留空则继承父值
+`URL`|Discord Web 钩子 URL
+`USERNAME`|在 Web 钩子中显示的用户名
+
 ### Cron (`cron`)
 
 名称|描述
@@ -329,6 +341,15 @@ name: 配置文件手册
 `NOTICE_PAGING_NUM`|系统提示管理页面每页显示记录条数
 `ORG_PAGING_NUM`|组织管理页面每页显示记录条数
 
+#### Prometheus (`prometheus`)
+
+名称|描述
+----|-----------
+`ENABLED`|激活该选项以启用 Prometheus 监控信息，默认为 `true`
+`ENABLE_BASIC_AUTH`|激活该选项以启用 HTTP 基本认证保护监控信息数据，默认为 `false`
+`BASIC_AUTH_USERNAME`|HTTP 基本认证的用户名
+`BASIC_AUTH_PASSWORD`|HTTP 基本认证的密码
+
 ### 其他 (`other`)
 
 名称|描述
diff --git a/zh-CN/advanced/release_and_tips_blogs.md b/zh-CN/advanced/release_and_tips_blogs.md
deleted file mode 100644
index a9366537..00000000
--- a/zh-CN/advanced/release_and_tips_blogs.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: 公告与高阶指南
----
-
-# 公告与高阶指南
-
-## 公告博文
-
-- `v0.2`：[Gogs：用二进制才是真正的部署](http://wuwen.org/article/27/gogs-binary-is-what-called-real-deployment.html)
-- `v0.3`：[使用 Gogs 搭建私有 Git 托管服务](http://wuwen.org/article/29/setup-your-private-git-hosting-with-gogs.html)
-- `v0.4`：[基于 Gogs 进行协同工作](http://wuwen.org/article/33/use-gogs-to-work-collaboratively.html)
-- `v0.5`：[通过 Gogs 的组织功能管理团队](http://wuwen.org/article/44/organize-your-teams-with-gogs-organization.html)
-
-## 高阶指南
-
-- [使用 OAuth 登录 Gogs](http://wuwen.org/article/30/login-gogs-with-oauth.html)
diff --git a/zh-CN/donate.md b/zh-CN/donate.md
index 93cc16a2..c1ec0437 100644
--- a/zh-CN/donate.md
+++ b/zh-CN/donate.md
@@ -37,6 +37,29 @@ name: 捐赠我们
 
 | 捐赠时间          | 捐赠人     | 金额      |
 | --------------- |:---------:| --------:|
+| 2018-12-31 | anchengjian | ¥100.00 |
+| 2018-09-28 | 小波同学 | ¥20.00 |
+| 2018-09-13 | 国建同学 | ¥10.00 |
+| 2018-09-07 | 森同学 | ¥10.00 |
+| 2018-08-18 | 淼同学 | ¥100.00 |
+| 2018-08-17 | 琮同学 | ¥10.00 |
+| 2018-08-11 | 虎同学 | ¥6.66 |
+| 2018-08-08 | 长书同学 | ¥10.00 |
+| 2018-08-06 | 少波同学 | ¥10.00 |
+| 2018-07-28 | 峰同学 | ¥10.00 |
+| 2018-07-09 | 琼同学 | ¥5.00 |
+| 2018-05-13 | Summer | ¥800.00 |
+| 2018-05-10 | ufogxl | ¥66.66 |
+| 2018-04-26 | 波同学 | ¥20.00 |
+| 2018-04-10 | 桐同学 | ¥6.78 |
+| 2018-03-17 | 桐同学 | ¥300.00 |
+| 2018-03-10 | 斌同学 | ¥10.00 |
+| 2018-03-08 | lindexi | ¥20.00 |
+| 2018-02-08 | 伟同学 | ¥20.00 |
+| 2018-02-03 | 明同学 | ¥20.00 |
+| 2018-01-29 | 敏同学 | ¥10.00 |
+| 2018-01-17 | 冬同学 | ¥33.00 |
+| 2018-01-13 | 言同学 | ¥10.00 |
 | 2017-11-23 | 朱同学 | ¥20.00 |
 | 2017-11-20 | 余同学 | ¥10.00 |
 | 2017-10-28 | 寒子 | ¥6.66 |
diff --git a/zh-CN/features/authentication.md b/zh-CN/features/authentication.md
index 8be32678..064000ab 100644
--- a/zh-CN/features/authentication.md
+++ b/zh-CN/features/authentication.md
@@ -4,7 +4,21 @@ name: 授权认证
 
 # 授权认证
 
-## LDAP
+## 从本地文件加载认证源
+
+自 `0.11.45.0412` 版本起，您可以通过在本地文件中定义认证源来简化自动化部署流程。
+
+凡是在自定义路径的 `conf/auth.d` 目录下以 `.conf` 结尾的文件都将被识别为认证源。例如，`custom/conf/auth.d/my_auth_source.conf`。您可以随意命名这些文件帮助记忆，只要保证以 `.conf` 结尾即可。所有支持类型的示例文件可以在 [这里](https://github.com/gogs/gogs/tree/f2ecfdc96a338815ffb2be898b3114031f0da48c/conf/auth.d) 查看。
+
+当文件加载完成之后，您就可以通过 **管理面板 - 认证源管理** 页面进行查看。通过本地文件加载和存储在数据库中的认证源相互兼容，并不冲突。
+
+![](/docs/images/auth_sources.png)
+
+不过需要注意的是，由于只有在 Gogs 启动时才会加载相关文件，请使用 Web 界面而不是直接编辑文件。
+
+## 认证源配置
+
+### LDAP
 
 基于 BindDN 和 simple auth 的 LDAP 授权方式共享以下字段：
 
@@ -73,10 +87,8 @@ name: 授权认证
     authenticate. The `%s` matching parameter will be substituted with login
     name given on sign-in form.
   - Example: `(&(objectClass=posixAccount)(uid=%s))`
-  - To substitute more than once `%[1]s` should be used instead, eg. when
-    matching supplied login name against multiple attributes such as user
-    identifier, email or even phone number.
-  - Example: `(&(objectClass=Person)(|(uid=%[1]s)(mail=%[1]s)(mobile=%[1]s)))`
+  - To substitute more than once, e.g. when matching a supplied login name against multiple attributes such as user identifier, email, or even phone number.
+  - Example: `(&(objectClass=Person)(|(uid=%s)(mail=%s)(mobile=%s)))`
 
 **基于 simple auth** 需要填充以下字段：
 
@@ -110,12 +122,12 @@ name: 授权认证
     * Which user LDAP attribute is listed in the group.
     * Example: `uid`
 
-## PAM
+### PAM
 
-To configure this you just need to set the 'PAM Service Name' to a filename in `/etc/pam.d/`.
+To configure this you just need to set the **PAM Service Name** to a filename in `/etc/pam.d/`.
 If you want it to work with normal Linux passwords, the user running Gogs must have read access to `/etc/shadow`.
 
-## SMTP
+### SMTP
 
 Gogs 支持通过指定邮箱服务器来对用户进行创建和认证，可以通过配置以下选项启用该功能：
 
@@ -145,7 +157,7 @@ Gogs 支持通过指定邮箱服务器来对用户进行创建和认证，可以
 - This authentication is activate
   - Enable or disable this auth.
 
-## Freeipa
+### Freeipa
 
 - In order to login to the Gogs using FreeIPA credentials, you need to create a bind account for Gogs to use:
 
@@ -174,4 +186,4 @@ Gogs 支持通过指定邮箱服务器来对用户进行创建和认证，可以
 
 -  Now login to the gogs as an Admin, click on “Authentication” under Admin Panel. Then click New LDAP Source and fill in the details, changing all where appropriate to your own domain as photo below:
 
-![Freeipa-Gogs](https://raw.githubusercontent.com/Karen09/docs/master/images/Freeipa-Gogs.png)
+![](/docs/images/Freeipa-Gogs.png)
diff --git a/zh-CN/features/custom_template.md b/zh-CN/features/custom_template.md
new file mode 100644
index 00000000..58f890a0
--- /dev/null
+++ b/zh-CN/features/custom_template.md
@@ -0,0 +1,44 @@
+---
+name: 自定义模板
+---
+
+# 自定义模板
+
+## 重载 HTML 模板
+
+用户可以通过在 `custom/templates/` 目录下创建一个自定义版本的副本实现 HTML 模板重载（包括邮件模板），该文件不会因为版本升级而受到影响，但可以会因为改动过大导致与后续版本不兼容。
+
+例如，可以通过以下步骤自定义站点首页：
+
+1. 复制模板文件 `templates/home.tmpl` 的内容
+2. 将修改保存到文件 `custom/templates/home.tmpl`
+
+:warning: 所有针对自定义模板的修改都**需要重启 Gogs 实例**
+
+:warning: 当用户配置 `[server] LOAD_ASSETS_FROM_DISK = true` 时，邮件模板无法被重载
+
+## 重载静态文件
+
+用户可以通过在 `custom/public/` 目录下创建一个自定义版本的副本实现静态文件重载（CSS、JavaScript、图片等等），该文件不会因为版本升级而受到影响，但可以会因为改动过大导致与后续版本不兼容。
+
+例如，可以通过保存自定义图标到 `custom/public/img/favicon.png` 实现站点图标的重载。
+
+:warning: 所有针对自定义静态文件的修改都**不需要重启 Gogs 实例**
+
+## 注入自定义内容到模板中
+
+您可以不需要修改仓库源码就能注入自定义头部和尾部内容，这对添加分析代码和自定义静态资源非常有用。
+
+了解更多有关 [注入自定义头部和尾部](https://discuss.gogs.io/t/how-to-inject-custom-head-and-footer/943)。
+
+在条件允许的情况下，尽可能使用该方案以减少对模板渲染的影响。
+
+### 注入自定义 CSS 文件
+
+这里展示如何为您的 Gogs 实例添加自定义 CSS 文件，目录和文件名都是为了方便演示，您可以把文件放在任何能够通过网络访问的目录。
+
+1. 在 `custom/public/css/` 目录下创建一个名为 `custom.css` 的文件
+2. 向文件中添加一些 CSS 规则
+3. 编辑 `custom/templates/inject/head.tmpl` 文件并添加一行内容 `<link rel="stylesheet" href="/css/custom.css">`
+4. 重启 Gogs
+5. 后续对自定义 CSS 文件的编辑**不需要重启 Gogs 实例**
diff --git a/zh-CN/features/custome_template.md b/zh-CN/features/custome_template.md
deleted file mode 100644
index 11e1e506..00000000
--- a/zh-CN/features/custome_template.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: 自定义模板
----
-
-# 自定义模板
-
-您可以不需要修改仓库源码就能注入自定义头部和尾部内容，这对添加分析代码和自定义静态资源非常有用。
-
-了解更多有关 [注入自定义头部和尾部](https://discuss.gogs.io/t/how-to-inject-custom-head-and-footer/943)。
-
-## 添加自定义 CSS 文件
-
-这里展示如何为您的 Gogs 实例添加自定义 CSS 文件，目录和文件名都是为了方便演示，您可以把文件放在任何能够通过网络访问的目录。
-
-1. 在 `public/css` 目录下创建一个名为 `custom.css` 的文件
-2. 向文件中添加一些 CSS 规则
-3. 编辑 `custom/templates/inject/head.tmpl` 文件并添加一行内容 `<link rel="stylesheet" href="/css/custom.css">`
-4. 重启 Gogs
-5. 后续对自定义 CSS 文件的编辑不需要重启 Gogs
\ No newline at end of file
diff --git a/zh-CN/features/i18n.md b/zh-CN/features/i18n.md
index 3ce6f270..f8c059f1 100644
--- a/zh-CN/features/i18n.md
+++ b/zh-CN/features/i18n.md
@@ -16,7 +16,7 @@ NAMES = English,简体中文,繁體中文,Deutsch,Français,Nederlands,Latviešu
 
 ## 贡献翻译
 
-到 [Crowdin](https://crowdin.com/project/gogs) 注册一个用户然后填补未翻译的字段。
+到 [Crowdin](https://crowdin.gogs.io/) 注册一个用户然后填补未翻译的字段。
 
 有时候您会发现您无法将一个句子准确地从英文翻译到您的语言，没关系，这很正常！只需要使用您的语言将中心思想表达出来就可以，而不需要斤斤计较。
 
diff --git a/zh-CN/installation/README.md b/zh-CN/installation/README.md
index b8a109cb..7e18c5ab 100644
--- a/zh-CN/installation/README.md
+++ b/zh-CN/installation/README.md
@@ -5,18 +5,18 @@ name: 下载安装
 ## 环境要求
 
 - 数据库（选择以下一项）：
-    - [MySQL](http://dev.mysql.com)：版本 >= 5.5.3
+    - [MySQL](http://dev.mysql.com)：版本 >= 5.7
     - [PostgreSQL](http://www.postgresql.org/)
-    - [MSSQL](https://en.wikipedia.org/wiki/Microsoft_SQL_Server)
     - [TiDB](https://github.com/pingcap/tidb)（实验性支持，使用 MySQL 协议连接）
     - 或者 **什么都不安装** 直接使用 SQLite3
 - [git](http://git-scm.com/)（bash）：
-    - 服务端和客户端均需版本 >= 1.7.1
+    - 服务端和客户端均需版本 >= 1.8.3
     - Windows 系统建议使用最新版
 - SSH 服务器：
     - **如果您只使用 HTTP/HTTPS 的话请忽略此项**
     - 如果您选择在 Windows 系统使用内置 SSH 服务器，请确保添加 `ssh-keygen` 到您的 `%PATH%` 环境变量中
     - 推荐 Windows 系统使用 [Cygwin OpenSSH](http://docs.oracle.com/cd/E24628_01/install.121/e22624/preinstall_req_cygwin_ssh.htm) 或 [Copssh](https://www.itefix.net/copssh)
+    - Windows 系统 请确保 Bash 是默认的 Shell 程序，而不是 PowerShell
 
 ### 安装数据库
 
diff --git a/zh-CN/installation/configuration_and_run.md b/zh-CN/installation/configuration_and_run.md
index bfa6b2d5..1d8606a9 100644
--- a/zh-CN/installation/configuration_and_run.md
+++ b/zh-CN/installation/configuration_and_run.md
@@ -25,7 +25,7 @@ ROOT = /home/jiahuachen/gogs-repositories
 
 ```
 [database]
-PASSWD = root
+PASSWORD = root
 ```
 
 ### 为什么要这么做？
@@ -53,5 +53,5 @@ $ ./gogs web
 
 - Gogs 支持多种方式的启动：
 	- 普通：只需执行 `./gogs web`
-	- 守护进程：详见 [scripts](https://github.com/gogits/gogs/tree/master/scripts) 文件夹
+	- 守护进程：详见 [scripts](https://github.com/gogs/gogs/tree/main/scripts) 文件夹
 - 然后访问 `/install` 来完成首次运行的配置工作
diff --git a/zh-CN/installation/install_from_binary.md b/zh-CN/installation/install_from_binary.md
index 928c9add..bb21bde3 100644
--- a/zh-CN/installation/install_from_binary.md
+++ b/zh-CN/installation/install_from_binary.md
@@ -4,73 +4,57 @@ name: 二进制安装
 
 # 二进制安装
 
-**目前只提供最近发布的小版本二进制下载，更多版本下载请前往 [GitHub](https://github.com/gogits/gogs/releases) 查看。**
+**目前只提供最近发布的小版本二进制下载，更多版本下载请前往 [GitHub](https://github.com/gogs/gogs/releases) 查看。**
 
-所有的版本都支持 **MySQL**、**PostgreSQL**、**MSSQL** 和 **TiDB**（使用 MySQL 协议）作为数据库，并且均使用构建标签（build tags）**`cert`** 进行构建。需要注意的是，不同的版本的支持状态有所不同，请根据实际的 Gogs 提示进行操作。
+所有的版本都支持 **MySQL**、**PostgreSQL** 和 **TiDB**（使用 MySQL 协议）作为数据库，并且均使用构建标签（build tags）**`cert`** 进行构建。需要注意的是，不同的版本的支持状态有所不同，请根据实际的 Gogs 提示进行操作。
 
-## 备注
-
-- `mws` 表示提供内置 Windows 服务支持，如果您使用 NSSM 请使用另外一个版本。
+`mws` 表示提供内置 Windows 服务支持，如果您使用 NSSM 请使用另外一个版本。
 
 ## 如何使用下载好的压缩包？
 
+0. 检查[环境要求](/docs/installation)是否已满足
 1. 解压压缩包。
 2. 使用命令 `cd` 进入到刚刚创建的目录。
-3. 执行命令 `./gogs web`，然后，就没有然后了。
-
-## 如何通过二进制升级？
+3. 执行命令 `./gogs web`。
+4. Gogs 默认会在端口 `3000` 启动 HTTP 服务，访问 `/install` 以进行初始配置（例如 http://localhost:3000/install ）。
 
-1. 下载最新版的压缩包。
-2. 删除当前的 `templates` 目录。
-3. 解压压缩包并将所有内容复制粘贴到相应（当前）的位置。
+安装完成后可继续参照 [配置与运行](configuration_and_run.html)。
 
-### 0.11.34 @ 2017-11-22
+## 下载二进制
 
-|系统名称|系统类型|SQLite|PAM|下载（[GitHub](https://github.com/gogits/gogs/releases/tag/v0.11.34)）|
-|------|----|------|---|--------|
-|Linux|386|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.34/linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.34/linux_386.tar.gz) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/linux_386.zip) \| [TAR.GZ](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/linux_386.tar.gz)|
-|Linux|amd64|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.34/linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.34/linux_amd64.tar.gz) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/linux_amd64.zip) \| [TAR.GZ](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/linux_amd64.tar.gz)|
-|Linux|armv5|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.34/linux_armv5.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/linux_armv5.zip)|
-|Raspberry Pi|v2&v3 / armv6|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.34/raspi2_armv6.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/raspi2_armv6.zip)|
-|Windows|386|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.34/windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.34/windows_386_mws.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/windows_386.zip) \| [ZIP w/mws](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/windows_386_mws.zip)|
-|Windows|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.34/windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.34/windows_amd64_mws.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/windows_amd64.zip) \| [ZIP w/ mws](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/windows_amd64_mws.zip)|
-|Mac OS|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.34/darwin_amd64.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.34/darwin_amd64.zip)|
+本页仅展示最新版的二进制，旧版的二进制可以在 [GitHub release](https://github.com/gogs/gogs/releases) 上查看。
 
-### 0.11.29 @ 2017-08-15
+### 0.13.3 @ 2025-06-08
 
-|系统名称|系统类型|SQLite|PAM|下载（[GitHub](https://github.com/gogits/gogs/releases/tag/v0.11.29)）|
+|系统名称|系统类型|SQLite|PAM|下载 ([GitHub](https://github.com/gogs/gogs/releases/tag/v0.13.3))|
 |------|----|------|---|--------|
-|Linux|386|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.29/linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.29/linux_386.tar.gz) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/linux_386.zip) \| [TAR.GZ](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/linux_386.tar.gz)|
-|Linux|amd64|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.29/linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.29/linux_amd64.tar.gz) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/linux_amd64.zip) \| [TAR.GZ](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/linux_amd64.tar.gz)|
-|Linux|armv5|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.29/linux_armv5.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/linux_armv5.zip)|
-|Raspberry Pi|v2 / armv6|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.29/raspi2_armv6.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/raspi2_armv6.zip)|
-|Windows|386|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.29/windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.29/windows_386_mws.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/windows_386.zip) \| [ZIP w/mws](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/windows_386_mws.zip)|
-|Windows|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.29/windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.29/windows_amd64_mws.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/windows_amd64.zip) \| [ZIP w/ mws](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/windows_amd64_mws.zip)|
-|Mac OS|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.29/darwin_amd64.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.11.29/darwin_amd64.zip)|
+|Linux|amd64|✅|✅|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_linux_amd64.zip) \| [TAR.GZ](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_linux_amd64.tar.gz)|
+|Linux|armv8|✅|✅|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_linux_armv8.zip) \| [TAR.GZ](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_linux_armv8.tar.gz)|
+|Windows|amd64|✅|❌|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_windows_amd64.zip) \| [ZIP w/ mws](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_windows_amd64_mws.zip)|
+|macOS|amd64|✅|❌|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_darwin_amd64.zip)|
+|macOS|arm64|✅|❌|HTTPS: [ZIP](https://github.com/gogs/gogs/releases/download/v0.13.3/gogs_0.13.3_darwin_arm64.zip)|
 
-### 0.10.18 @ 2017-03-14
+### 0.12.11 @ 2023-02-25
 
-|系统名称|系统类型|SQLite|PAM|下载（[GitHub](https://github.com/gogits/gogs/releases/tag/v0.10.18)）|
+|系统名称|系统类型|SQLite|PAM|下载 ([GitHub](https://github.com/gogs/gogs/releases/tag/v0.12.11))|
 |------|----|------|---|--------|
-|Linux|386|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.10.18/linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.10.18/linux_386.tar.gz) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/linux_386.zip) \| [TAR.GZ](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/linux_386.tar.gz)|
-|Linux|amd64|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.10.18/linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.10.18/linux_amd64.tar.gz) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/linux_amd64.zip) \| [TAR.GZ](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/linux_amd64.tar.gz)|
-|Linux|armv5|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/0.10.18/linux_armv5.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/linux_armv5.zip)|
-|Raspberry Pi|v2 / armv6|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.10.18/raspi2_armv6.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/raspi2_armv6.zip)|
-|Windows|386|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.10.18/windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.10.18/windows_386_mws.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/windows_386.zip) \| [ZIP w/mws](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/windows_386_mws.zip)|
-|Windows|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.10.18/windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.10.18/windows_amd64_mws.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/windows_amd64.zip) \| [ZIP w/ mws](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/windows_amd64_mws.zip)|
-|Mac OS|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.10.18/darwin_amd64.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/0.10.18/darwin_amd64.zip)|
+|Linux|386|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_386.tar.gz)|
+|Linux|amd64|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_amd64.tar.gz)|
+|Linux|armv7|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_armv7.zip) \| [TAR.GZ](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_armv7.tar.gz)|
+|Linux|armv8|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_armv8.zip) \| [TAR.GZ](https://dl.gogs.io/0.12.11/gogs_0.12.11_linux_armv8.tar.gz)|
+|Windows|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.12.11/gogs_0.12.11_windows_amd64_mws.zip)|
+|macOS|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_darwin_amd64.zip)|
+|macOS|arm64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.12.11/gogs_0.12.11_darwin_arm64.zip)|
 
-### v0.9.141 @ 2017-02-11
+### 0.11.91 @ 2019-08-11
 
-|系统名称|系统类型|SQLite|PAM|下载（[GitHub](https://github.com/gogits/gogs/releases/tag/v0.9.141)）|
+|系统名称|系统类型|SQLite|PAM|下载（[GitHub](https://github.com/gogs/gogs/releases/tag/v0.11.91)）|
 |------|----|------|---|--------|
-|Linux|386|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/gogs_v0.9.141_linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/gogs_v0.9.141_linux_386.tar.gz) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_linux_386.zip) \| [TAR.GZ](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_linux_386.tar.gz)|
-|Linux|amd64|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/gogs_v0.9.141_linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/gogs_v0.9.141_linux_amd64.tar.gz) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_linux_amd64.zip) \| [TAR.GZ](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_linux_amd64.tar.gz)|
-|Linux|armv5|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/gogs_v0.9.141_linux_armv5.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_linux_armv5.zip)|
-|Linux|armv6|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/gogs_v0.9.141_linux_armv6.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_linux_armv6.zip)|
-|Raspberry Pi|v2|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/gogs_v0.9.141_raspi2_armv6.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_raspi2_armv6.zip)|
-|Windows|386|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/gogs_v0.9.141_windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/gogs_v0.9.141_windows_386_mws.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_windows_386.zip) \| [ZIP w/mws](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_windows_386_mws.zip)|
-|Windows|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/gogs_v0.9.141_windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/gogs_v0.9.141_windows_amd64_mws.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_windows_amd64.zip) \| [ZIP w/ mws](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_windows_amd64_mws.zip)|
-|Mac OS|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/gogs_v0.9.141_darwin_amd64.zip) - CDN: [ZIP](http://7d9nal.com2.z0.glb.qiniucdn.com/gogs_v0.9.141_darwin_amd64.zip)|
-
-安装完成后可继续参照 [配置与运行](configuration_and_run.html)。
+|Linux|386|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_386.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_386.tar.gz)|
+|Linux|amd64|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_amd64.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_amd64.tar.gz)|
+|Linux|armv5|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_armv5.zip)|
+|Linux|armv6|❌|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_linux_armv6.zip)|
+|Raspberry Pi|v2/v3 / armv7|✅|✅|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_raspi_armv7.zip) \| [TAR.GZ](https://dl.gogs.io/0.11.91/gogs_0.11.91_raspi_armv7.tar.gz)|
+|Windows|386|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_windows_386.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.91/gogs_0.11.91_windows_386_mws.zip)|
+|Windows|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_windows_amd64.zip) \| [ZIP w/ mws](https://dl.gogs.io/0.11.91/gogs_0.11.91_windows_amd64_mws.zip)|
+|macOS|amd64|✅|❌|HTTPS: [ZIP](https://dl.gogs.io/0.11.91/gogs_0.11.91_darwin_amd64.zip)|
diff --git a/zh-CN/installation/install_from_packages.md b/zh-CN/installation/install_from_packages.md
index fc6a3ab4..abe908af 100644
--- a/zh-CN/installation/install_from_packages.md
+++ b/zh-CN/installation/install_from_packages.md
@@ -8,8 +8,8 @@ name: 包管理安装
 
 ### Packager.io
 
-- 当前支持 Ubuntu 12.04 + 14.04、CentOS 6 + 7 和 Debian 7 + 8 版本。
-- 可以从 [packager.io](https://packager.io/gh/pkgr/gogs) 获取到相应包管理资源（该工具的自定义配置文件有时会放置在 `/etc/default/gogs`）。
+- 当前支持 Ubuntu 14.04 + 16.04 + 18.04、CentOS 6 + 7 和 Debian 8 + 9 + 10 版本。
+- 可以从 [packager.io](https://packager.io/gh/gogs/gogs) 获取到相应包管理资源（该工具的自定义配置文件有时会放置在 `/etc/default/gogs`）。
 
 ### Arch Linux
 
diff --git a/zh-CN/installation/install_from_source.md b/zh-CN/installation/install_from_source.md
index 8e238c8d..befe1351 100644
--- a/zh-CN/installation/install_from_source.md
+++ b/zh-CN/installation/install_from_source.md
@@ -4,103 +4,51 @@ name: 源码安装
 
 # 源码安装
 
-## 安装依赖
-
-### 基本依赖
-
-- [Go 语言](http://golang.org)：版本 >= 1.6
-
-### 第三方包
-
-请通过 [gopmfile](https://github.com/gogits/gogs/blob/master/.gopmfile) 查看完整的第三方包依赖列表。一般情况下只有在您为 Gogs 制作构建包的时候才会用到。
-
 ## 安装 Go 语言
 
-如果您的系统已经安装要求版本的 Go 语言，可以跳过此小节。
+Gogs 要求至少使用 Go 1.21 或更高的版本进行编译，具体安装步骤请参考 [官方文档](https://golang.org/doc/install)。
 
-### 下载
+## 设置环境
 
-您可以通过以下方式安装 Go 语言到 `/home/git/local/go` 目录：
+我们将创建一个名为 `git` 用户，并在该用户空间内完成剩余的安装步骤：
 
 ```sh
-sudo su - git
-cd ~
-# create a folder to install 'go'
-mkdir local
-# Download go (change go$VERSION.$OS-$ARCH.tar.gz to the latest release)
-wget https://storage.googleapis.com/golang/go$VERSION.$OS-$ARCH.tar.gz
-# expand it to ~/local
-tar -C /home/git/local -xzf go$VERSION.$OS-$ARCH.tar.gz
+sudo adduser --disabled-login --gecos 'Gogs' git
 ```
 
-### 设置环境
-
-请设置和您系统环境对应的路径：
+## 编译 Gogs
 
 ```sh
-sudo su - git
-cd ~
-echo 'export GOROOT=$HOME/local/go' >> $HOME/.bashrc
-echo 'export GOPATH=$HOME/go' >> $HOME/.bashrc
-echo 'export PATH=$PATH:$GOROOT/bin:$GOPATH/bin' >> $HOME/.bashrc
-source $HOME/.bashrc
+# 克隆仓库到 "gogs" 子目录
+git clone --depth 1 https://github.com/gogs/gogs.git gogs
+# 修改工作目录
+cd gogs
+# 编译主程序，这个步骤会下载所有依赖
+go build -o gogs
 ```
 
-## 安装 Gogs
-
-常用的安装方式：
-
-```sh
-# 下载并安装依赖
-$ go get -u github.com/gogits/gogs
-
-# 构建主程序
-$ cd $GOPATH/src/github.com/gogits/gogs
-$ go build
-```
-
-### 构建 `develop` 分支版本
-
-如果您想要安装 `develop`（或其它）分支版本，则可以通过以下命令：
-
-```sh
-$ mkdir -p $GOPATH/src/github.com/gogits
-$ cd $GOPATH/src/github.com/gogits
-
-# 请确保没有使用 “https://github.com/gogits/gogs.git”
-$ git clone --depth=1 -b develop https://github.com/gogits/gogs
-$ cd gogs
-$ go build
-```
-
-### 测试安装
+## 测试安装
 
 您可以通过以下方式检查 Gogs 是否可以正常工作：
 
 ```sh
-cd $GOPATH/src/github.com/gogits/gogs
 ./gogs web
 ```
 
 如果您没有发现任何错误信息，则可以使用 `Ctrl-C` 来终止运行。
 
-### 使用标签构建
+## 使用标签构建
 
 Gogs 默认并没有支持一些功能，这些功能需要在构建时明确使用构建标签（[build tags](https://golang.org/pkg/go/build/#hdr-Build_Constraints)）来支持。
 
 目前使用标签构建的功能如下：
 
-- `sqlite3`：SQLite3 数据库支持
 - `pam`：PAM 授权认证支持
 - `cert`：生成自定义证书支持
-- `miniwinsvc`：Windows 服务内置支持（或者您可以使用 NSSM 来创建服务）
-
-例如，您需要支持以上所有功能，则需要先删除 `$GOPATH/pkg/{GOOS_GOARCH}/github.com/gogits/gogs` 目录，然后执行以下命令：
+- `minwinsvc`：Windows 服务内置支持（或者您可以使用 NSSM 来创建服务）
 
 ```sh
-$ go get -u -tags "sqlite pam cert" github.com/gogits/gogs
-$ cd $GOPATH/src/github.com/gogits/gogs
-$ go build -tags "sqlite pam cert"
+go build -tags "pam cert" -o gogs
 ```
 
 安装完成后可继续参照 [配置与运行](configuration_and_run.html)。
diff --git a/zh-CN/installation/run_as_windows_service.md b/zh-CN/installation/run_as_windows_service.md
index 57df9677..cc1e9ae0 100644
--- a/zh-CN/installation/run_as_windows_service.md
+++ b/zh-CN/installation/run_as_windows_service.md
@@ -8,8 +8,8 @@ name: 注册 Windows 服务
 
 想要使 Gogs 通过 Windows 服务的方式运行，必须满足以下两个条件：
 
-1. 使用 `miniwinsvc` 构建标签获得内置 Windows 服务支持。
-2. 不使用 `miniwinsvc` 构建标签并通过 [NSSM](http://nssm.cc/) 注册为服务。
+1. 使用 `minwinsvc` 构建标签获得内置 Windows 服务支持。
+2. 不使用 `minwinsvc` 构建标签并通过 [NSSM](http://nssm.cc/) 注册为服务。
 
 在注册成为服务之前，需要确保给予 Gogs 二进制相应目录的读写权限，包括存放仓库的根目录（`[repository] ROOT`）。
 
@@ -28,7 +28,7 @@ PROTOCOL = http
 HTTP_ADDR = 127.0.1.1
 HTTP_PORT = 80
 OFFLINE_MODE = true
-ROOT_URL = http://gogs/
+EXTERNAL_URL = http://gogs/
 ```
 
 Moves Gogs' listen port to 80 on the local interface subnet, and tells the Gogs HTTPd that its virtual host is the "gogs" domain.
diff --git a/zh-CN/intro/change_log.md b/zh-CN/intro/change_log.md
deleted file mode 100644
index c857d4da..00000000
--- a/zh-CN/intro/change_log.md
+++ /dev/null
@@ -1,125 +0,0 @@
----
-name: 变更日志
----
-
-# 变更日志
-
-### 0.11.34 @ 2017-11-22
-
-#### Bug 修复
-
-- *回退*：跨仓库合并请求无法正常工作 [#4890](https://github.com/gogits/gogs/issues/4890)
-
-### 0.11.33 @ 2017-11-19
-
-#### Bug 修复
-
-- 部分安全修复
-- 合并请求后发送的 Web 钩子推送内容包含错误的提交 ID [#4442](https://github.com/gogits/gogs/issues/4442)
-- HTML 标签 go-import 未响应正确的值 [#4832](https://github.com/gogits/gogs/issues/4832)
-
-#### 新增特性
-
-- 添加钉钉 Web 钩子支持 [#4773](https://github.com/gogits/gogs/pull/4773)
-- 支持合并请求前先进行衍合操作 [#4798](https://github.com/gogits/gogs/issues/4798)
-
-#### 功能改进
-
-- 在 LDAP BindDN 中支持使用 '%s' 作为用户名占位符 [#2526](https://github.com/gogits/gogs/issues/2526)
-- 允许通过环境变量指定 Docker 容器内 git 用户的 UID [#3520](https://github.com/gogits/gogs/issues/3520)
-- 添加仓库设置以便在检查合并请求冲突时忽略空白符的差异 [#4834](https://github.com/gogits/gogs/issues/4834)
-
-#### 其它变更
-
-- 添加新语种支持：斯洛伐克语
-
-### 0.11.29 @ 2017-08-15
-
-#### Bug 修复
-
-- 如果仓库曾经为公开的，则变为私有后相关活动信息未被设为私有 [#4414](https://github.com/gogits/gogs/issues/4414)
-- Web 钩子不接受 IPv6 URL [#4428](https://github.com/gogits/gogs/issues/4428)
-- 通过代码提交关闭工单后没有发送邮件提醒 [#4430](https://github.com/gogits/gogs/issues/4430)
-- 探索页面分页不正确 [#4441](https://github.com/gogits/gogs/issues/4441)
-- `/api/v1/repos/search` 返回空值 [#4522](https://github.com/gogits/gogs/issues/4522)
-- 创建合并请求完成后发生错误 [#4572](https://github.com/gogits/gogs/issues/4572)
-
-### 0.11.19 @ 2017-06-10
-
-#### Bug 修复
-
-- 无法使用 go get 子包 [#1878](https://github.com/gogits/gogs/issues/1878)
-- 非首次使用 LDAP 登录无法更新用户为管理员 [#2855](https://github.com/gogits/gogs/issues/2855)
-- 使用 PAM 登录时发生错误 [#4216](https://github.com/gogits/gogs/issues/4216)
-- PostgreSQL 恢复备份后出现错误 `unique constraint violation` [#4357](https://github.com/gogits/gogs/issues/4357)
-- IPython notebook 的图片无法显示 [#4366](https://github.com/gogits/gogs/issues/4366)
-- 编辑文件预览时无法正确处理图片相对链接 [#4368](https://github.com/gogits/gogs/issues/4368)
-- 提交历史页面无法渲染 Emoji [#4439](https://github.com/gogits/gogs/issues/4439)
-- 查看包含文件权限更改的单个提交时 CPU 异常高 [#4475](https://github.com/gogits/gogs/issues/4475)
-- 无法修改协作者的权限 [#4512](https://github.com/gogits/gogs/issues/4512)
-
-#### 新增特性
-
-- 支持两步验证登录 [#945](https://github.com/gogits/gogs/issues/945)
-- 支持 LDAP 登录时验证组成员身份 [#4398](https://github.com/gogits/gogs/pull/4398)
-
-#### 功能改进
-
-- 安装页面检查 SMTP 地址中是否包含端口号 [#2243](https://github.com/gogits/gogs/issues/2243)
-- 镜像仓库没有拉取新代码提交时不更新最后更新时间 [#4341](https://github.com/gogits/gogs/issues/4341)
-- 支持 IPython Notebook 形式的 README [#4367](https://github.com/gogits/gogs/issues/4367)
-- 支持自定义 TLS 相关配置 [#4450](https://github.com/gogits/gogs/issues/4450)
-
-### 0.11.4 @ 2017-04-05
-
-#### Bug 修复
-
-- 在进行 HTTP/HTTPS 推送和拉取时客户端没有提示用户输入凭据
-- 镜像用户凭据没有进行 URL 编码 [#4014](https://github.com/gogits/gogs/issues/4014)
-- 仓库禁用合并请求时，发起合并请求按钮仍旧在分支页面显示 [#4377](https://github.com/gogits/gogs/issues/4377)
-- 用户在安装页面发生验证错误时应用会崩溃 [#4383](https://github.com/gogits/gogs/issues/4383) 
-
-### 0.11 @ 2017-04-03
-
-#### Bug 修复
-
-- 编辑个人信息发生验证错误时丢失内容 [#1123](https://github.com/gogits/gogs/issues/1123)
-- 组织控制面板显示错误的仓库统计 [#4351](https://github.com/gogits/gogs/issues/4351)
-- 从 0.10 之前的版本自动迁移失败 [#4355](https://github.com/gogits/gogs/issues/4355)
-- 允许公开访问工单的私有仓库没有正确处理匿名访问 [#4359](https://github.com/gogits/gogs/issues/4359)
-
-### 0.11 RC @ 2017-03-27
-
-#### Bug 修复
-
-- 不正确的会话文件权限 [#3363](https://github.com/gogits/gogs/issues/3363)
-- API：仓库对象的权限字段返回无效的值 [#4309](https://github.com/gogits/gogs/issues/4309)
-- 非本地用户无法更新个人设置 [#4313](https://github.com/gogits/gogs/issues/4313)
-- 工单索引不存在会显示随机工单 [#4315](https://github.com/gogits/gogs/issues/4315)
-- 无法从二级派生仓库发起合并请求 [#4324](https://github.com/gogits/gogs/issues/4324)
-- 无法更新保护分支白名单 [#4333](https://github.com/gogits/gogs/issues/4333)
-- 派生、迁移和镜像仓库的体积没有正确更新 [#4336](https://github.com/gogits/gogs/issues/4336)
-
-#### 新增特性
-
-- 支持私有仓库工单的公开访问 [#649](https://github.com/gogits/gogs/issues/649)
-- 支持私有仓库 Wiki 的公开访问 [#2157](https://github.com/gogits/gogs/issues/2157)
-- 支持重新推送 Web 钩子的历史记录 [#2187](https://github.com/gogits/gogs/issues/2187)
-- API：同步镜像仓库 [#2235](https://github.com/gogits/gogs/issues/2235)
-- 支持在控制面板中加载更多的活动内容 [#2511](https://github.com/gogits/gogs/issues/2511)
-- 支持设置指定当前用户时候登录的 Cookie 值 [#2885](https://github.com/gogits/gogs/issues/2885)
-- 支持备份及恢复 [#2924](https://github.com/gogits/gogs/issues/2924)
-- 支持空仓库的工单和 Wiki 操作 [#4104](https://github.com/gogits/gogs/issues/4104)
-- 提交历史页面自定义每页显示的数量 [#4230](https://github.com/gogits/gogs/issues/4230)
-- 用户设置页面添加管理仓库面板 [#4277](https://github.com/gogits/gogs/issues/4277)
-
-#### 功能改进
-
-- 探索页面显示私有但有访问权限的仓库 [#3088](https://github.com/gogits/gogs/issues/3088)
-- 允许在安装页面选择使用终端模式的日志 [#3119](https://github.com/gogits/gogs/issues/3119)
-- 允许配置 XORM 的日志器 [#3183](https://github.com/gogits/gogs/issues/3183)
-- 添加有关 HTML 渲染模式的配置选项 [#3608](https://github.com/gogits/gogs/issues/3608)
-- Web 钩子推送事件添加有关文件被添加、删除和修改的信息 [#3897](https://github.com/gogits/gogs/issues/3897)
-- 允许设置控制面板每页显示的活动数量 [#4247](https://github.com/gogits/gogs/issues/4247)
-
-**更早的变更日志可以在 [GitHub](https://github.com/gogits/gogs/releases?after=v0.11rc) 上找到。**
diff --git a/zh-CN/intro/faqs.md b/zh-CN/intro/faqs.md
index 5aaf4419..35ef50ad 100644
--- a/zh-CN/intro/faqs.md
+++ b/zh-CN/intro/faqs.md
@@ -44,7 +44,7 @@ server {
 }
 ```
 
-然后在配置文件中设置 `[server] ROOT_URL = http://git.crystalnetwork.us/gogs/`。
+然后在配置文件中设置 `[server] EXTERNAL_URL = http://git.crystalnetwork.us/gogs/`。
 
 ##### 为什么上传大文件时总是发生错误？
 
@@ -66,24 +66,26 @@ client_max_body_size 50m;
                  Allow from all
         </Proxy>
 
-        ProxyPass /git http://127.0.0.1:3000/
-        ProxyPassReverse /git http://127.0.0.1:3000/
+        ProxyPass /git http://127.0.0.1:3000
+        ProxyPassReverse /git http://127.0.0.1:3000
 </VirtualHost>
 ```
 
 ##### 有没有用 lighttpd 配置子路径的例子？
 
-可以尝试使用下面的配置模板：
+```
+server.modules  += ( "mod_proxy" )
+$HTTP["host"] == "git.example.com" {
+    proxy.server = ( "" => ( ( "host" => "127.0.0.1", "port" => "3000" ) ) )
+}
+```
 
 ```
-server.modules  += ( "mod_proxy_backend_http" )
-$HTTP["url"] =~ "^/gogs" {
-        proxy-core.protocol = "http"
-        proxy-core.backends = ( "localhost:3000" )
-        proxy-core.rewrite-request = (
-          "_uri" => ( "^/gogs/?(.*)" => "/$1" ),
-          "Host" => ( ".*" => "localhost:3000" ),
-        )
+# requires lighttpd 1.4.46 or later
+server.modules  += ( "mod_proxy" )
+$HTTP["url"] =~ "^/gogs/" {
+    proxy.server = ( "" => ( ( "host" => "localhost", "port" => "3000" ) ) )
+    proxy.header = ( "map-urlpath" => ( "/gogs/" => "/" ) )
 }
 ```
 
@@ -94,7 +96,7 @@ $HTTP["url"] =~ "^/gogs" {
 ```
 [server]
 PROTOCOL = https
-ROOT_URL = https://try.gogs.io/
+EXTERNAL_URL = https://try.gogs.io/
 CERT_FILE = custom/https/cert.pem
 KEY_FILE = custom/https/key.pem
 ```
@@ -115,18 +117,18 @@ KEY_FILE = custom/https/key.pem
 
 Gogs 拥有一些由第三方提供的脚本来支持以守护进程形式运行：
 
-- [init.d/centos](https://github.com/gogits/gogs/blob/master/scripts/init/centos/gogs)
-- [init.d/debian](https://github.com/gogits/gogs/blob/master/scripts/init/debian/gogs)
+- [init.d/centos](https://github.com/gogs/gogs/blob/main/scripts/init/centos/gogs)
+- [init.d/debian](https://github.com/gogs/gogs/blob/main/scripts/init/debian/gogs)
 - 下小节中的 Systemd 服务
 
 #### Systemd 服务
 
-在 GitHub 上的 Gogs 仓库有一个 [systemd 服务模版文件](https://github.com/gogits/gogs/blob/master/scripts/systemd/gogs.service)，您需要做出一定的修改才能够使用它：
+在 GitHub 上的 Gogs 仓库有一个 [systemd 服务模版文件](https://github.com/gogs/gogs/blob/main/scripts/systemd/gogs.service)，您需要做出一定的修改才能够使用它：
 
 1. 更新 `User`、`Group`、`WorkingDirectory`、`ExecStart` 和 `Environment` 为相对应的值。其中 `WorkingDirectory` 为您的 Gogs 实际安装路径根目录。
 3. [可选] 如果您 Gogs 安装示例使用 `MySQL/MariaDB`、`PostgreSQL`、`Redis` 或 `memcached`，请去掉相应 `After` 属性的注释。
 
-当您完成修改后，请将文件保存至 `/etc/systemd/system/gogs.service`，然后通过 `sudo systemctl enable gogs` 命令激活，最后执行 `sudo systemctl start gogs`。
+当您完成修改后，请将文件保存至 `/usr/lib/systemd/system/gogs.service`，然后通过 `sudo systemctl enable gogs` 命令激活，最后执行 `sudo systemctl start gogs`。
 
 您可以通过 `sudo systemctl status gogs -l` 或 `sudo journalctl -b -u gogs`  命令检查 Gogs 的运行状态。
 
diff --git a/zh-CN/intro/troubleshooting.md b/zh-CN/intro/troubleshooting.md
index 8157c1d8..3bd6347f 100644
--- a/zh-CN/intro/troubleshooting.md
+++ b/zh-CN/intro/troubleshooting.md
@@ -6,7 +6,7 @@ name: 故障排查
 
 ## 安装
 
-- 错误描述：`../gosrc/src/github.com/gogits/gogs/cmd/cert.go:79: undefined: elliptic.P224`
+- 错误描述：`../gosrc/src/github.com/gogs/gogs/cmd/cert.go:79: undefined: elliptic.P224`
 - 可能原因：Go 语言的 RHEL/CentOS 官方发行版中因专利问题移除了相关加密算法的代码
 - 解决方案：从 [golang.org/dl](http://golang.org/dl) 下载安装 Go 语言
 
@@ -56,7 +56,7 @@ name: 故障排查
 - 错误描述：`cache: unknown adaptername "memcache" (forgotten import?)`
 - 可能原因：为了减少不必要的导入，您需要使用构建 tags 来启用某个缓存适配器。
 - 解决方案：
-	- 下载：`go get -tags memcache github.com/gogits/gogs`
+	- 下载：`go get -tags memcache github.com/gogs/gogs`
 	- 构建：`go build -tags memcache`
 	- 如果要启用 `redis` 也是一样的步骤。
 
@@ -79,7 +79,7 @@ name: 故障排查
 
 - 错误描述：`Database setting is not correct: This server only supports the insecure old password authentication. If you still want to use it, please add 'allowOldPasswords=1' to your DSN. See also https://github.com/go-sql-driver/mysql/wiki/old_passwords`
 - 可能原因：只更新了 @localhost 的密码，但 @% 用户依旧使用旧密码
-- 解决方案：[GitHub 讨论](https://github.com/gogits/gogs/issues/385#issuecomment-54357073)
+- 解决方案：[GitHub 讨论](https://github.com/gogs/gogs/issues/385#issuecomment-54357073)
 
 #### 连接到错误的 SQLite3 数据库
 
diff --git a/zh-CN/upgrade/upgrade_from_binary.md b/zh-CN/upgrade/upgrade_from_binary.md
index deb44337..32910f85 100644
--- a/zh-CN/upgrade/upgrade_from_binary.md
+++ b/zh-CN/upgrade/upgrade_from_binary.md
@@ -28,10 +28,10 @@ $ mv gogs gogs_old
 
 ```bash
 # 请根据系统和类型获取相应的二进制版本
-$ wget wget https://dl.gogs.io/$VERSION/$OS_$ARCH.tar.gz
-$ tar -zxvf $OS_$ARCH.tar.gz
+$ wget https://dl.gogs.io/$VERSION/gogs_$VERSION_$OS_$ARCH.tar.gz
+$ tar -zxvf gogs_$VERSION_$OS_$ARCH.tar.gz
 $ ls
-gogs gogs_old  gogs-repositories $OS_$ARCH.tar.gz
+gogs gogs_old  gogs-repositories gogs_$VERSION_$OS_$ARCH.tar.gz
 ```
 
 复制 `custom`、`data` 和 `log` 目录到新解压的目录中：
diff --git a/zh-CN/upgrade/upgrade_from_source.md b/zh-CN/upgrade/upgrade_from_source.md
index 7b778d69..a2acf48e 100644
--- a/zh-CN/upgrade/upgrade_from_source.md
+++ b/zh-CN/upgrade/upgrade_from_source.md
@@ -4,26 +4,14 @@ name: 源码升级
 
 # 从源码升级
 
-升级 Gogs 的一般步骤：
+切换工作目录到 Gogs 仓库的本地克隆：
 
 ```bash
-# 更新源码以及依赖
-$ go get -u github.com/gogits/gogs
-
-$ cd $GOPATH/src/github.com/gogits/gogs
-
-# 移除旧的二进制
-$ rm gogs
-
-# 或将旧的二进制进行备份
-$ mv gogs gogs.$(date +%Y-%m-%d).old
-
-# 重新构建 Gogs
-$ go build
+$ git pull
+$ go build -o gogs
 ```
 
 其它操作：
 
-- [构建 `develop` 分支版本](/docs/installation/install_from_source#%E6%9E%84%E5%BB%BA-develop-%E5%88%86%E6%94%AF%E7%89%88%E6%9C%AC)
 - [测试安装](/docs/installation/install_from_source#%E6%B5%8B%E8%AF%95%E5%AE%89%E8%A3%85)
 - [使用标签构建](/docs/installation/install_from_source#%E4%BD%BF%E7%94%A8%E6%A0%87%E7%AD%BE%E6%9E%84%E5%BB%BA)
