gnome-devel-docs r600 - branches/hig-2-3



Author: calum
Date: Mon Sep 29 16:42:17 2008
New Revision: 600
URL: http://svn.gnome.org/viewvc/gnome-devel-docs?rev=600&view=rev

Log:
Merge 2.2 changes from head (XML files only; images and
Makefile.am to follow)


Modified:
   branches/hig-2-3/ChangeLog
   branches/hig-2-3/hig-book.xml
   branches/hig-2-3/hig-ch-controls.xml
   branches/hig-2-3/hig-ch-credits.xml
   branches/hig-2-3/hig-ch-desktop.xml
   branches/hig-2-3/hig-ch-feedback.xml
   branches/hig-2-3/hig-ch-icons.xml
   branches/hig-2-3/hig-ch-input.xml
   branches/hig-2-3/hig-ch-layout.xml
   branches/hig-2-3/hig-ch-menus.xml
   branches/hig-2-3/hig-ch-toolbars.xml
   branches/hig-2-3/hig-ch-whatsnew.xml
   branches/hig-2-3/hig-ch-windows.xml

Modified: branches/hig-2-3/hig-book.xml
==============================================================================
--- branches/hig-2-3/hig-book.xml	(original)
+++ branches/hig-2-3/hig-book.xml	Mon Sep 29 16:42:17 2008
@@ -26,6 +26,8 @@
 <year>2002-2008</year>
 <holder>Calum Benson, Bryan Clark, Adam Elman, Seth Nickell, colin z robertson</holder>
 </copyright>
+<pubdate>2008-09-25</pubdate>
+<edition>2.3</edition>
 
 <legalnotice>
   <para>
@@ -49,7 +51,7 @@
   </para>
 </legalnotice>
 
-<title>GNOME Human Interface Guidelines (Draft 2.1)</title>
+<title>GNOME Human Interface Guidelines 2.3</title>
 
 </bookinfo>
 

Modified: branches/hig-2-3/hig-ch-controls.xml
==============================================================================
--- branches/hig-2-3/hig-ch-controls.xml	(original)
+++ branches/hig-2-3/hig-ch-controls.xml	Mon Sep 29 16:42:17 2008
@@ -51,8 +51,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-sensitivity.png"
-          format="PNG" />
+          <imagedata depth="76" fileref="images/controls-sensitivity.png"
+          format="PNG" width="258" />
         </imageobject>
 
         <imageobject>
@@ -135,8 +135,8 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="283" fileref="images/controls-locked.png"
-            format="PNG" width="473" />
+            <imagedata depth="216" fileref="images/controls-locked.png"
+            format="PNG" width="475" />
           </imageobject>
 
           <imageobject>
@@ -175,8 +175,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-text.png"
-          format="PNG" />
+          <imagedata depth="153" fileref="images/controls-text.png"
+          format="PNG" width="545" />
         </imageobject>
 
         <imageobject>
@@ -248,8 +248,8 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/controls-text-prompt.png"
-              format="PNG" />
+              <imagedata depth="31" fileref="images/controls-text-prompt.png"
+              format="PNG" width="130" />
             </imageobject>
 
             <imageobject>
@@ -281,8 +281,8 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/controls-text-choose.png"
-              format="PNG" />
+              <imagedata depth="41" fileref="images/controls-text-choose.png"
+              format="PNG" width="298" />
             </imageobject>
 
             <imageobject>
@@ -400,8 +400,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-spin-box.png"
-          format="PNG" />
+          <imagedata depth="32" fileref="images/controls-spin-box.png"
+          format="PNG" width="204" />
         </imageobject>
 
         <imageobject>
@@ -474,8 +474,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-slider.png"
-          format="PNG" />
+          <imagedata depth="27" fileref="images/controls-slider.png"
+          format="PNG" width="208" />
         </imageobject>
 
         <imageobject>
@@ -537,9 +537,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata
+              <imagedata depth="85"
               fileref="images/controls-slider-spinbox.png" format="PNG"
-               />
+              width="356" />
             </imageobject>
 
             <imageobject>
@@ -566,8 +566,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-buttons.png"
-          format="PNG" />
+          <imagedata depth="47" fileref="images/controls-buttons.png"
+          format="PNG" width="190" />
         </imageobject>
 
         <imageobject>
@@ -677,8 +677,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-check-boxes.png"
-          format="PNG" />
+          <imagedata depth="140" fileref="images/controls-check-boxes.png"
+          format="PNG" width="143" />
         </imageobject>
 
         <imageobject>
@@ -751,9 +751,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="92"
+              <imagedata depth="70"
               fileref="images/controls-check-box-ambiguous.png" format="PNG"
-              width="222" />
+              width="279" />
             </imageobject>
 
             <imageobject>
@@ -791,9 +791,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="98"
+              <imagedata depth="170"
               fileref="images/controls-check-boxes-mixed.png" format="PNG"
-              width="300" />
+              width="223" />
             </imageobject>
 
             <imageobject>
@@ -877,8 +877,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-radio-buttons.png"
-          format="PNG" />
+          <imagedata depth="105" fileref="images/controls-radio-buttons.png"
+          format="PNG" width="352" />
         </imageobject>
 
         <imageobject>
@@ -948,9 +948,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="108"
+              <imagedata depth="105"
               fileref="images/controls-radio-button-mixed.png" format="PNG"
-              width="327" />
+              width="314" />
             </imageobject>
 
             <imageobject>
@@ -1019,8 +1019,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-toggle-buttons.png"
-          format="PNG" />
+          <imagedata depth="46" fileref="images/controls-toggle-buttons.png"
+          format="PNG" width="137" />
         </imageobject>
 
         <imageobject>
@@ -1153,8 +1153,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-option-menu.png"
-          format="PNG" />
+          <imagedata depth="178" fileref="images/controls-option-menu.png"
+          format="PNG" width="377" />
         </imageobject>
 
         <imageobject>
@@ -1264,8 +1264,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-combo.png"
-          format="PNG" />
+          <imagedata depth="200" fileref="images/controls-combo.png"
+          format="PNG" width="304" />
         </imageobject>
 
         <imageobject>
@@ -1388,8 +1388,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-list.png"
-          format="PNG" />
+          <imagedata depth="149" fileref="images/controls-list.png"
+          format="PNG" width="179" />
         </imageobject>
 
         <imageobject>
@@ -1476,9 +1476,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata 
+              <imagedata depth="133"
               fileref="images/controls-list-checkbox.png" format="PNG"
-              />
+              width="160" />
             </imageobject>
 
             <imageobject>
@@ -1602,8 +1602,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-tree.png"
-          format="PNG" />
+          <imagedata depth="277" fileref="images/controls-tree.png"
+          format="PNG" width="343" />
         </imageobject>
 
         <imageobject>
@@ -1669,9 +1669,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata 
+              <imagedata depth="297"
               fileref="images/controls-tree-checkbox.png" format="PNG"
-              />
+              width="349" />
             </imageobject>
 
             <imageobject>
@@ -1722,12 +1722,12 @@
     cabinet.</para>
 
     <figure>
-      <title>A typical notebook control with four tabs</title>
+      <title>A typical notebook control with three tabs</title>
 
       <mediaobject>
         <imageobject>
-          <imagedata depth="247" fileref="images/controls-notebook.png"
-          format="PNG" width="379" />
+          <imagedata depth="270" fileref="images/controls-notebook.png"
+          format="PNG" width="341" />
         </imageobject>
 
         <imageobject>
@@ -1735,7 +1735,7 @@
         </imageobject>
 
         <textobject>
-          <phrase>Picture of notebook control with four tabs</phrase>
+          <phrase>Picture of notebook control with three tabs</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -1793,9 +1793,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="77"
+              <imagedata depth="92"
               fileref="images/controls-notebook-tabs.png" format="PNG"
-              width="420" />
+              width="475" />
             </imageobject>
 
             <imageobject>
@@ -1836,8 +1836,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata depth="191" fileref="images/controls-notebook-list.png"
-          format="PNG" width="390" />
+          <imagedata depth="200" fileref="images/controls-notebook-list.png"
+          format="PNG" width="370" />
         </imageobject>
 
         <imageobject>
@@ -1906,11 +1906,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/progress-time.png" format="PNG" />
+            <imagedata width="386" fileref="images/controls-progress-time.png" format="PNG" depth="38"/>
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/progress-time.eps" format="EPS" />
+            <imagedata fileref="images/controls-progress-time.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1941,11 +1941,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/progress-typical-time.png" format="PNG" />
+            <imagedata depth="32" fileref="images/controls-progress-typical.png" format="PNG" width="385" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/progress-proportion.eps" format="EPS" />
+            <imagedata fileref="images/controls-progress-typical.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1981,12 +1981,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="141" fileref="images/progress-indeterminate.png"
-            format="PNG" width="236" />
+            <imagedata depth="210" fileref="images/controls-progress-indeterminate.png"
+            format="PNG" width="409" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/progress-indeterminate.eps"
+            <imagedata fileref="images/controls-progress-indeterminate.eps"
             format="EPS" />
           </imageobject>
 
@@ -2014,8 +2014,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata depth="103" fileref="images/controls-status-bar.png"
-          format="PNG" width="297" />
+          <imagedata depth="53" fileref="images/controls-status-bar.png"
+          format="PNG" width="244" />
         </imageobject>
 
         <imageobject>
@@ -2117,9 +2117,9 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="80"
+              <imagedata depth="58"
               fileref="images/controls-status-bar-interactive.png"
-              format="PNG" width="459" />
+              format="PNG" width="461" />
             </imageobject>
 
             <imageobject>
@@ -2173,8 +2173,8 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata depth="321" fileref="images/controls-frames.png"
-          format="PNG" width="297" />
+          <imagedata depth="256" fileref="images/controls-frames.png"
+          format="PNG" width="288" />
         </imageobject>
 
         <imageobject>
@@ -2192,7 +2192,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/controls-old-frames.png" format="PNG" />
+          <imagedata depth="275" fileref="images/controls-old-frames.png" format="PNG" width="296"/>
         </imageobject>
 
         <imageobject>

Modified: branches/hig-2-3/hig-ch-credits.xml
==============================================================================
--- branches/hig-2-3/hig-ch-credits.xml	(original)
+++ branches/hig-2-3/hig-ch-credits.xml	Mon Sep 29 16:42:17 2008
@@ -8,12 +8,23 @@
       <para>
 	<itemizedlist>
 	  <listitem><para>Calum Benson, <email>calum benson sun com</email></para></listitem>
-          <listitem><para>Bryan Clark, <email>bclark redhat com</email></para></listitem>
-	  <listitem><para>Seth Nickell, <email>snickell redhat com</email></para></listitem>
+          <listitem><para>Bryan Clark, <email>clarkbw gnome org</email></para></listitem>
+	  <listitem><para>Seth Nickell, <email>seth gnome org</email></para></listitem>
 	</itemizedlist>
       </para>
     </sect1>
 
+    <sect1 id="credits-figures">
+	<title>Additional Illustrations</title>
+	<para>
+	  <itemizedlist>
+	  	<listitem><para>Mihai Anca,</para><email>ropiku gmail com</email></listitem>
+		<listitem><para>Denis Anisimov,</para><email>genius s146 net ru</email></listitem>
+		<listitem><para>Wouter Bron,</para><email>wousser gmail com</email></listitem>
+	  </itemizedlist>
+	</para>
+    </sect1>
+
     <sect1 id="credits-inactive-authors">
       <title>Retired/Inactive Authors</title>
       <para>

Modified: branches/hig-2-3/hig-ch-desktop.xml
==============================================================================
--- branches/hig-2-3/hig-ch-desktop.xml	(original)
+++ branches/hig-2-3/hig-ch-desktop.xml	Mon Sep 29 16:42:17 2008
@@ -17,8 +17,8 @@
     
 	<figure><title>The Applications menu</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/applications-menu.png" format="PNG"/></imageobject>
-	    <imageobject><imagedata fileref="images/applications-menu.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/desktop-applications-menu.png" format="PNG" width="160" depth="365"/></imageobject>
+	    <imageobject><imagedata fileref="images/desktop-applications-menu.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Screenshot of the open Applications menu on the GNOME menu panel</phrase></textobject>
 	  </mediaobject>
 	</figure>

Modified: branches/hig-2-3/hig-ch-feedback.xml
==============================================================================
--- branches/hig-2-3/hig-ch-feedback.xml	(original)
+++ branches/hig-2-3/hig-ch-feedback.xml	Mon Sep 29 16:42:17 2008
@@ -295,16 +295,16 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="28" fileref="images/busy-pointers.png"
+            <imagedata depth="28" fileref="images/feedback-pointers-busy.png"
             format="PNG" width="58" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/busy-pointers.eps" format="EPS" />
+            <imagedata fileref="images/feedback-pointers-busy.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Busy pointer (watch) and busy-interactive pointer (arrow  with watch attached)</phrase>
+            <phrase>Busy pointer (left) and busy-interactive pointer (right)</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -389,11 +389,22 @@
         <title>Checklist Windows</title>
 
         <para>A checklist window shows the sequence of stages in an operation.
-        See <xref linkend="progress-window-checklists" />.<figure><title>A
-        Checklist Window</title><mediaobject><imageobject><imagedata
-        fileref="images/checklist-window-in-progress.png" format="PNG" /></imageobject><textobject>
-        <phrase>A checklist window showing a sequence of steps</phrase>
-        </textobject></mediaobject></figure></para>
+        See <xref linkend="progress-window-checklists" />.
+	
+	<figure><title>A Checklist Window</title>
+	
+	<mediaobject>
+		<imageobject><imagedata
+        fileref="images/feedback-checklist-running.png" format="PNG" width="336" depth="220" /></imageobject>
+	<textobject><phrase>A
+        checklist window showing a sequence of steps</phrase></textobject>
+	
+	<imageobject>
+            <imagedata fileref="images/feedback-checklist-running.eps" format="EPS" />
+          </imageobject>
+        </mediaobject>
+	  
+	  </figure></para>
       </sect3>
     </sect2>
   </sect1>

Modified: branches/hig-2-3/hig-ch-icons.xml
==============================================================================
--- branches/hig-2-3/hig-ch-icons.xml	(original)
+++ branches/hig-2-3/hig-ch-icons.xml	Mon Sep 29 16:42:17 2008
@@ -29,25 +29,25 @@
 	  </row>
 	</thead>
 	<tbody>
-	  <row valign="top">
+	  <row valign="middle">
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/icon-style-java.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/icon-style-java.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-java.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-java.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Java globe</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/icon-style-aqua.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/icon-style-aqua.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-aqua.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-aqua.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Aqua globe</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/icon-style-gnome.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/icon-style-gnome.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-gnome.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-style-gnome.eps" format="EPS"/></imageobject>
 		<textobject><phrase>GNOME globe</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -66,8 +66,8 @@
       <figure>
 	<title>Illustration of the table perspective</title>
 	<mediaobject>
-	  <imageobject><imagedata fileref="images/icon_perspective_table.png" format="PNG"/></imageobject>
-	  <imageobject><imagedata fileref="images/icon_perspective_table.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/icons-perspective-table.png" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/icons-perspective-table.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>illustration of the table perspective</phrase></textobject>
 	</mediaobject>
       </figure>
@@ -78,8 +78,8 @@
       <figure>
 	<title>Illustration of the shelf perspective</title>
 	<mediaobject>
-	  <imageobject><imagedata fileref="images/icon_perspective_shelf.png" format="PNG"/></imageobject>
-	  <imageobject><imagedata fileref="images/icon_perspective_shelf.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/icons-perspective-shelf.png" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/icons-perspective-shelf.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>illustration of the shelf perspective</phrase></textobject>
 	</mediaobject>
       </figure>
@@ -128,8 +128,8 @@
 	    <entry>Upper Left</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/object-icons.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/object-icons.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-objects.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-objects.eps" format="EPS"/></imageobject>
 		<textobject><phrase>variety of object icons</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -141,8 +141,8 @@
 	    <entry>Upper Left</entry>
 	    <entry>	
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/application-icons.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/application-icons.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-applications.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-applications.eps" format="EPS"/></imageobject>
 		<textobject><phrase>variety of application icons</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -154,8 +154,8 @@
 	    <entry>Overhead</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/toolbar-icons.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/toolbar-icons.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-toolbar.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-toolbar.eps" format="EPS"/></imageobject>
 		<textobject><phrase>variety of toolbar icons</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -167,8 +167,8 @@
 	    <entry>Overhead</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/menu-icons.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/menu-icons.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-menu.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-menu.eps" format="EPS"/></imageobject>
 		<textobject><phrase>variety of menu icons</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -226,16 +226,16 @@
 	<figure>
 	  <title>A functionally suggestive icon for a word processor</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/abiword-icon.png" format="PNG"/></imageobject>
-	    <imageobject><imagedata fileref="images/abiword-icon.eps" format="EPS"/></imageobject>
-	    <textobject><phrase>A document with a pen writing on it</phrase></textobject>
+	    <imageobject><imagedata fileref="images/icons-word-processor.png" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/icons-word-processor.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>A document with a pencil writing on it</phrase></textobject>
 	  </mediaobject>
 	</figure>
 	<figure>
 	  <title>A functionally suggestive icon for underline</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/underline-icon.png" format="PNG"/></imageobject>
-	    <imageobject><imagedata fileref="images/underline-icon.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/icons-underline-text.png" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/icons-underline-text.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>An underlined character</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -246,11 +246,11 @@
 	  <para>It is important to make it easy to visually distinguish icons that will be used together, for example toolbar icons and document icons. The human visual system is excellent at making rapid distinctions between items based on shape, thus a good way to help your users sort through a large number of icons is to use different shapes. You can see the shape of an icon most clearly by turning it into a silhouette: blacken all areas of the icon which are not transparent.</para>
 	</formalpara>
 	<example>
-	  <title>Distinct silhouettes from the Nautilus Crux theme</title>
+	  <title>Distinct silhouettes from the GNOME icon theme</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/toolbar-silhouette.png" format="PNG"/></imageobject>
-	    <imageobject><imagedata fileref="images/toolbar-silhouette.eps" format="EPS"/></imageobject>
-	    <textobject><phrase>Silhouettes of the various toolbar icons</phrase></textobject>
+	    <imageobject><imagedata fileref="images/icons-silhouette.png" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/icons-silhouette.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>Silhouettes of various toolbar icons</phrase></textobject>
 	  </mediaobject>
 	</example>
       </listitem>
