1 file changed, 22 insertions, 0 deletions
diff --git a/README.txt b/README.txt
index bcddbf4..5d9ea2a 100644
--- a/README.txt
+++ b/README.txt
@@ -124,6 +124,28 @@ meets its permissions and prints on stderr what the error log would get.
     $ sudo -u www-data /usr/lib/cgit/cgit.cgi --nohttp --query=url=demo/log
 
 
+Upgrading from upstream cgit
+----------------------------
+
+An upstream cgitrc still loads, but cgit skips the old name of a renamed option
+with only an "Unknown config key" line in the error log, so an old
+noplainemail=1 shows email addresses again. These are the new names.
+
+    agefile                    age-file
+    cache-repo-ttl             cache-summary-ttl
+    cache-root-ttl             cache-index-ttl
+    cache-scanrc-ttl           cache-scan-ttl
+    noheader=1                 enable-header=0
+    noplainemail=1             enable-plain-email=0
+    renamelimit                rename-limit
+    repo.extra-head-content    repo.head-content
+
+In a scanned repository's own cgitrc, extra-head-content is now head-content.
+enable-filter-overrides is gone, as repo.*-filter lines always apply and a
+scanned repository's own filters wait on trust-scan-config. owner-filter,
+repo.owner-filter and repo.homepage are gone with nothing in their place.
+
+
 Customisation
 -------------