r19830 - gnucash-docs/trunk - Improved markup for menu entry.

Cristian Marchi cmarchi at code.gnucash.org
Thu Nov 18 13:55:38 EST 2010


Author: cmarchi
Date: 2010-11-18 13:55:38 -0500 (Thu, 18 Nov 2010)
New Revision: 19830
Trac: http://svn.gnucash.org/trac/changeset/19830

Modified:
   gnucash-docs/trunk/guide/C/ch_accts.xml
   gnucash-docs/trunk/guide/C/ch_bus_ap.xml
   gnucash-docs/trunk/guide/C/ch_bus_ar.xml
   gnucash-docs/trunk/guide/C/ch_cbook.xml
   gnucash-docs/trunk/guide/C/ch_cc.xml
   gnucash-docs/trunk/guide/C/ch_currency.xml
   gnucash-docs/trunk/guide/C/ch_invest.xml
   gnucash-docs/trunk/guide/C/ch_txns.xml
   gnucash-docs/trunk/help/C/Help_ch_Account-Actions.xml
   gnucash-docs/trunk/help/C/Help_ch_Reports.xml
   gnucash-docs/trunk/help/C/Help_ch_Tools_Assistants.xml
   gnucash-docs/trunk/help/C/Help_ch_Transactions.xml
Log:
Improved markup for menu entry.

Modified: gnucash-docs/trunk/guide/C/ch_accts.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_accts.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/guide/C/ch_accts.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -321,7 +321,8 @@
       <para>Below are the standard <guilabel>Income</guilabel> and
       <guilabel>Expense</guilabel> accounts after selecting <guilabel>Common
       Accounts</guilabel> in the assistant for creating a new Account Hierarchy
-      (<guimenu>File -&gt; New -&gt; New Account Hierarchy</guimenu>).</para>
+      (<menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>New Account 
+      Hierarchy</guimenuitem></menuchoice>).</para>
       
       <screenshot id="accts-DefaultIncomeAccounts">
           <mediaobject>
@@ -445,8 +446,8 @@
 
       <para>Start with a clean <application>&app;</application> file (do not select any predefined
       accounts) and build this basic starting account structure
-      (<guilabel>File</guilabel> -&gt; <guilabel>New
-      Account...</guilabel>).</para>
+      (<menuchoice><guimenu>File</guimenu><guimenuitem>New
+      Account...</guimenuitem></menuchoice>).</para>
 
       <orderedlist>
         <listitem>

Modified: gnucash-docs/trunk/guide/C/ch_bus_ap.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_bus_ap.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/guide/C/ch_bus_ap.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -31,7 +31,7 @@
       hierarchy. You can start with the Business Accounts setup which is
       available from the New Account Hierarchy assistant, or you could build one
       manually. To access the prebuilt Business Accounts, start <application>&app;</application> and
-      click on <guimenu>File</guimenu> -&gt; <guimenu>New File</guimenu> and
+      click on <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice> and
       proceed until you see the list of available accounts, select Business
       Accounts.</para>
 
@@ -61,7 +61,7 @@
 
       <para>After you have built the account structure, register the <application>&app;</application>
       file as belonging to your company. To register your company, select
-      <guimenu>File</guimenu> -&gt; <guimenu>Properties</guimenu>:</para>
+      <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>:</para>
 
       <itemizedlist>
         <listitem>
@@ -81,7 +81,9 @@
 
   <sect1 id="bus-ap-components1">
   <title>System Components</title>
-  <para><application>&app;</application> has an integrated accounts payable system.  The transactions generated by the A/P system are placed within the Accounts Payable account, as a record of what occurs.  Generally you do not directly work with this account but use the four integrated <application>&app;</application> A/P application components.  The A/P components are available from the<guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> sub-menu.  These A/P components are:</para>
+  <para><application>&app;</application> has an integrated accounts payable system.  The transactions generated by the A/P system are placed within the Accounts Payable account, 
+  as a record of what occurs.  Generally you do not directly work with this account but use the four integrated <application>&app;</application> A/P application components.
+  The A/P components are available from the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu></menuchoice> sub-menu.  These A/P components are:</para>
 
   <itemizedlist>
   <listitem>
@@ -107,7 +109,7 @@
  
   <sect2 id="bus-ap-vendornew2">
   <title>New</title>
- <para>To register a new vendor, select the <guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> -&gt; <guimenu>New Vendor</guimenu> menu item.  Fill in general information about the vendor, such as Company Name, Address, Phone, Fax, etc.  Below is a list of the other options: </para>
+ <para>To register a new vendor, select the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>New Vendor</guimenuitem></menuchoice> menu item.  Fill in general information about the vendor, such as Company Name, Address, Phone, Fax, etc.  Below is a list of the other options: </para>
 
  <itemizedlist>
  <listitem>
@@ -126,7 +128,7 @@
  <para><guilabel>Payment Information - Currency</guilabel> - specifies the default payment currency.</para>
  </listitem>
  <listitem>
- <para><guilabel>Payment Information - Terms</guilabel> - specifies the default payment terms for this vendor.  Payment terms must be preregistered using <guimenu>Business</guimenu> -&gt; <guimenu>Billing Terms</guimenu>.</para>
+ <para><guilabel>Payment Information - Terms</guilabel> - specifies the default payment terms for this vendor.  Payment terms must be preregistered using <menuchoice><guimenu>Business</guimenu><guimenuitem>Billing Terms</guimenuitem></menuchoice>.</para>
  </listitem>
 
  <listitem>
@@ -144,13 +146,13 @@
               <listitem>
                 <para><guilabel>Use Global</guilabel> means to use the setting
                 made in the global preferences accessible through
-                <guimenu>Edit</guimenu> -&gt;
-                <guimenu>Preferences</guimenu>.</para>
+                <menuchoice><guimenu>Edit</guimenu>
+                <guimenuitem>Preferences</guimenuitem></menuchoice>.</para>
               </listitem>
             </itemizedlist></para>
  </listitem>
  <listitem>
- <para><guilabel>Payment Information - Tax Table</guilabel> - specifies a default tax table to apply to bills from this vendor.  Tax tables must be registered using the <guimenu>Business</guimenu> -&gt; <guimenu>Tax Table</guimenu> menu item.</para>
+ <para><guilabel>Payment Information - Tax Table</guilabel> - specifies a default tax table to apply to bills from this vendor.  Tax tables must be registered using the <menuchoice><guimenu>Business</guimenu><guimenuitem>Tax Table</guimenuitem></menuchoice> menu item.</para>
  </listitem>
  </itemizedlist>
 
@@ -175,7 +177,7 @@
   <sect2 id="bus-ap-vendorfind2">
   <title>Find and Edit</title>
 
- <para>To search for an existing vendor, use the <guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> -&gt; <guimenu>Find Vendor</guimenu> window.  You select a vendor to <guibutton>View/Edit</guibutton> from the results of the search.  This window is also used to look up a vendor when entering bills and processing payments.</para>
+ <para>To search for an existing vendor, use the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>Find Vendor</guimenuitem></menuchoice> window.  You select a vendor to <guibutton>View/Edit</guibutton> from the results of the search.  This window is also used to look up a vendor when entering bills and processing payments.</para>
 	<screenshot id="bus-ar-vendorfind">
 	  <mediaobject>
 	    <imageobject>
@@ -218,7 +220,7 @@
  <para>A bill is a request for payment you receive from a vendor.  <application>&app;</application> can track bills.</para>
   <sect2 id="bus-ap-billnew2">
   <title>New</title>