@@ -359,13 +359,13 @@
 	<listitem>
 	  <formalpara>
 	    <title>Avoid name suggestive icons</title>
-	    <para>Some icons, such as the Nautilus icon, do not suggest the program&apos;s purpose, but instead suggest the program&apos;s name. This is less desirable than a functionally suggestive icon, because an extra layer of abstraction is added (rather than associating file management with an icon representing files, they have to associate file management with nautilus with an image of a nautilus shell). Additionally it makes it difficult for new users who may not know what &quot;Nautilus&quot; is, and hence will not recognize a shell icon as the file manager.</para>
+	    <para>Some icons, such as the original Nautilus file manager icon, do not suggest the program&apos;s purpose, but instead suggest the program&apos;s name. This is less desirable than a functionally suggestive icon, because an extra layer of abstraction is added (rather than associating file management with an icon representing files, they have to associate file management with nautilus with an image of a nautilus shell). Additionally it makes it difficult for new users who may not know what &quot;Nautilus&quot; is, and hence will not recognize a shell icon as the file manager.</para>
 	  </formalpara>
 	  <figure>
-	    <title>A name suggestive icon for Nautilus</title>
+	    <title>The original, name suggestive icon for Nautilus</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/nautilus-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/nautilus-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-nautilus.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-nautilus.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>A picture of a nautilus shell</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -373,27 +373,28 @@
 	<listitem>
 	  <formalpara>
 	    <title>Do <emphasis>not</emphasis> include meaningful text in icons</title>
-	    <para>Icons which contain the text of the program name in the icon. They effectively contain no metaphor or picture for the user to identify with, and are probably harder to read than the accompanying caption. Since icons draw the eyes, an icon that is harder to identify than text is potentially worse than no icon at all. Hence &quot;text icons&quot; should not be used. Moreover, text should be avoided in icons because it makes the icons difficult to translate. If there is text in icons it should not form words in your native language, a good metric for ensuring that the particular text is not lending to the meaning of the icon.</para>
+	    <para>Icons that contain the text of the program name in the icon. They effectively contain no metaphor or picture for the user to identify with, and are probably harder to read than the accompanying caption. Since icons draw the eyes, an icon that is harder to identify than text is potentially worse than no icon at all. Hence &quot;text icons&quot; should not be used. Moreover, text should be avoided in icons because it makes the icons difficult to translate. If there is text in icons it should not form words in your native language, a good metric for ensuring that the particular text is not lending to the meaning of the icon.</para>
 	  </formalpara>
 	  <figure>
-	    <title>Text in the old GEdit icon</title>
+	    <title>Text in the original GEdit icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/gedit-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/gedit-icon.eps" format="EPS"/></imageobject>
-	      <textobject><phrase>The GEdit icon</phrase></textobject>
+	      <imageobject><imagedata fileref="images/icons-gedit.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-gedit.eps" format="EPS"/></imageobject>
+	      <textobject><phrase>The original GEdit icon, a rectangle containing the word &quot;GEdit&quot;.</phrase></textobject>
 	    </mediaobject>
 	  </figure>
 	</listitem>
 	<listitem>
 	  <formalpara>
 	    <title>Do <emphasis>not</emphasis> rely on information your users will not have</title>
-	    <para>Random icons appear to have no association with the program (except perhaps some odd connection in the mind of the developer). These icons should <emphasis>never</emphasis> be used and will likely serve to confuse the user more than help them. The icon&apos;s purpose should not be to &quot;look pretty&quot;; this is merely a very desirable side effect. The sodipodi logo is a squirrel, which they show as their icon. However, because the logo has no obvious connection <emphasis>to a user</emphasis>, it is a poor icon. Make sure that you are not relying on information that users won&apos;t necessarily posses.</para>
+	    <para>Random icons appear to have no association with the application (except perhaps some odd connection in the mind of the developer). These icons should <emphasis>never</emphasis> be used and will likely serve to confuse the user more than help them. The icon&apos;s purpose should not be to &quot;look pretty&quot;; this is merely a very desirable side effect.</para>
+	    <para>The SodiPodi project logo is a squirrel, which is used as the application icon. However, because the logo has no obvious connection <emphasis>to a user</emphasis>, it is a poor icon. Make sure that you are not relying on information that users won&apos;t necessarily possess.</para>
 	  </formalpara>
 	  <figure>
 	    <title>A seemingly random icon for SodiPodi</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/sodipodi-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/sodipodi-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-sodipodi.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-sodipodi.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>A squirrel</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -401,24 +402,24 @@
 	<listitem id="icon_problems_extraneous_information">
 	  <formalpara>
 	    <title>Do <emphasis>not</emphasis> include extraneous information</title>
-	    <para>Remember that icons will often be viewed in a smaller form. Too much information may render the icon unintelligible when it is shrunk in size (e.g. to be placed on a panel, or in the tasklist). Too much information also makes it easier for users confuse the purpose of the application. For example, in user testing many users thought the Evolution icon would launch a word processor. They were misled by the pencil and the paper, which could be seen as extraneous information: it is implicit that the mail program will allow you to write messages as well as receive them. A better icon might have been a simple envelope. Foremost in the icon designer&apos;s mind should be a consideration of the minimal visual elements necessary to express the purpose of the program.</para>
+	    <para>Remember that icons will often be viewed in a smaller form. Too much information may render the icon unintelligible when it is shrunk in size (e.g. to be placed on a panel, or in the tasklist). Too much information also makes it easier for users confuse the purpose of the application. For example, in user testing many users thought an older version of the Evolution icon (below) would launch a word processor. They were misled by the pencil and the paper, which could be seen as extraneous information: it is implicit that the mail program will allow you to write messages as well as receive them. A better icon might have been a simple envelope. Foremost in the icon designer&apos;s mind should be a consideration of the minimal visual elements necessary to express the purpose of the program.</para>
 	  </formalpara>
 	  <figure>
 	    <title>Extraneous information - the Evolution icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/evolution-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/evolution-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-evolution.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-evolution.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>The Evolution icon</phrase></textobject>
 	    </mediaobject>
 	  </figure>
 	  <para>
-	    The Gnumeric icon is a great icon except for the introduction of extra visual noise. The extra sheet of paper with the &apos;g&apos; on it behind the spreadsheet and chart adds no significant value to the icon and provides extra visual distraction. In this case the contribution of the extraneous element to the appearance of the icon is negative. Simple well balanced icons look more attractive than cluttered icons. An improved icon might contain only the spreadsheet and chart; larger because they can use all of the space in the icon, and hence more visually distinct.
+	    This Gnumeric icon (below) is a great icon except for the introduction of extra visual noise. The extra sheet of paper with the &apos;g&apos; on it behind the spreadsheet and chart adds no significant value to the icon and provides extra visual distraction. In this case the contribution of the extraneous element to the appearance of the icon is negative. Simple, well-balanced icons look more attractive than cluttered icons. An improved icon might contain only the spreadsheet and chart; larger because they can use all of the space in the icon, and hence more visually distinct.
 	  </para>
 	  <figure>
 	    <title>Extraneous information - the old Gnumeric icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/gnumeric-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/gnumeric-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-gnumeric.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-gnumeric.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>The Gnumeric icon</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -431,16 +432,16 @@
 	  <figure>
 	    <title>Using body parts - the font selector icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/fontsel-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/fontsel-icon.eps" format="EPS"/></imageobject>
-	      <textobject><phrase>The Font Selector Icon</phrase></textobject>
+	      <imageobject><imagedata fileref="images/icons-font-selection-poor.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-font-selection-poor.eps" format="EPS"/></imageobject>
+	      <textobject><phrase>The original Font Selector Icon</phrase></textobject>
 	    </mediaobject>
 	  </figure>	    
 	  <figure>
 	    <title>A better icon for the Font Selector</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/fontsel-suggestion.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/fontsel-suggestion.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-font-selection-good.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-font-selection-good.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>A simple replacement icon showing an ornate &quot;Aa&quot;</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -453,8 +454,8 @@
 	  <figure>
 	    <title>Word play - System Log Monitor icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/log-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/log-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-system-log.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-system-log.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>A tree log</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -467,8 +468,8 @@
 	  <figure>
 	    <title>Destructive-looking Shutdown icon</title>
 	    <mediaobject>
-	      <imageobject><imagedata fileref="images/shutdown-icon.png" format="PNG"/></imageobject>
-	      <imageobject><imagedata fileref="images/shutdown-icon.eps" format="EPS"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-shut-down.png" format="PNG"/></imageobject>
+	      <imageobject><imagedata fileref="images/icons-shut-down.eps" format="EPS"/></imageobject>
 	      <textobject><phrase>An explosive detonation button</phrase></textobject>
 	    </mediaobject>
 	  </figure>
@@ -496,7 +497,8 @@
        <para>To be considered fully accessible, all icons in your application
 	       must be replaced by a suitable alternative when one of these
 	       themes is used.<remark>The HighContrastLargePrint, HighContrastLargePrintInverse and LowContrastLargePrint <emphasis>icon</emphasis> themes are deprecated as of GNOME 2.12.  New icons need only be added to the HighContrast, HighContrastInverse and LowContrast themes.</remark></para>
-
+	<tip><title>Low Contrast Icons</title>
+	<para>Low contrast icon themes were deprecated in GNOME 2.22. It is no longer necessary to deliver low contrast icon equivalents. </para></tip>
 	<tip><title>Adding icons to accessible themes</title>
 	<para>When you have designed high and low contrast versions of all
 	your icons, submit them to the gnome-themes module maintainers for
@@ -537,15 +539,15 @@
 		<entry>Book</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-book.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-book.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-book.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-book.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Book icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-book-blur.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-book-blur.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-book-blur.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-book-blur.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Blurred Book icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -554,15 +556,15 @@
 		<entry>CD-ROM</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-cdrom.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-cdrom.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-cdrom.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-cdrom.eps" format="EPS"/></imageobject>
 		<textobject><phrase>CD-ROM icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-cdrom-blur.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-cdrom-blur.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-cdrom-blur.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-cdrom-blur.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Blurred CD-ROM icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -571,15 +573,15 @@
 		<entry>Copy</entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-copy.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-copy.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-copy.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-copy.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Copy icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
 	    <entry>
 	      <mediaobject>
-		<imageobject><imagedata fileref="images/highcontrast-copy-blur.png" format="PNG"/></imageobject>
-		<imageobject><imagedata fileref="images/highcontrast-copy-blur.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-copy-blur.png" format="PNG"/></imageobject>
+		<imageobject><imagedata fileref="images/icons-hc-copy-blur.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Blurred Copy icon</phrase></textobject>
 	      </mediaobject>
 	    </entry>
@@ -594,8 +596,8 @@
 	 <figure>
 		 <title>Simplified representation of metaphors for high contrast icons</title>
 	         <mediaobject>
-			 <imageobject><imagedata fileref="images/highcontrast-metaphors.png" format="PNG"/></imageobject>
-			 <imageobject><imagedata fileref="images/highcontrast-metaphors.eps" format="EPS"/></imageobject>
+			 <imageobject><imagedata fileref="images/icons-hc-metaphors.png" format="PNG"/></imageobject>
+			 <imageobject><imagedata fileref="images/icons-hc-metaphors.eps" format="EPS"/></imageobject>
 			 <textobject><phrase>Comparison of photorealistic style of regular icons with the simpler, line-art style of high contrast icons</phrase></textobject>
 								               </mediaobject>
 									             </figure>
@@ -604,8 +606,8 @@
 	 <figure>
 		<title>Layered technique for high contrast icons</title>
 	         <mediaobject>
-			 <imageobject><imagedata fileref="images/floppy-dissected.png" format="PNG"/></imageobject>
-		             <imageobject><imagedata fileref="images/floppy-dissected.eps" format="EPS"/></imageobject>
+			 <imageobject><imagedata fileref="images/icons-floppy-dissected.png" format="PNG"/></imageobject>
+		             <imageobject><imagedata fileref="images/icons-floppy-dissected.eps" format="EPS"/></imageobject>
 			     <textobject><phrase>Exploded view of layers used in high contrast floppy disk icon</phrase></textobject>
 								               </mediaobject>
 									             </figure>
@@ -628,13 +630,14 @@
 			 <imageobject><imagedata fileref="images/highcontrastinverse-theme.eps" format="EPS"/></imageobject>
 			 <textobject><phrase>Part of gedit window rendered in high contrast inverse, large print theme</phrase></textobject>
 								               </mediaobject>
-									             </figure>
+	</figure>
 
 	</sect3>
      </sect2>
 
      <sect2 id="icons-design-lowcontrast">
 	     <title>Low Contrast Icons</title>
+<!--
 	     <para>Low contrast icons and themes are useful to users who are particularly sensitive to light, to the extent that they find even a high contrast inverse theme uncomfortable to use.  In low contrast icons, the colors are compressed towards the middle value range, so they do not contain any large luminance values (the 'V' in HSV).  That is, dark colors are lightened, and light colors are darkened.</para>
 	 <figure>
 		 <title>Part of application window rendered in low contrast theme</title>
@@ -643,7 +646,10 @@
 			 <imageobject><imagedata fileref="images/lowcontrast-theme.eps" format="EPS"/></imageobject>
 			 <textobject><phrase>Part of gedit window rendered in low contrast theme</phrase></textobject>
 								               </mediaobject>
-									             </figure>
+								             </figure>
+-->
+		<tip><title>Low Contrast Icons</title>
+		<para>Low contrast icon themes were deprecated in GNOME 2.22. It is no longer necessary to deliver low contrast icon equivalents. </para></tip>
 	     <para>
 		     Low contrast icons are generated from the existing regular icons by adjusting the levels. In GIMP, use these values in the Levels dialog:</para>
 	<itemizedlist>
@@ -654,8 +660,8 @@
 	      <figure>
 	        <title>Levels dialog in GIMP showing correct levels for generating low contrast icons</title>
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/levels-lowcontrast.png" format="PNG"/></imageobject>
-                  <imageobject><imagedata fileref="images/levels-lowcontrast.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/icons-lowcontrast-levels.png" format="PNG"/></imageobject>
+                  <imageobject><imagedata fileref="images/icons-lowcontrast-levels.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Levels dialog in GIMP showing input levels set to 100, 1.25, 200, and output levels set to 100 and 160.</phrase></textobject>
 		 </mediaobject>
 	      </figure>

Modified: branches/hig-2-3/hig-ch-input.xml
==============================================================================
--- branches/hig-2-3/hig-ch-input.xml	(original)
+++ branches/hig-2-3/hig-ch-input.xml	Mon Sep 29 16:42:17 2008
@@ -11,8 +11,8 @@
 
 	<figure> <title>A plethora of pointing devices: mouse, trackball, foot-operated mouse, joystick, trackpad, and a finger-mounted pointing device.</title>
 	  <mediaobject>
-	  <imageobject><imagedata fileref="images/pointingdevices.png" format="PNG" width="480" depth="80"/></imageobject>
-	  <imageobject><imagedata fileref="images/pointingdevices.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/input-pointing-devices.png" format="PNG" width="480" depth="80"/></imageobject>
+	  <imageobject><imagedata fileref="images/input-pointing-devices.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>Pictures of different types of pointing device, including mouse, trackball, foot-operated mouse and joystick.</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -185,14 +185,14 @@
 
 	<figure> <title>Examples illustrating dynamic selection highlighting during bounding box selection.  In the first example, the folder color and label highlighting changes to indicate selection.  In the second, selection is indicated by the addition of resizing handles to selected objects.</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/rubberband.png" format="PNG" width="542" depth="143"/></imageobject>
-	    <imageobject><imagedata fileref="images/rubberband.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/input-drag-select-files.png" format="PNG" width="509" depth="166"/></imageobject>
+	    <imageobject><imagedata fileref="images/input-drag-select-files.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Example illustrating dynamic selection highlighting during bounding box selection</phrase></textobject>
 	  </mediaobject>
 
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/rubberband_dia.png" format="PNG" width="598" depth="147"/></imageobject>
-	    <imageobject><imagedata fileref="images/rubberband_dia.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/input-drag-select-graphics.png" format="PNG" width="598" depth="147"/></imageobject>
+	    <imageobject><imagedata fileref="images/input-drag-select-graphics.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Example illustrating dynamic selection highlighting during bounding box selection</phrase></textobject>
 	  </mediaobject>
 	  
@@ -223,8 +223,8 @@
 		<figure>
 		<title>Example of copy pointer augmented by an icon representing the file being copied</title>
 		<mediaobject>
-		<imageobject><imagedata fileref="images/dragcursor-augmented.png" format="PNG" width="168" depth="97"/></imageobject>
-		<imageobject><imagedata fileref="images/dragcursor-augmented.eps" format="EPS"/></imageobject>
+		<imageobject><imagedata fileref="images/input-drag-cursor.png" format="PNG" width="101" depth="129"/></imageobject>
+		<imageobject><imagedata fileref="images/input-drag-cursor.eps" format="EPS"/></imageobject>
 		<textobject><phrase>Copy pointer superimposed on icon representing a file being copied, to form a "copy file" pointer</phrase></textobject>
 		</mediaobject>
 		</figure>
@@ -326,8 +326,8 @@
 		<row>
 		  <entry>
 	            <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-move.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-move.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-move.png" format="PNG" width="31" depth="32"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-move.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Move" pointer</phrase></textobject>
 	             </mediaobject>
                   </entry>
@@ -338,8 +338,8 @@
 		<row>
 		  <entry>
                     <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-copy.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-copy.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-copy.png" format="PNG" width="33" depth="30"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-copy.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Copy" pointer</phrase></textobject>
 	             </mediaobject>
                   </entry>
@@ -348,8 +348,8 @@
 		<row>
 		  <entry>
                     <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-link.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-link.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-link.png" format="PNG" width="37" depth="33"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-link.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Link" pointer</phrase></textobject>
 	             </mediaobject>
                   </entry>
@@ -359,8 +359,8 @@
 		<row>
 		  <entry>
                     <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-rmb.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-rmb.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-query.png" format="PNG" width="28" depth="32"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-query.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Query drop" pointer</phrase></textobject>
 	             </mediaobject>
                    </entry>
