From 2c0fbfdb0df304e18b9eede46464fd256719b267 Mon Sep 17 00:00:00 2001
From: Shara Miller <shara.miller@gmail.com>
Date: Sat, 26 Feb 2011 01:57:01 -0600
Subject: [PATCH] Expanded upon Preferences and Getting Started sections. Added info about panel styling and opacity in Preferences. Restructured text in Getting Started section/ Did not add new images yet. Added intro text to Action Buttions plugin page.

---
 actions.page         |    2 +-
 getting-started.page |   24 ++++-----
 preferences.page     |  137 +++++++++++++++++++++++++++++++++++--------------
 3 files changed, 110 insertions(+), 53 deletions(-)

diff --git a/actions.page b/actions.page
index 5464e59..916c84f 100644
--- a/actions.page
+++ b/actions.page
@@ -17,7 +17,7 @@
 
   <title>Action Buttons</title>
 
-  <p></p>
+  <p>The Action Buttons panel plugin allows you to add up to two buttons to your panel that can be configured to log you out of your session, hibernate or suspend your session, or even shutdown your computer.</p>
 
   <section id="properties">
     <title>Properties</title>
diff --git a/getting-started.page b/getting-started.page
index aeee9ae..7db0122 100644
--- a/getting-started.page
+++ b/getting-started.page
@@ -42,25 +42,29 @@
 
     <terms>
       <item>
-        <title>Migrate old config</title>
+        <title><gui>Migrate old config</gui></title>
         <p>
-          This option will try only be available when an old 4.6 panel
+          This option will only be available when an old 4.6 panel
           configuration is found on your system. It will try to migrate
           the old panel layout to the new panel configuration in 
           <app>Xfconf</app>.
         </p>
       </item>
       <item>
-        <title>Use default layout</title>
+        <title><gui>Use default layout</gui></title>
         <p>
           This will import the default panel configuration with most of
           the default panel plugins. If you use the <app>Xfce Panel</app>
           for the  first time, this will be a good base to create your own
           panel configuration.
         </p>
+    	<figure>
+      	  <title><gui>Default panel layout</gui></title>
+          <media type="image" src="figures/default.png" mime="image/png" style="right"/>
+    	</figure>
       </item>
       <item>
-        <title>One empty panel</title>
+        <title><gui>One empty panel</gui></title>
         <p>
           This will give you one empty panel window. Might be what you
           want if you have already used <app>Xfce Panel</app> before and
@@ -70,16 +74,10 @@
     </terms>
 
     <p>
-      Once you have choosen the configuration you want, the settings are
-      imported and the panel will show up, for example the default
-      configuration in the picture below. Read more about changing the
-      <link xref="preferences">configuration of the panel</link> and the
-      various plugins in the other sections of this manual.
+      Once you have selected an option, your panel will appear.
+      Read more about changing the <link xref="preferences">configuration of the panel</link>
+      and the various plugins in the other sections of this manual.
     </p>
 
-    <figure>
-      <title>Default panel layout</title>
-      <media type="image" src="figures/default.png" mime="image/png" style="right"/>
-    </figure>
   </section>
 </page>
diff --git a/preferences.page b/preferences.page
index bb8574b..0c7efa7 100644
--- a/preferences.page
+++ b/preferences.page
@@ -16,26 +16,39 @@
   </info>
 
   <title>Preferences</title>
-  
-  <p>
-    The panel preferences can be openen by using the item menu <guiseq>
-    <gui>Xfce Panel</gui><gui>Panel Preferences</gui></guiseq> or by 
-    clicking on the <gui>Panel Preferences</gui> in the the 
-    <app>Xfce Settings Manager</app>.
-  </p>
+
+   <p>
+       The Xfce panel preferences dialog gives you the ability
+       to customize your panel. You can change the size, appearance,
+       and orentation of your panels. You can also add or remove extra 
+       panels on your desktop.	
+   </p> 
 
   <figure>
-    <title>Panel's Preferences dialog</title>
+    <title>Panel Preferences Dialog</title>
     <media type="image" src="figures/preferences.png" mime="image/png" style="right"/>
   </figure>
+
+  <section>
+    <title>Accessing Panel Preferences</title>
+
+    <p>
+		The panel preferences can be opened by going to <guiseq>
+		<gui>Settings</gui><gui>Panel</gui></guiseq> in your applications menu. 
+		You can also access panel preferences by right clicking on your panel
+		and going to <gui>Panel Settings</gui>. If you right click on space occupied by a 
+		panel plugin, you can access panel preferences by going to <guiseq><gui>Panel</gui>
+		<gui>Panel Settings</gui></guiseq>.
+    </p>
+  </section>
   
   <section>
-    <title>Select a panel</title>
+    <title>Selecting a panel</title>
     
     <p>
-      You can select a panel with the combo box in the top of the dialog.
-      Next to this selector there are also two buttons to remove the 
-      currently selected panel or add a new empty panel.
+      You can select a panel from the dropdown list at the top of the dialog.
+      Next to this are two buttons that can be used to remove (-) the currently 
+      selected panel or add (+) a new empty panel.
     </p>
     
     <p>
@@ -66,8 +79,8 @@
         <item>
           <title><gui>Output</gui></title>
           <p>
