Autogenerated HTML docs for v1.6.0.1-285-g1070

diff --git a/config.txt b/config.txt
index ed3285f89927e1d988527ae5b67a5bea357d30e0..922ac7b44da1c2cc04bf024307e9ccd54709580f 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -790,6 +790,15 @@ help.format::
        Values 'man', 'info', 'web' and 'html' are supported. 'man' is
        the default. 'web' and 'html' are the same.
 
+help.autocorrect::
+       Automatically correct and execute mistyped commands after
+       waiting for the given number of deciseconds (0.1 sec). If more
+       than one command can be deduced from the entered text, nothing
+       will be executed.  If the value of this option is negative,
+       the corrected command will be executed immediately. If the
+       value is 0 - the command will be just shown but not executed.
+       This is the default.
+
 http.proxy::
        Override the HTTP proxy, normally configured using the 'http_proxy'
        environment variable (see linkgit:curl[1]).  This can be overridden

diff --git a/git-config.html b/git-config.html
index 8966da9db240c65e1eec8a128cf7e034202d4998..61a001e3a7d1868e35a6fe6b773cd60c85fe1042 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1957,6 +1957,20 @@ help.format
 </p>\r
 </dd>\r
 <dt>\r
+help.autocorrect\r
+</dt>\r
+<dd>\r
+<p>\r
+        Automatically correct and execute mistyped commands after\r
+        waiting for the given number of deciseconds (0.1 sec). If more\r
+        than one command can be deduced from the entered text, nothing\r
+        will be executed.  If the value of this option is negative,\r
+        the corrected command will be executed immediately. If the\r
+        value is 0 - the command will be just shown but not executed.\r
+        This is the default.\r
+</p>\r
+</dd>\r
+<dt>\r
 http.proxy\r
 </dt>\r
 <dd>\r
@@ -2730,7 +2744,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-09-01 06:10:53 UTC\r
+Last updated 2008-09-09 01:34:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitattributes.html b/gitattributes.html
index c4ceac2a2e12e9aaec66c0b4952072132427dd51..01c7b26c40c50dc122f7043fd253ab27cc11f1f3 100644 (file)
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -638,6 +638,11 @@ patterns are available:</p></div>
 </li>\r
 <li>\r
 <p>\r
+<tt>html</tt> suitable for HTML/XHTML documents.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <tt>java</tt> suitable for source code in the Java lanugage.\r
 </p>\r
 </li>\r
@@ -648,22 +653,22 @@ patterns are available:</p></div>
 </li>\r
 <li>\r
 <p>\r
-<tt>python</tt> suitable for source code in the Python language.\r
+<tt>php</tt> suitable for source code in the PHP language.\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-<tt>ruby</tt> suitable for source code in the Ruby language.\r
+<tt>python</tt> suitable for source code in the Python language.\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-<tt>tex</tt> suitable for source code for LaTeX documents.\r
+<tt>ruby</tt> suitable for source code in the Ruby language.\r
 </p>\r
 </li>\r
 <li>\r
 <p>\r
-<tt>html</tt> suitable for HTML/XHTML documents.\r
+<tt>tex</tt> suitable for source code for LaTeX documents.\r
 </p>\r
 </li>\r
 </ul></div>\r
@@ -938,7 +943,7 @@ frotz   unspecified</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2008-09-01 06:10:54 UTC\r
+Last updated 2008-09-09 01:34:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitattributes.txt b/gitattributes.txt
index 5fb5007413666d0b3d0aaa4c553c1fd5a67e60d9..75124d26125f736b446b8e18826af3e444503edd 100644 (file)
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -311,18 +311,20 @@ patterns are available:
 
 - `bibtex` suitable for files with BibTeX coded references.
 
+- `html` suitable for HTML/XHTML documents.
+
 - `java` suitable for source code in the Java lanugage.
 
 - `pascal` suitable for source code in the Pascal/Delphi language.
 
+- `php` suitable for source code in the PHP language.
+
 - `python` suitable for source code in the Python language.
 
 - `ruby` suitable for source code in the Ruby language.
 
 - `tex` suitable for source code for LaTeX documents.
 
-- `html` suitable for HTML/XHTML documents.
-
 
 Performing a three-way merge
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~