@@ -370,8 +370,8 @@
 		<row>
 		  <entry>
                      <mediaobject>
-		      <imageobject><imagedata fileref="images/dragcursor-nodrop.png" format="PNG" width="32" depth="32"/></imageobject>
-		      <imageobject><imagedata fileref="images/dragcursor-nodrop.eps" format="EPS"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-nodrop.png" format="PNG" width="28" depth="32"/></imageobject>
+		      <imageobject><imagedata fileref="images/input-drag-cursor-nodrop.eps" format="EPS"/></imageobject>
 	              <textobject><phrase>"Can't drop here" pointer</phrase></textobject>
 	             </mediaobject>
 </entry>
@@ -422,8 +422,8 @@
 	<figure>
 	  <title>Dialog and menu, with some of their access and shortcut keys indicated</title>
 	  <mediaobject>
-	  <imageobject><imagedata fileref="images/mnemonics_and_shortcuts.png" format="PNG" width="484" depth="272"/></imageobject>
-	  <imageobject><imagedata fileref="images/mnemonics_and_shortcuts.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/input-accesskeys-shortcuts.png" format="PNG" width="497" depth="399"/></imageobject>
+	  <imageobject><imagedata fileref="images/input-accesskeys-shortcuts.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>Screenshot of a dialog and a menu with some of their access keys and shortcut keys highlighted</phrase></textobject>
 	  </mediaobject>
 	</figure>

Modified: branches/hig-2-3/hig-ch-layout.xml
==============================================================================
--- branches/hig-2-3/hig-ch-layout.xml	(original)
+++ branches/hig-2-3/hig-ch-layout.xml	Mon Sep 29 16:42:17 2008
@@ -35,8 +35,8 @@
 
       <figure><title>The basic GNOME 32-color palette</title>
 	<mediaobject>
-	  <imageobject><imagedata fileref="images/ximian-palette.png" format="PNG"/></imageobject>
-	  <imageobject><imagedata fileref="images/ximian-palette.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/visdes-palette.png" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/visdes-palette.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>The basic GNOME 32-color palette</phrase></textobject>
 	</mediaobject>
       </figure>
@@ -59,15 +59,15 @@
 	  <tbody valign="middle">
 	    <row>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-1.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-1.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-1.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-1.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Basic 3D Highlight</entry>
 	      <entry>234 232 227</entry>
 	      <entry>#EAE8E3 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-2.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-2.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-2.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-2.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Basic 3D Medium</entry>
 	      <entry>186 181 171</entry>
@@ -75,15 +75,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-3.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-3.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-3.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-3.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Basic 3D Dark</entry>
 	      <entry>128 125 116</entry>
 	      <entry>#807D74 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-4.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-4.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-4.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-4.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>3D Shadow</entry>
 	      <entry>86 82 72</entry>
@@ -91,15 +91,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-5.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-5.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-5.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-5.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Green Highlight</entry>
 	      <entry>197 210 200</entry>
 	      <entry>#C5D2C8 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-6.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-6.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-6.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-6.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Green Medium</entry>
 	      <entry>131 166 127</entry>
@@ -107,15 +107,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-7.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-7.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-7.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-7.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Green Dark</entry>
 	      <entry>93 117 85</entry>
 	      <entry>#5D7555 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-8.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-8.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-8.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-8.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Green Shadow</entry>
 	      <entry>68 86 50</entry>
@@ -123,15 +123,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-9.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-9.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-9.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-9.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Red Highlight</entry>
 	      <entry>224 182 175</entry>
 	      <entry>#E0B6AF </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-10.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-10.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-10.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-10.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Red Medium</entry>
 	      <entry>193 102 90</entry>
@@ -139,15 +139,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-11.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-11.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-11.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-11.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Red Dark</entry>
 	      <entry>136 70 49</entry>
 	      <entry>#884631 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-12.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-12.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-12.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-12.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Red Shadow</entry>
 	      <entry>102 56 34</entry>
@@ -155,15 +155,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-13.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-13.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-13.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-13.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Purple Highlight</entry>
 	      <entry>173 167 200</entry>
 	      <entry>#ADA7C8 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-14.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-14.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-14.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-14.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Purple Medium</entry>
 	      <entry>136 127 163</entry>
@@ -171,15 +171,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-15.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-15.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-15.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-15.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Purple Dark</entry>
 	      <entry>98 91 129</entry>
 	      <entry>#625B81 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-16.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-16.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-16.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-16.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Purple Shadow</entry>
 	      <entry>73 64 102</entry>
@@ -187,15 +187,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-17.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-17.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-17.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-17.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Blue Highlight</entry>
 	      <entry>157 184 210</entry>
 	      <entry>#9DB8D2 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-18.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-18.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-18.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-18.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Blue Medium</entry>
 	      <entry>117 144 174</entry>
@@ -203,15 +203,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-19.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-19.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-19.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-19.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Blue Dark</entry>
 	      <entry>75 105 131</entry>
 	      <entry>#4B6983 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-20.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-20.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-20.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-20.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Blue Shadow</entry>
 	      <entry>49 78 108</entry>
@@ -219,15 +219,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-21.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-21.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-21.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-21.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Face Skin Highlight</entry>
 	      <entry>239 224 205</entry>
 	      <entry>#EFE0CD </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-22.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-22.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-22.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-22.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Face Skin Medium</entry>
 	      <entry>224 195 158</entry>
@@ -235,15 +235,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-23.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-23.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-23.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-23.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Face Skin Dark</entry>
 	      <entry>179 145 105</entry>
 	      <entry>#B39169 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-24.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-24.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-24.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-24.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Face Skin Shadow</entry>
 	      <entry>130 102 71</entry>
@@ -251,15 +251,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-25.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-25.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-25.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-25.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Red</entry>
 	      <entry>223 66 30</entry>
 	      <entry>#DF421E </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-26.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-26.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-26.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-26.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Red Dark</entry>
 	      <entry>153 0 0</entry>
@@ -267,15 +267,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-27.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-27.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-27.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-27.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Yellow</entry>
 	      <entry>238 214 128</entry>
 	      <entry>#EED680 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-28.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-28.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-28.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-28.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Yellow Dark</entry>
 	      <entry>209 148 12</entry>
@@ -283,15 +283,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-29.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-29.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-29.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-29.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Green </entry>
 	      <entry>70 160 70</entry>
 	      <entry>#46A046 </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-30.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-30.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-30.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-30.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Accent Green Dark</entry>
 	      <entry>38 199 38</entry>
@@ -299,15 +299,15 @@
 	    </row>
 	    <row> 
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-31.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-31.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-31.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-31.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>White</entry>
 	      <entry>255 255 255</entry>
 	      <entry>#ffffff </entry>
 	      <entry><mediaobject>
-		  <imageobject><imagedata fileref="images/palette-32.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/palette-32.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-32.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-palette-32.eps" format="EPS"/></imageobject>
 		</mediaobject></entry>
 	      <entry>Black</entry>
 	      <entry>0 0 0</entry>
@@ -336,23 +336,23 @@
 	      <row>
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/earthNorm.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/earthNorm.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-normal.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-normal.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Photo of earth as a normally-sighted user would see it</phrase></textobject>
 		  </mediaobject>
 	        </entry>
 		
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/earthDeutan.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/earthDeutan.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-deutan.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-deutan.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Photo of earth as a user with red-green color-blindness would see it</phrase></textobject>
 		  </mediaobject>
 	        </entry>
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/earthTritan.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/earthTritan.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-tritan.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-colorblind-tritan.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Photo of earth as a user with blue-yellow color-blindness would see it</phrase></textobject>
 		  </mediaobject>
 	        </entry>
@@ -406,16 +406,16 @@
 	      <row>
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/layout1.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/layout1.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-layout-poor.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-layout-poor.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Initial layout with poor alignment and limited use of white space</phrase></textobject>
 		  </mediaobject>
 	        </entry>
 		
 		<entry>
 	          <mediaobject>
-		    <imageobject><imagedata fileref="images/layout2.png" format="PNG"/></imageobject>
-		    <imageobject><imagedata fileref="images/layout2.eps" format="EPS"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-layout-good.png" format="PNG"/></imageobject>
+		    <imageobject><imagedata fileref="images/visdes-layout-good.eps" format="EPS"/></imageobject>
 		    <textobject><phrase>Improved layout with fewer alignment points, frames removed to relieve clutter, and clearer grouping with use of white space</phrase></textobject>
 		  </mediaobject>
 	        </entry>
@@ -438,8 +438,8 @@
       <figure id="layout-callouts-figure"><title>Layout specifications</title>
 	
 	<mediaobject>
-	  <imageobject><imagedata fileref="images/layout_callouts.png" format="PNG"/></imageobject>
-	  <imageobject><imagedata fileref="images/layout_callouts.eps" format="EPS"/></imageobject>
+	  <imageobject><imagedata fileref="images/visdes-layout-annotated.png" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/visdes-layout-annotated.eps" format="EPS"/></imageobject>
 	  <textobject><phrase>Improved layout with fewer alignment points, frames removed to relieve clutter, and clearer grouping with use of white space</phrase></textobject>
 	</mediaobject>
       </figure>
@@ -577,10 +577,10 @@
 	    <row>
 	      <entry>Large Icons (file browser)</entry>
 	      <entry>Horizontally centered and (6 pixels, if specification necessary) below large icons</entry>
-	      <entry align="center">
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/large_icon_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/large_icon_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-large-icon-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-large-icon-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Large icon with text label centered below</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -589,10 +589,10 @@
 	    <row>
 	      <entry>Small icons (toolbar)</entry>
 	      <entry>Vertically centered and (6 pixels, if specification necessary) to the right of small icons</entry>
-	      <entry align="center">
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/small_icon_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/small_icon_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-small-icon-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-small-icon-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Small icon with text label to the right</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -601,10 +601,10 @@
 	    <row>
 	      <entry>List control label</entry>
 	      <entry>6 pixels above and horizontally left aligned with the list control or 12 pixels to the left of and horizontally top aligned with list control</entry>
-	      <entry align="center">
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/list_control_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/list_control_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-list-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-list-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>List control with text label horizontally aligned above</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -613,10 +613,10 @@
 	    <row>
 	      <entry>Radio button and check box labels</entry>
 	      <entry>6 pixels to the right of and vertically center aligned with the radio button</entry>
-	      <entry align="center">
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/radio_button_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/radio_button_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-radiobutton-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-radiobutton-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Radio button with text label to its right</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -624,12 +624,12 @@
 	    </row>
 
 	    <row> 
-	      <entry>Textfield labels</entry>
+	      <entry>Text field labels</entry>
 	      <entry>6 pixels to the left of and vertically center aligned with the textfield control</entry>
-	      <entry align="center">
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/textbox_label.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/textbox_label.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-textbox-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-textbox-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Textbox with text label to its left</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -638,10 +638,10 @@
 	    <row>
 	      <entry>Button labels</entry>
 	      <entry>12 pixels of padding to either side of centered text (and any accompanying graphic). If appearing in a group of buttons, longest button label sets button size, center all other button labels and accompanying graphics in same-sized buttons</entry>
-	      <entry align="center">
+	      <entry align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/icons_labels.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/icons_labels.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-button-label.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-button-label.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Buttons with centered text</phrase></textobject>
 		</mediaobject>
 	      </entry>