- <para>When you receive a bill from a vendor and want to enter it into <application>&app;</application>, you must create a new bill.  To create a new bill use the <guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> -&gt; <guimenu>New Bill</guimenu> menu item, and fill in the resulting window appropriately.</para>
+ <para>When you receive a bill from a vendor and want to enter it into <application>&app;</application>, you must create a new bill.  To create a new bill use the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>New Bill</guimenuitem></menuchoice> menu item, and fill in the resulting window appropriately.</para>
   <itemizedlist>
   <listitem>
   <para><guilabel>Invoice Info - Invoice ID</guilabel> (optional) - the identification number of the invoice as emitted by the vendor (IE: the vendor's internal number for this invoice).</para>
@@ -409,7 +411,7 @@
 
   <sect2 id="bus-ap-billfind2">
   <title>Find</title>
-  <para>To find an existing bill, use the <guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> -&gt; <guimenu>Find Bill</guimenu> application.  From the results of the search, you can select a bill to edit, or view.</para>
+  <para>To find an existing bill, use the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>Find Bill</guimenuitem></menuchoice> application.  From the results of the search, you can select a bill to edit, or view.</para>
   <note>
   <para>Before you can edit a posted bill, you will need to <guilabel>Unpost</guilabel> it.</para>
   </note>
@@ -424,7 +426,7 @@
   <sect1 id="bus-ap-jobs1">
   <title>Vendor Jobs</title>
   <para>Vendor Jobs are used to group multiple bills from a single vendor.  Use of the vendor jobs feature is optional.  The feature is useful when you have multiple "jobs" for the same vendor, and would like to view all the bills for a single job.</para>
-  <para>To use vendor jobs, you must create them using the <guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> -&gt; <guimenu>New Job</guimenu> application.  You will see the <guilabel>New Job</guilabel> window.  The editable fields are:</para>
+  <para>To use vendor jobs, you must create them using the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>New Job</guimenuitem></menuchoice> application.  You will see the <guilabel>New Job</guilabel> window.  The editable fields are:</para>
 
 
     <itemizedlist>
@@ -472,15 +474,15 @@
         </screenshot>
 
 
-    <para>To edit an existing vendor job, use the
-    <guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> -&gt;
-    <guimenu>Find Job</guimenu> application. Select the desired job in the
+    <para>To edit an existing vendor job, use the <menuchoice>
+    <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu>
+    <guimenuitem>Find Job</guimenuitem></menuchoice> application. Select the desired job in the
     search results, and click the <guilabel>View/Edit Job</guilabel>
     button.</para>
 
-    <para>To select from the bills associated with a given job, use
-    <guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> -&gt;
-    <guimenu>Find Job</guimenu> application. Select the desired job in the
+    <para>To select from the bills associated with a given job, use <menuchoice>
+    <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu>
+    <guimenuitem>Find Job</guimenuitem></menuchoice> application. Select the desired job in the
     search results and click the <guilabel>View Invoices</guilabel> button. A
     window listing bills associated with this job appears. Select a
     bill and click the <guilabel>View Invoice</guilabel> button to open a
@@ -489,7 +491,7 @@
 
   <sect1 id="bus-ap-payment1">
   <title>Process Payment</title>
-  <para>Eventually, you need to pay your bills.  To do so, use the Process Payment application found in <guimenu>Business</guimenu> -&gt; <guimenu>Vendor</guimenu> -&gt; <guimenu>Process Payment</guimenu>.</para>
+  <para>Eventually, you need to pay your bills.  To do so, use the Process Payment application found in <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>Process Payment</guimenuitem></menuchoice>.</para>
   <para>The Process Payment application consists of:</para>
   <itemizedlist>
   <listitem>

Modified: gnucash-docs/trunk/guide/C/ch_bus_ar.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_bus_ar.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/guide/C/ch_bus_ar.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -58,7 +58,7 @@
       hierarchy. You can start with the Business Accounts setup which is
       available from the New Account Hierarchy assistant, or you could build one
       manually. To access the prebuilt Business Accounts, start <application>&app;</application> and
-      click on <guimenu>File</guimenu> -&gt; <guimenu>New File</guimenu> and
+      click on <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice> and
       proceed until you see the list of available accounts, select Business
       Accounts.</para>
 
@@ -104,7 +104,7 @@
 
       <para>After you have built the account structure, register the <application>&app;</application>
       file as belonging to your company. To register your company, select
-      <guimenu>File</guimenu> -&gt; <guimenu>Properties</guimenu>:</para>
+      <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>:</para>
 
       <itemizedlist>
         <listitem>
@@ -133,8 +133,8 @@
     transactions generated by the A/R system are recorded within the Accounts
     Receivable account. You generally do not work directly with this account.
     You generally work with the four integrated <application>&app;</application> A/R application
-    components available through the <guimenu>Business</guimenu> -&gt;
-    <guimenu>Customer</guimenu> sub-menu. These four components are:</para>
+    components available through the <menuchoice><guimenu>Business</guimenu>
+    <guisubmenu>Customer</guisubmenu></menuchoice> sub-menu. These four components are:</para>
 
     <itemizedlist>
       <listitem>
@@ -173,9 +173,9 @@
     <sect2 id="bus-ar-custnew2">
       <title>New</title>
 
-      <para>To register a new customer, enter the menu
-      <guimenu>Business</guimenu> -&gt; <guimenu>Customer</guimenu> -&gt;
-      <guimenu>New Customer</guimenu>. Fill in customer information, such as
+      <para>To register a new customer, enter the menu <menuchoice>
+      <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu>
+      <guimenuitem>New Customer</guimenuitem></menuchoice>. Fill in customer information, such as
       Company Name, Address, Phone, Fax, etc. Below is a list of the other
       options:</para>
 
@@ -211,8 +211,8 @@
         <listitem>
           <para><guilabel>Billing Information - Terms</guilabel> - specifies
           the default billing terms for this customer. Billing terms must be
-          preregistered using <guimenu>Business</guimenu> -&gt;
-          <guimenu>Billing Terms Editor</guimenu>.</para>
+          preregistered using <menuchoice><guimenu>Business</guimenu>
+          <guimenuitem>Billing Terms Editor</guimenuitem></menuchoice>.</para>
         </listitem>
 
         <listitem>
@@ -248,8 +248,8 @@
               <listitem>
                 <para><guilabel>Use Global</guilabel> means to use the setting
                 made in the global preferences accessible through
-                <guimenu>Edit</guimenu> -&gt;
-                <guimenu>Preferences</guimenu>.</para>
+                <menuchoice><guimenu>Edit</guimenu>
+                <guimenuitem>Preferences</guimenuitem></menuchoice>.</para>
               </listitem>
             </itemizedlist></para>
         </listitem>
@@ -257,8 +257,8 @@
         <listitem>
           <para><guilabel>Billing Information - Tax Table</guilabel> -
           specifies a default tax table to apply to invoice line items. Tax
-          tables must be registered from the <guimenu>Business</guimenu> -&gt;
-          <guimenu>Tax Table Editor</guimenu> menu item.</para>
+          tables must be registered from the <menuchoice><guimenu>Business</guimenu>
+          <guimenuitem>Tax Table Editor</guimenuitem></menuchoice> menu item.</para>
         </listitem>
 
         <listitem>
@@ -291,9 +291,9 @@
     <sect2 id="bus-ar-custfind2">
       <title>Find and Edit</title>
 
-      <para>To search for an existing customer, use the
-      <guimenu>Business</guimenu> -&gt; <guimenu>Customer</guimenu> -&gt;
-      <guimenu>Find Customer</guimenu> window. You select a customer to
+      <para>To search for an existing customer, use the <menuchoice>
+      <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu>
+      <guimenuitem>Find Customer</guimenuitem></menuchoice> window. You select a customer to
       <guilabel>View/Edit</guilabel> from the results of the search. This
       window is also used to look up customers when creating invoices and
       processing payments.</para>
@@ -349,8 +349,8 @@
       <title>New</title>
 
       <para>To send an invoice to a customer you must first create a new
-      invoice. To create an invoice use <guimenu>Business</guimenu> -&gt;
-      <guimenu>Customer</guimenu> -&gt; <guimenu>New Invoice</guimenu>. The
+      invoice. To create an invoice use <menuchoice><guimenu>Business</guimenu>
+      <guisubmenu>Customer</guisubmenu><guimenuitem>New Invoice</guimenuitem></menuchoice>. The
       New Invoice window must be filled in appropriately:</para>
 
       <itemizedlist>
@@ -677,8 +677,8 @@
     <sect2 id="bus-ar-invoicefind2">
       <title>Find</title>
 
-      <para>To find an existing invoice, use the <guimenu>Business</guimenu>
-      -&gt; <guimenu>Customer</guimenu> -&gt; <guimenu>Find Invoice</guimenu>
+      <para>To find an existing invoice, use the <menuchoice><guimenu>Business</guimenu>
+      <guisubmenu>Customer</guisubmenu><guimenuitem>Find Invoice</guimenuitem></menuchoice>
       application. From the results of the search, you can select an invoice
       to edit or view.</para>
 
@@ -713,8 +713,8 @@
       <title>Print</title>
 
       <para>After you post an invoice, you should print it and send it to your
-      customer. To print an invoice use <guimenu>File</guimenu> -&gt;
-      <guimenu>Print Invoice</guimenu> menu item.</para>
+      customer. To print an invoice use <menuchoice><guimenu>File</guimenu>
+      <guimenuitem>Print Invoice</guimenuitem></menuchoice> menu item.</para>
 
       <para>An example of the default <application>&app;</application> invoice print output is shown
       below.</para>
@@ -741,15 +741,15 @@
       </note>
 
       <para>Invoices can also be printed from the main window by selecting
-      <guimenu>Reports</guimenu> -&gt; <guimenu>Business Reports</guimenu>
-      -&gt; <guimenu>Printable Invoice</guimenu> from the main menu. The
+      <menuchoice><guimenu>Reports</guimenu><guisubmenu>Business Reports</guisubmenu>
+      <guimenuitem>Printable Invoice</guimenuitem></menuchoice> from the main menu. The
       resulting report window states that no valid invoice is selected. To
       select the invoice to print:</para>
 
       <orderedlist>
         <listitem>
           <para>Use the <guilabel>Options</guilabel> tool bar button or select
-          <guimenu>Edit</guimenu> -&gt; <guimenu>Report Options</guimenu> from
+          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Report Options</guimenuitem></menuchoice> from
           the main menu.</para>
         </listitem>
 
@@ -790,8 +790,8 @@
 
       <note>
         <para><application>&app;</application> optionally compresses files. Disable compression and
-        save before editing the file. To enable or disable compression use
-        <guimenu>Edit</guimenu> -&gt; <guimenu>Preferences</guimenu>, access
+        save before editing the file. To enable or disable compression use <menuchoice>
+        <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>, access
         the <guilabel>General</guilabel> tab, and select or deselect the
         <guilabel>Compress Files</guilabel> check box.</para>
       </note>
@@ -806,9 +806,9 @@
     useful when you have multiple "jobs" for the same customer, and would like
     to view all the invoices related to a single job.</para>
 
-    <para>To use customer jobs, you must create them using the
-    <guimenu>Business</guimenu> -&gt; <guimenu>Customer</guimenu> -&gt;
-    <guimenu>New Job</guimenu> application. You will see the <guilabel>New
+    <para>To use customer jobs, you must create them using the <menuchoice>
+    <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu>
+    <guimenuitem>New Job</guimenuitem></menuchoice> application. You will see the <guilabel>New
     Job</guilabel> window. The editable fields are:</para>
 
     <itemizedlist>
@@ -858,15 +858,15 @@
       </mediaobject>
     </screenshot>
 
-    <para>To edit an existing customer job, use the
-    <guimenu>Business</guimenu> -&gt; <guimenu>Customer</guimenu> -&gt;
-    <guimenu>Find Job</guimenu> application. Select the desired job in the
+    <para>To edit an existing customer job, use the <menuchoice>
+    <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu>
+    <guimenuitem>Find Job</guimenuitem></menuchoice> application. Select the desired job in the
     search results, and click the <guilabel>View/Edit Job</guilabel>
     button.</para>
 
-    <para>To select from the invoices associated with a given job, use
-    <guimenu>Business</guimenu> -&gt; <guimenu>Customer</guimenu> -&gt;
-    <guimenu>Find Job</guimenu> application. Select the desired job in the
+    <para>To select from the invoices associated with a given job, use <menuchoice>
+    <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu><guimenuitem>Find
+    Job</guimenuitem></menuchoice> application. Select the desired job in the
     search results and click the <guilabel>View Invoices</guilabel> button. A
     window listing invoices associated with this job appears. Select an
     invoice and click the <guilabel>View Invoice</guilabel> button to open an
@@ -878,9 +878,9 @@
 
     <para>Eventually, you will receive payment from your customers for
     outstanding invoices. To register these payments, use the Process Payment
-    application found in <guimenu>Business</guimenu> -&gt;
-    <guimenu>Customer</guimenu> -&gt; <guimenu>Process
-    Payment</guimenu>.</para>
+    application found in <menuchoice><guimenu>Business</guimenu>
+    <guisubmenu>Customer</guisubmenu><guimenuitem>Process
+    Payment</guimenuitem></menuchoice>.</para>
 
     <para>The Process Payment application consists of:</para>
 
@@ -955,13 +955,13 @@
     letterhead paper. There are some things you can do to change invoice
     appearance.</para>
 
-    <para>Use <guimenu>File</guimenu> -&gt; <guimenu>Properties</guimenu> to
+    <para>Use <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice> to
     enter your company name and address, which is printed on the right side of
     invoices.</para>
 
     <para>To add a customized background, heading banner or logo to invoices,
-    modify the invoice style sheets. To do this, go to <guimenu>Edit</guimenu>
-    -&gt; <guimenu>Style Sheets</guimenu> and make a <guilabel>New</guilabel>
+    modify the invoice style sheets. To do this, go to <menuchoice><guimenu>Edit</guimenu>
+    <guimenuitem>Style Sheets</guimenuitem></menuchoice> and make a <guilabel>New</guilabel>
     style sheet. You will see a window like this:</para>
 
     <screenshot id="bus-ar-invoicechange1">

Modified: gnucash-docs/trunk/guide/C/ch_cbook.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_cbook.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/guide/C/ch_cbook.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -97,7 +97,8 @@
 
     <tip>
       <para>Be sure to check the Tax-Related box and assign an appropriate tax
-      category in the Income Tax Information Dialog (Edit -&gt; Tax Report Options)
+      category in the Income Tax Information Dialog (<menuchoice><guimenu>Edit</guimenu><guimenuitem>Tax 
+      Report Options</guimenuitem></menuchoice>)
       when you set up taxable income accounts. Some types of income,
       such as gift income, may not be considered taxable, so check the
       appropriate tax rules to determine what is taxable. For ways to track
@@ -338,8 +339,8 @@
   
       <orderedlist>
         <listitem>
-          <para>Select <guimenu>Actions</guimenu><guimenu> -&gt;
-            </guimenu><guimenuitem>Reconcile</guimenuitem> from the menu, and fill
+          <para>Select <menuchoice><guimenu>Actions</guimenu>
+            <guimenuitem>Reconcile</guimenuitem></menuchoice> from the menu, and fill
             in the Closing balance as $1451.79. Click OK to begin reconciling the
             account. Check off the entries as they appear on the sample statement.
             When you have checked off all your entries, the reconcile window
@@ -467,9 +468,9 @@
         <listitem>
           <para>First let's have a look at the <guilabel>Cash Flow</guilabel> report
           for the month of March.</para>
-          <para>Select the cash flow report from <guimenu>Reports</guimenu> -&gt; 
-            <guisubmenu>Income &amp; Expense</guisubmenu> -&gt; 
-            <guimenuitem>Cash Flow</guimenuitem>
+          <para>Select the cash flow report from <menuchoice><guimenu>Reports</guimenu> 
+            <guisubmenu>Income &amp; Expense</guisubmenu> 
+            <guimenuitem>Cash Flow</guimenuitem></menuchoice>
           </para>
       
       	  <screenshot id="cbook-puttoget2-Cash">
@@ -495,8 +496,8 @@
           <para>Now let's have a look at corresponding transaction report for the various 
             Asset accounts.
           </para>
-          <para>Select the transaction report from <guimenu>Reports</guimenu> -&gt; 
-            <guimenuitem>Transaction Report</guimenuitem>
+          <para>Select the transaction report from <menuchoice><guimenu>Reports</guimenu>
+            <guimenuitem>Transaction Report</guimenuitem></menuchoice>
           </para>
           
       	  <screenshot id="cbook-puttoget2-TransactionRptChecking">

Modified: gnucash-docs/trunk/guide/C/ch_cc.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_cc.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/guide/C/ch_cc.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -231,8 +231,8 @@
           <listitem>
             <para>Select the purchase transaction you want to refund (that is
             the Jeans transaction in our case), and selecting
-            <guimenu>Transaction</guimenu> -&gt; <guisubmenu>Add Reversing
-            Transaction</guisubmenu>. Modify the date as needed.</para>
+            <menuchoice><guimenu>Transaction</guimenu><guisubmenu>Add Reversing
+            Transaction</guisubmenu></menuchoice>. Modify the date as needed.</para>
           </listitem>
         </itemizedlist>
 
@@ -419,8 +419,8 @@
       <para>When your credit card bill arrives you should reconcile your
       credit card account to this document. This is done using <application>&app;</application>'s
       built-in reconciliation application. Highlight the credit card account
-      and click on <guimenu>Actions</guimenu> -&gt;
-      <guimenu>Reconcile...</guimenu>. This reconciliation procedure is
+      and click on <menuchoice><guimenu>Actions</guimenu>
+      <guimenuitem>Reconcile...</guimenuitem></menuchoice>. This reconciliation procedure is
       described in detail in the <xref linkend="txns-reconcile1"></xref>, 
       but we will step
       through the process here as well. For this example, let's assume that
@@ -544,9 +544,9 @@
         <listitem>
           <para>First let's have a look at the <guilabel>Cash Flow</guilabel> report
           for the liability account <guilabel>Visa</guilabel> during the month of March.</para>
-          <para>Select the cash flow report from <guimenu>Reports</guimenu> -&gt; 
-            <guisubmenu>Income &amp; Expense</guisubmenu> -&gt; 
-            <guimenuitem>Cash Flow</guimenuitem>
+          <para>Select the cash flow report from <menuchoice><guimenu>Reports</guimenu> 
+            <guisubmenu>Income &amp; Expense</guisubmenu> 
+            <guimenuitem>Cash Flow</guimenuitem></menuchoice>
           </para>
       
       	  <screenshot id="cc-puttoget2-Cash">
@@ -572,8 +572,8 @@
           <para>Now let's have a look at corresponding transaction report for the Visa 
             account.
           </para>
-          <para>Select the transaction report from <guimenu>Reports</guimenu> -&gt; 
-            <guimenuitem>Transaction Report</guimenuitem>
+          <para>Select the transaction report from <menuchoice><guimenu>Reports</guimenu> 
+            <guimenuitem>Transaction Report</guimenuitem></menuchoice>
           </para>
           
       	  <screenshot id="cc-puttoget2-TransactionRptVisa">

Modified: gnucash-docs/trunk/guide/C/ch_currency.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_currency.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/guide/C/ch_currency.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -34,11 +34,10 @@
   <sect1 id="currency_acct1">
     <title>Account Setup</title>
 
-    <para>Your default account currency is set in <guimenu>Edit</guimenu>
-    -&gt; <guimenu>Preferences</guimenu> -&gt; <guimenu>Accounts</guimenu>
-    -&gt; <guilabel>Default Currency</guilabel>. You should set this parameter
-    correctly, as it will save you much time when building your account
-    structure.</para>
+    <para>Your default account currency is set in the <guilabel>Account</guilabel> tab 
+    under <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. 
+    You should set this parameter correctly, as it will save you much time when building
+    your account structure.</para>
 
     <para>When you create a new account, you have the option to define the
     commodity. For currency accounts, you can specify any one of the hundreds
@@ -179,8 +178,8 @@
     <sect2 id="currency_howto_Manual">
       <title>Manually Updating Exchange Rates</title>
 
-      <para>Open the Price Editor by going to <guimenu>Tools</guimenu> -&gt;
-      <guimenu>Price Editor</guimenu>.</para>
+      <para>Open the Price Editor by going to <menuchoice><guimenu>Tools</guimenu>
+      <guimenuitem>Price Editor</guimenuitem></menuchoice>.</para>
 
       <screenshot id="currency_peditor">
         <mediaobject>
@@ -266,8 +265,8 @@
       new currency exchange rate, but there must be an easier way to do it.
       And there is.</para>
 
-      <para>Open the Price Editor by going to <guimenu>Tools</guimenu> -&gt;
-      <guimenu>Price Editor</guimenu>.</para>
+      <para>Open the Price Editor by going to <menuchoice><guimenu>Tools</guimenu>
+      <guimenuitem>Price Editor</guimenuitem></menuchoice>.</para>
 
       <screenshot id="currency_BeforeGetOnline">
         <mediaobject>
@@ -351,8 +350,8 @@
       <itemizedlist>
         <listitem>
           <para>Open the Securities window by selecting
-          <guimenu>Tools</guimenu> -&gt; <guimenuitem>Security
-          Editor</guimenuitem>.</para>
+          <menuchoice><guimenu>Tools</guimenu><guimenuitem>Security
+          Editor</guimenuitem></menuchoice>.</para>
         </listitem>
         <listitem>
           <para>Make sure the <guilabel>Show National Currencies</guilabel> box
@@ -574,7 +573,7 @@
       </screenshot>
 
       <para>The stock definition can be seen in the Security Editor.
-      (<guimenu>Tools</guimenu> -&gt; <guimenu>Security Editor</guimenu>)
+      (<menuchoice><guimenu>Tools</guimenu><guimenu>Security Editor</guimenu></menuchoice>)
       </para>
 
       <screenshot id="currency_purchase_Commodities.png">
@@ -650,8 +649,8 @@
 
       <para>However, as you can see, the USD totals may be zero if
       <application>&app;</application> doesn't have an exchange rate between USD and HKD.
-      To fix this, go to
-      <guimenu>Tools</guimenu> -&gt; <guimenu>Price Editor</guimenu>
+      To fix this, go to <menuchoice><guimenu>Tools</guimenu><guimenuitem>Price
+      Editor</guimenuitem></menuchoice>
       and click the <guibutton>Get Quotes</guibutton> button to
       automatically retrieve the exchange rates you need.</para>
 
@@ -943,8 +942,8 @@
       <title>Configure Accounts</title>
 
       <para>This time let's start with a fresh and new <application>&app;</application> data file, so
-      <guimenu>File</guimenu> -&gt; <guimenuitem>New</guimenuitem>, and edit
-      preferences (<guimenu>Edit</guimenu> -&gt; <guimenuitem>Preferences</guimenuitem>) 
+      <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice>, and edit
+      preferences (<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>) 
       to set Default Currency as AUD. Since you have
       decided to be able to track as much of your various expenses and incomes
       as possible, the following account hierarchy could be used;</para>
@@ -1278,7 +1277,7 @@
       <title>Get the online quotes</title>
 
       <para>To get the current exchange rates and stock quotes, go to
-      <guimenu>Tools</guimenu> -&gt; <guimenu>Price Editor</guimenu> and then
+      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Price Editor</guimenuitem></menuchoice> and then
       click on <guibutton>Get Quotes</guibutton>. </para>
 
       <para></para>

Modified: gnucash-docs/trunk/guide/C/ch_invest.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_invest.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/guide/C/ch_invest.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -532,8 +532,8 @@
 
       <para>As an example, let's assume that you currently own 100 shares of
       Amazon stock. First, create the stock account AMZN by selecting the
-      <guilabel>Stock</guilabel> account and click on the menu
-      <guimenu>File</guimenu> -&gt; <guimenu>New Account</guimenu>. The New
+      <guilabel>Stock</guilabel> account and click on the menu <menuchoice>
+      <guimenu>File</guimenu><guimenu>New Account</guimenu></menuchoice>. The New
       Account dialog will appear, follow the steps, in the sequence below to
       setup your new stock account.</para>
 
@@ -725,9 +725,9 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Tax Related</emphasis> - Go to Edit -&gt; Tax Report
-          Options to check this box if this account's transactions will relate to
-          Income Taxes.</para>
+          <para><emphasis>Tax Related</emphasis> - Go to <menuchoice><guimenu>Edit</guimenu>
+          <guimenuitem>Tax Report Options</guimenuitem></menuchoice> to check this box if this 
+          account's transactions will relate to Income Taxes.</para>
         </listitem>
 
         <listitem>
@@ -871,7 +871,7 @@
 
       <para>To use the Price Editor to track a stock value, you must initially
       insert the stock. To do so, open the Price Editor
-      (<guimenu>Tools</guimenu> -&gt; <guimenu>Price Editor</guimenu>) and
+      (<menuchoice><guimenu>Tools</guimenu><guimenuitem>Price Editor</guimenuitem></menuchoice>) and
       click on <guibutton>Add</guibutton> button. The first time a
       Commodity/Stock is entered this window will be blank except for the
       control buttons on the bottom. Select the appropriate Commodity you want
@@ -1013,7 +1013,8 @@
         <para>With Finance::Quote installed and functioning correctly, you
         must configure your <application>&app;</application> securities to use this feature to
         obtain updated price information automatically. Whether creating new securities or modifying securities
-        that have already been setup, use the <guibutton>Tools -&gt; Security Editor</guibutton>, to edit the
+        that have already been setup, use the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
+        </menuchoice>, to edit the
         security and check the <guilabel>Get Online Quotes</guilabel> box. You will
         now be able to modify the radio buttons for <guilabel>Type of quote source</guilabel>, the pull-down menus 
         to specify the specific source(s) and <guilabel>The timezone for these
@@ -1026,8 +1027,8 @@
         <quote>$HOME/gnucash-filename</quote> will depend on the name and location of your
         data file.
         This can be determined by the name displayed in the top frame of the <application>&app;</application> window,
-        before the <quote>-</quote>.  The file name can also be found <quote>File -&gt;</quote>
-        <quote>pull down list</quote>, the first item, numbered 1, is the name of the currently
+        before the <quote>-</quote>.  The file name can also be found under <guimenu>File</guimenu>
+        in the recently opened file list; the first item, numbered 1, is the name of the currently
         open file.</para>
 
         <para>This can be automated by creating a crontab entry. For example,
@@ -1083,7 +1084,8 @@
 
       <para>Most <application>&app;</application> Asset reports have options to set/modify a number of parameters for the report.  The
        Options windows is displayed by selecting the report tab then clicking on either the <guibutton>Options</guibutton>
-       icon in the menu bar or selecting <guimenu>Edit -&gt; Report Options</guimenu>.  The tab "General" in the
+       icon in the menu bar or selecting <menuchoice><guimenu>Edit</guimenu><guimenuitem>Report Options</guimenuitem></menuchoice>.  
+       The tab "General" in the
        resulting window contains various parameters for the report.  One of these is "Price Source" which of offers
        three alternatives to determine stock prices in reports:</para>
 
@@ -1636,7 +1638,7 @@
 
       <para>As an example, our holding of NST stock declared a 2 for 1 stock split effective
       June 6, 2005.  The process for entering this transaction is; select 
-      <guimenu>Action</guimenu> -&gt; <guimenu>Stock Split</guimenu> to start
+      <menuchoice><guimenu>Actions</guimenu><guimenuitem>Stock Split</guimenuitem></menuchoice> to start
       the assistant.</para>
 
       <screenshot id="invest-split1">

Modified: gnucash-docs/trunk/guide/C/ch_txns.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_txns.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/guide/C/ch_txns.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -294,16 +294,16 @@
     packages.</para>
 
     <para>You can choose a different register style by selecting
-    <guimenu>View</guimenu> -&gt; <guisubmenu>Auto-Split Ledger</guisubmenu>
+    <menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem></menuchoice>
     style expands the current transaction automatically. As you highlight a
     new transaction in the register, the transaction automatically expands to
-    show all splits. The <guimenu>View</guimenu> -&gt; <guisubmenu>Transaction
-    Journal</guisubmenu> style is more like an accounting journal, in which
+    show all splits. The <menuchoice><guimenu>View</guimenu><guimenuitem>Transaction
+    Journal</guimenuitem></menuchoice> style is more like an accounting journal, in which
     all splits are shown for all transactions.</para>
 
     <para>All styles permit you to view your data in either single-line or
-    double-line format. Select <guimenu>View</guimenu> -&gt;
-    <guimenuitem>Double Line</guimenuitem>, and you will see your transaction
+    double-line format. Select <menuchoice><guimenu>View</guimenu>
+    <guimenuitem>Double Line</guimenuitem></menuchoice>, and you will see your transaction
     line expand to two register lines.</para>
     
     <para>Let's have a closer look at how the Basic Ledger and Transaction Journal view differs.
@@ -587,8 +587,8 @@
       it can no longer be easily changed.</para>
 
       <para>To use the Reconciliation Windows, select an account from the
-      account tree and click on <guimenu>Actions</guimenu> -&gt;
-      <guimenu>Reconcile</guimenu>. A window will appear in which you can
+      account tree and click on <menuchoice><guimenu>Actions</guimenu>
+      <guimenuitem>Reconcile</guimenuitem></menuchoice>. A window will appear in which you can
       enter the reconcile information.</para>
 
       <screenshot id="txns-reconcile-window-1">
@@ -1079,7 +1079,7 @@
       <note>
         <para>If you entered the transaction for 28 of April at this stage,
         then please revert back to the last saved <application>&app;</application> file.
-        <guimenu>File</guimenu> -&gt;<guimenuitem> Open</guimenuitem> and
+        <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice> and
         choose <filename>gcashdata_3</filename></para>
       </note>
     </sect2>
@@ -1337,9 +1337,9 @@
           <para>First let's have a look at the <guilabel>Cash Flow</guilabel>
           report for the month of March.</para>
 
-          <para>Select the cash flow report from <guimenu>Reports</guimenu>
-          -&gt; <guisubmenu>Income &amp; Expense</guisubmenu> -&gt;
-          <guimenuitem>Cash Flow</guimenuitem></para>
+          <para>Select the cash flow report from <menuchoice><guimenu>Reports</guimenu>
+          <guisubmenu>Income &amp; Expense</guisubmenu>
+          <guimenuitem>Cash Flow</guimenuitem></menuchoice></para>
 
           <screenshot id="txns-puttoget2-Cash">
             <mediaobject>
@@ -1366,8 +1366,8 @@
           <para>Now let's have a look at corresponding transaction report for
           the Checking account.</para>
 
-          <para>Select the transaction report from <guimenu>Reports</guimenu>
-          -&gt; <guimenuitem>Transaction Report</guimenuitem></para>
+          <para>Select the transaction report from <menuchoice><guimenu>Reports</guimenu>
+          <guimenuitem>Transaction Report</guimenuitem></menuchoice></para>
 
           <screenshot id="txns-puttoget2-TransactionRptChecking">
             <mediaobject>

Modified: gnucash-docs/trunk/help/C/Help_ch_Account-Actions.xml
===================================================================
--- gnucash-docs/trunk/help/C/Help_ch_Account-Actions.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/help/C/Help_ch_Account-Actions.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -257,8 +257,8 @@
 
         <para>The <guilabel>New Account</guilabel> properties dialog consists of two tabs, the <guilabel>General
          Information</guilabel> tab and the <guilabel>Opening Balance</guilabel> tab. This dialog can be accessed by
-         going to <guimenu>File -&gt; New Account...</guimenu> or by clicking the <guilabel>New</guilabel> toolbar
-         icon in the Account Tree Window.
+         going to <menuchoice><guimenu>File</guimenu><guimenuitem>New Account...</guimenuitem></menuchoice> 
+         or by clicking the <guilabel>New</guilabel> toolbar icon in the Account Tree Window.
         </para>
 
         <para>Creating a New Account involves planning in advance several details that are
@@ -295,7 +295,8 @@
            account. It provides a way of connecting the account to stock information if it is
            one of the currency, mutual fund or stock account types. It can also be flagged as
            a Placeholder account. It displays if it is flagged as a Tax Related account (which
-           is set through the Edit -&gt; Tax Report Options dialog).</para>
+           is set through the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Tax Report
+           Options</guimenuitem></menuchoice> dialog).</para>
 
           <para>There are six panes in the Identification section of this tab.</para>
 