-            Select the output on which this panel should appear. If the
-            output is not connected, the panel will not be shown.
+            Select the output (such as an secondary monitor) on which this panel should appear. 
+	    		If the output is not connected, the panel will not be shown.
           </p>
         </item>
         
@@ -75,25 +88,27 @@
           <title><gui>Span monitors</gui></title>
           <p>
             If you have multiple monitors connected to the computer, this
-            option will appear in the properties dialog. It will
-            set the panel to look at the screen size instead of the monitor
-            size.
+            option will appear in the properties dialog. This will tell the panel
+	    		to stretch across multiple monitors instead of only being restricted to
+	    		one monitor. This tells the panel to look at the total screen size instead
+	    		of the size of an individual monitor.
           </p>
         </item>
         
         <item>
           <title><gui>Lock panel</gui></title>
           <p>
-            Don't show the handles on the panel whcih allow you to move
-            the panel or draw it to snap positions on the bordes of the
-            monitor.
+            Don't show the handles on the panel which allow you to move
+            the panel. When this option is disabled, you can drag the panel 
+	    		anywhere you want on your screen. The panel will also snap to the 
+	    		edges of your screen.
           </p>
         </item>
         
         <item>
           <title><gui>Automatically show and hide the panel</gui></title>
           <p>
-            Hide the panel 
+            Automatically hide the panel if the mouse is not hovering over it.
           </p>
         </item>
       </terms>
@@ -136,7 +151,7 @@
     <title>Appearance</title>
     
     <p>
-      This tab hold the style settings of the currently selected panel.
+      This tab contains the style settings of the currently selected panel.
     </p>
     
     <section>
@@ -145,49 +160,88 @@
       <terms>
         <item>
           <title><gui>Style</gui></title>
-          <p>
-          
-          </p>
+			 <p>
+			 	This allows you to change the transparency, color, and background
+			 	image of the panel. You have three options to choose from.
+			 </p>
+        
+			<terms>
+			  <item>
+			    <title><gui>None (user system style)</gui></title>
+			    <p>
+			    	The panel inherits colors from the currently selected GTK+
+			    	theme. You can view and change the current GTK+ theme by going to
+			    	<guiseq><gui>Settings</gui><gui>Appearance</gui></guiseq>.
+			    </p>
+			  </item>
+			  
+			  <item>
+			    <title><gui>Solid Color</gui></title>
+			    <p>
+			    	You can select a color using the provided color picker. 
+			    	The color you select will be applied to the panel.
+			    </p>
+			  </item>
+			  
+			  <item>
+			    <title><gui>Background Image</gui></title>
+			    <p>
+			    	Select a background for your panel.
+			    </p>
+			  </item>
+			</terms>
         </item>
         
         <item>
           <title><gui>Alpha</gui></title>
           <p>
-          
+          	Change the alpha transparency of the panel.
+          	Some panel plugins may still retain a non-transparent backgound.
+          	This option is only available if your panel style is set to <gui>None</gui>
+          	or <gui>Solid Color</gui>.
           </p>
         </item>
         
         <item>
           <title><gui>Color</gui></title>
           <p>
-          
+          	Clicking this activates a color picker. You can select a color
+          	by using the color wheel, entering a hex value, or entering a color
+          	name. This option is only available if your panel style is set to
+          	<gui>Solid Color</gui>.
           </p>
         </item>
         
         <item>
           <title><gui>File</gui></title>
           <p>
-          
+          	This allows you to select a background for the panel using
+          	a file browser. This option is only available if your panel style
+          	is set to <gui>Background Image</gui>.
           </p>
         </item>
       </terms>
     </section>
     
     <section>
-      <title>Transparency</title>
-      
+      <title>Opacity</title>
+      	These options set the transparency of the entire panel.
       <terms>
         <item>
           <title><gui>Enter</gui></title>
           <p>
-          
+          	This controls the transparency of the panel when a mouse pointer is
+          	not hovering over it. Ranges from 0 (fully transparent) and 100 (fully opaque).
+          	All panel plugins will be affected by this setting.
           </p>
         </item>
       
         <item>
           <title><gui>Leave</gui></title>
           <p>
-          
+          	This controls the transparency of the panel when a mouse pointer is
+          	<b>not</b> hovering over it. Ranges from 0 (fully transparent) and 
+          	100 (fully opaque). All panel plugins will be affected by this setting.
           </p>
         </item>
       </terms>
@@ -205,19 +259,24 @@
     </p>
     
     <p>
-      Most of the tab is self explaining. With the up and down buttons you
-      can move the currently selected item in the panel.
+    	This tab contains a row of buttons that allow you to manipulate the items
+    	on the panel.
+    </p>
+    
+    <p>
+      With the <gui>up</gui> and <gui>down</gui> buttons you can move the currently selected 
+      item in the panel.
     </p>
     
     <p>
-      The add button opens the <link xref="add-new-items">add new items
-      dialog</link>. With the remove button you can remove the currently
-      selected item van de panel.
+      The <gui>add</gui> button opens the <link xref="add-new-items">add new items
+      dialog</link>. With the <gui>remove</gui> button you can remove the currently
+      selected item from the panel.
     </p>
     
     <p>
-      The preferences and about buttons are only active if the plugin
-      support these features. It will open the item settings.
+      The <gui>preferences</gui> and <gui>about</gui> buttons are only active if the plugin
+      support these features. It will open the selected items' settings.
     </p>
     
     <p>
-- 
1.7.4.1