Autogenerated HTML docs for v1.6.0.2-229-g1293c

diff --git a/git-config.html b/git-config.html
index 61a001e3a7d1868e35a6fe6b773cd60c85fe1042..a64b28ddf57e1f1bdfe92bdea0bf66d8cb899669 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -2162,7 +2162,7 @@ merge.stat
 </dt>\r
 <dd>\r
 <p>\r
-        Whether to print the diffstat between ORIG_HEAD and merge result\r
+        Whether to print the diffstat between ORIG_HEAD and the merge result\r
         at the end of the merge.  True by default.\r
 </p>\r
 </dd>\r
@@ -2744,7 +2744,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-09-09 01:34:20 UTC\r
+Last updated 2008-09-13 06:06:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.html b/git-merge.html
index 3ad4e286604ed383569949fe6de2d76867271a6a..a9ad58d58df0f522022faab58a47fb935e3f7597 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -565,7 +565,7 @@ merge.stat
 </dt>\r
 <dd>\r
 <p>\r
-        Whether to print the diffstat between ORIG_HEAD and merge result\r
+        Whether to print the diffstat between ORIG_HEAD and the merge result\r
         at the end of the merge.  True by default.\r
 </p>\r
 </dd>\r
@@ -827,7 +827,7 @@ Look at the originals.  <em>git show :1:filename</em> shows the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-24 03:33:55 UTC\r
+Last updated 2008-09-13 06:06:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-web--browse.html b/git-web--browse.html
index a1e2511e9932e7052fd2b75846e66ddebe9bcc4c..4d4907eb0e31a3cf949e6136415749bb5541dd7b 100644 (file)
--- a/git-web--browse.html
+++ b/git-web--browse.html
@@ -434,7 +434,7 @@ the URLs passed as arguments.</p></div>
 </div>\r
 <h2 id="_note_about_konqueror">Note about konqueror</h2>\r
 <div class="sectionbody">\r
-<div class="para"><p>When <em>konqueror</em> is specified by the a command line option or a\r
+<div class="para"><p>When <em>konqueror</em> is specified by a command line option or a\r
 configuration variable, we launch <em>kfmclient</em> to try to open the HTML\r
 man page on an already opened konqueror in a new tab if possible.</p></div>\r
 <div class="para"><p>For consistency, we also try such a trick if <em>browser.konqueror.path</em> is\r
@@ -476,7 +476,7 @@ git-list &lt;git@vger.kernel.org&gt;.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-07-06 05:17:07 UTC\r
+Last updated 2008-09-13 06:06:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-web--browse.txt b/git-web--browse.txt
index 36afad8d4e0d67a8d9dd33d3bc590789e9f6604d..7f7a45b2eaa3997cbf5a250fb78387e2a0959a11 100644 (file)
--- a/git-web--browse.txt
+++ b/git-web--browse.txt
@@ -77,7 +77,7 @@ the URLs passed as arguments.
 Note about konqueror
 --------------------
 
-When 'konqueror' is specified by the a command line option or a
+When 'konqueror' is specified by a command line option or a
 configuration variable, we launch 'kfmclient' to try to open the HTML
 man page on an already opened konqueror in a new tab if possible.
 

diff --git a/git.html b/git.html
index 970f457013567b7e8ff9a3d84e37741e7ee8b971..504182f18b4a0cc068d1c2b6d34407334049491b 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2025,7 +2025,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p></div>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-08-25 00:33:14 UTC\r
+Last updated 2008-09-13 06:06:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index e178fb581323adaa5f490fb67732f98147ec460f..df420aeb331592192ab27d76af780c8c97a95e87 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -43,10 +43,11 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.6.1/git.html[documentation for release 1.6.1]
+* link:v1.6.0.2/git.html[documentation for release 1.6.0.2]
 
 * release notes for
-  link:RelNotes-1.6.1.txt[1.6.1],
+  link:RelNotes-1.6.0.2.txt[1.6.0.2],
+  link:RelNotes-1.6.0.1.txt[1.6.0.1],
   link:RelNotes-1.6.0.txt[1.6.0].
 
 * link:v1.5.6.5/git.html[documentation for release 1.5.6.5]

diff --git a/gitattributes.html b/gitattributes.html
index 01c7b26c40c50dc122f7043fd253ab27cc11f1f3..30d3c5d679077efb84771d0c9bc03c61297f1009 100644 (file)
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -643,7 +643,7 @@ patterns are available:</p></div>
 </li>\r
 <li>\r
 <p>\r
-<tt>java</tt> suitable for source code in the Java lanugage.\r
+<tt>java</tt> suitable for source code in the Java language.\r
 </p>\r
 </li>\r
 <li>\r
@@ -943,7 +943,7 @@ frotz   unspecified</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-09-09 01:34:20 UTC\r
+Last updated 2008-09-13 06:06:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitattributes.txt b/gitattributes.txt
index 75124d26125f736b446b8e18826af3e444503edd..6f3551dc825a04628e7bcd133421093d89f01956 100644 (file)
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -313,7 +313,7 @@ patterns are available:
 
 - `html` suitable for HTML/XHTML documents.
 
-- `java` suitable for source code in the Java lanugage.
+- `java` suitable for source code in the Java language.
 
 - `pascal` suitable for source code in the Pascal/Delphi language.
 

diff --git a/merge-config.txt b/merge-config.txt
index 00277e061313974a4f8fdb9333608902c7ef653f..c735788b0f1c8efb0b250d4810be420be6c62f89 100644 (file)
--- a/merge-config.txt
+++ b/merge-config.txt
@@ -1,5 +1,5 @@
 merge.stat::
-       Whether to print the diffstat between ORIG_HEAD and merge result
+       Whether to print the diffstat between ORIG_HEAD and the merge result
        at the end of the merge.  True by default.
 
 merge.log::