[gnome-terminal/wip/mallard-merge: 261/278] Help: Reworded help in app-colors.page.

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 6c4afe5b64cd8fe2286fde882d11ec87d0f32e11
Author: Sindhu S <sindhus live in>
Date:   Wed Feb 27 15:38:53 2013 +0530

    Help: Reworded help in app-colors.page.

 help/C/app-colors.page |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/help/C/app-colors.page b/help/C/app-colors.page
index b0105d6..1c014b1 100644
--- a/help/C/app-colors.page
+++ b/help/C/app-colors.page
@@ -32,6 +32,11 @@
   change the colors that are used for the text and background. You can use
   colors from your theme, select one of the presets or use a custom scheme.</p>
 
+<<<<<<< HEAD
+=======
+  <section id="from-system-theme">
+    <title>Use colors from your system theme</title>
+>>>>>>> Help: Reworded help in app-colors.page.
 
   <section id="system-theme">
     <title>Use colors from your system theme</title>
@@ -102,6 +107,7 @@
         change.</p>
       </item>
       <item>
+<<<<<<< HEAD
         <p>Choose your desired color from the color sample blocks and click
         <gui style="button">Select</gui>.</p>
         <p>If you wish to select a custom color, click on
@@ -109,13 +115,34 @@
         typing in the hexadecimal color code, or by dragging the slider and the
         crosshairs. Click <gui style="button">Select</gui>.</p>
         <p>Your changes will be applied automatically.</p>
+=======
+        <!-- Note to self: check UI -->
+        <p>Choose your desired color from the color sample and click
+        <gui style="button">Select</gui>.</p>
+      </item>
+      <item>
+        <p>If you wish to select a color from the color picker, click on
+        <gui style="button">+</gui>. You can either input the desired color in the following ways:</p>
+        <list>
+          <item>
+            <p>Input the hexadecimal color code in the input box.</p>
+          </item>
+          <item>
+            <p>Drag the slider on the left to adjust the colors and click on the desired color in the color 
picker.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <p>Click <gui style="button">Close</gui> to quit the dialog and return
+        to <app>Terminal</app>.</p>
+>>>>>>> Help: Reworded help in app-colors.page.
       </item>
     </steps>
 
     <note style="tip">
       <p>You may also alter a color when you have chosen a built-in scheme by
       clicking on the color sample block. Once changed, your selection in the
-      built-in scheme chooser will change to <gui>Custom</gui>.</p>
+      built-in scheme menu will change to <gui>Custom</gui>.</p>
     </note>
 
   </section>