@@ -360,7 +361,8 @@
          </orderedlist>
 
            <para> Below the panes are check-boxes: one to show if the account is <guilabel>Tax
-           Related</guilabel> (which is set through the Edit -&gt; Tax Report Options dialog), and
+           Related</guilabel> (which is set through the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Tax Report
+           Options</guimenuitem></menuchoice> dialog), and
            two to mark the account as a <guilabel>Placeholder</guilabel>, and/or a
            <guilabel>Hidden</guilabel> account.
            </para>
@@ -377,9 +379,9 @@
 
            <para>The check box <guilabel>Hidden</guilabel> marks this account (and any sub-accounts) to be hidden in
            the account tree and not appear in the pop-up account list in the register.  To reset this option, you will
-           first need to open the <guimenu>View -&gt; Filter By...</guimenu> dialog for the account tree and check the
-           <guilabel>show hidden accounts</guilabel> option.  Doing so will allow you to select the account and reopen
-           this dialog.</para>
+           first need to open the <menuchoice><guimenu>View</guimenu><guimenuitem>Filter By...</guimenuitem></menuchoice>
+           dialog for the account tree and check the <guilabel>show hidden accounts</guilabel> option.  
+           Doing so will allow you to select the account and reopen this dialog.</para>
 
           <para>The next pane contains a list of <guilabel>Account Types</guilabel>. Select a type from the
            descriptions in the Types of <application>&app;</application> Accounts section.</para>
