some initial reworkings of the window management help and some reorg work to the workspace help

4 files changed, 167 insertions, 99 deletions

diff --git a/gnome-help/C/shell-windows-maximize.page b/gnome-help/C/shell-windows-maximize.page
new file mode 100644
index 0000000..014ff32
--- /dev/null
+++ b/gnome-help/C/shell-windows-maximize.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="shell-windows-maximize">
+
+  <info>
+
+    <link type="guide" xref="shell-windows#working-with-windows"/>
+
+    <desc>Maximize, restore, resize, arrange and hide. </desc>
+    <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="review"/>
+    <credit type="author">
+      <name>GNOME Documentation Project</name>
+      <email>gnome-doc-list@gnome.org</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Maximize and unmaximize (restore) a window:</title>
+
+    <p> To maximize or unmaximize a window, you can:</p>
+     <list>
+       <item>
+       <p>
+        To maximize a window, click on the <gui>title bar</gui> of an application, and drag it to the top of the screen.  When the <gui>mouse pointer</gui> touches the very top of the screen, the entire screen becomes hilighted.  Release the mouse button to maximize the screen.
+       </p>
+      <item>
+
+      </item>
+       <p>
+        To restore the window to its original size, click on the <gui>title bar</gui> of the application, and drag it down from the <gui>top bar</gui>.  After the window separates from the <gui>top bar</gui> it will restore itself to an unmaximized state.
+       </p>
+      </item>
+    </list>
+
+    <note style="tip">
+      <p>
+        Pressing <keyseq><key>Alt</key><key>right-click</key></keyseq> anywhere in the application screen will allow you to move the application. Some people may find this easier than needing to click in the <gui>title bar</gui> area of an application.
+      </p>
+      <p>
+         You can also use your keyboard to maximize a window. Press <keyseq><key>Alt</key><key>Space</key></keyseq> to bring up the window menu, and then press <key>x</key>.
+      </p>
+    </note>
+
+</page>
diff --git a/gnome-help/C/shell-windows-workspaces-add.page b/gnome-help/C/shell-windows-workspaces-add.page
new file mode 100644
index 0000000..a6c42da
--- /dev/null
+++ b/gnome-help/C/shell-windows-workspaces-add.page
@@ -0,0 +1,106 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="shell-windows-workspaces-add">
+
+  <info>
+
+    <link type="guide" xref="shell-windows#working-with-workspaces"/>
+
+    <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="candidate"/>
+    <credit type="author">
+      <name>GNOME Documentation Project</name>
+      <email>gnome-doc-list@gnome.org</email>
+    </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+<title>Add a Workspace</title>
+
+ <p>In the <gui>Activities</gui> overview, move your cursor to the right-most side of the screen. A vertical panel will appear with your current workspaces plus an extra empty (having no open application windows on it) workspace.
+ </p>
+ <list>
+ <item><p>
+  To add a workspace, move an application window from an existing workspace onto the empty workspace in the right panel.  To do this, click on an application window in a workspace and drag and drop it onto the empty workspace.  This workspace now contains the window you dropped into it, and a new empty workspace should appear at the bottom of the workspace panel.
+  </p></item>
+  <item><p>
+   To remove a workspace simply close all the window in it, or move the window onto a previous workspace.
+   </p>
+
+   </item>
+</list>
+  <note>
+ <p>
+ You can never remove the first workspace.
+ </p>
+ </note>
+
+<section id="switch">
+ <title>Switch between workspaces</title>
+
+
+
+<terms>
+<item>
+  <title>From the <gui>Activities</gui> overview:</title>
+<p>
+  If you have multiple workspaces open, you can click on each workspace to view the open windows on each workspace.
+  </p>
+  </item>
+ <item>
+    <title>From workspace and <gui>Activity</gui> overview:</title>
+<list>
+  <item><p>
+Press <keyseq><key>Ctrl</key><key>Alt</key><key>&#8593;</key></keyseq> to move to a workspace which is above the current workspace.
+</p></item>
+<item><p>
+
+ Press <keyseq><key>Ctrl</key><key>Alt</key><key>&#8595;</key></keyseq> to move to a workspace which is below the current workspace.
+</p></item>
+</list>
+
+</item>
+</terms>
+
+
+
+
+
+</section>
+
+<section id="move">
+ <title>Move windows to a different workspace</title>
+ <p>
+You can move a window between workspaces.
+</p>
+<p>In a workspace:  </p>
+<steps>
+<item><p>
+Click on the window to make it <em>live</em>.
+</p></item>
+<item><list>
+<item><p>
+Press <keyseq><key>Ctrl</key><key>Alt</key><key>Shift</key><key>&#8593;</key></keyseq> to move the window to a workspace which is above the current workspace. </p></item>
+<item><p>
+ Press <keyseq><key>Ctrl</key><key>Alt</key><key>Shift</key><key>	&#8595;</key></keyseq> to move the window to a workspace which is below the current workspace.
+ </p></item>
+</list></item>
+</steps>
+
+<p>In the <gui>Activities</gui> overview:</p>
+
+<steps>
+<item><p>
+  Click and drag the window to the right of the screen.
+</p></item>
+<item><p>
+  The panel with the workspaces will appear.
+</p></item>
+<item><p>
+  Drop the window onto the empty workspace. This will move the window to a new workspace and a new empty workspace will be created.
+</p></item>
+</steps>
+</section>
+
+
+</page>
diff --git a/gnome-help/C/shell-windows-workspaces.page b/gnome-help/C/shell-windows-workspaces.page
index 0cf68bd..50985c7 100644
--- a/gnome-help/C/shell-windows-workspaces.page
+++ b/gnome-help/C/shell-windows-workspaces.page
@@ -4,9 +4,8 @@
 
   <info>
 
