Merge branch 'jk/http-auth-redirects'

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 9e0ef0eaf32f8861ba7090ae2feb6188c2c2f0b7..5c0a4ab2d6d4c123899fa32e8f147a8c077f2130 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -438,7 +438,8 @@ Edit..Preferences..Composition, wrap plain text messages at 0
 In Thunderbird 3:
 Edit..Preferences..Advanced..Config Editor.  Search for
 "mail.wrap_long_lines".
-Toggle it to make sure it is set to `false`.
+Toggle it to make sure it is set to `false`. Also, search for
+"mailnews.wraplength" and set the value to 0.
 
 3. Disable the use of format=flowed:
 Edit..Preferences..Advanced..Config Editor.  Search for