@@ -539,8 +541,8 @@
           can be used to fetch the current prices of your stocks.  The file specified
           <quote>&lt;gnucash-file-name&gt;</quote> will depend on the name and location of your
           data file.  This can be determined by the name displayed in the top frame of the <application>&app;</application> window,
-          before the <quote>-</quote>.  The file name can also be found <quote>File -&gt;</quote>
-          <quote>pull down list</quote>, the first item, numbered 1, is the name of the currently
+          before the <quote>-</quote>.  The file name can also be found under <guimenu>File</guimenu>
+          in the list of recently opened file; the first item, numbered 1, is the name of the currently
           open file.</para>
 
           <para>This can be automated by creating a crontab entry. For example, to update your file every Friday
@@ -602,7 +604,8 @@
         <para></para>
         <para>The Edit Account dialog consists of just the General Information tab. This tab
          has the same information that was described in To Create a New Account <xref linkend="acct-create"></xref>.
-         To access the Edit Account dialog go to <guimenu>Edit -&gt; Edit Account</guimenu> (menu shortcut Ctrl-E) or
+         To access the Edit Account dialog go to <menuchoice><guimenu>Edit</guimenu><guimenuitem>Edit Account</guimenuitem>
+         </menuchoice> (menu shortcut <keycombo><keycap>Ctrl</keycap><keycap>E</keycap></keycombo>) or
          click the <guilabel>Edit</guilabel> toolbar icon in the Account Tree Window.</para>
       </sect1>
 
