Bug 731223 - Update help from changes from bug #694514 and bug #733258. r=InvisibleSmiley
--- a/suite/locales/en-US/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mailnews_preferences.xhtml
@@ -280,16 +280,34 @@
you are currently composing automatically at the given interval. After a
computer crash or program failure you can find the latest saved version of
the message in your Drafts folder.</li>
<li><strong>Confirm when using keyboard shortcut to send message</strong>:
Check this option if want to be asked if you're sure to be ready to
send the message when you're pressing Ctrl+Return in message editor.
This may help you avoid accidentally sending the message if you enter the
keyboard shortcut by mistake when composing a message.</li>
+ <li><strong>Select reply header type</strong>:
+ Select the type of reply header you wish to use. There are four choices
+ available:
+ <ol>
+ <li>No Reply Header</li>
+ <li>[Author] wrote:<br/>
+ This setting is based on the mailnews.reply_header_authorwrote
+ preference.</li>
+ <li>On [date], [author] wrote:<br/>
+ This setting is based on a combination of the mailnews.reply_header_ondate,
+ mailnews.reply_header_separator and mailnews.reply_header_authorwrote
+ preferences.</li>
+ <li>[Author] wrote, On [date]:<br/>
+ This setting is based on a combination of the
+ mailnews.reply_header_authorwrote, mailnews.reply_header_separator and
+ mailnews.reply_header_ondate preferences.</li>
+ </ol>
+ </li>
<li><strong>Wrap plain text messages at [__] characters</strong>: Enter a
number to set the right margin for text in the message area.</li>
<li><strong>Defaults for HTML Messages</strong>: Here you can define what the
defaults are for font, size, text and background color if you choose to
send mails in HTML format.</li>
</ul>
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of