1 file changed, 11 insertions, 14 deletions

diff --git a/custom/servers/apache.conf b/custom/servers/apache.confindex 33b5439..e335151 100644--- a/custom/servers/apache.conf+++ b/custom/servers/apache.conf@@ -20,13 +20,11 @@ #   public URL        https://git.example.org/  (cgit at the domain root) # # cgit is one CGI executable. It learns the repository and the page from-# PATH_INFO and reads page options such as h= and id= from QUERY_STRING.-# ScriptAlias runs the binary and forwards the trailing path as PATH_INFO, so-# no extra path tuning is needed. cgit builds its own link base from-# SCRIPT_NAME. The five static assets are served straight off disk. mod_alias-# resolves Alias and ScriptAlias in order and the first match wins, so the-# static Alias lines come before the catch-all ScriptAlias to stop the two-# routes from shadowing each other.+# PATH_INFO and reads page options such as h= and id= from QUERY_STRING. The+# five static assets are served straight off disk. mod_alias resolves Alias and+# ScriptAlias in order and the first match wins, so the static Alias lines come+# before the catch-all ScriptAlias to stop the two routes from shadowing each+# other.   # ServerRoot is what every relative path below resolves against, including the@@ -253,13 +251,12 @@ AddType text/plain               .txt     Alias /favicon.ico /usr/share/cgit/favicon.ico     Alias /robots.txt  /usr/share/cgit/robots.txt -    # ScriptAlias maps a URL prefix to a path, marks it executable, and-    # forwards the rest of the URL as PATH_INFO. Mapping / makes cgit the-    # handler for every URL the static Aliases above did not already claim.-    # The trailing slash on cgit.cgi/ is load bearing, telling Apache that-    # cgit.cgi is the program and the rest of the URL is PATH_INFO. cgit-    # derives its link base from SCRIPT_NAME, which at the domain root is /-    # and needs no tuning. For a sub-path install see the note below.+    # Mapping / makes cgit the handler for every URL the static Aliases above+    # did not already claim. The trailing slash on cgit.cgi/ is load bearing,+    # telling Apache that cgit.cgi is the program and the rest of the URL is+    # PATH_INFO. cgit derives its link base from SCRIPT_NAME, which at the+    # domain root is / and needs no tuning. For a sub-path install see the+    # note below.     ScriptAlias / /usr/lib/cgit/cgit.cgi/ </VirtualHost> 
diff --git a/custom/servers/apache.conf b/custom/servers/apache.conf
index 33b5439..e335151 100644
--- a/custom/servers/apache.conf
+++ b/custom/servers/apache.conf
@@ -20,13 +20,11 @@
 #   public URL        https://git.example.org/  (cgit at the domain root)
 #
 # cgit is one CGI executable. It learns the repository and the page from
-# PATH_INFO and reads page options such as h= and id= from QUERY_STRING.
-# ScriptAlias runs the binary and forwards the trailing path as PATH_INFO, so
-# no extra path tuning is needed. cgit builds its own link base from
-# SCRIPT_NAME. The five static assets are served straight off disk. mod_alias
-# resolves Alias and ScriptAlias in order and the first match wins, so the
-# static Alias lines come before the catch-all ScriptAlias to stop the two
-# routes from shadowing each other.
+# PATH_INFO and reads page options such as h= and id= from QUERY_STRING. The
+# five static assets are served straight off disk. mod_alias resolves Alias and
+# ScriptAlias in order and the first match wins, so the static Alias lines come
+# before the catch-all ScriptAlias to stop the two routes from shadowing each
+# other.
 
 
 # ServerRoot is what every relative path below resolves against, including the
@@ -253,13 +251,12 @@ AddType text/plain               .txt
     Alias /favicon.ico /usr/share/cgit/favicon.ico
     Alias /robots.txt  /usr/share/cgit/robots.txt
 
-    # ScriptAlias maps a URL prefix to a path, marks it executable, and
-    # forwards the rest of the URL as PATH_INFO. Mapping / makes cgit the
-    # handler for every URL the static Aliases above did not already claim.
-    # The trailing slash on cgit.cgi/ is load bearing, telling Apache that
-    # cgit.cgi is the program and the rest of the URL is PATH_INFO. cgit
-    # derives its link base from SCRIPT_NAME, which at the domain root is /
-    # and needs no tuning. For a sub-path install see the note below.
+    # Mapping / makes cgit the handler for every URL the static Aliases above
+    # did not already claim. The trailing slash on cgit.cgi/ is load bearing,
+    # telling Apache that cgit.cgi is the program and the rest of the URL is
+    # PATH_INFO. cgit derives its link base from SCRIPT_NAME, which at the
+    # domain root is / and needs no tuning. For a sub-path install see the
+    # note below.
     ScriptAlias / /usr/lib/cgit/cgit.cgi/
 </VirtualHost>