@@ -774,8 +777,9 @@
         <para>A side effect of removing an account that contains transactions is that you will
          end up with unbalanced accounts. This will be indicated in the account by a gray
          check-box next to the debit and credit amounts. You can repair automatically these
-         unbalanced accounts by using the <guimenu>Actions -&gt; Check &amp; Repair</guimenu> menu. This will
-         automatically assign the unbalanced amounts to a new account named <emphasis role="bold">Imbalance.
+         unbalanced accounts by using the <menuchoice><guimenu>Actions</guimenu><guimenuitem>Check &amp; 
+         Repair</guimenuitem></menuchoice> menu. This will automatically assign the unbalanced amounts 
+         to a new account named <emphasis role="bold">Imbalance.
          </emphasis></para>
       </sect1>
 
@@ -794,7 +798,8 @@
          (reconciled).</para>
 
         <para>The Reconciling Windows are accessed in the Account Tree Window or the Account Register Window by
-         going to  <guimenu>Actions -&gt; Reconcile...</guimenu> (menu shortcut Alt-A, R).</para>
+         going to <menuchoice><guimenu>Actions</guimenu><guimenuitem>Reconcile...</guimenuitem></menuchoice> 
+         (menu shortcut <keycombo><keycap>Alt</keycap><keycap>A</keycap></keycombo>, <keycap>R</keycap>).</para>
 
 
       <sect2 id="tool-reconcile">
