Autogenerated HTML docs for v1.5.3-rc4

diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt
index 03d18430e8b49d377923d5c7b39d8e47663c0da8..21bb1fc6f2d1dfdb0231ba7381f0ade1ecb66c49 100644 (file)
--- a/RelNotes-1.5.3.txt
+++ b/RelNotes-1.5.3.txt
@@ -47,8 +47,8 @@ Updates since v1.5.2
     renaming history of a single file.
 
   - "git-filter-branch" lets you rewrite the revision history of
-    the current branch, creating a new branch. You can specify a
-    number of filters to modify the commits, files and trees.
+    specified branches. You can specify a number of filters to
+    modify the commits, files and trees.
 
   - "git-cvsserver" learned new options (--base-path, --export-all,
     --strict-paths) inspired by git-daemon.
@@ -274,6 +274,6 @@ this release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.5.3-rc3-119-g50cff52
+O=v1.5.3-rc4
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

diff --git a/config.txt b/config.txt
index 3135cb7a66814a5764891641f300be07681c551e..de9e72b562eec6310af23cb4e5ef237268e8df2a 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -101,7 +101,7 @@ Example
 
        # Proxy settings
        [core]
-               gitProxy="ssh" for "ssh://kernel.org/"
+               gitProxy="ssh" for "kernel.org"
                gitProxy=default-proxy ; for the rest
 
 Variables

diff --git a/git-config.html b/git-config.html
index 61fa4723c0f83b6cafc03780eb66074ebbfa97f9..6cd648711495c619cdd8013a5fd3037e4c4c1952 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -601,9 +601,7 @@ GIT_CONFIG_LOCAL
 <div class="content">\r
 <pre><tt>; Proxy settings\r
 [core]\r
-        gitproxy="ssh" for "ssh://kernel.org/"\r
         gitproxy="proxy-command" for kernel.org\r
-        gitproxy="myprotocol-command" for "my://"\r
         gitproxy=default-proxy ; for all the rest</tt></pre>\r
 </div></div>\r
 <p>you can set the filemode to true with</p>\r
@@ -666,7 +664,7 @@ i.e. the one without a "for &#8230;" postfix, do something like this:</p>
 <p>To add a new proxy, without altering any of the existing ones, use</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>% git config core.gitproxy '"proxy" for example.com'</tt></pre>\r
+<pre><tt>% git config core.gitproxy '"proxy-command" for example.com'</tt></pre>\r
 </div></div>\r
 </div>\r
 <h2>CONFIGURATION FILE</h2>\r
@@ -761,7 +759,7 @@ customary UNIX fashion.</p>
 <div class="content">\r
 <pre><tt># Proxy settings\r
 [core]\r
-        gitProxy="ssh" for "ssh://kernel.org/"\r
+        gitProxy="ssh" for "kernel.org"\r
         gitProxy=default-proxy ; for the rest</tt></pre>\r
 </div></div>\r
 <h3>Variables</h3>\r
@@ -1885,7 +1883,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Aug-2007 08:42:09 UTC\r
+Last updated 04-Aug-2007 00:27:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-config.txt b/git-config.txt
index 8451cccf8a34d73a3b6b74be53af8ad110fc9f09..c3dffffe3209317fdd228c9a4a1ac89cb1c348f4 100644 (file)
--- a/git-config.txt
+++ b/git-config.txt
@@ -214,9 +214,7 @@ Given a .git/config like this:
 
        ; Proxy settings
        [core]
-               gitproxy="ssh" for "ssh://kernel.org/"
                gitproxy="proxy-command" for kernel.org
-               gitproxy="myprotocol-command" for "my://"
                gitproxy=default-proxy ; for all the rest
 
 you can set the filemode to true with
@@ -291,7 +289,7 @@ To actually match only values with an exclamation mark, you have to
 To add a new proxy, without altering any of the existing ones, use
 
 ------------
-% git config core.gitproxy '"proxy" for example.com'
+% git config core.gitproxy '"proxy-command" for example.com'
 ------------