From 27eacdbd2c8b7b2022677161fd88e25972f42841 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Wed, 10 Jan 2007 05:37:47 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.4.4.4-gbb10

---
 git-applymbox.html | 15 +++++++--------
 git-applymbox.txt  | 14 +++++++-------
 git-mailinfo.html  | 17 +++++++----------
 git-mailinfo.txt   | 16 +++++++---------
 4 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/git-applymbox.html b/git-applymbox.html
index 27d48b6a7..a1856b16c 100644
--- a/git-applymbox.html
+++ b/git-applymbox.html
@@ -325,14 +325,13 @@ current branch.</p>
 </dt>
 <dd>
 <p>
-        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.
 </p>
+<p>Note that the patch is always used as-is without charset
+conversion, even with this flag.</p>
 </dd>
 <dt>
 -c .dotest/&lt;num&gt;
@@ -391,7 +390,7 @@ current branch.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:40:51 UTC
+Last updated 10-Jan-2007 05:37:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-applymbox.txt b/git-applymbox.txt
index f74c6a49b..95dc65a58 100644
--- 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 ec57b6d25..8eb768e1c 100644
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -305,16 +305,13 @@ command directly.</p>
 </dt>
 <dd>
 <p>
-        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.
 </p>
+<p>Note that the patch is always used as-is without charset
+conversion, even with this flag.</p>
 </dd>
 <dt>
 --encoding=&lt;encoding&gt;
@@ -360,7 +357,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:11 UTC
+Last updated 10-Jan-2007 05:37:42 UTC
 </div>
 </div>
 </body>
diff --git a/git-mailinfo.txt b/git-mailinfo.txt
index ea0a06557..5088bbea8 100644
--- 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
-- 
2.26.2