@@ -865,16 +870,18 @@
           <para>The set of unreconciled transactions in the Funds In and Funds Out panes can
            be changed by using the menus and toolbar to access the account and transaction
            information. If you wish to postpone the reconciliation until later use the
-           <guimenu>Reconcile -&gt; Postpone</guimenu> menu item (menu shortcut Ctrl-P) or pressing the
-           <guibutton>Postpone</guibutton> icon.   If you wish to cancel the reconciliation use the
-           <guimenu>Reconcile -&gt; Cancel</guimenu> menu item or press the
+           <menuchoice><guimenu>Reconcile</guimenu><guimenuitem>Postpone</guimenuitem></menuchoice> 
+           menu item (menu shortcut <keycombo><keycap>Ctrl</keycap><keycap>P</keycap></keycombo>) or pressing the
+           <guibutton>Postpone</guibutton> icon.  If you wish to cancel the reconciliation use the
+           <menuchoice><guimenu>Reconcile</guimenu><guimenuitem>Cancel</guimenuitem></menuchoice> menu item or press the
            <guibutton>Cancel</guibutton> icon.</para>
 
           <para>Select each unreconciled transaction matching a transaction on the statement so a
            green tick appears in the R column. The Balance pane changes to reflect each
            selected transaction until the Ending Balance equals the Reconciled Balance and the
            Difference is zero. Once this is done select the <guibutton>Finish</guibutton> button or
-           <guimenu>Reconcile -&gt; Finish</guimenu> (menu shortcut Ctrl-F) to finish the reconcile process.</para>
+           <menuchoice><guimenu>Reconcile</guimenu><guimenuitem>Finish</guimenuitem></menuchoice> 
+           (menu shortcut <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>) to finish the reconcile process.</para>
 <!--        </sect2>
 
         <table frame="topbot" id="Tools-ReconcileWin">

Modified: gnucash-docs/trunk/help/C/Help_ch_Reports.xml
===================================================================
--- gnucash-docs/trunk/help/C/Help_ch_Reports.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/help/C/Help_ch_Reports.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -52,7 +52,7 @@
           <note><para>For this to work, the user has to segregate taxable and non taxable
            income to different accounts, as well as deductible and non deductible expenses.
            The Income Tax Information dialog is used for this. To access the Income Tax
