From 0fdac172db1f3f79a10b65396040d4056d330da6 Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Sat, 18 Feb 2012 13:14:23 +0100
Subject: User Docs: Also cover mail composer in 'Character Encodings' page.
 See bug 552873.

---
 help/C/mail-displaying-character-encodings.page | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'help/C')

diff --git a/help/C/mail-displaying-character-encodings.page b/help/C/mail-displaying-character-encodings.page
index 45aff217ea..02a1c73c29 100644
--- a/help/C/mail-displaying-character-encodings.page
+++ b/help/C/mail-displaying-character-encodings.page
@@ -2,11 +2,12 @@
       type="topic" id="mail-displaying-character-encodings">
 
   <info>
-    <desc>When characters in an email are not shown correctly or missing.</desc>
+    <desc>When letters in an email are not shown correctly or missing.</desc>
 
     <link type="guide" xref="mail-displaying-message" />
+    <link type="guide" xref="index#mail-composing-advanced" />
 
-    <revision pkgversion="3.0.2" version="0.3" date="2011-08-02" status="final"/>
+    <revision pkgversion="3.3.91" version="0.4" date="2012-02-18" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -17,11 +18,22 @@
 
   </info>
 
-<title>Character Encodings and Sets</title>
+<title>Character Encodings</title>
 
-<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed -->
+<section id="received-messages">
+<title>Received mail</title>
 
 <p>If the email application of the sender is broken or misconfigured, plain text emails might not include information about the character encoding used. If you receive such messages, choose <guiseq><gui>View</gui><gui>Character Encoding</gui></guiseq> from the main menu and change the currently chosen character encoding to an appropriate one that might be the encoding used by the sender. You have to make this change every time you view the message.</p>
 <p>To make this the default setting, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Display</gui><gui>Default character encoding</gui></guiseq>.</p>
 
+</section>
+
+<section id="sending-messages">
+<title>Sending mail</title>
+
+<p>In the unlikely event that you would like to change the default character encoding for messages that you send, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default Behavior</gui><gui>Character encoding</gui></guiseq>.</p>
+<note style="tip"><p>This setting only refers to Plain Text messages as <link xref="mail-composer-html">HTML messages</link> always use UTF-8 encoding.</p></note>
+
+</section>
+
 </page>
-- 
cgit v1.2.3