User Docs: Finally split formatting options into Plain Text and HTML

8 files changed, 100 insertions, 52 deletions

diff --git a/help/C/mail-composer-enable-html-format.page b/help/C/mail-composer-enable-html-format.page
new file mode 100644
index 0000000000..ed5a24ca48
--- /dev/null
+++ b/help/C/mail-composer-enable-html-format.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-enable-html-format">
+
+  <info>
+    <desc>Enable HTML format in the mail composer.</desc>
+    <link type="guide" xref="mail-composer-html#formatting-options-html" />
+
+    <revision pkgversion="3.5.90" version="0.1" date="2012-08-16" status="draft"/>
+    <credit type="author">
+      <name its:translate="no">Andre Klapper</name>
+      <email its:translate="no">ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name its:translate="no">Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-html -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+<title>Enabling HTML format</title>
+
+<p>You can change the format of an email message from plain text to HTML in the email composer by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar.</p>
+<p>Alternately, you also can change the first dropdown list below the <gui>Subject</gui> line from <gui>Plain Text</gui> to <gui>HTML</gui>.</p>
+<p>If you choose HTML format, a second tool bar will be displayed below the <gui>Subject</gui> line with HTML-only options.</p>
+<p>To send all your mail as HTML by default, enable <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default Behavior</gui><gui>Format messages in HTML</gui></guiseq>.</p>
+
+</page>
+
diff --git a/help/C/mail-composer-html-image.page b/help/C/mail-composer-html-image.page
index f7eeb315d9..d5149ae555 100644
--- a/help/C/mail-composer-html-image.page
+++ b/help/C/mail-composer-html-image.page
@@ -3,9 +3,9 @@
 
   <info>
     <desc>Embed a picture in the mail composer.</desc>
-    <link type="guide" xref="mail-composer-html#formatting-options" />
+    <link type="guide" xref="mail-composer-html#formatting-options-html" />
 
-    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="final"/>
+    <revision pkgversion="3.5.90" version="0.5" date="2012-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
diff --git a/help/C/mail-composer-html-link.page b/help/C/mail-composer-html-link.page
index 310a04c82a..2a9d247dc3 100644
--- a/help/C/mail-composer-html-link.page
+++ b/help/C/mail-composer-html-link.page
@@ -3,9 +3,9 @@
 
   <info>
     <desc>Insert a link to a website in the mail composer.</desc>
-    <link type="guide" xref="mail-composer-html#formatting-options" />
+    <link type="guide" xref="mail-composer-html#formatting-options-html" />
 
-    <revision pkgversion="3.5.90" version="0.3" date="2012-08-16" status="final"/>
+    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
diff --git a/help/C/mail-composer-html-rule.page b/help/C/mail-composer-html-rule.page
index 3bdf6d3d82..c136bdc714 100644
--- a/help/C/mail-composer-html-rule.page
+++ b/help/C/mail-composer-html-rule.page
@@ -3,9 +3,9 @@
 
   <info>
     <desc>Insert a horizontal line in the mail composer.</desc>
-    <link type="guide" xref="mail-composer-html#formatting-options" />
+    <link type="guide" xref="mail-composer-html#formatting-options-html" />
 
-    <revision pkgversion="3.5.90" version="0.3" date="2011-08-16" status="final"/>
+    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
diff --git a/help/C/mail-composer-html-table.page b/help/C/mail-composer-html-table.page
index cbb571df4c..7a12f902ff 100644
--- a/help/C/mail-composer-html-table.page
+++ b/help/C/mail-composer-html-table.page
@@ -3,9 +3,9 @@
 
   <info>
     <desc>Insert a table in the mail composer.</desc>
-    <link type="guide" xref="mail-composer-html#formatting-options" />
+    <link type="guide" xref="mail-composer-html#formatting-options-html" />
 
-    <revision pkgversion="3.5.90" version="0.3" date="2011-08-16" status="final"/>
+    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
diff --git a/help/C/mail-composer-html-text.page b/help/C/mail-composer-html-text.page
index ee91cf945c..0f3508de42 100644
--- a/help/C/mail-composer-html-text.page
+++ b/help/C/mail-composer-html-text.page
@@ -2,10 +2,10 @@
       type="topic" id="mail-composer-html-text">
 
   <info>
-    <desc>Format Text in the mail composer.</desc>
-    <link type="guide" xref="mail-composer-html#formatting-options" />
+    <desc>Change font sizes, styles and colors in the mail composer.</desc>
+    <link type="guide" xref="mail-composer-html#formatting-options-html" />
 
-    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="draft"/>
+    <revision pkgversion="3.5.90" version="0.7" date="2012-08-16" status="draft"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -20,35 +20,8 @@
 
 <title>Formatting Text in HTML</title>
 