-           Information dialog go to <guimenu>Edit -&gt; Tax Report Options</guimenu>. The user
+           Information dialog go to <menuchoice><guimenu>Edit</guimenu><guimenuitem>Tax Report Options</guimenuitem></menuchoice>. The user
            also must set the TXF category of each tax related account. The Income Tax
            Information dialog is described in the <xref linkend="set-tax-options"></xref> section.</para></note>
 
@@ -308,7 +308,8 @@
           <listitem>
             <para>Style Sheet: Select a Style Sheet. Style sheets control how reports are
              displayed. At the moment, there are three style sheets, "default", "Easy" and "technicolor".
-             You can customize each of these from the Edit -&gt; Style Sheets... menu item.
+             You can customize each of these from the <menuchoice><guimenu>Edit</guimenu><guimenuitem>Style 
+             Sheets...</guimenuitem></menuchoice> menu item.
              This is described in the Changing Style Sheets section. <xref linkend="change-style"></xref></para>
           </listitem>
 
@@ -356,7 +357,7 @@
 
         <para><application>&app;</application> is able to print reports and to export the reports to HTML (web) pages. The
          Print <application>&app;</application> Document dialog is accessed from the Print button on the toolbar or
-         go to File -&gt; Print in the menu. To Export a report to a web page (HTML) select
+         go to <menuchoice><guimenu>File</guimenu><guimenuitem>Print</guimenuitem></menuchoice> in the menu. To Export a report to a web page (HTML) select
          the Export button on the toolbar and type in a file name.</para>
 
 

Modified: gnucash-docs/trunk/help/C/Help_ch_Tools_Assistants.xml
===================================================================
--- gnucash-docs/trunk/help/C/Help_ch_Tools_Assistants.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/help/C/Help_ch_Tools_Assistants.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -35,7 +35,7 @@
 
         <note><para>The <guilabel>Find</guilabel> tool will also search for; a Customer, an Invoice, a Job, a Vendor,
         Bill(s), Employee(s), or Expense Voucher(s). The target of the search is determined by where the tools is
-        invoked.  Access to the Tool via <guimenu>Business &gt; (Customer/Vendor/Employee) &gt; ... </guimenu>.
+        invoked.  Access to the Tool via <menuchoice><guimenu>Business</guimenu><guisubmenu>(Customer/Vendor/Employee)</guisubmenu></menuchoice>.
         </para></note>
 
         <para>To open the Find Transactions dialog in the Account Tree Window
@@ -1268,8 +1268,8 @@
      <para>The Since Last Run assistant is run automatically when <application>&app;</application> is started. It is
       used to enter into the register any transactions that are due to be automatically
       entered. The run on <application>&app;</application> start can be altered in the preferences. To run the
-      Since Last Run assistant manually go to <guilabel>Actions -&gt; Scheduled Transactions -&gt;
-      Since Last Run...</guilabel></para>
+      Since Last Run assistant manually go to <menuchoice><guilabel>Actions</guilabel><guisubmenu>Scheduled Transactions</guisubmenu>
+      <guimenuitem>Since Last Run...</guimenuitem></menuchoice></para>
 
           <para>The Since Last Run assistant will automatically skip any screens that have no
            transactions. The following describes every possible screen the assistant will show.
@@ -1352,7 +1352,8 @@
           <para>This assistant creates a loan repayment scheduled transaction. When used to setup
            a scheduled transaction, the assistant creates a variable formula so that the
            compounding interest is correctly calculated. To start this assistant manually go to
-           <guilabel>Actions -&gt; Scheduled Transactions -&gt; Mortgage and Loan Repayment...</guilabel> </para>
+           <menuchoice><guilabel>Actions</guilabel><guisubmenu>Scheduled Transactions</guisubmenu>
+           <guimenuitem>Mortgage and Loan Repayment...</guimenuitem></menuchoice>.</para>
 
           <para>The Mortgage and Loan Repayment assistant opens with a screen that briefly
            describes what this assistant does. The three buttons at the very bottom of the screen
@@ -1622,7 +1623,8 @@
            way of entering the details of the stock split and also any change in stock price
            or cash disbursement as a result of the stock split.</para>
 
-          <para>The Stock Split assistant is accessed by going to <guimenu>Actions -&gt; Stock Split...</guimenu>
+          <para>The Stock Split assistant is accessed by going to <menuchoice><guimenu>Actions</guimenu>
+          <guimenuitem>Stock Split...</guimenuitem></menuchoice>.
           </para>
 
           <para>The Stock Split assistant opens with a screen that briefly describes what this

Modified: gnucash-docs/trunk/help/C/Help_ch_Transactions.xml
===================================================================
--- gnucash-docs/trunk/help/C/Help_ch_Transactions.xml	2010-11-18 18:18:25 UTC (rev 19829)
+++ gnucash-docs/trunk/help/C/Help_ch_Transactions.xml	2010-11-18 18:55:38 UTC (rev 19830)
@@ -202,8 +202,9 @@
           <listitem>
            <para>Enter an amount for the transaction in the correct fields. When the transaction is "balanced"
             pressing the <keycap>Enter</keycap> key, selecting the <guibutton>Enter</guibutton> icon or going to
-            <guimenu>Transaction -&gt; Enter Transaction</guimenu> will finish the transaction. Selecting the
-            <guibutton>Cancel </guibutton> icon or going to <guimenu>Transaction -&gt; Cancel Transaction</guimenu>
+            <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Enter Transaction</guimenuitem></menuchoice> will 
+            finish the transaction. Selecting the <guibutton>Cancel</guibutton> icon or going to 
+            <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Cancel Transaction</guimenuitem></menuchoice>
             will erase the transaction.</para>
           </listitem>
 
@@ -215,7 +216,8 @@
 
           <listitem>
            <para>To move to the blank transaction at the bottom of the register, press the 
-            <guibutton>Blank</guibutton> toolbar icon or go to <guimenu>Actions -&gt; Blank Transaction</guimenu>.
+            <guibutton>Blank</guibutton> toolbar icon or go to 
+            <menuchoice><guimenu>Actions</guimenu><guimenuitem>Blank Transaction</guimenuitem></menuchoice>.
            </para>
           </listitem>
          </orderedlist>
@@ -291,9 +293,10 @@
         </listitem>
 
         <listitem>
-         <para>To enter the additional splits, press the Split button on the toolbar or select 
-          <guimenu>Actions -&gt; Split Transaction</guimenu>. Transactions with more than one split show
-          '--Split Transaction--' and the <guibutton>Split</guibutton> button will need to be used
+         <para>To enter the additional splits, press the <guibutton>Split</guibutton> button on the toolbar or select 
+          <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>. 
+          Transactions with more than one split show the text <emphasis>--Split Transaction--</emphasis> and the 
+          <guibutton>Split</guibutton> button will need to be used
           to show the details.</para>
         </listitem>
 
@@ -320,8 +323,9 @@
 
         <listitem>
          <para>Move to the missing amount field on the third line and fill in the amount. Pressing the
-          <keycap>Enter</keycap> key, selecting the <guibutton>Enter</guibutton> icon or going to <guimenu>Actions
-          -&gt; Enter</guimenu> will now move the cursor to the next line.</para>
+          <keycap>Enter</keycap> key, selecting the <guibutton>Enter</guibutton> icon or going to 
+          <menuchoice><guimenu>Actions</guimenu><guimenuitem>Enter</guimenuitem></menuchoice> 
+          will now move the cursor to the next line.</para>
         </listitem>
 
         <listitem>
@@ -338,7 +342,8 @@
         <listitem>
          <para>Pressing <keycap>Enter</keycap> as described above past the blank line will jump to the next
           transaction. Selecting the next transaction will close the split or it can be manually closed by pressing
