r17612 by gpittman - some minor rearrangements in the colors doc

[scribus-commit]

Author: gpittman
Date: Sat Jun 23 13:20:30 2012
New Revision: 17612

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17612
Log:
some minor rearrangements in the colors doc

Modified:
    branches/Version14x/Scribus/scribus/doc/en/add_colors.html
    branches/Version14x/Scribus/scribus/doc/en/menu.xml

Modified: branches/Version14x/Scribus/scribus/doc/en/add_colors.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17612&path=/branches/Version14x/Scribus/scribus/doc/en/add_colors.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/add_colors.html (original)
+++ branches/Version14x/Scribus/scribus/doc/en/add_colors.html Sat Jun 23 13:20:30 2012
@@ -7,10 +7,7 @@
 <h2>Adding and Editing Colors</h2>
 If you are looking for instructions on how to change an entire color palette, <a href="color2.html">then go here</a>.
 <h3>Manual Methods</h3>
-<h4>From the Color Picker</h4>
-<p>The little eyedropper on the toolbar activates the color picker, after which clicking on some spot on the screen grabs its color. You can expect to be presented with a dialog asking for a name for this color. If you don't name it, the color will not be added, even if you click <strong>OK</strong></p>
-<p><img src="images/add_colors3.png"></p>
-<h4>New Color</h4>
+<h4>Making a New Color</h4>
 <p>Here again is our <i>Colors</i> dialog we saw in the last article (brought up with <i>Edit > Colors</i>). Click tne <strong>New</strong> button, and you then see the <i>Edit Color</i> dialog. Give it a unique name, then use the sliders to adjust the hue and saturation. You can also click somewhere in the rainbow area for a quick approximation of what you're looking to achieve. Click <strong>OK</strong> to add this new color to your palette. Keep in mind that using this method, your palette will only apply to this document – having said this, below we'll see how to import a palette from a saved file.</p>
 <p>You have 3 <i>Color Models</i> to choose from: <strong>RGB</strong>, <strong>CMYK</strong>, and <strong>Web Safe RGB</strong>. This last choice limits the values to those which will display the same on 8-bit and 16-bit color systems.</p>
 <table width="100%">
@@ -27,6 +24,9 @@
 <img src="images/add_colors5.png">
 </p></td>
 </tr></table>
+<h4>From the Color Picker</h4>
+<p>The little eyedropper on the toolbar activates the color picker, after which clicking on some spot on the screen grabs its color. You can expect to be presented with a dialog asking for a name for this color. If you don't name it, the color will not be added, even if you click <strong>OK</strong></p>
+<p><img src="images/add_colors3.png"></p>
 <h4>Duplicate</h4>
 <p>In the <i>Colors</i> dialog above, click a color you wish to modify. This will of course bring up <i>Edit Color</i>, but click <strong>Cancel</strong>, so that you can go back and click <strong>Duplicate</strong>. Now your color name will show as <i>Copy of ...</i> and you can edit in the various ways we have shown and change the name.</p>
 <h4>Getting Rid of Colors</h4>

Modified: branches/Version14x/Scribus/scribus/doc/en/menu.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17612&path=/branches/Version14x/Scribus/scribus/doc/en/menu.xml
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/menu.xml (original)
+++ branches/Version14x/Scribus/scribus/doc/en/menu.xml Sat Jun 23 13:20:30 2012
@@ -48,9 +48,9 @@
                 <submenuitem text="Editing Colors" file="color_editing.html">
 			<submenuitem text="Adding and Editing Colors" file="add_colors.html" />
 			<submenuitem text="The Color Wheel" file="colorwheel.html" />
+			<submenuitem text="Managing Color Sets" file="color2.html" />
 		</submenuitem>
-		<submenuitem text="Color Palettes" file="color1.html">
-			<submenuitem text="Managing Color Sets" file="color2.html" />
+		<submenuitem text="Included Color Sets" file="color1.html">
 			<submenuitem text="Open Source Color Sets" file="color3.html" />
 			<submenuitem text="National Color Standards" file="color4.html" />
 			<submenuitem text="Resene Color Sets" file="color5.html" />