Autogenerated HTML docs for v1.4.4.4-gbb10

diff --git a/git-applymbox.html b/git-applymbox.html
index 27d48b6a78a85cd60063ed770f359aa1ac6efaff..a1856b16c0bef9c805467e25b7571b12e82c6668 100644 (file)
--- a/git-applymbox.html
+++ b/git-applymbox.html
@@ -325,14 +325,13 @@ current branch.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        By default, the commit log message, author name and\r
-        author email are taken from the e-mail without any\r
-        charset conversion, after minimally decoding MIME\r
-        transfer encoding.  This flag causes the resulting\r
-        commit to be encoded in utf-8 by transliterating them.\r
-        Note that the patch is always used as is without charset\r
-        conversion, even with this flag.\r
+        The commit log message, author name and author email are\r
+        taken from the e-mail, and after minimally decoding MIME\r
+        transfer encoding, re-coded in UTF-8 by transliterating\r
+        them.  This used to be optional but now it is the default.\r
 </p>\r
+<p>Note that the patch is always used as-is without charset\r
+conversion, even with this flag.</p>\r
 </dd>\r
 <dt>\r
 -c .dotest/&lt;num&gt;\r
@@ -391,7 +390,7 @@ current branch.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:40:51 UTC\r
+Last updated 10-Jan-2007 05:37:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-applymbox.txt b/git-applymbox.txt
index f74c6a49b3c5d52ed662a83832c7d06915fac65b..95dc65a583552d4f7e2d1fa34c448832c66a3353 100644 (file)
--- a/git-applymbox.txt
+++ b/git-applymbox.txt
@@ -42,13 +42,13 @@ OPTIONS
        and the current tree.
 
 -u::
-       By default, the commit log message, author name and
-       author email are taken from the e-mail without any
-       charset conversion, after minimally decoding MIME
-       transfer encoding.  This flag causes the resulting
-       commit to be encoded in utf-8 by transliterating them.
-       Note that the patch is always used as is without charset
-       conversion, even with this flag.
+       The commit log message, author name and author email are
+       taken from the e-mail, and after minimally decoding MIME
+       transfer encoding, re-coded in UTF-8 by transliterating
+       them.  This used to be optional but now it is the default.
++
+Note that the patch is always used as-is without charset
+conversion, even with this flag.
 
 -c .dotest/<num>::
        When the patch contained in an e-mail does not cleanly

diff --git a/git-mailinfo.html b/git-mailinfo.html
index ec57b6d2548a104888aeeda9b560d0e3fa475ec1..8eb768e1caaac53fb36f9db099d3837739257ba5 100644 (file)
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -305,16 +305,13 @@ command directly.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        By default, the commit log message, author name and\r
-        author email are taken from the e-mail without any\r
-        charset conversion, after minimally decoding MIME\r
-        transfer encoding.  This flag causes the resulting\r
-        commit to be encoded in the encoding specified by\r
-        i18n.commitencoding configuration (defaults to utf-8) by\r
-        transliterating them.\r
-        Note that the patch is always used as is without charset\r
-        conversion, even with this flag.\r
+        The commit log message, author name and author email are\r
+        taken from the e-mail, and after minimally decoding MIME\r
+        transfer encoding, re-coded in UTF-8 by transliterating\r
+        them.  This used to be optional but now it is the default.\r
 </p>\r
+<p>Note that the patch is always used as-is without charset\r
+conversion, even with this flag.</p>\r
 </dd>\r
 <dt>\r
 --encoding=&lt;encoding&gt;\r
@@ -360,7 +357,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:11 UTC\r
+Last updated 10-Jan-2007 05:37:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mailinfo.txt b/git-mailinfo.txt
index ea0a06557f933ce48374ddbb751a64945ff65955..5088bbea84c0e6b681641b78b816755fa12f6b6d 100644 (file)
--- a/git-mailinfo.txt
+++ b/git-mailinfo.txt
@@ -33,15 +33,13 @@ OPTIONS
        format-patch --mbox' output.
 
 -u::
-       By default, the commit log message, author name and
-       author email are taken from the e-mail without any
-       charset conversion, after minimally decoding MIME
-       transfer encoding.  This flag causes the resulting
-       commit to be encoded in the encoding specified by
-       i18n.commitencoding configuration (defaults to utf-8) by
-       transliterating them. 
-       Note that the patch is always used as is without charset
-       conversion, even with this flag.
+       The commit log message, author name and author email are
+       taken from the e-mail, and after minimally decoding MIME
+       transfer encoding, re-coded in UTF-8 by transliterating
+       them.  This used to be optional but now it is the default.
++
+Note that the patch is always used as-is without charset
+conversion, even with this flag.
 
 --encoding=<encoding>::
        Similar to -u but if the local convention is different