-    <link type="guide" xref="shell-windows#working-with-windows"/>
+    <link type="guide" xref="shell-windows#working-with-workspaces"/>
 
-    <desc>Group windows on different workspaces.</desc>
     <revision pkgversion="3.0" version="0.1" date="2011-01-03" status="candidate"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -16,103 +15,11 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Organize Windows with Workspaces</title>
+<title>What is a workspace, and how will it help me?</title>
 
 <p>Workspaces refer to the grouping of windows on your desktop.
   You can create many workspaces, which act like virtual desktops.
 Workspaces are meant to reduce clutter and make the desktop easier to navigate.</p>
 
 <p>You could use workspaces to organize your work.  For example, you could have all your communication windows, such as e-mail and your chat program on one workspace and the work you are doing on a different workspace.  Your music manager could be on a third workspace.</p>
-<section id="add">
- <title>Adding and Removing Workspaces</title>
-
- <p>In the <gui>Activities</gui> overview, move your cursor to the right-most side of the screen. A vertical panel will appear with your current workspaces plus an extra empty (having no open application windows on it) workspace.
- </p>
- <list>
- <item><p>
-  To add a workspace, move an application window from an existing workspace onto the empty workspace in the right panel.  To do this, click on an application window in a workspace and drag and drop it onto the empty workspace.  This workspace now contains the window you dropped into it, and a new empty workspace should appear at the bottom of the workspace panel.
-  </p></item>
-  <item><p>
-   To remove a workspace simply close all the window in it, or move the window onto a previous workspace.
-   </p>
-
-   </item>
-</list>
-  <note>
- <p>
- You can never remove the first workspace.
- </p>
- </note>
-</section>
-
-
-
-<section id="switch">
- <title>Switch between workspaces</title>
-
-
-
-<terms>
-<item>
-  <title>From the <gui>Activities</gui> overview:</title>
-<p>
-  If you have multiple workspaces open, you can click on each workspace to view the open windows on each workspace.
-  </p>
-  </item>
- <item>
-    <title>From workspace and <gui>Activity</gui> overview:</title>
-<list>
-  <item><p>
-Press <keyseq><key>Ctrl</key><key>Alt</key><key>&#8593;</key></keyseq> to move to a workspace which is above the current workspace.
-</p></item>
-<item><p>
-
- Press <keyseq><key>Ctrl</key><key>Alt</key><key>&#8595;</key></keyseq> to move to a workspace which is below the current workspace.
-</p></item>
-</list>
-
-</item>
-</terms>
-
-
-
-
-
-</section>
-
-<section id="move">
- <title>Move windows to a different workspace</title>
- <p>
-You can move a window between workspaces.
-</p>
-<p>In a workspace:  </p>
-<steps>
-<item><p>
-Click on the window to make it <em>live</em>.
-</p></item>
-<item><list>
-<item><p>
-Press <keyseq><key>Ctrl</key><key>Alt</key><key>Shift</key><key>&#8593;</key></keyseq> to move the window to a workspace which is above the current workspace. </p></item>
-<item><p>
- Press <keyseq><key>Ctrl</key><key>Alt</key><key>Shift</key><key>	&#8595;</key></keyseq> to move the window to a workspace which is below the current workspace.
- </p></item>
-</list></item>
-</steps>
-
-<p>In the <gui>Activities</gui> overview:</p>
-
-<steps>
-<item><p>
-  Click and drag the window to the right of the screen.
-</p></item>
-<item><p>
-  The panel with the workspaces will appear.
-</p></item>
-<item><p>
-  Drop the window onto the empty workspace. This will move the window to a new workspace and a new empty workspace will be created.
-</p></item>
-</steps>
-</section>
-
-
 </page>