-<!-- TODO: We need a way to describe the non-HTML-only functions for plain text mail somewhere else (first bar). -->
-
-     <p>HTML formatting tools are located in the two tool bars just above the area where you actually write the message. They also appear in the <gui>Insert</gui> and <gui>Format</gui> menus.</p>
-     <p>The icons in the tool bar are explained in tooltips which appear when you hold your mouse pointer over the buttons. The buttons fall into five categories:</p>
-
-<section id="first-bar">
-<title>First bar</title>
-
-<section id="headers-and-lists">
- <title>Headers and Lists:</title>
- <p>At the left of the upper tool bar, you can choose <gui>Normal</gui> for a default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for varying sizes of header from large (1) to tiny (6). Other styles include <gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, and three types of bullet points for lists.</p>
- <p>For instance, instead of using asterisks to mark a bulleted list, you can use the <gui>Bulleted List</gui> style from the style dropdown list. Evolution uses different bullet styles, and handles word wrap and multiple levels of indentation.</p>
-</section>
-
-<section id="alignment">
-      <title>Alignment:</title>
-      <p>Located next to the Headers and Lists dropdown, the three paragraph icons should be familiar to users of most word processing software. The left-most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right.</p>
-</section>
-
-<section id="indentation-rules">
-      <title>Indentation Rules:</title>
-      <p>The button with the arrow pointing left decreases a paragraph's indentation, and the right arrow increases its indentation.</p>
-</section>
-
-</section>
-
-
-<section id="first-bar">
-<title>Second bar</title>
+     <p>Text formatting tools that are available in HTML format only are located in the second tool bar below the <gui>Subject</gui> line after enabling HTML format. They also appear in the <gui>Insert</gui> and <gui>Format</gui> menus.</p>
+     <p>The icons in the tool bar are explained in tooltips which appear when you hold your mouse pointer over the buttons.</p>
 
 <section id="text-styles">
       <title>Text Styles:</title>
@@ -89,9 +62,7 @@
   </tr>
 </table>
 
-<p>The other buttons are explained under <link xref="mail-composer-html#formatting-options" />.</p>
-
-</section>
+<p>The other buttons are explained under <link xref="mail-composer-html#formatting-options-html" />.</p>
 
 </section>
 
diff --git a/help/C/mail-composer-html.page b/help/C/mail-composer-html.page
index a0b305cb1c..d63debdbdc 100644
--- a/help/C/mail-composer-html.page
+++ b/help/C/mail-composer-html.page
@@ -2,10 +2,10 @@
       type="guide" id="mail-composer-html">
 
   <info>
-    <desc>Format emails by using HTML instead of plain text.</desc>
+    <desc>Changing fonts, using colors, and inserting images, tables and links.</desc>
     <link type="guide" xref="index#mail-composing" />
 
-    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="final"/>
+    <revision pkgversion="3.5.90" version="0.5" date="2012-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -18,18 +18,23 @@
     </credit>
   </info>
 
-<title>Using HTML format to enhance emails</title>
+<title>Formatting emails (in Plain Text and HTML)</title>
 
-<p>Normally, you cannot set text styles or insert pictures in email. However, most newer email applications can display images and text styles in addition to basic alignment and paragraph formatting. This is done with HTML, which is the format that also web pages use.</p>
+<p></p>
+
+<p>Text formatting tools for basic alignment and paragraph formatting are located in the tool bar below the <gui>Subject</gui> line. They also appear in the <gui>Insert</gui> and <gui>Format</gui> menus.</p>
+     <p>The icons in the tool bar are explained in tooltips which appear when you hold your mouse pointer over the buttons.</p>
+
+<p>Normally, you cannot set text color or size or embed pictures in messages. However, most newer email applications can do this by using HTML format, which is the format that also web pages use.</p>
 
 <p>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, <app>Evolution</app> sends plain text unless you explicitly ask for HTML.</p>
 
-<p>You can change the format of an email message from plain text to HTML in the email composer by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar.</p>
-<p>Alternately, you also can change the first dropdown list below the <gui>Subject</gui> line from <gui>Plain Text</gui> to <gui>HTML</gui>.</p>
-<p>To send all your mail as HTML by default, enable <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default Behavior</gui><gui>Format messages in HTML</gui></guiseq>.</p>
+  <section id="formatting-options-plain" style="2column">
+    <title>Plain Text Formatting Options</title>
+  </section>
 
-  <section id="formatting-options" style="2column">
-    <title>HTML Formatting Options</title>
+  <section id="formatting-options-html" style="2column">
+    <title>HTML-only Formatting Options</title>
   </section>
 
 </page>
diff --git a/help/C/mail-composer-plain-text.page b/help/C/mail-composer-plain-text.page
new file mode 100644
index 0000000000..cff0b63b9f
--- /dev/null
+++ b/help/C/mail-composer-plain-text.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-plain-text">
+
+  <info>
+    <desc>Change font alignment and paragraph formatting in the mail composer.</desc>
+    <link type="guide" xref="mail-composer-html#formatting-options-plain" />
+
+    <revision pkgversion="3.5.90" version="0.1" date="2012-08-16" status="draft"/>
+    <credit type="author">
+      <name its:translate="no">Andre Klapper</name>
+      <email its:translate="no">ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name its:translate="no">Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-html -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+<title>Formatting Text in Plain Text Format</title>
+
+     <p>Text formatting tools are located in the tool bar below the <gui>Subject</gui> line. They also appear in the <gui>Insert</gui> and <gui>Format</gui> menus.</p>
+     <p>The icons in the tool bar are explained in tooltips which appear when you hold your mouse pointer over the buttons.</p>
+
+<section id="headers-and-lists">
+ <title>Headers and Lists:</title>
+ <p>At the left of the upper tool bar, you can choose <gui>Normal</gui> for a default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for varying sizes of header from large (1) to tiny (6). Other styles include <gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, and three types of bullet points for lists.</p>
+ <p>For instance, instead of using asterisks to mark a bulleted list, you can use the <gui>Bulleted List</gui> style from the style dropdown list. Evolution uses different bullet styles, and handles word wrap and multiple levels of indentation.</p>
+</section>
+
+<section id="alignment">
+      <title>Alignment:</title>
+      <p>Located next to the Headers and Lists dropdown, the three paragraph icons should be familiar to users of most word processing software. The left-most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right.</p>
+</section>
+
+<section id="indentation-rules">
+      <title>Indentation Rules:</title>
+      <p>The button with the arrow pointing left decreases a paragraph's indentation, and the right arrow increases its indentation.</p>
+</section>
+
+</page>
+