From: Junio C Hamano <junio@hera.kernel.org>
Date: Tue, 9 Sep 2008 01:34:39 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.6.0.1-285-g1070
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f24b80653c648a2a71edae762a4c2f508be7f391;p=git.git

Autogenerated HTML docs for v1.6.0.1-285-g1070
---

diff --git a/config.txt b/config.txt
index ed3285f89..922ac7b44 100644
--- 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 8966da9db..61a001e3a 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1957,6 +1957,20 @@ help.format
 </p>
 </dd>
 <dt>
+help.autocorrect
+</dt>
+<dd>
+<p>
+        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.
+</p>
+</dd>
+<dt>
 http.proxy
 </dt>
 <dd>
@@ -2730,7 +2744,7 @@ web.browser
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-09-01 06:10:53 UTC
+Last updated 2008-09-09 01:34:20 UTC
 </div>
 </div>
 </body>
diff --git a/gitattributes.html b/gitattributes.html
index c4ceac2a2..01c7b26c4 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -638,6 +638,11 @@ patterns are available:</p></div>
 </li>
 <li>
 <p>
+<tt>html</tt> suitable for HTML/XHTML documents.
+</p>
+</li>
+<li>
+<p>
 <tt>java</tt> suitable for source code in the Java lanugage.
 </p>
 </li>
@@ -648,22 +653,22 @@ patterns are available:</p></div>
 </li>
 <li>
 <p>
-<tt>python</tt> suitable for source code in the Python language.
+<tt>php</tt> suitable for source code in the PHP language.
 </p>
 </li>
 <li>
 <p>
-<tt>ruby</tt> suitable for source code in the Ruby language.
+<tt>python</tt> suitable for source code in the Python language.
 </p>
 </li>
 <li>
 <p>
-<tt>tex</tt> suitable for source code for LaTeX documents.
+<tt>ruby</tt> suitable for source code in the Ruby language.
 </p>
 </li>
 <li>
 <p>
-<tt>html</tt> suitable for HTML/XHTML documents.
+<tt>tex</tt> suitable for source code for LaTeX documents.
 </p>
 </li>
 </ul></div>
@@ -938,7 +943,7 @@ frotz   unspecified</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-09-01 06:10:54 UTC
+Last updated 2008-09-09 01:34:20 UTC
 </div>
 </div>
 </body>
diff --git a/gitattributes.txt b/gitattributes.txt
index 5fb500741..75124d261 100644
--- 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~