diff --git a/gnome-help/C/shell-windows.page b/gnome-help/C/shell-windows.page
index fa20c17..1165a83 100644
--- a/gnome-help/C/shell-windows.page
+++ b/gnome-help/C/shell-windows.page
@@ -20,8 +20,14 @@
 
 <title>Windows and workspaces</title>
 
-<p>Like other desktops, Gnome Shell uses windows to display your running applications. Using both the <gui>overview</gui> and the <gui>dash</gui>, you can launch new applications and control which window is active.</p>
- <p>In the <gui>Activities</gui> overview, the <gui>dash</gui> displays your favorite applications as well as your running applications. The <gui>dash</gui> will place a slight glow behind any running applications.
+<p>Like other desktops, Gnome uses windows to display your running applications. Using both the <gui>overview</gui> and the <gui>dash</gui>, you can launch new applications and control which window is active.</p>
+
+<p>In addition to windows, you can also group your applications together within workspaces. Visit the window and workspace help topics below to better learn how to use these features.</p>
+<!-- 
+
+Want to keep this intro simple . . . what to do here?
+
+<p>In the <gui>Activities</gui> overview, the <gui>dash</gui> displays your favorite applications as well as your running applications. The <gui>dash</gui> will place a slight glow behind any running applications.
  </p>
  <p>
   Clicking on the application icon will launch it if it is not running, and will open the last used window of that application if it is already running.
@@ -34,12 +40,16 @@ Right clicking on the application icon for a running application will bring all
 <p>
    Windows are shown on their corresponding <link xref="shell-windows-workspaces">workspaces</link>.
 </p>
-
+-->
 <section id="working-with-windows" style="2column">
  <title>Working With Windows</title>
+</section>
 
+<section id="working-with-workspaces" style="2column">
+ <title>Working With Workspaces</title>
 </section>
-<comment>
+
+<comment><p>Briefly explain the different window states that exist and how you can use and recognize those states. Discuss interesting ways of arranging windows (i.e. if there is a "Tile" option or something like that). Mention, in passing, how you can move and resize windows in multiple ways.</p>
 <p>Very brief overview of what you can do with windows. Link to relevant topics.</p>
 </comment>
 </page>