@@ -649,10 +649,10 @@
 	    <row> 
 	      <entry>Other component labels (e.g., spin boxes, text fields </entry>
 	      <entry>12 pixels between the longest text label and its associated component, all other text labels in component grouping left aligned with the longest label. All labels vertically center aligned with associated components</entry>
-	      <entry  align="center">
+	      <entry  align="center" valign="middle">
 		<mediaobject>
-		  <imageobject><imagedata fileref="images/other_labels.png" format="PNG"/></imageobject>
-		  <imageobject><imagedata fileref="images/other_labels.eps" format="EPS"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-other-labels.png" format="PNG"/></imageobject>
+		  <imageobject><imagedata fileref="images/visdes-other-labels.eps" format="EPS"/></imageobject>
 		  <textobject><phrase>Drop-down list with label to its left</phrase></textobject>
 		</mediaobject>
 	      </entry>

Modified: branches/hig-2-3/hig-ch-menus.xml
==============================================================================
--- branches/hig-2-3/hig-ch-menus.xml	(original)
+++ branches/hig-2-3/hig-ch-menus.xml	Mon Sep 29 16:42:17 2008
@@ -84,273 +84,237 @@
         <para>Do not provide a mechanism for hiding the menubar, as this may be activated accidentally. Some users will not be able to figure out how to get the menu bar back in this case.</para>
       </listitem>
     </itemizedlist>
-  </sect1>
-  <sect1 id="menus-types">
-    <title>Types of Menu</title>
-    <sect2 id="menu-type-drop-down">
-      <title>Drop-down Menus</title>
-      <figure id="drop-down-menu">
-        <title>A typical drop-down menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot of a typical drop-down menu</phrase>
-          </textobject>
-        </mediaobject>
+
+   </sect1>
+
+   <sect1 id="menus-types">
+      <title>Types of Menu</title>
+
+
+	<sect2 id="menu-type-drop-down">
+	  <title>Drop-down Menus</title>
+	<figure id="drop-down-menu">
+	<title>A typical drop-down menu</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-dropdown.png" format="PNG" width="166" depth="300"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-dropdown.eps" format="EPS"/></imageobject>
+	  <textobject><phrase>Screenshot of a typical drop-down menu</phrase></textobject>
+	</mediaobject>
+
       </figure>
-      <para>A drop-down menu appears when the user clicks on its title in a menubar, or focuses the title and presses <keycap>Return</keycap>.</para>
-      <itemizedlist>
-        <title>Guidelines</title>
-        <listitem>
-          <para>Only place items on a menu that relate to that menu's title.</para>
-        </listitem>
-        <listitem>
-          <para>Organize menu items in the standard order--; see <xref linkend="menus-standard"/>.  For application-specific items where there is no standard order, arrange in numerical or other logical order (for example, <guimenuitem>50%</guimenuitem>, <guimenuitem>100%</guimenuitem>, <guimenuitem>200%</guimenuitem>), task order (for example, <guimenuitem>Compile</guimenuitem> followed by <guimenuitem>Debug</guimenuitem>) or by expected frequency of use.</para>
-        </listitem>
-        <listitem>
-          <para>Limit top-level menus to a maximum of about 15 items. If you have any more items than this, consider moving a functionally-related subset of the items into a submenu or a new top-level menu.</para>
-        </listitem>
-        <listitem>
-          <para>Do not add or remove individual menu items while the application is running, make them insensitive instead. Entire menus may be added or removed from the menubar at runtime, however, for example in component-based applications.</para>
-        </listitem>
-        <listitem>
-          <para>Immediately update menu items that are edited directly or indirectly by the user, such as those on the <guisubmenu>Open Recent</guisubmenu> submenu and the <guimenu>Bookmarks</guimenu> menu.</para>
-        </listitem>
-      </itemizedlist>
-      <remark> CB-Ed: As in JLFDG AT p. 33, perhaps provide a table of common access keys, or "mnemonics." </remark>
-      <remark> CFB: the keyboard navigation chapter already does so </remark>
-    </sect2>
-    <sect2 id="menu-type-submenu">
-      <title>Submenus</title>
-      <figure id="submenu">
-        <title>A drop-down menu with a submenu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/submenu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/submenu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot of a drop-down menu with a submenu</phrase>
-          </textobject>
-        </mediaobject>
+
+	<para>A drop-down menu appears when the user clicks on its title in a menubar, or focuses the title and presses <keycap>Return</keycap>.</para>
+
+<remark> CB-Ed/Fig: Define "post," as no-brainer-ish as it may seem, and also add a figure to show what it means.  A simple menu being shown at the user clicking on a menu title on a menubar, or "posted," makes sense.  </remark>
+<remark> CFB: I've just reworded everything to avoid the use of "post" </remark>
+
+    <itemizedlist><title>Guidelines</title>
+
+	<listitem><para>Only place items on a menu that relate to that menu's title.</para></listitem>
+
+      <listitem><para>Organize menu items in the standard orderâ see <xref linkend="menus-standard" />.  For application-specific items where there is no standard order, arrange in numerical or other logical order (for example, <guimenuitem>50%</guimenuitem>, <guimenuitem>100%</guimenuitem>, <guimenuitem>200%</guimenuitem>), task order (for example, <guimenuitem>Compile</guimenuitem> followed by <guimenuitem>Debug</guimenuitem>) or by expected frequency of use.</para></listitem>
+
+      <listitem><para>Limit top-level menus to a maximum of about 15 items. If you have any more items than this, consider moving a functionally-related subset of the items into a submenu or a new top-level menu.</para></listitem>
+
+      <listitem><para>Do not add or remove individual menu items while the application is running, make them insensitive instead. Entire menus may be added or removed from the menubar at runtime, however, for example in component-based applications.</para></listitem>
+
+      <listitem><para>Immediately update menu items that are edited directly or indirectly by the user, such as those on the <guisubmenu>Open Recent</guisubmenu> submenu and the <guimenu>Bookmarks</guimenu> menu.</para></listitem>
+
+
+    </itemizedlist>
+  <remark> CB-Ed: As in JLFDG AT p. 33, perhaps provide a table of common access keys, or "mnemonics." </remark>
+  <remark> CFB: the keyboard navigation chapter already does so </remark>
+
+
+	</sect2>
+
+	<sect2 id="menu-type-submenu">
+	  <title>Submenus</title>
+
+	<figure id="submenu">
+	<title>A drop-down menu with a submenu</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-submenu.png" format="PNG" width="352" depth="264"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-submenu.eps" format="EPS"/></imageobject>
+	  <textobject><phrase>Screenshot of a drop-down menu with a submenu</phrase></textobject>
+	</mediaobject>
       </figure>
-      <para>A submenu appears when the user clicks its title, which is indicated by a small arrow symbol beside its label.  You can save space on long menus by grouping related commands onto a single submenu.</para>
-      <itemizedlist>
-        <title>Guidelines</title>
-        <listitem>
-          <para>Use submenus sparingly, as they are physically difficult to navigate and make it harder to find and reach the items they contain.</para>
-        </listitem>
-        <listitem>
-          <para>Do not create submenus with fewer than three items, unless the items are added dynamically (for example the <menuchoice><guimenu>File</guimenu><guimenuitem>New Tab</guimenuitem></menuchoice> submenu in <application>gnome-terminal</application>).</para>
-        </listitem>
-        <listitem>
-          <para>Do not nest submenus within submenus.  More than two levels of hierarchy are difficult to memorize and navigate.</para>
-        </listitem>
-      </itemizedlist>
-      <remark> CB-Ed/Fig: In JLFDG AT, p. 41, the Most Recently Used (MRU) list is recommended to contain no more than 10 items. Add a figure here, with callouts to point out this rule, among others, if any are developed.  </remark>
-    </sect2>
-    <sect2 id="menu-type-popup">
-      <title>Popup Menus</title>
-      <figure id="popup-menu">
-        <title>A popup menu for a mail folder</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/popup-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/popup-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot of a popup menu for a mail folder, listing the actions that can be performed on that folder</phrase>
-          </textobject>
-        </mediaobject>
+
+	<para>A submenu appears when the user clicks its title, which is indicated by a small arrow symbol beside its label.  You can save space on long menus by grouping related commands onto a single submenu.</para>
+
+	<itemizedlist><title>Guidelines</title>
+
+		<listitem><para>Use submenus sparingly, as they are physically difficult to navigate and make it harder to find and reach the items they contain.</para></listitem>
+
+		<listitem><para>Do not create submenus with fewer than three items, unless the items are added dynamically (for example the <menuchoice><guimenu>File</guimenu><guimenuitem>New Tab</guimenuitem></menuchoice> submenu in <application>gnome-terminal</application>).</para></listitem>
+
+		<listitem><para>Do not nest submenus within submenus.  More than two levels of hierarchy are difficult to memorize and navigate.</para></listitem>
+		
+	</itemizedlist>
+
+	<remark> CB-Ed/Fig: In JLFDG AT, p. 41, the Most Recently Used (MRU) list is recommended to contain no more than 10 items. Add a figure here, with callouts to point out this rule, among others, if any are developed.  </remark> 
+
+	</sect2>
+
+	<sect2 id="menu-type-popup">
+	  <title>Popup Menus</title>
+
+	<figure id="popup-menu">
+	<title>A popup menu for a mail folder</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-popup.png" format="PNG" width="251" depth="233"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-popup.eps" format="EPS"/></imageobject>
+	  <textobject><phrase>Screenshot of a popup menu for a mail folder, listing the actions that can be performed on that folder</phrase></textobject>
+	</mediaobject>
       </figure>
-      <para>Popup menus provide shortcuts to those menu items that are applicable only to the currently selected object.  As such, they are sometimes known as "context menus" or "shortcut menus".  A popup menu is shown when the user right-clicks on an object, or selects the object and presses <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>.</para>
-      <para>Popup menus are used primarily by intermediate and advanced users.  Even some users who have used graphical desktops for many years do not know about popup menus until somebody shows them.</para>
-      <itemizedlist>
-        <title>Guidelines</title>
-        <listitem>
-          <para>Provide a popup menu for every object, selectable part, and text input target such as entry fields.</para>
-        </listitem>
-        <listitem>
-          <para>Provide the same popup menu for all objects of the same type.  If the properties of the selected instance make any of an object's popup menu items temporarily inappropriate, make those items insensitive rather than hiding them.</para>
-        </listitem>
-        <listitem>
-          <para>Provide an access key for each item.  Do not show keyboard shortcuts in popup menus however; doing so decreases their readability and spatial efficiency.</para>
-        </listitem>
-        <listitem>
-          <para>Since the user may not be aware of their presence, do not provide functions that are only accessible from popup menus unless you are confident that your target users will know how to use popup menus.</para>
-          <remark>But see http://bugzilla.mozilla.org/show_bug.cgi?id=34357</remark>
-        </listitem>
-        <listitem>
-          <para>Order items on a popup menu as follows:</para>
-          <itemizedlist>
-            <listitem>
-              <para>the double-click action for object, when it exists</para>
-            </listitem>
-            <listitem>
-              <para>other commands and settings in expected frequency-of-use order</para>
-            </listitem>
-            <listitem>
-              <para>transfer commands such as <command>Cut</command>, <command>Copy</command>, and <command>Paste</command></para>
-            </listitem>
-            <listitem>
-              <para><guimenuitem>Input Methods</guimenuitem>, where applicable. <guimenuitem>Input Methods</guimenuitem> is provided by GTK+ for supporting alternatives to the keyboard for input (such as used for Japanese, Chinese, and some accessibility technologies).</para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-        <listitem>
-          <para>Popup menus need to be as simple as possible to maximize their efficiency.  Do not place more than about ten items on a popup menu, and do avoid submenus.</para>
-        </listitem>
-      </itemizedlist>
-      <remark> CB-Ed: In the previous note, define the Input Methods menu and why it is an exception, for scalability reasons (other items may fall into the same category).  It also sounds like a pretty low-level command; should this be exposed to the user? </remark>
-      <remark> SN-Ed: No, it should not be exposed to the user. I'm not really sure what possessed the GTK guys to put this in every right click menu for text boxes. I suppose in this case having it be a submenu is good (if they insist on it existing) because it makes it maximally invisible </remark>
-      <remark> GJM: To make this worse, they've added "Insert Unicode control character".</remark>
-    </sect2>
-  </sect1>
-  <sect1 id="menus-design">
-    <title>Designing a Menu</title>
-    <sect2 id="menu-grouping">
-      <title>Grouping Menu Items</title>
-      <figure id="menu-separators">
-        <title>Items grouped on a menu with separators</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <phrase>Screenshot of a menu divided into five logical groups with menu separators</phrase>
-          </textobject>
-        </mediaobject>
+
+	<para>Popup menus provide shortcuts to those menu items that are applicable only to the currently selected object.  As such, they are sometimes known as &quot;context menus&quot; or &quot;shortcut menus&quot;.  A popup menu is shown when the user right-clicks on an object, or selects the object and presses <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>.</para>
+
+	<para>Be aware that popup menus are used primarily by intermediate and advanced users.  Even some users who have used graphical desktops for many years do not know about popup menus until somebody shows them.</para>
+
+	<itemizedlist><title>Guidelines</title>
+		<listitem><para>Provide a popup menu for every object, selectable part, and text input target such as entry fields.</para></listitem>
+		<listitem><para>Provide an access key for each item.  However, to enhance their spatial efficiency and readability, do not show keyboard shortcuts in popup menus.</para></listitem>
+		
+		<listitem><para>Since the user may not be aware of their presence, do not provide functions that are only accessible from popup menus unless you are confident that your target users will know how to use popup menus.</para>
+		<remark>But see http://bugzilla.mozilla.org/show_bug.cgi?id=34357</remark>
+		</listitem>
+
+		<listitem><para>Order items on a popup menu as follows:</para>
+		<itemizedlist>
+			<listitem><para>the double-click action for object, when it exists</para></listitem>
+			<listitem><para>other commands and settings in expected frequency-of-use order</para></listitem>
+			<listitem><para>transfer commands such as <command>Cut</command>, <command>Copy</command>, and <command>Paste</command></para></listitem>
+			<listitem><para><guimenuitem>Input Methods</guimenuitem>, where applicable. <guimenuitem>Input Methods</guimenuitem> is provided by GTK+ for supporting alternatives to the keyboard for input (such as used for Japanese, Chinese, and some accessibility technologies).</para></listitem>
+		</itemizedlist>
+		</listitem>
+
+	 	<listitem><para>Popup menus need to be as simple as possible to maximize their efficiency.  Do not place more than about ten items on a popup menu, and do avoid submenus.</para></listitem>
+
+	</itemizedlist>
+
+	<remark> CB-Ed: In the previous note, define the Input Methods menu and why it is an exception, for scalability reasons (other items may fall into the same category).  It also sounds like a pretty low-level command; should this be exposed to the user? </remark>
+	<remark> SN-Ed: No, it should not be exposed to the user. I'm not really sure what possessed the GTK guys to put this in every right click menu for text boxes. I suppose in this case having it be a submenu is good (if they insist on it existing) because it makes it maximally invisible </remark>
+	<remark> GJM: To make this worse, they've added "Insert Unicode control character".</remark>
+	</sect2>
+	</sect1>
+
+	<sect1 id="menus-design">
+	<title>Designing a Menu</title>
+
+	<sect2 id="menu-grouping">
+	  <title>Grouping Menu Items</title>
+
+	<figure id="menu-separators">
+	<title>Items grouped on a menu with separators</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-dropdown.png" format="PNG" width="166" depth="300"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-dropdown.eps" format="EPS"/></imageobject>
+	  <textobject><phrase>Screenshot of a menu divided into five logical groups with menu separators</phrase></textobject>
+	</mediaobject>
       </figure>
-      <para>Menu separators are the horizontal dividing lines that visually separate groups of related items on a drop-down menu, submenu, or popup menu.  For example, the separators in <xref linkend="menu-separators"/> divide the menu into five functionally-related groups.  Good use of separators helps to "chunk" the information on a menu and make it easier to scan and memorize.</para>
-      <itemizedlist>
-        <title>Guidelines</title>
-        <listitem>
-          <para>The best size for a group is around 2-5 items.  Single-item groups are best placed at the top or bottom of a menu, otherwise try to group them with other single items of the same type on the same menu.</para>
-        </listitem>
-        <listitem>
-          <para>Order items within a group logically, numerically, in task order or by expected frequency of use, as appropriate.</para>
-        </listitem>
-        <listitem>
-          <para>Only place one type of menu item in each group--; <link linkend="menu-item-type-command">command</link>, <link linkend="menu-item-type-mutable">mutable</link>, <link linkend="menu-item-type-check">check box</link> or <link linkend="menu-item-type-radio">radio button</link>.  For example, do not place commands (such as <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>) and settings (such as <menuchoice><guimenu>View</guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>) in the same group.</para>
-        </listitem>
-      </itemizedlist>
-    </sect2>
-    <sect2 id="menu-item-types">
-      <title>Types of menu item</title>
-      <sect3 id="menu-item-type-command">
-        <title>Command Items</title>
-        <figure id="command-items-figure">
-          <title>A group of command items on a menu</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="images/command-menu.png" format="PNG"/>
-            </imageobject>
-            <imageobject>
-              <imagedata fileref="images/command-menu.eps" format="EPS"/>
-            </imageobject>
-            <textobject>
-              <phrase>Screenshot of a group on a menu containing only command items: Save, Save As, and Revert</phrase>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <para>Command items are menu items that initiate a command or perform an action, such as <guimenuitem>Save</guimenuitem>, <guimenuitem>Print</guimenuitem> or <guimenuitem>Quit</guimenuitem>. They may act on the currently active document in a document based application, or on the application itself.</para>
-        <itemizedlist>
-          <title>Guidelines</title>
-          <listitem>
-            <para>Provide a keyboard shortcut for standard or frequently used command items.  See <xref linkend="shortcuts"/> for more information on choosing shortcut keys.</para>
-          </listitem>
-<!-- <para>Shortcuts consist of the <keysym>Control</keysym> key and an alphanumeric key, or of one of the keys <keysym>F1</keysym>-<keysym>F12</keysym>, <keysym>Insert</keysym>, <keysym>Delete</keysym>, <keysym>Home</keysym>, <keysym>End</keysym>, <keysym>Page Up</keysym> or <keysym>Page Down</keysym>. The <keysym>Shift</keysym> key may be used as an additional modifier for commands which are related to or the opposite of the command accessed without the <keysym>Shift</keysym> key.  See <xref linkend="shortcuts"/> for more information.</para> -->
-          <listitem>
-            <para>Do not remove command items from the menu when they are unavailable, make them insensitive instead.  This allows the user to infer what functionality the application provides even if it is not currently available, and keeping the menu structure static makes it easier to memorize.</para>
-          </listitem>
-          <listitem>
-            <para>Label the menu item with a trailing ellipsis ("...")  only if the command requires further input from the user before it can be performed. Do not add an ellipsis to items that only present a confirmation dialog (such as <guimenuitem>Delete</guimenuitem>), or that do not <emphasis>require</emphasis> further input (such as <guimenuitem>Properties</guimenuitem>, <guimenuitem>Preferences</guimenuitem> or <guimenuitem>About</guimenuitem>).</para>
-          </listitem>
-        </itemizedlist>
-        <remark>
+
+	  <para>Menu separators are the horizontal dividing lines that visually separate groups of related items on a drop-down menu, submenu, or popup menu.  For example, the separators in <xref linkend="menu-separators"/> divide the menu into five functionally-related groups.  Good use of separators helps to &quot;chunk&quot; the information on a menu and make it easier to scan and memorize.</para>
+	  
+	  <itemizedlist><title>Guidelines</title>
+
+	    <listitem><para>The best size for a group is around 2-5 items.  Single-item groups are best placed at the top or bottom of a menu, otherwise try to group them with other single items of the same type on the same menu.</para></listitem>
+
+	    <listitem><para>Order items within a group logically, numerically, in task order or by expected frequency of use, as appropriate.</para></listitem>
+
+	    <listitem><para>Only place one type of menu item in each groupâ <link linkend="menu-item-type-command">command</link>, <link linkend="menu-item-type-mutable">mutable</link>, <link linkend="menu-item-type-check">check box</link> or <link linkend="menu-item-type-radio">radio button</link>.  For example, do not place commands (such as <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>) and settings (such as. <menuchoice><guimenu>View</guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>) in the same group.</para></listitem>
+
+	    </itemizedlist>	  
+	</sect2>
+
+	<sect2 id="menu-item-types">
+	<title>Types of menu item</title>
+	
+	<sect3 id="menu-item-type-command">
+	  <title>Command Items</title>
+
+	<figure id="command-items-figure"><title>A group of command items on a menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-command-group.png" format="PNG" width="253" depth="105"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-command-group.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>Screenshot of a group on a menu containing only command items: Save, Save As, and Revert</phrase></textobject>
+	  </mediaobject>
+	</figure>
+
+	  <para>Command items are menu items that initiate a command or perform an action, such as <guimenuitem>Save</guimenuitem>, <guimenuitem>Print</guimenuitem> or <guimenuitem>Quit</guimenuitem>. They may act on the currently active document in a document based application, or on the application itself.</para>
+
+	<itemizedlist><title>Guidelines</title>
+
+		<listitem><para>Provide a keyboard shortcut for standard or frequently used command items.  See <xref linkend="shortcuts"/> for more information on choosing shortcut keys.</para></listitem>
+	  <!-- <para>Shortcuts consist of the <keysym>Control</keysym> key and an alphanumeric key, or of one of the keys <keysym>F1</keysym>-<keysym>F12</keysym>, <keysym>Insert</keysym>, <keysym>Delete</keysym>, <keysym>Home</keysym>, <keysym>End</keysym>, <keysym>Page Up</keysym> or <keysym>Page Down</keysym>. The <keysym>Shift</keysym> key may be used as an additional modifier for commands which are related to or the opposite of the command accessed without the <keysym>Shift</keysym> key.  See <xref linkend="shortcuts"/> for more information.</para> -->
+	  
+	<listitem><para>Do not remove command items from the menu when they are unavailable, make them insensitive instead.  This allows the user to infer what functionality the application provides even if it is not currently available, and keeping the menu structure static makes it easier to memorize.</para></listitem>
+
+	  <listitem><para>Label the menu item with a trailing ellipsis ("...")  only if the command requires further input from the user before it can be performed. Do not add an ellipsis to items that only present a confirmation dialog (such as <guimenuitem>Delete</guimenuitem>), or that do not <emphasis>require</emphasis> further input (such as <guimenuitem>Properties</guimenuitem>, <guimenuitem>Preferences</guimenuitem> or <guimenuitem>About</guimenuitem>).</para></listitem>
+
+	</itemizedlist>
+	<remark>
 	  Should we reserve <keysym>Alt</keysym> as a modifier for window manager operations? Should we state this here?
 	</remark>
-        <remark> CB-Ed/Fig: Figure would be nice here. </remark>
-      </sect3>
-      <sect3 id="menu-item-type-mutable">
-        <title>Mutable Command Items</title>
-        <para>A mutable command item changes its label when selected.  For example, <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> in a browser may change to <guimenuitem>Stop</guimenuitem> to allow the user to interrupt the operation if it is taking a long time.</para>
-        <para>Note that mutable menu items can be problematic because the user never sees the menu item changing, so it is not obvious that a different function has become available. </para>
-        <itemizedlist>
-          <title>Guidelines</title>
-          <listitem>
-            <para>If your mutable menu items are <link linkend="menu-item-type-command">command items</link>, and you have sufficient space on your menu, consider providing two adjacent menu items for the commands instead.  Then make the items sensitive or insensitive as the situation demands.  This also makes it easier for the user to tell when different shortcuts are available for each of the commands, for example <keycombo><keycap>Ctrl</keycap><keycap>R</keycap></keycombo> for <guimenuitem>Reload</guimenuitem>, and <keycap>Esc</keycap> for <guimenuitem>Stop</guimenuitem>.</para>
-          </listitem>
-          <listitem>
-            <para>Do not use mutable menu items to toggle a two-state setting (for example, <guimenuitem>Show Toolbar</guimenuitem> and <guimenuitem>Hide Toolbar</guimenuitem>).  Present such items as a single <link linkend="menu-item-type-check">check box item</link> instead.</para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
-      <sect3 id="menu-item-type-check">
-        <title>Checkbox Items</title>
-        <figure id="checkbox-items-figure">
-          <title>A group of check box items on a menu</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="images/checkbox-menu.png" format="PNG"/>
-            </imageobject>
-            <imageobject>
-              <imagedata fileref="images/checkbox-menu.eps" format="EPS"/>
-            </imageobject>
-            <textobject>
-              <phrase>Screenshot of group on a View menu containing three check box items: toolbar, statusbar and fullscreen</phrase>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <para>A check box menu item shows the current state of a two-state setting, and allows the user to toggle it by selecting the menu item.</para>
-        <itemizedlist>
-          <title>Guidelines</title>
-          <listitem>
-            <para>Use a check box menu item only when it is obvious from the label what the set and unset states mean.  This usually means that the two states are logical or natural opposites, such as "on" and "off".  If this is not the case, use two <link linkend="menu-item-type-radio">radio button items</link> instead.</para>
-          </listitem>
-          <listitem>
-            <para>Never change the label of a check box menu item in response to the user selecting the item.</para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
-      <sect3 id="menu-item-type-radio">
-        <title>Radio Button Items</title>
-        <figure id="radiobutton-items-figure">
-          <title>A group of radiobutton items on a menu</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="images/radiobutton-menu.png" format="PNG"/>
-            </imageobject>
-            <imageobject>
-              <imagedata fileref="images/radiobutton-menu.eps" format="EPS"/>
-            </imageobject>
-            <textobject>
-              <phrase>Screenshot of group on a menu containing two radiobutton items: view as icons, and view as list</phrase>
-            </textobject>
-          </mediaobject>
-        </figure>
-        <para>Radio button menu items show which of two or more mutually-exclusive settings are currently selected, and allow the user to choose a different setting by selecting its menu item.</para>
-        <itemizedlist>
-          <listitem>
-            <para>If you need to offer a choice of two mutually-exclusive settings to the user,  use a group of two radio button items instead of a single check box menu item if the settings are not clearly opposites.  For example, represent <guimenuitem>View as Icons</guimenuitem> and <guimenu>View as List</guimenu> as two radio button items.</para>
-          </listitem>
-          <listitem>
-            <para>Never change the label of a radio button menu item in response to the user selecting or deselecting the item.</para>
-          </listitem>
-        </itemizedlist>
-        <remark>
+	<remark> CB-Ed/Fig: Figure would be nice here. </remark>
+	</sect3>
+
+	<sect3 id="menu-item-type-mutable">
+	  <title>Mutable Command Items</title>
+	  <para>A mutable command item changes its label when selected.  For example, <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> in a browser may change to <guimenuitem>Stop</guimenuitem> to allow the user to interrupt the operation if it is taking a long time.</para>
+
+	  <para>Note that mutable menu items can be problematic because the user never sees the menu item changing, so it is not obvious that a different function has become available. </para>
+
+	<itemizedlist><title>Guidelines</title>
+		<listitem><para>If your mutable menu items are <link linkend="menu-item-type-command">command items</link>, and you have sufficient space on your menu, consider providing two adjacent menu items for the commands instead.  Then make the items sensitive or insensitive as the situation demands.  This also makes it easier for the user to tell when different shortcuts are available for each of the commands, for example <keycombo><keycap>Ctrl</keycap><keycap>R</keycap></keycombo> for <guimenuitem>Reload</guimenuitem>, and <keycap>Esc</keycap> for <guimenuitem>Stop</guimenuitem>.</para></listitem>
+
+		<listitem><para>Do not use mutable menu items to toggle a two-state setting (for example, <guimenuitem>Show Toolbar</guimenuitem> and <guimenuitem>Hide Toolbar</guimenuitem>).  Present such items as a single <link linkend="menu-item-type-check">check box item</link> instead.</para></listitem>
+	</itemizedlist>
+
+	</sect3>
+	<sect3 id="menu-item-type-check">
+	  <title>Checkbox Items</title>
+
+	<figure id="checkbox-items-figure"><title>A group of check box items on a menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-checkbox-group.png" format="PNG" width="231" depth="112"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-checkbox-group.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>Screenshot of group on a View menu containing four check box items: Main Toolbar, Side Pane, Location Bar and Status Bar</phrase></textobject>
+	  </mediaobject>
+	</figure>
+
+	  <para>A check box menu item shows the current state of a two-state setting, and allows the user to toggle it by selecting the menu item.</para>
+
+	<itemizedlist><title>Guidelines</title>
+	  
+	  	<listitem><para>Use a check box menu item only when it is obvious from the label what the set and unset states mean.  This usually means that the two states are logical or natural opposites, such as &quot;on&quot; and &quot;off&quot;.  If this is not the case, use two <link linkend="menu-item-type-radio">radio button items</link> instead.</para></listitem>
+		  <listitem><para>Never change the label of a check box menu item in response to the user selecting the item.</para></listitem>
+
+	</itemizedlist>
+
+	</sect3>
+	<sect3 id="menu-item-type-radio">
+	  <title>Radio Button Items</title>
+
+	<figure id="radiobutton-items-figure"><title>A group of radiobutton items on a menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-radiobutton-group.png" format="PNG" width="167" depth="117"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-radiobutton-group.eps" format="EPS"/></imageobject>
+	    <textobject><phrase>Screenshot of group on a menu containing three radiobutton items: view as icons, view as list and view details</phrase></textobject>
+	  </mediaobject>
+	</figure>
+
+	  <para>Radio button menu items show which of two or more mutually-exclusive settings are currently selected, and allow the user to choose a different setting by selecting its menu item.</para>
+
+	<itemizedlist>
+
+	  	<listitem><para>If you need to offer a choice of two mutually-exclusive settings to the user,  use a group of two radio button items instead of a single check box menu item if the settings are not clearly opposites.  For example, represent <guimenuitem>View as Icons</guimenuitem> and <guimenu>View as List</guimenu> as two radio button items.</para></listitem>
+
+	  <listitem><para>Never change the label of a radio button menu item in response to the user selecting or deselecting the item.</para></listitem>
+
+	</itemizedlist>
+
+	<remark>
 	Adam notes that this whole section can be a significant source of
 	nastiness in a UI. We need explicit recommendations here on how to
 	represent different states of a toggled menu item via icons in the UI.
@@ -362,10 +326,11 @@
 	* Ambiguous names for check box/toggle menu items which make it
 	  difficult to establish the current system state by looking at
 	  the menu.
-</remark>
+	</remark>
       </sect3>
     </sect2>
   </sect1>
+
   <sect1 id="menus-standard">
     <title>Standard Menus</title>
     <para>Most applications have many functions in common, such as <guimenu>Cut</guimenu>, <guimenu>Copy</guimenu>, <guimenu>Paste</guimenu> and <guimenu>Quit</guimenu>.  To aid learning and memorability, these menu items, and the menus on which they appear, must appear with the same labels and in the same order in every application.  The same commands must also behave the same way in different applications, to avoid surprising the user.</para>
@@ -380,69 +345,50 @@
       </listitem>
     </itemizedlist>
     <remark>What is the best way to present menus given the known variants? Multiple shots? Segments?</remark>
-    <figure id="generic-menu-bar">
-      <title>A menubar showing all the standard menu titles in their correct order</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/application-menubar.png" format="PNG"/>
-        </imageobject>
-        <imageobject>
-          <imagedata fileref="images/application-menubar.eps" format="EPS"/>
-        </imageobject>
-        <textobject>
-          <simplelist type="horiz" columns="9">
-            <member>
-              <guimenu><accel>F</accel>ile</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>E</accel>dit</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>V</accel>iew</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>I</accel>nsert</guimenu>
-            </member>
-            <member>
-              <guimenu>For<accel>m</accel>at</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>G</accel>o</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>B</accel>ookmarks</guimenu>
-            </member>
-<!--<member><guimenu><accel>T</accel>ools</guimenu></member>-->
-            <member>
-              <guimenu><accel>W</accel>indows</guimenu>
-            </member>
-            <member>
-              <guimenu><accel>H</accel>elp</guimenu>
-            </member>
-          </simplelist>
-        </textobject>
-      </mediaobject>
-    </figure>
-    <sect2 id="the-file-menu">
-      <title>File</title>
-      <para>The <guimenu>File</guimenu> menu contains commands that operate on the current document. It is the left-most item in the menubar because of its importance and frequency of use, and because it is a relevant menu in many applications. Historically, because most applications already had this menu, and because the distinction between closing documents and closing windows became blurred over time, the <guimenu>File</guimenu> menu has also become the standard location for <guimenuitem>Quit</guimenuitem>.</para>
-      
-      <para>The items on the <guimenu>File</guimenu> menu are generally ordered by locality, closest first.  That is, items to save or load from file, followed by printing, followed by sending to a remote user.  Try to maintain this ordering if you have to add new items to the menu.</para>
-      
-      <para>If your application does not operate on documents, name this item for the type of object it displays.  For example, many games should have a <guimenu>Game</guimenu> instead of a <guimenu>File</guimenu> menu.  However, place the <guimenuitem>Quit</guimenuitem> menu item last on this menu nonetheless.</para>
-      <remark>GJM: Quit should be deprecated. Close is often sufficient; especially when the application saves state as it should.</remark>
+
+      <figure id="generic-menu-bar">
+	<title>A menubar showing all the standard menu titles in their correct order</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-application.png" width="454" depth="27" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-application.eps" format="EPS"/></imageobject>
+	  <textobject>
+	    <simplelist type="horiz" columns="9">
+	      <member><guimenu><accel>F</accel>ile</guimenu></member>
+	      <member><guimenu><accel>E</accel>dit</guimenu></member>
+	      <member><guimenu><accel>V</accel>iew</guimenu></member>
+	      <member><guimenu><accel>I</accel>nsert</guimenu></member>
+	      <member><guimenu>For<accel>m</accel>at</guimenu></member>
+	      <member><guimenu><accel>G</accel>o</guimenu></member>
+	      <member><guimenu><accel>B</accel>ookmarks</guimenu></member>
+	      <!--<member><guimenu><accel>T</accel>ools</guimenu></member>-->
+	      <member><guimenu><accel>W</accel>indows</guimenu></member>
+	      <member><guimenu><accel>H</accel>elp</guimenu></member>
+	    </simplelist>
+	  </textobject>
+	</mediaobject>
+      </figure>
       
-<figure id="generic-file-menu">
-        <title>A generic File menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/file-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/file-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout><guimenu>File</guimenu><guimenuitem><accel>N</accel>ew                  Ctrl+N</guimenuitem><guimenuitem><accel>O</accel>pen...              Ctrl+O</guimenuitem><!--<guimenuitem>Recent <accel>F</accel>iles              &gt; </guimenuitem>-->
+      <sect2 id="the-file-menu">
+	<title>File</title>
+		<para>The <guimenu>File</guimenu> menu contains commands that operate on the current document. It is the left-most item in the menubar because of its importance and frequency of use, and because it is a relevant menu in many applications. Historically, because most applications already had this menu, and because the distinction between closing documents and closing windows became blurred over time, the <guimenu>File</guimenu> menu has also become the standard location for <guimenuitem>Quit</guimenuitem>.</para>
+
+		  <para>The items on the <guimenu>File</guimenu> menu are generally ordered by locality, closest first.  That is, items to save or load from file, followed by printing, followed by sending to a remote user.  Try to maintain this ordering if you have to add new items to the menu.</para>
+
+	        <para>If your application does not operate on documents, name this item for the type of object it displays.  For example, many games should have a <guimenu>Game</guimenu> instead of a <guimenu>File</guimenu> menu.  However, place the <guimenuitem>Quit</guimenuitem> menu item last on this menu nonetheless.</para>
+		
+<remark>GJM: Quit should be deprecated. Close is often sufficient; especially when
+the application saves state as it should.</remark>
+
+	<figure id="generic-file-menu"><title>A generic File menu</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="images/menus-file.png" width="290" depth="454" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-file.eps" format="EPS"/></imageobject>
+	  <textobject>
+<literallayout>
+<guimenu>File</guimenu>
+<guimenuitem><accel>N</accel>ew                  Ctrl+N</guimenuitem>
+<guimenuitem><accel>O</accel>pen...              Ctrl+O</guimenuitem>
+<!--<guimenuitem>Recent <accel>F</accel>iles              &gt; </guimenuitem>-->
 ---
 <guimenuitem><accel>S</accel>ave                 Ctrl+S</guimenuitem><guimenuitem>Save <accel>A</accel>s...     Shift+Ctrl+S</guimenuitem><guimenuitem>Sa<accel>v</accel>e a Copy...               </guimenuitem><guimenuitem><accel>R</accel>evert                     </guimenuitem>
 ---
@@ -717,52 +663,44 @@
 		<itemizedlist><listitem><para>Single document interface: close the application</para></listitem><listitem><para>Controlled single document interface: leave only the control window open</para></listitem><listitem><para>Multiple document interface: close the current document and create a new blank document</para></listitem></itemizedlist>		
 		  <remark>As mentioned on the usability list, Control+W is an Emacs shortcut for Cut. This has already proven deleterious for some users so we should consider dropping the shortcut.  But see also <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=76761";>http://bugzilla.gnome.org/show_bug.cgi?id=76761</ulink></remark>
 	      </entry>
-              </row>
-              <row>
-                <entry>
-                  <guimenuitem><accel>Q</accel>uit</guimenuitem>
-                </entry>
-                <entry>
-                  <keycombo>
-                    <keycap>Ctrl</keycap>
-                    <keycap>Q</keycap>
-                  </keycombo>
-                </entry>
-                <entry>
-                  <para>Closes the application. If there are unsaved changes in any open documents, present the user with a <link linkend="alerts-confirmation">confirmation alert</link> for each affected document, giving the option to save the changes, discard them, or cancel. If there are no unsaved changes, close the application immediately without presenting any further messages or dialogs.</para>
-<!-- This para in response to bug #73618-->
-                  <para>In particular, non-document based applications, for example a game or a calculator, should save their state and exit immediately.  This state should be restored the next time the application is started.</para>
-                  <remark>Kathy had suggested not providing a shortcut key to Quit. I can find no discussion of this. (And I think it should go away.)</remark>
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-    </sect2>
-    <sect2 id="menu-standard-edit">
-      <title>Edit</title>
-      <para>The <guimenu>Edit</guimenu> menu contains items relating to editing both the document (clipboard handling, search and replace, and inserting special objects) and the user's preferences.  Preferences are edited here rather than on a <guimenu>Settings</guimenu> menu, because:</para>
-      <itemizedlist>
-        <listitem>
-          <para>most applications' preferences windows are accessed via a single menu item, and single-item menus offer poor usability</para>
-        </listitem>
-        <listitem>
-          <para>most applications already contain a suitable <guimenu>Edit</guimenu> menu.</para>
-        </listitem>
-      </itemizedlist>
-      <remark>I think we should move to a MacOS/X concept of having an "AppName" menu that contains things like preferences, about, quit, etc. -Seth</remark>
-      <figure id="generic-edit-menu">
-        <title>A generic Edit menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/application-edit-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/application-edit-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>E</accel>dit</guimenu><guimenuitem><accel>U</accel>ndo                 Ctrl+Z</guimenuitem><guimenuitem><accel>R</accel>edo           Shift+Ctrl+Z</guimenuitem>
+	    </row>
+	    
+	    <row>
+	      <entry><guimenuitem><accel>Q</accel>uit</guimenuitem></entry>
+		<entry><keycombo><keycap>Ctrl</keycap><keycap>Q</keycap></keycombo></entry>
+	      <entry><para>Closes the application. If there are unsaved changes in any open documents, present the user with a <link linkend="alerts-confirmation">confirmation alert</link> for each affected document, giving the option to save the changes, discard them, or cancel. If there are no unsaved changes, close the application immediately without presenting any further messages or dialogs.</para>
+		<!-- This para in response to bug #73618--><para>In particular, non-document based applications, for example a game or a calculator, should save their state and exit immediately.  This state should be restored the next time the application is started.</para> 
+		  <remark>Kathy had suggested not providing a shortcut key to Quit. I can find no discussion of this. (And I think it should go away.)</remark>
+	      </entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+	</table>
+	</sect3>
+	
+      </sect2>
+      <sect2 id="menu-standard-edit">
+	<title>Edit</title>
+
+	<para>The <guimenu>Edit</guimenu> menu contains items relating to editing both the document (clipboard handling, search and replace, and inserting special objects) and the user's preferences.  Preferences are edited here rather than on a <guimenu>Settings</guimenu> menu, because:</para>
+
+	<itemizedlist>
+		<listitem><para>most applications' preferences windows are accessed via a single menu tem, and single-item menus offer poor usability</para></listitem>
+		<listitem><para>most applications already contain a suitable <guimenu>Edit</guimenu> menu.</para></listitem>
+	</itemizedlist>
+
+	<remark>I think we should move to a MacOS/X concept of having an "AppName" menu that contains things like preferences, about, quit, etc. -Seth</remark>
+
+	<figure id="generic-edit-menu">
+	  <title>A generic Edit menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-edit.png" width="226" depth="417" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-edit.eps" format="EPS"/></imageobject>
+	    <textobject>
+<literallayout class="monospaced">
+<guimenu><accel>E</accel>dit</guimenu>
+<guimenuitem><accel>U</accel>ndo                 Ctrl+Z</guimenuitem>
+<guimenuitem><accel>R</accel>edo           Shift+Ctrl+Z</guimenuitem>
 -
 <guimenuitem>Cu<accel>t</accel>                  Ctrl+X</guimenuitem><guimenuitem><accel>C</accel>opy                 Ctrl+C</guimenuitem><guimenuitem><accel>P</accel>aste                Ctrl+V</guimenuitem><guimenuitem>Paste <accel>S</accel>pecial...                Shift+Ctrl+V</guimenuitem><guimenuitem><accel>D</accel>elete               Del</guimenuitem><guimenuitem><accel>S</accel>elect All           Ctrl+A</guimenuitem><guimenuitem>Du<accel>p</accel>licate           Ctrl+U</guimenuitem><guimenuitem>Dese<accel>l</accel>ect All   Shift+Ctrl+A</guimenuitem>
 -
@@ -996,55 +934,61 @@
                 <entry>Opens a window or dialog allowing the user to search for specific content in the current document, and replace each occurrence with new content. 	    
 		 	<remark>Replace is not always descriptive of what the user may do with the utility window. Formatting a section is also a possibility. Ideally, these would all be merged into a simple utility window</remark>
 		</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-      <sect3>
-        <title>Inserting Special Objects</title>
-        <para>Where applicable, provide items on the <guimenu>Edit</guimenu> menu that insert special objects such as images, links, GUI controls or the current date and time. </para>
-        <para>If you have two or less types of object that can be inserted, add them as individual items to this menu, for example <guimenuitem>Insert Image</guimenuitem>, or <guimenuitem>Insert External Link</guimenuitem>.  If you have between three and six types, place them on an <menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert</guimenuitem></menuchoice> submenu.  If you have more than six, add a separate <link linkend="menu-standard-insert"><guimenu>Insert</guimenu> menu</link> to the menubar.</para>
-      </sect3>
-      <sect3>
-        <title>User Preferences</title>
-        <table frame="none">
-          <title>User Preferences menu items</title>
-          <tgroup colsep="0" rowsep="0" cols="3" align="left">
-            <thead>
-              <row>
-                <entry>Label</entry>
-                <entry>Shortcut</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody valign="top">
-              <row>
-                <entry>
-                  <guimenuitem>Pr<accel>e</accel>ferences</guimenuitem>
-                </entry>
-                <entry>None</entry>
-                <entry>Opens a <link linkend="preference-windows">preferences window</link> allowing the user to change preferences for the whole application.  Changes will apply to all running and subsequent instances of the application.</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-    </sect2>
-    <sect2 id="menu-standard-view">
-      <title>View</title>
-      <para>The <guimenu>View</guimenu> menu contains only items that affect the user's view of the current document.  Do not place any items on the <guimenu>View</guimenu> menu that affect the content of the current document.  (Exception: <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> may change the current contents if, for example, the document is a webpage that has been recently updated on the server).</para>
-      <figure id="generic-view-menu">
-        <title>A generic View menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-view-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>V</accel>iew</guimenu><guimenuitem><accel>T</accel>oolbar</guimenuitem><guimenuitem><accel>S</accel>tatusbar</guimenuitem>
+	      </row>
+	</tbody>
+	</tgroup>
+	</table>
+	</sect3>
+
+
+	<sect3>
+	  <title>Inserting Special Objects</title>
+	  <para>Where applicable, provide items on the <guimenu>Edit</guimenu> menu that insert special objects such as images, links, GUI controls or the current date and time. </para>
+
+	<para>If you have up to three types of object that can be inserted, add them as individual items to this menu, for example <guimenuitem>Insert Image</guimenuitem>, or <guimenuitem>Insert External Link</guimenuitem>.  If you have between three and six types, place them on an <menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert</guimenuitem></menuchoice> submenu.  If you have more than six, add a separate <link linkend="menu-standard-insert"><guimenu>Insert</guimenu> menu</link> to the menubar.</para>
+
+	</sect3>
+
+
+	<sect3>
+	  <title>User Preferences</title>
+
+	<table>
+	<title>User Preferences menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+	      <row>
+		      <entry><guimenuitem>Pr<accel>e</accel>ferences</guimenuitem></entry>
+	      		<entry>None</entry>
+			<entry>Opens a <link linkend="preference-windows">preferences window</link> allowing the user to change preferences for the whole application.  Changes will apply to all running and subsequent instances of the application.</entry>
+		</row>
+		</tbody>
+		</tgroup>
+	</table>
+	</sect3>
+
+      </sect2>
+      <sect2 id="menu-standard-view">
+	<title>View</title>
+	<para>The <guimenu>View</guimenu> menu contains only items that affect the user's view of the current document.  Do not place any items on the <guimenu>View</guimenu> menu that affect the the content of the current document.  (Exception: <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice> may change the current contents if, for example, the document is a webpage that has been recently updated on the server).</para>
+
+	<figure id="generic-view-menu">
+	  <title>A generic View menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-view.png" width="166" depth="300" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-view.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>V</accel>iew</guimenu>
+<guimenuitem><accel>T</accel>oolbar</guimenuitem>
+<guimenuitem><accel>S</accel>tatusbar</guimenuitem>
 ---
 <guimenuitem><accel>I</accel>cons</guimenuitem><guimenuitem><accel>L</accel>ist</guimenuitem><guimenuitem><accel>D</accel>etails</guimenuitem>
 ---
@@ -1203,432 +1147,380 @@
                 </entry>
                 <entry>Redraws the current view of the document, checking the data source for changes first.  For example, checks the web server for updates to the page before redrawing it.
 			<para>If your application requires both <guimenuitem>Reload</guimenuitem> and <guimenuitem>Refresh</guimenuitem>, use <keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap><keycap>R</keycap></keycombo> as the shortcut for <guimenuitem>Reload</guimenuitem>.</para></entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </sect3>
-    </sect2>
-    <sect2 id="menu-standard-insert">
-      <title>Insert</title>
-      <para>The <guimenuitem>Insert</guimenuitem> menu lists the type of special objects that can be inserted into the document at the current caret position, for example images, links, page breaks or GUI objects.  Only provide this menu if you have more than about six types of object that can be inserted, otherwise place individual items for each type on the <link linkend="menu-standard-edit"><guimenu>Edit</guimenu> menu</link>.</para>
-      <figure id="generic-insert-menu">
-        <title>A generic Insert menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-insert-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-insert-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>P</accel>age Break</guimenu><guimenuitem><accel>D</accel>ate and Time...</guimenuitem><guimenuitem><accel>S</accel>ymbol...</guimenuitem>
+		</row>
+
+		</tbody>
+		</tgroup>
+	</table>
+	</sect3>
+      </sect2>
+
+      <sect2 id="menu-standard-insert">
+	<title>Insert</title>
+	<para>The <guimenuitem>Insert</guimenuitem> menu lists the type of special objects that can be inserted into the document at the current caret position, for example images, links, page breaks or GUI objects.  Only provide this menu if you have more than about six types of object that can be inserted, otherwise place individual items for each type on the <link linkend="menu-standard-edit"><guimenu>Edit</guimenu> menu</link>.</para>
+
+	<figure id="generic-insert-menu">
+	  <title>A generic Insert menu</title>
+	  <mediaobject>
+	  <imageobject><imagedata fileref="images/menus-insert.png" width="118" depth="245" format="PNG"/></imageobject>
+	  <imageobject><imagedata fileref="images/menus-insert.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>P</accel>age Break</guimenu>
+<guimenuitem><accel>D</accel>ate and Time...</guimenuitem>
+<guimenuitem><accel>S</accel>ymbol...</guimenuitem>
 ---
 <guimenuitem><accel>S</accel>heet...</guimenuitem><guimenuitem><accel>R</accel>ows...</guimenuitem><guimenuitem><accel>C</accel>olumns...</guimenuitem>
 ---
 <guimenuitem><accel>I</accel>mage...</guimenuitem><guimenuitem><accel>G</accel>raph...</guimenuitem>
 ---
-<guimenuitem><accel>F</accel>rom File...</guimenuitem><guimenuitem>E<accel>x</accel>ternal Link...</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>The types of object will vary between applications, but the table below shows some common types that may be applicable.</para>
-      <table frame="none">
-        <title>Insert menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>P</accel>age Break</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts a page break at the caret position.  Show the page break visually, for example as a dotted line across the page, unless the user has specifically requested not to see them.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>D</accel>ate and Time...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts the current date and/or time at the caret position.  Open a dialog giving a choice of date and time formats.  If applicable, also offer the choice to insert either as plain text, so the specified date and time will always appear in the document, or as a special field that will updated every time the document is opened, refreshed or printed.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem>Sy<accel>m</accel>bol...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts a special symbol, such as a mathematical symbol or foreign character, at the caret position.  Open a dialog showing all the available symbols as a table, from which the user can choose.  The user must be able to add multiple symbols to the document at one time without having to close and re-open the dialog.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>S</accel>heet...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Adds a new sheet to the current workbook.  Do not prompt for a name, but choose a sensible default (such as <guilabel>Sheet-2</guilabel>) and allow the user to change it later.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>R</accel>ows...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Adds new rows to a table in which one or more rows or cells are currently selected.  Open a dialog asking whether to insert rows above or below the current selection, and for any other required information.  Copy the row format from the last or first row of the current selection respectively, unless the user specifies otherwise.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>C</accel>olumns...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Adds new columns to a table in which one or more columns or cells are currently selected.  Open a dialog asking whether to insert columns to the left or right of the current selection, and for any other required information.  Copy the column format from the right- or left-most column of the current selection respectively, unless the user specifies otherwise.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>I</accel>mage...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts an image into the document from a file.  Present a standard Open File dialog filtered on acceptable file types, from which the user can choose an image file to insert.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>G</accel>raph...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts a graph into the document.  Open a dialog or assistant that allows the user to build (or open from a file) a graph of their choice, using the current selection as an indication of which values, axis labels and data labels to use.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>F</accel>rom FIle...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts an object from any acceptable file type, for example plain text, formatted text, or an image.  Present a standard Open File dialog filtered on acceptable file types, from which the user can choose a file to insert.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem>E<accel>x</accel>ternal Link...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Inserts a link to an object stored in a different file, or on a remote system.  The object is not embedded in or saved with the document, only a link to it.  Open a dialog in which the user can type or choose the name of the object, for example a filename or a webpage URL.  Show the link in the document in as informative way as possible.  For example, show a link to an image as a thumbnail of that image, unless the user specifies otherwise.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="menu-standard-format">
-      <title>Format</title>
-      <para>A <guimenu>Format</guimenu> menu contains commands to change the visual appearance of the document.  For example, changing the font, color, or line spacing of a text selection.</para>
-      <para>The difference between these commands and those on the <link linkend="menu-standard-view"><guimenuitem>View</guimenuitem> menu</link> is that changes made with Format commands are persistent and saved as part of the document, for example as HTML or RTF tags.</para>
-      <figure id="generic-format-menu">
-        <title>A generic Format menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-format-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-format-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>S</accel>tyle...</guimenu>
----
+<guimenuitem><accel>F</accel>rom File...</guimenuitem>
+<guimenuitem>E<accel>x</accel>ternal Link...</guimenuitem>
+
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+	
+	<para>The types of object will vary between applications, but the table below shows some common types that may be applicable.</para>
+
+	<table>
+	<title>Insert menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>P</accel>age Break</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts a page break at the caret position.  Show the page break visually, for example as a dotted line across the page, unless the user has specifically requested not to see them.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>D</accel>ate and Time...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts the current date and/or time at the caret position.  Open a dialog giving a choice of date and time formats.  If applicable, also offer the choice to insert either as plain text, so the specified date and time will always appear in the document, or as a special field that will updated every time the document is opened, refreshed or printed.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem>Sy<accel>m</accel>bol...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts a special symbol, such as a mathematical symbol or foreign character, at the caret position.  Open a dialog showing all the available symbols as a table, from which the user can choose.  The user must be able to add multiple symbols to the document at one time without having to close and re-open the dialog.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>S</accel>heet...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Adds a new sheet to the current workbook.  Do not prompt for a name, but choose a sensible default (such as <guilabel>Sheet-2</guilabel>) and allow the user to change it later.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>R</accel>ows...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Adds new rows to a table in which one or more rows or cells are currently selected.  Open a dialog asking whether to insert rows above or below the current selection, and for any other required information.  Copy the row format from the last or first row of the current selection respectively, unless the user specifies otherwise.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>C</accel>olumns...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Adds new columns to a table in which one or more columns or cells are currently selected.  Open a dialog asking whether to insert columns to the left or right of the current selection, and for any other required information.  Copy the column format from the right- or left-most column of the current selection respectively, unless the user specifies otherwise.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>I</accel>mage...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts an image into the document from a file.  Present a standard Open File dialog filtered on acceptable file types, from which the user can choose an image file to insert.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>G</accel>raph...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts a graph into the document.  Open a dialog or assistant that allows the user to build (or open from a file) a graph of their choice, using the current selection as an indication of which values, axis labels and data labels to use.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem><accel>F</accel>rom FIle...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts an object from any acceptable file type, for example plain text, formatted text, or an image.  Present a standard Open File dialog filtered on acceptable file types, from which the user can choose a file to insert.</entry>
+			</row>
+
+		<row>
+			<entry><guimenuitem>E<accel>x</accel>ternal Link...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Inserts a link to an object stored in a different file, or on a remote system.  The object is not embedded in or saved with the document, only a link to it.  Open a dialog in which the user can type or choose the name of the object, for example a filename or a webpage URL.  Show the link in the document in as informative way as possible.  For example, show a link to an image as a thumbnail of that image, unless the user specifies otherwise.</entry>
+			</row>
+
+		</tbody>
+		</tgroup>
+	</table>
+
+
+      </sect2>
+
+
+      <sect2 id="menu-standard-format">
+	<title>Format</title>
+
+		<para>A <guimenu>Format</guimenu> menu contains commands to change the visual appearance of the document.  For example, changing the font, color, or line spacing of a text selection.</para>
+		<para>The difference between these commands and those on the <link linkend="menu-standard-view"><guimenuitem>View</guimenuitem> menu</link> is that changes made with Format commands are persistent and saved as part of the document, for example as HTML or RTF tags.</para>
+
+	<figure id="generic-format-menu">
+	  <title>A generic Format menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-format.png" width="163" depth="265" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-format.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>S</accel>tyle...</guimenu>
+---
 <guimenuitem><accel>F</accel>ont...</guimenuitem><guimenuitem><accel>P</accel>aragraph...</guimenuitem>
 ---
 <guimenuitem><accel>B</accel>old	Ctrl+B</guimenuitem><guimenuitem><accel>I</accel>talic	Ctrl+I</guimenuitem><guimenuitem><accel>U</accel>nderline	Ctrl+U</guimenuitem>
 ---
 <guimenuitem><accel>C</accel>ells...</guimenuitem><guimenuitem><accel>L</accel>ist...</guimenuitem>
 ---
-<guimenuitem>L<accel>ayer</accel>...</guimenuitem><guimenuitem>P<accel>a</accel>ge...</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <para>Items found on the <guimenu>Format</guimenu> will be very application-specific, but some common items are listed in the table below.</para>
-      <table frame="none">
-        <title>Format menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>S</accel>tyle...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the style attributes of the selected text or objects either individually or to a named, predefined style.  Open a dialog allowing the user to set attributes such as bold, italic, size and spacing individually, and to create their own named styles where applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>F</accel>ont...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the font properties of the selected text or objects.  Open a dialog allowing the user to choose font, size, style, color, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>P</accel>aragraph...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of the selected paragraph.  Open a dialog allowing the user to choose style, line spacing, tabulation, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>B</accel>old</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>B</keycap>
-                </keycombo>
-              </entry>
-              <entry>Toggles the boldness of the current text selection on or off.  If some of the selection is currently bold and some is not, this command should bolden the selected text.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>I</accel>talic</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>I</keycap>
-                </keycombo>
-              </entry>
-              <entry>Toggles the italicization of the current text selection on or off.  If some of the selection is currently italicized and some is not, this command should italicize the selected text.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>U</accel>nderline</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>U</keycap>
-                </keycombo>
-              </entry>
-              <entry>Toggles underlining of the current text selection.  If some of the selection is currently underlined and some is not, this command should underline the selected text.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>C</accel>ells...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of the selected table cells.  Open a dialog allowing the user to choose alignment, borders, shading, text style, number format, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>L</accel>ist...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of the selected list, or turns the selected paragraphs into a list if they are not already formatted as such.  Open a dialog allowing the user to choose number or bullet style, spacing, tabulation, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem>Laye<accel>r</accel>...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of all or selected layers of a multi-layered document.  Open a dialog allowing the user to choose name, size, visibility, opacity, z-ordering, or whatever other attributes are applicable.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem>P<accel>a</accel>ge...</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Sets the properties of all or selected pages of the document.  Open a dialog allowing the user to choose paper size, orientation, columns, margins, or whatever other attributes are applicable.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="menu-standard-bookmarks">
-      <title>Bookmarks</title>
-      <para>Provide a <guimenu>Bookmarks</guimenu> menu in any application that allows the user to browse files and folders, help documents, web pages or any other large information space.</para>
-      <note>
-        <title>Icons</title>
-        <para>Show icons for bookmark entries on the Bookmarks menu that indicate the type of the bookmark, even if the user has globally turned off icons for other menu items on the desktop.</para>
-      </note>
-      <figure id="generic-bookmarks-menu">
-        <title>A generic Bookmarks menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-bookmarks-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-bookmarks-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced">
-              <guimenu><accel>B</accel>ookmarks</guimenu>
-              <guimenuitem><accel>A</accel>dd Bookmark   </guimenuitem>
-              <keycombo>
-                <keycap>Ctrl</keycap>
-                <keycap>D</keycap>
-              </keycombo>
-              <guimenuitem><accel>E</accel>dit Bookmarks </guimenuitem>
-              <keycombo>
-                <keycap>Ctrl</keycap>
-                <keycap>B</keycap>
-              </keycombo>
-            </literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <table frame="none">
-        <title>Bookmark menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>A</accel>dd Bookmark</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>D</keycap>
-                </keycombo>
-              </entry>
-              <entry>Adds a bookmark for the current document to the default bookmark list.  Do not pop up a dialog asking for a title or location for the bookmark, instead choose sensible defaults (such as the document's title or filename as the bookmark name) and allow the user to change them later using the <guimenuitem>Edit Bookmarks</guimenuitem> feature.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>E</accel>dit Bookmarks</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>B</keycap>
-                </keycombo>
-              </entry>
-              <entry>Allows the user to edit the application's bookmark list.  Open a window in which the user can arrange bookmarks into a hierarchy, move, copy, and delete bookmarks, and change their properties.</entry>
-            </row>
-            <row>
-              <entry>
-                <emphasis>Bookmark List</emphasis>
-              </entry>
-              <entry>None</entry>
-              <entry>The user's current list of bookmarks for the application.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="menu-standard-go">
-      <title>Go</title>
-      <para>A <guimenu>Go</guimenu> menu provides commands for quickly navigating around a document or collection of documents, or an information space such as a directory structure or the web.</para>
-      <para>The contents of the menu will vary depending on the type of application.  Different standard menus are presented here for browser-based and document-based applications , but your application may require a combination of both.</para>
-      <figure id="generic-browser-go-menu">
-        <title>A generic Go menu for a browser application</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-browser-go-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-browser-go-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>G</accel>o</guimenu><guimenuitem><accel>B</accel>ack       Alt+Left</guimenuitem><guimenuitem><accel>F</accel>orward	Alt+Right    </guimenuitem><guimenuitem><accel>U</accel>p		Alt+Up         </guimenuitem>
+<guimenuitem>L<accel>ayer</accel>...</guimenuitem>
+<guimenuitem>P<accel>a</accel>ge...</guimenuitem>
+
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+
+	<para>Items found on the <guimenu>Format</guimenu> will be very application-specific, but some common items are listed in the table below.</para>
+
+	<table>
+	<title>Format menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>S</accel>tyle...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the style attributes of the selected text or objects either individually or to a named, predefined style.  Open a dialog allowing the user to set attributes such as bold, italic, size and spacing individually, and to create their own named styles where applicable.</entry>
+
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>F</accel>ont...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the font properties of the selected text or objects.  Open a dialog allowing the user to choose font, size, style, color, or whatever other attributes are applicable.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>P</accel>aragraph...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of the selected paragraph.  Open a dialog allowing the user to choose style, line spacing, tabulation, or whatever other attributes are applicable.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>B</accel>old</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo></entry>
+			<entry>Toggles the boldness of the current text selection on or off.  If some of the selection is currently bold and some is not, this command should bolden the selected text.</entry>
+
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>I</accel>talic</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>I</keycap></keycombo></entry>
+			<entry>Toggles the italicisation of the current text selection on or off.  If some of the selection is currently italicised and some is not, this command should italicise the selected text.</entry>
+
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>U</accel>nderline</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>U</keycap></keycombo></entry>
+			<entry>Toggles underlining of the current text selection.  If some of the selection is currently underlined and some is not, this command should underline the selected text.</entry>
+
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>C</accel>ells...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of the selected table cells.  Open a dialog allowing the user to choose alignment, borders, shading, text style, number format, or whatever other attributes are applicable.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>L</accel>ist...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of the selected list, or turns the selected paragraphs into a list if they are not already formatted as such.  Open a dialog allowing the user to choose number or bullet style, spacing, tabulation, or whatever other attributes are applicable.</entry>
+		</row>
+
+
+		<row>
+			<entry><guimenuitem>Laye<accel>r</accel>...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of all or selected layers of a multi-layered document.  Open a dialog allowing the user to choose name, size, visibility, opacity, z-ordering, or whatever other attributes are applicable.</entry>
+		</row>
+
+
+		<row>
+			<entry><guimenuitem>P<accel>a</accel>ge...</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Sets the properties of all or selected pages of the document.  Open a dialog allowing the user to choose paper size, orientation, columns, margins, or whatever other attributes are applicable.</entry>
+		</row>
+
+		</tbody>
+		</tgroup>
+	</table>
+
+      </sect2>
+
+
+      <sect2 id="menu-standard-bookmarks">
+	<title>Bookmarks</title>
+
+	<para>Provide a <guimenu>Bookmarks</guimenu> menu in any application that allows the user to browse files and folders, help documents, web pages or any other large information space.</para>
+	<note><title>Icons</title><para>Show icons for bookmark entries on the Bookmarks menu that indicate the type of the bookmark, even if the user has globally turned off icons for other menu items on the desktop.</para></note>
+
+	<figure id="generic-bookmarks-menu">
+	  <title>A generic Bookmarks menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-bookmarks.png" width="190" depth="49"  format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-bookmarks.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>B</accel>ookmarks</guimenu>
+<guimenuitem><accel>A</accel>dd Bookmark   </guimenuitem><keycombo><keycap>Ctrl</keycap><keycap>D</keycap></keycombo>
+<guimenuitem><accel>E</accel>dit Bookmarks </guimenuitem><keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo>
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+	<table>
+	<title>Bookmark menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>A</accel>dd Bookmark</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>D</keycap></keycombo></entry>
+			<entry>Adds a bookmark for the current document to the default bookmark list.  Do not pop up a dialog asking for a title or location for the bookmark, instead choose sensible defaults (such as the document's title or filename as the bookmark name) and allow the user to change them later using the <guimenuitem>Edit Bookmarks</guimenuitem> feature.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>E</accel>dit Bookmarks</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo></entry>
+			<entry>Allows the user to edit the application's bookmark list.  Open a window in which the user can arrange bookmarks into a hierarchy, move, copy, and delete bookmarks, and change their properties.</entry>
+		</row>
+		<row>
+			<entry><emphasis>Bookmark List</emphasis></entry>
+			<entry>None</entry>
+			<entry>The user's current list of bookmarks for the application.</entry>
+		</row>
+		</tbody>
+		</tgroup>
+	</table>
+
+      </sect2>
+      <sect2 id="menu-standard-go">
+
+	<title>Go</title>
+
+	<para>A <guimenu>Go</guimenu> menu provides commands for quickly navigating around a document or collection of documents, or an information space such as a directory structure or the web.</para>
+
+	<para>The contents of the menu will vary depending on the type of application.  Different standard menus are presented here for browser-based and document-based applications , but your application may require a combination of both.</para>
+
+	<figure id="generic-browser-go-menu">
+	  <title>A generic Go menu for a browser application</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-go-browser.png" width="178" depth="127" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-go-browser.eps" format="EPS"/></imageobject>
+	    <textobject>
+<literallayout class="monospaced">
+<guimenu><accel>G</accel>o</guimenu>
+<guimenuitem><accel>B</accel>ack       Alt+Left</guimenuitem>
+<guimenuitem><accel>F</accel>orward	Alt+Right    </guimenuitem>
+<guimenuitem><accel>U</accel>p		Alt+Up         </guimenuitem>
 ---
-<guimenuitem><accel>H</accel>ome	Alt+Home       </guimenuitem><guimenuitem><accel>L</accel>ocation...  Ctrl+L</guimenuitem></literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <table frame="none">
-        <title>Go menu items for a browser application</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>B</accel>ack</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Alt</keycap>
-                  <keycap>Left</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to the previous document in the browser's history list.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>F</accel>orward</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Alt</keycap>
-                  <keycap>Right</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to the next document in the browser's history list.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>U</accel>p</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Alt</keycap>
-                  <keycap>Up</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to the current document's (or folder's) parent document (or folder).  For a document browser, such as an on-line help viewer, this usually means navigating to the enclosing sub-section, section, chapter or contents page.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>H</accel>ome</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Alt</keycap>
-                  <keycap>Home</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to a starting page defined by the user or the application.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>L</accel>ocation...</guimenuitem>
-              </entry>
-              <entry>
-                <keycombo>
-                  <keycap>Ctrl</keycap>
-                  <keycap>L</keycap>
-                </keycombo>
-              </entry>
-              <entry>Navigates to a user-specified URI.  Open a dialog into which the user can type a suitable URI, or select one from a list where applicable (for example, a file selection dialog for applications that can handle file:// URIs).</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <figure id="generic-document-go-menu">
-        <title>A generic Go menu for document-based applications</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-document-go-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-document-go-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced"><guimenu><accel>G</accel>o</guimenu><guimenuitem><accel>P</accel>revious Page 	PgUp </guimenuitem><guimenuitem><accel>N</accel>ext Page      		PgDn</guimenuitem><guimenuitem><accel>G</accel>o to Page...</guimenuitem>
+<guimenuitem><accel>H</accel>ome	Alt+Home       </guimenuitem>
+<guimenuitem><accel>L</accel>ocation...  Ctrl+L</guimenuitem>
+</literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+
+
+	<table>
+	<title>Go menu items for a browser application</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+
+		<row>
+			<entry><guimenuitem><accel>B</accel>ack</guimenuitem></entry>
+			<entry><keycombo><keycap>Alt</keycap><keycap>Left</keycap></keycombo></entry>
+			<entry>Navigates to the previous document in the browser's history list.</entry>
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>F</accel>orward</guimenuitem></entry>
+			<entry><keycombo><keycap>Alt</keycap><keycap>Right</keycap></keycombo></entry>
+			<entry>Navigates to the next document in the browser's history list.</entry>		
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>U</accel>p</guimenuitem></entry>
+			<entry><keycombo><keycap>Alt</keycap><keycap>Up</keycap></keycombo></entry>
+			<entry>Navigates to the current document's (or folder's) parent document (or folder).  For a document browser, such as an online help viewer, this usually means navigating to the enclosing sub-section, section, chapter or contents page.</entry>		
+		</row>
+	
+		<row>
+			<entry><guimenuitem><accel>H</accel>ome</guimenuitem></entry>
+			<entry><keycombo><keycap>Alt</keycap><keycap>Home</keycap></keycombo></entry>
+			<entry>Navigates to a starting page defined by the user or the application.</entry>
+		</row>
+
+
+		<row>
+			<entry><guimenuitem><accel>L</accel>ocation...</guimenuitem></entry>
+			<entry><keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo></entry>
+			<entry>Navigates to a user-specified URI.  Open a dialog into which the user can type a suitable URI, or select one from a list where applicable (for example, a file selection dialog for applications that can handle file:// URIs).</entry>		
+		</row>
+
+			</tbody>
+		</tgroup>
+	</table>
+
+	<figure id="generic-document-go-menu">
+	  <title>A generic Go menu for document-based applications</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-go-document.png" width="206" depth="127" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-go-document.eps" width="210" depth="121" format="EPS"/></imageobject>
+	    <textobject>
+<literallayout class="monospaced">
+<guimenu><accel>G</accel>o</guimenu>
+<guimenuitem><accel>P</accel>revious Page 	PgUp </guimenuitem>
+<guimenuitem><accel>N</accel>ext Page      		PgDn</guimenuitem>
+<guimenuitem><accel>G</accel>o to Page...</guimenuitem>
 -
 <guimenuitem><accel>F</accel>irst Page    		Ctrl+Home </guimenuitem><guimenuitem><accel>L</accel>ast Page		Ctrl+End</guimenuitem></literallayout>
           </textobject>
@@ -1718,88 +1610,81 @@
       </sect2>
 
 -->
-    <sect2 id="application-windows-menu">
-      <title>Windows</title>
-      <para>The Windows menu contains commands that apply to all of the application's open windows.  Only use a Windows menu in <link linkend="mdi">multiple document interface</link> (MDI) applications.</para>
-      <note>
-        <title>MDI Applications</title>
-        <para>The use of MDI is discouraged, as they have a number of inherent usability problems.</para>
-      </note>
-      <para>You may also label this menu <guimenu><accel>D</accel>ocuments</guimenu>, <guimenu><accel>B</accel>uffers</guimenu>, or similar according to the type of document handled by your application.</para>
-      <para>The last items on this menu are a numbered list of the application's primary windows, for example <guimenuitem><accel>1</accel>shoppinglist.abw</guimenuitem>.  Selecting one of these items raises the corresponding window.</para>
-      <figure id="generic-windows-menu">
-        <title>A generic Windows menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-windows-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-windows-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced">
-              <guimenu><accel>W</accel>indows</guimenu>
-              <guimenuitem><accel>S</accel>ave All</guimenuitem>
-              <guimenuitem><accel>C</accel>lose All</guimenuitem>
-            </literallayout>
-          </textobject>
-        </mediaobject>
-      </figure>
-      <table frame="none">
-        <title>Windows menu items</title>
-        <tgroup colsep="0" rowsep="0" cols="3" align="left">
-          <thead>
-            <row>
-              <entry>Label</entry>
-              <entry>Shortcut</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody valign="top">
-            <row>
-              <entry>
-                <guimenuitem><accel>S</accel>ave All</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Saves all open documents.  If any documents have no current filename, prompt for a filename for each one in turn using the standard Save dialog.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>C</accel>lose All</guimenuitem>
-              </entry>
-              <entry>None</entry>
-              <entry>Closes all open documents.  If there are any unsaved changes in any documents, post a <link linkend="alerts-confirmation">confirmation alert</link> for each one in turn.</entry>
-            </row>
-            <row>
-              <entry>
-                <guimenuitem><accel>1</accel>. <replaceable>first open window title</replaceable></guimenuitem>
-                <para>
-                  <guimenuitem><accel>2</accel>. <replaceable>second open window title</replaceable></guimenuitem>
-                </para>
-                <para>etc.</para>
-              </entry>
-              <entry>None</entry>
-              <entry>Raises the corresponding window to the top of the window stack.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="menu-standard-help">
-      <title>Help</title>
-      <para>The <guimenu>Help</guimenu> menu provides access to all on-line documentation for your application.  This includes both the user guide, and the <guimenuitem>About</guimenuitem> window which includes a brief description of your application's functionality.</para>
-      <figure id="generic-help-menu">
-        <title>A generic Help menu</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="images/generic-help-menu.png" format="PNG"/>
-          </imageobject>
-          <imageobject>
-            <imagedata fileref="images/generic-help-menu.eps" format="EPS"/>
-          </imageobject>
-          <textobject>
-            <literallayout class="monospaced">
-              <guimenu><accel>H</accel>elp</guimenu>
+
+      <sect2 id="application-windows-menu">
+	<title>Windows</title>
+		<para>The Windows menu contains commands that apply to all of the application's open windows.  Only use a Windows menu in <link linkend="mdi">multiple document interface</link> (MDI) applications.</para>
+
+      <note><title>MDI Applications</title><para>The use of MDI is discouraged, as they have a number of inherent usability problems.</para></note>
+	
+		<para>You may also label this menu <guimenu><accel>D</accel>ocuments</guimenu>, <guimenu><accel>B</accel>uffers</guimenu>, or similar according to the type of document handled by your application.</para>
+	
+	<para>The last items on this menu are a numbered list of the application's primary windows, for example <guimenuitem><accel>1</accel>shoppinglist.abw</guimenuitem>.  Selecting one of these items raises the corresponding window.</para>
+
+	<figure id="generic-windows-menu">
+	  <title>A generic Windows menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-windows.png" width="151" depth="172" format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-windows.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>W</accel>indows</guimenu>
+<guimenuitem><accel>S</accel>ave All</guimenuitem>
+<guimenuitem><accel>C</accel>lose All</guimenuitem>
+	      </literallayout>
+	    </textobject>
+	  </mediaobject>
+	</figure>
+	
+
+<table>
+	<title>Windows menu items</title>
+	 <tgroup cols="3" align="left">
+	    <thead> 
+	      <row> 
+		<entry>Label</entry> 
+		<entry>Shortcut</entry>
+		<entry>Description</entry>
+		</row>
+	      </thead>
+	    <tbody valign="top">
+		<row>
+			<entry><guimenuitem><accel>S</accel>ave All</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Saves all open documents.  If any documents have no current filename, prompt for a filename for each one in turn using the standard Save dialog.</entry>		
+		</row>
+
+		<row>
+			<entry><guimenuitem><accel>C</accel>lose All</guimenuitem></entry>
+			<entry>None</entry>
+			<entry>Closes all open documents.  If there are any unsaved changes in any documents, post a <link linkend="alerts-confirmation">confirmation alert</link> for each one in turn.</entry>
+		</row>
+		<row>
+			<entry><guimenuitem><accel>1</accel>. <replaceable>first open window title</replaceable></guimenuitem>
+			<para><guimenuitem><accel>2</accel>. <replaceable>second open window title</replaceable></guimenuitem></para>
+			<para>etc.</para></entry>
+			<entry>None</entry>
+			<entry>Raises the corresponding window to the top of the window stack.</entry>
+		</row>
+			</tbody>
+		</tgroup>
+	</table>
+
+	
+      </sect2>
+      <sect2 id="menu-standard-help">
+	<title>Help</title>
+	<para>The <guimenu>Help</guimenu> menu provides access to all online documentation for your application.  This includes both the user guide, and the <guimenuitem>About</guimenuitem> window which includes a brief description of your application's functionality.</para>
+
+	<figure id="generic-help-menu">
+	  <title>A generic Help menu</title>
+	  <mediaobject>
+	    <imageobject><imagedata fileref="images/menus-help.png" width="118" depth="45"  format="PNG"/></imageobject>
+	    <imageobject><imagedata fileref="images/menus-help.eps" format="EPS"/></imageobject>
+	    <textobject>
+	      <literallayout class="monospaced">
+<guimenu><accel>H</accel>elp</guimenu>
+
 <!--<guimenuitem><accel>S</accel>earch</guimenuitem>-->
               <guimenuitem><accel>C</accel>ontents      F1</guimenuitem>
               <guimenuitem><accel>A</accel>bout</guimenuitem>

Modified: branches/hig-2-3/hig-ch-toolbars.xml
==============================================================================
--- branches/hig-2-3/hig-ch-toolbars.xml	(original)
+++ branches/hig-2-3/hig-ch-toolbars.xml	Mon Sep 29 16:42:17 2008
@@ -8,53 +8,20 @@
   <note><para>Although the latter is just a side-effect of the fact that palettes can't be created with the standard toolbar widgetsâ it would be rather nice if they could, especially as they would then automatically feature in the toolbar keyboard navigation order.</para></note>
   -->
     
-
-  <!--    
   <figure id="mail-toolbar-example">
-  <title>Example toolbar from an email composition window</title>
-  <mediaobject>
-  <imageobject><imagedata fileref="images/EvoToolbar.png" format="PNG" width="577" depth="36"/></imageobject>
-  <imageobject><imagedata fileref="images/EvoToolbar.eps" format="EPS"/></imageobject>
-  <textobject><phrase>Example email composition toolbar</phrase></textobject>
-      </mediaobject>
-    </figure>
-  -->
-    
-  <figure id="web-toolbar-example">
-    <title>Example toolbar from a web browser window</title>
+    <title>Example toolbar from a simple mail application</title>
     <mediaobject>
-      <imageobject><imagedata fileref="images/browser-toolbar.png" format="PNG" width="612" depth="86"/></imageobject>
-      <imageobject><imagedata fileref="images/browser-toolbar.eps" format="EPS"/></imageobject>
-      <textobject><phrase>Example web browser toolbar</phrase></textobject>
+      <imageobject><imagedata fileref="images/toolbars-mail.png" format="PNG" width="428" depth="48"/></imageobject>
+      <imageobject><imagedata fileref="images/toolbars-mail.eps" format="EPS"/></imageobject>
+      <textobject><phrase>Example mail application toolbar</phrase></textobject>
     </mediaobject>
   </figure>
 
-  <!--    
-  <figure id="fileman-toolbar-example">
-  <title>Example toolbar from a file manager window</title>
-  <mediaobject>
-  <imageobject><imagedata fileref="images/GtkToolbar_browserdefault.png" format="PNG" width="486" depth="58"/></imageobject>
-  <imageobject><imagedata fileref="images/GtkToolbar_browserdefault.eps" format="EPS"/></imageobject>
-  <textobject><phrase>Example file manager toolbar</phrase></textobject>
-      </mediaobject>
-    </figure>
-  <figure id="text-toolbar-example">
-  <title>Example toolbar from a text editor window</title>
-  <mediaobject>
-  <imageobject><imagedata fileref="images/GtkToolbar_gedit.png" format="PNG" width="476" depth="58"/></imageobject>
-  <imageobject><imagedata fileref="images/GtkToolbar_gedit.eps" format="EPS"/></imageobject>
-  <textobject><phrase>Example text editor toolbar</phrase></textobject>
-      </mediaobject>
-    </figure>
-  -->
-
   <!-- Notes from GJM:
   Text-on-the-side toolbars are now part of Gtk+.
   Stock items have mnemonics/access keys. I don't think they should.
   -->
-    
-
-  <!-- CB-Fig: The four figures of the toolbars in rapid succession right at the beginning of the chapter is a little overwhelming, and possibly useless before the user reads anything about these.  Perhaps save them for later, when each type is discussed, or more details are given about toolbars so that the figures actually demonstrate something more than variety.  -->
+ 
   <!-- CFB: Assuming for now therefore that we ought to be recommending Gtk toolbars, but trying to keep the text as widget-neutral as possible
   <note>
   <title>For discussion</title>
@@ -161,8 +128,8 @@
 	<figure id="view-toolbar">
 	  <title>Example View menu fragments for applications with one toolbar (left), two or three toolbars (middle), or four or more toolbars (right)</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/view-toolbar.png" format="PNG" width="450" depth="118"/></imageobject>
-	    <imageobject><imagedata fileref="images/view-toolbar.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-configure-menu.png" format="PNG" width="488" depth="135"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-congfigure-menu.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Example View menu for application with single toolbar</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -190,8 +157,8 @@
 	<figure>
 	  <title>Toolbar with labels under all buttons</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/GtkToolbar_gedit.png" format="PNG" width="476" depth="58"/></imageobject>
-	    <imageobject><imagedata fileref="images/GtkToolbar_gedit.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-labels-below.png" format="PNG" width="381" depth="56"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-labels-below.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Toolbar showing labels under all controls</phrase></textobject>
 	  </mediaobject>
 	</figure>
@@ -203,8 +170,8 @@
 	<figure>
 	  <title>Toolbar with &quot;priority text&quot; labels beside the first few buttons only</title>
 	  <mediaobject>
-	    <imageobject><imagedata fileref="images/EvoToolbar.png" format="PNG" width="577" depth="36"/></imageobject>
-	    <imageobject><imagedata fileref="images/EvoToolbar.eps" format="EPS"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-labels-beside.png" format="PNG" width="459" depth="35"/></imageobject>
+	    <imageobject><imagedata fileref="images/toolbars-labels-beside.eps" format="EPS"/></imageobject>
 	    <textobject><phrase>Toolbar with "priority text" labels beside the first few items only</phrase></textobject>
 	  </mediaobject>
 	</figure>

Modified: branches/hig-2-3/hig-ch-whatsnew.xml
==============================================================================
--- branches/hig-2-3/hig-ch-whatsnew.xml	(original)
+++ branches/hig-2-3/hig-ch-whatsnew.xml	Mon Sep 29 16:42:17 2008
@@ -2,69 +2,163 @@
 <!-- :xml.root=hig-book.xml: -->
 
   <preface id="whatsnew">
-    <title>What's new since HIG v2.0?</title>
+    <title>What's new?</title>
     <para>This section highlights recent changes to the HIG that may affect your application.</para>
-    <para>The following sections are new to this version of the HIG:</para>
+     <para>The following changes were made in HIG v2.2:</para>
     <itemizedlist>
+	<listitem><para>Mention deprecation of low contrast icons in <xref linkend="icons-design-accessible"/>
+		</para></listitem>
     	<listitem><para>
-	    	<xref linkend="desktop-application-startup"/>
+	    	Updated illustrations throughout.
+		</para></listitem>	
+    </itemizedlist>
+
+   <para>The following sections were added in HIG v2.0:</para>
+    <itemizedlist>
+    	<listitem><para>
+	    	<xref linkend="gconf-keys"/>
 		</para></listitem>	
 	<listitem><para>
-	    	<xref linkend="controls-disclosure"/>
+	    	<xref linkend="windows-show-hide"/>
 		</para></listitem>
-    </itemizedlist>
+	<listitem><para>
+	    	<xref linkend="desktop-notification-area"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="windows-progress"/>
+		</para></listitem>
+        <listitem><para>
+	    	<xref linkend="toolbars-media"/>
+		</para></listitem>
+		<listitem><para>
+	    	<xref linkend="controls-scrollbars"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="controls-lists-sortable"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="controls-trees-sortable"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="controls-tab-status"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="controls-progress-bars"/>
+		</para></listitem>
+		<listitem><para>
+	    	<xref linkend="icons-design-accessible"/>
+		</para></listitem>
+	<listitem><para>
+	    	<xref linkend="bibliography"/>
+		</para></listitem>
+	</itemizedlist>
+
+	
+    <para>New or revised guidelines were added to these sections in HIG v2.0:</para>
 
-    <para>The following sections include new or revised guidelines:</para>
-    	<itemizedlist>
+  	<itemizedlist>
 	    <listitem><para>
-		  <xref linkend="icons-design-accessible"/>
-		  <itemizedlist>
-			<listitem><para>
-			contains more information on low contrast icons
-			</para></listitem>
-	  	</itemizedlist>
-		  
-	    </para></listitem>
-	    
+		<xref linkend="internationalization"/>
+		</para></listitem>
+
 	    <listitem><para>
-		  <xref linkend="menu-type-popup"/>
-		   <itemizedlist>
-			<listitem><para>
-		  	clarifies when to disable items and when to hide them
-			</para></listitem>
-	  	</itemizedlist>
-	    </para></listitem>
+		<xref linkend="desktop-integration"/>
+		</para></listitem>
 
 	    <listitem><para>
-		  <xref linkend="desktop-notification-interaction"/>
-		  <itemizedlist>
-			<listitem><para>
-		  	specifies that <action>single click</action>, not <action>double click</action>, should be used to activate a status notification icon
-			</para></listitem>
-			<listitem><para>
-			specifies that if <action>clicking</action> a notification icon opens a window, <action>clicking</action> it again should dismiss it (unless it's an explicit apply dialog)</para></listitem>
-	  	</itemizedlist>
-	  </para></listitem>
+		<xref linkend="windows-primary"/>
+		</para></listitem>
 
 	    <listitem><para>
-		  <xref linkend="window-props-icon"/>
-		  <itemizedlist>
-			<listitem><para>
-		  	suggests that an icon identical or similar to an application's launcher icon be used as the window icon for every window in the
-			application.
-			</para></listitem>
-	  	</itemizedlist>
-	  </para></listitem>
-
-	  <listitem><para>
-		  <xref linkend="choosing-access-keys"/>
-		  <itemizedlist>
-			<listitem><para>
-		  	notes that the shortcut for entering unicode characters in widgets is now Shift-Ctrl-U.
-			</para></listitem>
-	  	</itemizedlist>
-	  </para></listitem>
-	  
-    </itemizedlist>
+		<xref linkend="windows-utility"/>
+		</para></listitem>
+
+	     <listitem><para>
+		<xref linkend="alerts-confirmation"/>
+		</para></listitem>
+	
+	     <listitem><para>
+		<xref linkend="windows-assistant"/>
+		</para></listitem>
+
+	     <listitem><para>
+		<xref linkend="menus-menubar"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="the-file-menu"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="menu-standard-view"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="menu-standard-bookmarks"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="menu-standard-go"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="application-windows-menu"/>
+		</para></listitem>
+
+	       <listitem><para>
+		<xref linkend="controls-status-bars"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="controls-entry"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="controls-frames"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="feedback-choosing"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="feedback-interrupting"/>
+		</para></listitem>
+
+	       <listitem><para>
+		<xref linkend="layout-capitalization"/>
+		</para></listitem>
+
+	     <listitem><para>
+		<xref linkend="mouse-buttons"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="selection"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="drag-drop"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="choosing-access-keys"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="shortcuts"/>
+		</para></listitem>
+
+	      <listitem><para>
+		<xref linkend="standard-shortcuts"/>
+		</para></listitem>
+
+	</itemizedlist>
+
+<para>The following terminology changes were introduced in HIG v2.0:</para>
+<itemizedlist>
+	<listitem><para>"Option menus" are now called "Drop-down lists" </para></listitem>
+	<listitem><para>"Combo boxes" are now called "Drop-down combination boxes"</para></listitem>
+</itemizedlist>
 
-  </preface>
+</preface>

Modified: branches/hig-2-3/hig-ch-windows.xml
==============================================================================
--- branches/hig-2-3/hig-ch-windows.xml	(original)
+++ branches/hig-2-3/hig-ch-windows.xml	Mon Sep 29 16:42:17 2008
@@ -21,16 +21,17 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="27" fileref="images/window-title.png"
-            format="PNG" width="367" />
+            <imagedata depth="28" fileref="images/windows-titlebar.png"
+            format="PNG" width="379" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/window-title.eps" format="EPS" />
+            <imagedata fileref="images/windows-titlebar.eps" format="EPS" />
           </imageobject>
 
           <textobject>
-            <phrase>Screenshot showing a window title bar with title &quot;blah.abw Properties&quot;</phrase>
+            <phrase>Screenshot showing a window title bar with title
+            &quot;Parts of Windows and System Interaction - Mozilla Firefox&quot;</phrase>
           </textobject>
         </mediaobject>
       </figure>
@@ -219,12 +220,12 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/primary-window.png"
-          format="PNG" />
+          <imagedata depth="372" fileref="images/windows-primary.png"
+          format="PNG" width="397" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/primary-window.eps" format="EPS" />
+          <imagedata fileref="images/windows-primary.eps" format="EPS" />
         </imageobject>
 
         <textobject>
@@ -390,12 +391,12 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/sdi.png" format="PNG"
-              />
+              <imagedata depth="226" fileref="images/windows-sdi.png" format="PNG"
+              width="268" />
             </imageobject>
 
             <imageobject>
-              <imagedata fileref="images/sdi.eps" format="EPS" />
+              <imagedata fileref="images/windows-sdi.eps" format="EPS" />
             </imageobject>
 
             <textobject>
@@ -418,12 +419,12 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/mdi.png" format="PNG"
-             />
+              <imagedata depth="349" fileref="images/windows-mdi.png" format="PNG"
+              width="372" />
             </imageobject>
 
             <imageobject>
-              <imagedata fileref="images/mdi.eps" format="EPS" />
+              <imagedata fileref="images/windows-mdi.eps" format="EPS" />
             </imageobject>
 
             <textobject>
@@ -585,12 +586,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="55" fileref="images/explicit-apply.png"
-            format="PNG" width="449" />
+            <imagedata depth="55" fileref="images/windows-explicit-apply.png"
+            format="PNG" width="387" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/explicit-apply.eps" format="EPS" />
+            <imagedata fileref="images/windows-explicit-apply.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -637,12 +638,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/property-window.png"
-            format="PNG" />
+            <imagedata fileref="images/windows-properties.png"
+            format="PNG" width="302" depth="335"/>
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/property-window.eps" format="EPS" />
+            <imagedata fileref="images/windows-properties.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -687,12 +688,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/preferences-window.png"
-            format="PNG" />
+            <imagedata depth="249" fileref="images/windows-preferences.png"
+            format="PNG" width="354" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/preferences-window.eps" format="EPS" />
+            <imagedata fileref="images/windows-preferences.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -764,12 +765,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="89" fileref="images/toolbox-small.png"
-            format="PNG" width="131" />
+            <imagedata depth="89" fileref="images/windows-toolbox-small.png"
+            format="PNG" width="136" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/toolbox-small.eps" format="EPS" />
+            <imagedata fileref="images/windows-toolbox-small.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -880,12 +881,12 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata depth="332" fileref="images/toolbox.png" format="PNG"
-              width="131" />
+              <imagedata depth="156" fileref="images/windows-toolbox-large.png" format="PNG"
+              width="136" />
             </imageobject>
 
             <imageobject>
-              <imagedata fileref="images/toolbox.eps" format="EPS" />
+              <imagedata fileref="images/windows-toolbox-large.eps" format="EPS" />
             </imageobject>
 
             <textobject>
@@ -950,11 +951,11 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/information-alert.png" format="PNG" />
+          <imagedata fileref="images/windows-alert-information.png" width="251" depth="123" format="PNG" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/information-alert.eps" format="EPS" />
+          <imagedata fileref="images/windows-alert-information.eps" format="EPS" />
         </imageobject>
 
         <textobject>
@@ -1044,11 +1045,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/alert-text.png" format="PNG" />
+            <imagedata fileref="images/windows-alert-text.png" width="446" depth="178" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/alert-text.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-text.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1107,12 +1108,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="54" fileref="images/alert-button-order.png"
-            format="PNG" width="481" />
+            <imagedata fileref="images/windows-alert-buttons.png"
+            format="PNG" width="425" depth="62" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/alert-button-order.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-buttons.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1203,12 +1204,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="213" fileref="images/alert-spacing.png"
-            format="PNG" width="591" />
+            <imagedata fileref="images/windows-alert-spacing.png"
+            format="PNG" width="530" depth="250" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/alert-spacing.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-spacing.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1431,12 +1432,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="152" fileref="images/information-alert.png"
-            format="PNG" width="438" />
+            <imagedata depth="123" fileref="images/windows-alert-information.png"
+            format="PNG" width="251" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/information-alert.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-information.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1494,11 +1495,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/error-alert.png" format="PNG" />
+            <imagedata fileref="images/windows-alert-error.png" width="287" depth="156" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/error-alert.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-error.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1547,11 +1548,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/confirmation-alert.png" format="PNG" />
+            <imagedata fileref="images/windows-alert-confirmation.png" contentwidth="450" contentdepth="162" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/confirmation-alert.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-confirmation.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1609,11 +1610,11 @@
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="images/save_alert.png" format="PNG" />
+              <imagedata fileref="images/windows-alert-save.png" width="500" depth="194" format="PNG" />
             </imageobject>
 
             <imageobject>
-              <imagedata fileref="images/save_alert.eps" format="EPS" />
+              <imagedata fileref="images/windows-alert-save.eps" format="EPS" />
             </imageobject>
 
             <textobject>
@@ -1676,11 +1677,11 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/authentication-alert.png" format="PNG" />
+            <imagedata fileref="images/windows-alert-authentication.png" width="460" depth="279" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/authentication-alert.eps" format="EPS" />
+            <imagedata fileref="images/windows-alert-authentication.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1742,11 +1743,11 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/progress-window.png" format="PNG" />
+          <imagedata fileref="images/windows-progress.png" width="425" depth="159" format="PNG" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/progress-window.eps" format="EPS" />
+          <imagedata fileref="images/windows-progress.eps" format="EPS" />
         </imageobject>
 
         <textobject>
@@ -1834,11 +1835,11 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/progress-window-copy.png" format="PNG" />
+          <imagedata fileref="images/windows-progress-copy-file.png" width="408" depth="227" format="PNG" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/progress-window-copy.eps" format="EPS" />
+          <imagedata fileref="images/windows-progress-copy-file.eps" format="EPS" />
         </imageobject>
 
         <textobject>
@@ -1867,17 +1868,16 @@
         modifications later, if they so desire.</para>
       </example>
 
-      <figure id="example-checklist-in-progress-figure">
-        <title>An example checklist window (In Progress)</title>
+      <figure id="example-checklist-start-figure">
+        <title>An example checklist window (Ready to Start)</title>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/checklist-window-in-progress.png"
-            format="PNG" />
+            <imagedata fileref="images/windows-progress-checklist-start.png" width="422" depth="249" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/checklist-window-in-progress.eps"
+            <imagedata fileref="images/windows-progress-checklist-start.eps"
             format="EPS" />
           </imageobject>
 
@@ -1887,17 +1887,17 @@
         </mediaobject>
       </figure>
 
-      <figure id="example-checklist-start-figure">
-        <title>An example checklist window (Ready to Start)</title>
+      <figure id="example-checklist-in-progress-figure">
+        <title>An example checklist window (In Progress)</title>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/checklist-window-start.png"
-            format="PNG" />
+            <imagedata fileref="images/windows-progress-checklist.png"
+            width="336" depth="220" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/checklist-window-start.eps"
+            <imagedata fileref="images/windows-progress-checklist.eps"
             format="EPS" />
           </imageobject>
 
@@ -1906,17 +1906,17 @@
           </textobject>
         </mediaobject>
       </figure>
-
+      
       <figure id="example-checklist-done-figure">
         <title>An example checklist window (Completed)</title>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/checklist-window-done.png" format="PNG" />
+            <imagedata fileref="images/windows-progress-checklist-done.png" width="356" depth="223" format="PNG" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/checklist-window-done.eps" format="EPS" />
+            <imagedata fileref="images/windows-progress-checklist-done.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -1980,15 +1980,15 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tabbed-dialog-box.png" format="PNG" />
+          <imagedata fileref="images/windows-dialog-tabbed.png" width="357" depth="322" format="PNG" />
         </imageobject>
 
         <imageobject>
-          <imagedata fileref="images/tabbed-dialog-box.eps" format="EPS" />
+          <imagedata fileref="images/windows-dialog-tabbed.eps" format="EPS" />
         </imageobject>
 
         <textobject>
-          <phrase>An example of a dialog: the Glade project options dialog</phrase>
+          <phrase>An example of a tabbed dialog: the GNOME print dialog</phrase>
         </textobject>
       </mediaobject>
     </figure>
@@ -2187,12 +2187,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="341" fileref="images/assistant-first-page.png"
-            format="PNG" width="452" />
+            <imagedata fileref="images/windows-assistant-first-page.png"
+            format="PNG" width="502" depth="318" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/assistant-first-page.eps" format="EPS" />
+            <imagedata fileref="images/windows-assistant-first-page.eps" format="EPS" />
           </imageobject>
 
           <textobject>
@@ -2229,12 +2229,12 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata depth="341" fileref="images/assistant-middle-page.png"
+            <imagedata depth="341" fileref="images/windows-assistant-middle-page.png"
             format="PNG" width="452" />
           </imageobject>
 
           <imageobject>
-            <imagedata fileref="images/assistant-middle-page.eps" format="EPS" />
+            <imagedata fileref="images/windows-assistant-middle-page.eps" format="EPS" />
           </imageobject>
 
           <textobject>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]