-          the <guibutton>Split</guibutton> icon or selecting <guimenu>Actions -&gt; Split Transaction</guimenu>.</para>
+          the <guibutton>Split</guibutton> icon or selecting 
+          <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>.</para>
         </listitem>
        </orderedlist>
 
@@ -361,29 +366,31 @@
 
         <para>Editing a transaction involves just selecting the part of the transaction that needs to be changed.
          Once the changes are complete pressing the <keycap>Enter</keycap> key, selecting the
-         <guibutton>Enter</guibutton> icon or going to <guimenu>Transaction -&gt; Enter Transaction</guimenu> will
+         <guibutton>Enter</guibutton> icon or going to 
+         <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Enter Transaction</guimenuitem></menuchoice> will
          now move the cursor to the next line or transaction.
         </para>
 
         <para>To see a more detailed view of a transaction for editing in Basic Ledger, press the
-         <guibutton>Split</guibutton> button on the toolbar or select <guimenu>Actions -&gt; Split Transaction
-         </guimenu>.</para>
+         <guibutton>Split</guibutton> button on the toolbar or select 
+         <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>.</para>
     </sect1>
 
     <sect1 id="trans-delete">
         <title>Deleting a Transaction</title>
 
         <para>If a transaction needs to be removed from the register, select the transaction and press either
-         the <guibutton>Delete</guibutton> icon on the toolbar or go to <guimenu>Transaction -&gt; Delete
-         Transaction</guimenu>.
+         the <guibutton>Delete</guibutton> icon on the toolbar or go to 
+         <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Delete Transaction</guimenuitem></menuchoice>.
 
          A window will appear to confirm the delete, unless the preference has been changed.  The window presents
          two options; "Remember and don't ask again", and "Remember and don't ask again this session". The response
-         will be set according to the selected checkbox.  The preference can also be reset via <guimenu>Actions -&gt;
-         Reset Warnings </guimenu>.  <xref linkend="reset-warning"></xref>.</para>
+         will be set according to the selected checkbox.  The preference can also be reset via 
+         <menuchoice><guimenu>Actions</guimenu><guimenuitem>Reset Warnings</guimenuitem></menuchoice>.  <xref linkend="reset-warning"></xref>.</para>
 
          <para>Parts of a transaction can also be removed by pressing the <guibutton>Split</guibutton> button on
-         the toolbar or selecting <guimenu>Actions -&gt; Split Transaction</guimenu>. The part of the
+         the toolbar or selecting 
+         <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>. The part of the
          transaction that needs to be deleted can be then selected for deletion.</para>
     </sect1>
 
@@ -397,16 +404,16 @@
         <orderedlist>
           <listitem>
             <para>If in Basic Ledger, press the <guibutton>Split</guibutton> button on the toolbar or Select
-             <guimenu>Action -&gt; Split Transaction</guimenu> to open the transaction.  If in other modes
-             select transaction.</para>
+             <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice> 
+             to open the transaction.  If in other modes select transaction.</para>
           </listitem>
 
           <listitem>
-            <para>Select <guimenu>Transaction -&gt; Remove Transaction Splits</guimenu>.</para>
+            <para>Select <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Remove Transaction Splits</guimenuitem></menuchoice>.</para>
             <para>A window will appear to confirm the delete, unless the preference has been changed.  The window
              presents two options; "Remember and don't ask again", and "Remember and don't ask again this session".
              The response will be set according to the selected checkbox.  The preference can also be reset via
-             <guimenu>Actions -&gt; Reset Warnings </guimenu>.  <xref linkend="reset-warning"></xref>.</para>
+             <menuchoice><guimenu>Actions</guimenu><guimenuitem>Reset Warnings</guimenuitem></menuchoice>.  <xref linkend="reset-warning"></xref>.</para>
           </listitem>
 
           <listitem>
@@ -436,7 +443,7 @@
          This way of copying a transaction will use the date showing in the new transaction blank line.
         </para>
 
-        <para>The <guimenu>Transaction -&gt; Duplicate Transaction...</guimenu> or the toolbar
+        <para>The <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Duplicate Transaction...</guimenuitem></menuchoice> or the toolbar
          <guimenu>Duplicate</guimenu> which, unlike the Copy method, allows for choosing a different date.</para>
 
         <itemizedlist>
@@ -445,7 +452,7 @@
           </listitem>
 
           <listitem>
-            <para>Go to <guilabel>Transaction -&gt; Duplicate Transaction...</guilabel></para>
+            <para>Go to <menuchoice><guimenu>Transaction</guimenu><guimenuitem>Duplicate Transaction...</guimenuitem></menuchoice></para>
           </listitem>
 
           <listitem>
@@ -486,7 +493,8 @@
 
      <para>The easiest way to setup a scheduled transaction is to use an existing transaction in an account register
       as a template. Select the transaction you wish to use as a template and then either select the
-      <guilabel>Schedule</guilabel> icon on the toolbar or go to <guilabel>Actions -&gt; Schedule...</guilabel>.
+      <guilabel>Schedule</guilabel> icon on the toolbar or go to 
+      <menuchoice><guimenu>Actions</guimenu><guimenuitem>Schedule...</guimenuitem></menuchoice>.
       This will bring up the <emphasis role="bold">Make Scheduled Transaction</emphasis> dialog.</para>
 
       <itemizedlist>
@@ -542,8 +550,8 @@
 
          <para>The tool bar of this window contains three buttons to create, delete and edit scheduled transactions.
           New and Edit opens the Edit Scheduled Transaction dialog. Delete removes the selected scheduled transaction.
-          The same options are available thru <guimenu>Schedule -&gt; New/Edit/Delete</guimenu>, from the Scheduled
-          Transaction Tab. </para>
+          The same options are available thru <menuchoice><guimenu>Schedule</guimenu><guimenuitem>New/Edit/Delete</guimenuitem></menuchoice>,
+          from the Scheduled Transaction Tab. </para>
 
          <para>Below the list of scheduled transactions is the Upcoming calendar. This calendar displays up to the next
           year and highlights the dates that the scheduled transactions are scheduled to occur so it is easy to see when
@@ -552,7 +560,8 @@
           once more on the calendar removes the transaction list.</para>
 
          <para>The Scheduled Transaction Window is activated from the Account tab or the Transaction Register via
-          <guimenu>Actions -&gt; Scheduled Transactions -&gt; Scheduled Transaction Editor</guimenu>,</para>
+         <menuchoice><guimenu>Actions</guimenu><guisubmenu>Scheduled Transaction</guisubmenu>
+         <guimenuitem>Scheduled Transaction Editor...</guimenuitem></menuchoice>.</para>
 
         </sect2>
 </sect1>
@@ -598,13 +607,13 @@
      a custom check format. Check position and Date formats are also customizable.</para>
 
      <para>To print a single check in <application>&app;</application>, select the transaction to print a check for
-     and go to File -&gt; Print Checks. This will open the Print Checks properties dialog
-     to print the selected transaction.</para>
+     and go to <menuchoice><guimenu>File</guimenu><guimenuitem>Print Checks</guimenuitem></menuchoice>. 
+     This will open the Print Checks properties dialog to print the selected transaction.</para>
 
      <para>To print multiple checks in <application>&app;</application> execute a search to find the transactions
-     you wish to print.  With the search results window as the front window go to File
-     -&gt; Print Checks. This will open the Print Checks properties dialog to print all
-     the transactions in the search results window.</para>
+     you wish to print.  With the search results window as the front window go to
+     <menuchoice><guimenu>File</guimenu><guimenuitem>Print Checks</guimenuitem></menuchoice>. This will open 
+     the Print Checks properties dialog to print all the transactions in the search results window.</para>
 
      <para>The Print Checks dialog has two tabs. The first tab, Options, is used to setup
       the most common options to print a check. The second tab, Custom format, is used to



More information about the gnucash-changes mailing list