[passepartout] properly use menuchoice for menu paths

[Sven Herzberg <herzi src gnome org>]

commit 956a59ef3e0bc25060f562b37dda0065bb3850e1
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 23 11:29:31 2009 +0200

    properly use menuchoice for menu paths
    
    * doc/users_guide.xml: use menuchoice, it looks so nicely when being used in
      yelp
---
 doc/users_guide.xml |   61 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/doc/users_guide.xml b/doc/users_guide.xml
index cdc7a77..e0bbc1c 100644
--- a/doc/users_guide.xml
+++ b/doc/users_guide.xml
@@ -85,15 +85,15 @@
       <title>Creating a new document</title>
 
       <para>To create an empty document, select
-          <guimenuitem>New&#160;...</guimenuitem> from the
-          <guimenu>File</guimenu> menu. In the dialog that will
+	<menuchoice><guimenu>File</guimenu><guimenuitem>New&#160;...</guimenuitem></menuchoice>.
+	In the dialog that will
           appear, you can choose between creating a document from an
           existing template (any Passepartout document can be used as
           a template) or by specifying the paper format. You can
           also specify the page number the first page in the document
           should have.  These settings can be changed at a later point
-          by selecting <guimenuitem>Properties&#160;...</guimenuitem> from
-          the <guimenu>File</guimenu> menu.
+	  by selecting
+	  <menuchoice><guimenu>File</guimenu><guimenuitem>Properties&#160;...</guimenuitem></menuchoice>.
       </para>
     </section>
 
@@ -101,9 +101,10 @@
       <title>Adding pages</title>
 
       <para>To add a page to the document, select
-        <guimenuitem>Insert Before&#160;...</guimenuitem> or
-        <guimenuitem>Insert After&#160;...</guimenuitem> from the
-        <guimenu>Page</guimenu> menu. If the document was created from
+	<menuchoice><guimenu>Page</guimenu><guimenuitem>Insert Before&#160;...</guimenuitem></menuchoice>
+	or
+	<menuchoice><guimenu>Page</guimenu><guimenuitem>Insert After&#160;...</guimenuitem></menuchoice>.
+        If the document was created from
         a template, you will be asked to select a template
         page.</para>
     </section>
@@ -116,8 +117,7 @@
     <section><title>Importing images</title>
 
       <para>You can add an image to a page by selecting 
-	<guimenuitem>Insert Image&#160;...</guimenuitem> from the
-	<guimenu>Edit</guimenu> menu.
+	<menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert Image&#160;...</guimenuitem></menuchoice>.
       </para>
 
       <para>
@@ -137,11 +137,12 @@
     
     <section><title>Text frames &amp; text streams</title> 
       <para>A text frame can be added to a page by selecting
-	<guimenuitem>Insert Text Frame&#160;...</guimenuitem> from the
-	<guimenu>Edit</guimenu> menu.  The text shown in a text frame
+	<menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert Text Frame&#160;...</guimenuitem></menuchoice>
+	The text shown in a text frame
 	is read from an <acronym>XML</acronym> file, but the text
 	frame is not connected directly to the file. Instead, each
 	text frame is connected to a <glossterm>text
+	  <!-- FIXME: missing link to glossary -->
 	stream</glossterm>, which in turn is connected to an
 	<acronym>XML</acronym> file. The reason for this is that a
 	text may span several frames, possibly on several pages. All
@@ -160,10 +161,13 @@
 	format.</para>
 
       <para>You can change the stream connected to a text frame in the
-	<guilabel>Object Properties</guilabel> window. Text streams
+	<guilabel>Object Properties</guilabel> window
+	(<menuchoice><guimenu>View</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>).
+	Text streams
 	may be manipulated in the <guilabel>Text Streams</guilabel>
-	window, accessible from the <guimenuitem>Streams</guimenuitem>
-	item on the <guimenu>View</guimenu> menu.
+	window, accessible from 
+	<menuchoice><guimenu>View</guimenu><guimenuitem>Streams</guimenuitem></menuchoice>.
+	<!-- FIXME: add links to "Manipulating Objects" like "for more information..." -->
       </para>
     </section>
     
@@ -173,8 +177,9 @@
       <para>Any object can be moved or resized using the mouse.  The
 	properties of an object can also be manipulated explicitly in
 	the <guilabel>Object Properties</guilabel> window which is
-	accessible through the <guimenuitem>Properties</guimenuitem>
-	item on the <guimenu>View</guimenu> menu. When an object is
+	accessible through
+	<menuchoice><guimenu>View</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>.
+	When an object is
 	selected, its properties can be edited in the window. Not all
 	properties apply to all types of object. The properties that
 	are unique to certain kinds of object are displayed in
@@ -194,9 +199,12 @@
       <para>Several frames may be combined into a
 	<emphasis>group</emphasis> by selecting more than one frame
 	(using CTRL-button&#160;1) and selecting
-	<guimenuitem>Group</guimenuitem> from the
-	<guimenu>Arrange</guimenu> submenu in the
-	<guimenu>Edit</guimenu> menu.  Frames can also be moved up
+	<menuchoice>
+	  <guimenu>Edit</guimenu>
+	  <guimenu>Arrange</guimenu>
+	  <guimenuitem>Group</guimenuitem>
+	</menuchoice>
+	Frames can also be moved up
 	or down relative to other frames using the items in the
 	<guimenu>Arrange</guimenu> submenu.</para>
     </section>
@@ -225,8 +233,12 @@
 	printing command, such as <command>lpr</command>, or saved to
 	a file.</para>
       
-      <para>Select <guimenuitem>Print&#160;...</guimenuitem>
-	from the <guimenu>File</guimenu> menu. There is also a
+      <para>Select
+	<menuchoice>
+	  <guimenu>File</guimenu>
+	  <guimenuitem>Print&#160;...</guimenuitem>
+	</menuchoice>.
+	There is also a
 	<guimenuitem>Print Preview</guimenuitem> item that will start
 	an external PostScript viewer (if one has been
 	defined).</para>
@@ -241,8 +253,11 @@
 	levels.</para>
 
       <para>A view can be duplicated by selecting
-	<guimenuitem>New&#160;View</guimenuitem> from the
-	<guimenu>File</guimenu> menu. A document will not be closed
+	<menuchoice>
+	  <guimenu>View</guimenu>
+	  <guimenuitem>New&#160;View</guimenuitem>
+	</menuchoice>.
+	A document will not be closed
 	until all its views has been closed.</para>
     </section>
   </section>