r19501 - gnucash-docs/branches/2.2/guide/C - Replace all usage of the words 'GnuCash' or 'Gnucash' with the 'app' entity

Geert Janssens gjanssens at code.gnucash.org
Sun Aug 29 09:38:16 EDT 2010


Author: gjanssens
Date: 2010-08-29 09:38:16 -0400 (Sun, 29 Aug 2010)
New Revision: 19501
Trac: http://svn.gnucash.org/trac/changeset/19501

Modified:
   gnucash-docs/branches/2.2/guide/C/appendixa.xml
   gnucash-docs/branches/2.2/guide/C/appendixb.xml
   gnucash-docs/branches/2.2/guide/C/appendixd.xml
   gnucash-docs/branches/2.2/guide/C/ch_accts.xml
   gnucash-docs/branches/2.2/guide/C/ch_basics.xml
   gnucash-docs/branches/2.2/guide/C/ch_budgets.xml
   gnucash-docs/branches/2.2/guide/C/ch_bus_ap.xml
   gnucash-docs/branches/2.2/guide/C/ch_bus_ar.xml
   gnucash-docs/branches/2.2/guide/C/ch_bus_pay.xml
   gnucash-docs/branches/2.2/guide/C/ch_capgain.xml
   gnucash-docs/branches/2.2/guide/C/ch_cbook.xml
   gnucash-docs/branches/2.2/guide/C/ch_cc.xml
   gnucash-docs/branches/2.2/guide/C/ch_currency.xml
   gnucash-docs/branches/2.2/guide/C/ch_dep.xml
   gnucash-docs/branches/2.2/guide/C/ch_invest.xml
   gnucash-docs/branches/2.2/guide/C/ch_loans.xml
   gnucash-docs/branches/2.2/guide/C/ch_oview.xml
   gnucash-docs/branches/2.2/guide/C/ch_reports.xml
   gnucash-docs/branches/2.2/guide/C/ch_txns.xml
   gnucash-docs/branches/2.2/guide/C/gnucash-guide.xml
Log:
Replace all usage of the words 'GnuCash' or 'Gnucash' with the 'app' entity
Backport from r19500
Patch by Yawar Amin

Modified: gnucash-docs/branches/2.2/guide/C/appendixa.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/appendixa.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/appendixa.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -13,19 +13,19 @@
  <appendix id="appendixa">
  <title>Migration Guide</title>
  <para>
-This appendix is to help current users of other financial software packages in their migration to GnuCash.  We address the conceptual differences between the layout of GnuCash accounts versus other software packages.
+This appendix is to help current users of other financial software packages in their migration to &app;.  We address the conceptual differences between the layout of &app; accounts versus other software packages.
   </para>
 
 <sect1 id="appendixa_accts_vs_cats1">
 <title>Using Accounts vs. Categories</title>
 <para>
-If you are familiar with other personal finance programs, you are already accustomed to tracking your income and expenses as categories. Since GnuCash is a double-entry system (refer to section 2.1), incomes and expenses are tracked in accounts. The basic concept is the same, but the account structure allows more consistency with accepted business practices. So, if you are a business user as well as a home user, GnuCash makes it easy to keep track of your business as well as your personal accounts.
+If you are familiar with other personal finance programs, you are already accustomed to tracking your income and expenses as categories. Since &app; is a double-entry system (refer to section 2.1), incomes and expenses are tracked in accounts. The basic concept is the same, but the account structure allows more consistency with accepted business practices. So, if you are a business user as well as a home user, &app; makes it easy to keep track of your business as well as your personal accounts.
 </para>
 <para>
-Income and expense accounts give you the same information you would get with categories, but they also give you more flexibility in entering your transactions.    In GnuCash, you have the option to enter transactions directly into income and expense accounts through their account registers.   Other programs that use categories do not offer this option, because there is no <quote>account register</quote> for a category.
+Income and expense accounts give you the same information you would get with categories, but they also give you more flexibility in entering your transactions.    In &app;, you have the option to enter transactions directly into income and expense accounts through their account registers.   Other programs that use categories do not offer this option, because there is no <quote>account register</quote> for a category.
 </para>
 <para>
-You also have the option in GnuCash to treat income and expense accounts exactly as you would treat categories, if you are more comfortable with that method.  In <trademark class="registered">Quicken</trademark> and similar programs,  transactions require an account and a category.   Substitute an income or expense account name in GnuCash where you would normally enter a category name in the other programs, and the result should be the same.   We will discuss transaction entry in Chapter 4 in greater detail.
+You also have the option in &app; to treat income and expense accounts exactly as you would treat categories, if you are more comfortable with that method.  In <trademark class="registered">Quicken</trademark> and similar programs,  transactions require an account and a category.   Substitute an income or expense account name in &app; where you would normally enter a category name in the other programs, and the result should be the same.   We will discuss transaction entry in Chapter 4 in greater detail.
 </para>
 </sect1>
 
@@ -46,10 +46,10 @@
  </sect1>
 
 <sect1 id="appendixa_xmlconvert1">
-<title>Converting XML GnuCash File</title>
- <para>The Gnucash XML data file can be tranformed to almost any other data
+<title>Converting XML &app; File</title>
+ <para>The &app; XML data file can be tranformed to almost any other data
 format (e.g., QIF, CSV...) quite easily if one is familiar with XSLT. 
-The Gnucash data file is well-formed XML, and it can therefore be run
+The &app; data file is well-formed XML, and it can therefore be run
 through an XSLT parser with an associated stylesheet.  This allows one
 to transform the file to just about any format that can be designed,
 given a properly written stylesheet.</para>
@@ -59,7 +59,7 @@
 need to do:</para>
   <orderedlist>
   <listitem>
-  <para>Copy the Gnucash to a working file.  Modify the working file's
+  <para>Copy the &app; to a working file.  Modify the working file's
 &lt;gnc-v2&gt; tag to read something like what's below.  Note that you can
 pretty much put anything you want in the '="..."' part; I used the URL
 because it's traditional (if such can be said about such a young
@@ -105,7 +105,7 @@
   <listitem>
 <para>You will now have a file in the desired output format.  An
 enterprising individual could go so far as to write a stylesheet to
-transform the Gnucash data file to an OpenOffice spreadsheet (or
+transform the &app; data file to an OpenOffice spreadsheet (or
 vice-versa, for that matter).  Such things as QIF ought to be a little
 less work.</para>
   </listitem>

Modified: gnucash-docs/branches/2.2/guide/C/appendixb.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/appendixb.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/appendixb.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -18,11 +18,11 @@
 
       <sect2 id="appendixb_info_where">
         <title>Q: Where's the FAQ?</title>
-        <para>A: You're looking at it. The most up-to-date copy can be found <ulink url="http://wiki.gnucash.org/wiki/FAQ">within the GnuCash Wiki</ulink>.</para>
+        <para>A: You're looking at it. The most up-to-date copy can be found <ulink url="http://wiki.gnucash.org/wiki/FAQ">within the &app; Wiki</ulink>.</para>
       </sect2>
 
       <sect2 id="appendixb_info_mail">
-        <title>Q: Are there mailing lists for GnuCash?</title>
+        <title>Q: Are there mailing lists for &app;?</title>
         <para>A: Yes. Go to <ulink url="http://lists.gnucash.org/mailman/listinfo/gnucash-user">http://lists.gnucash.org/mailman/listinfo/gnucash-user</ulink> and <ulink url="http://lists.gnucash.org/mailman/listinfo/gnucash-devel">http://lists.gnucash.org/mailman/listinfo/gnucash-devel</ulink> to subscibe.</para>
       </sect2>
 
@@ -32,8 +32,8 @@
       </sect2>
 
       <sect2 id="appendixb_info_other">
-        <title>Q: Are there other means of obtaining support for GnuCash?</title>
-        <para>A: Yes. Many of the developers hang out on icq in the #gnucash discussion on irc.gnome.org. Also, there is a wiki online at <ulink url="http://wiki.gnucash.org/wiki/GnuCash">http://wiki.gnucash.org/wiki/GnuCash</ulink>.</para>
+        <title>Q: Are there other means of obtaining support for &app;?</title>
+        <para>A: Yes. Many of the developers hang out on icq in the #gnucash discussion on irc.gnome.org. Also, there is a wiki online at <ulink url="http://wiki.gnucash.org/wiki/&app;">http://wiki.gnucash.org/wiki/&app;</ulink>.</para>
       </sect2>
     </sect1>
 
@@ -41,45 +41,45 @@
       <title>General Information</title>
 
       <sect2 id="appendixb_software_windows">
-        <title>Q: Can I run GnuCash on Windows?</title>
-        <para>A: Yes. Starting with release 2.2.0, GnuCash is also available on Windows.</para>
-        <para>Other related options would be colinux, VMWare and a windows-based X-server hosting a remote GnuCash session.</para>
+        <title>Q: Can I run &app; on Windows?</title>
+        <para>A: Yes. Starting with release 2.2.0, &app; is also available on Windows.</para>
+        <para>Other related options would be colinux, VMWare and a windows-based X-server hosting a remote &app; session.</para>
       </sect2>
 
       <sect2 id="appendixb_general_hard2compile">
-        <title>Q: I heard it is too hard to compile GnuCash!</title>
-        <para>A: This was probably true at the time when 1.6.0 was released. It is no longer true today, as almost every distribution ships with all the necessary libraries (except g-wrap, which means there is in fact "one" extra library to be installed before compiling GnuCash). However, by default, distributions won't install the development packages of the required libraries, so you might need to start your distribution's installer program and tell it to install not only the library packages but also the -devel packages. In general, it was noted that this problem concerns many applications in the gnome domain, and this also boils down to the fact that there is no such thing as "one monolithic gnome package".</para>
+        <title>Q: I heard it is too hard to compile &app;!</title>
+        <para>A: This was probably true at the time when 1.6.0 was released. It is no longer true today, as almost every distribution ships with all the necessary libraries (except g-wrap, which means there is in fact "one" extra library to be installed before compiling &app;). However, by default, distributions won't install the development packages of the required libraries, so you might need to start your distribution's installer program and tell it to install not only the library packages but also the -devel packages. In general, it was noted that this problem concerns many applications in the gnome domain, and this also boils down to the fact that there is no such thing as "one monolithic gnome package".</para>
       </sect2>
 
       <sect2 id="appendixb_general_batchmode">
-        <title>Q: Is there a batch mode (non-interactive) available for GnuCash, for building reports, etc?</title>
-        <para>A: No, for now GnuCash must be run interactively.</para>
+        <title>Q: Is there a batch mode (non-interactive) available for &app;, for building reports, etc?</title>
+        <para>A: No, for now &app; must be run interactively.</para>
       </sect2>
 
       <sect2 id="appendixb_general_multuser">
-        <title>Q: Can multiple people access the same datafile in GnuCash?</title>
+        <title>Q: Can multiple people access the same datafile in &app;?</title>
         <para>A: You can have multiple people with access to the same datafile, but they cannot use the data file simultaneously.</para>
         <para>To setup multi-person access, all the people must have read/write access to the directory containing the file (to read the other's created files, and to create new files).  One way to do this is by creating a user group and setting the data directory to be owned by the shared group and set to mode 2775. The '2' makes the directory setgid which copies the permissions to all files.</para>
       </sect2>
 
       <sect2 id="appendixb_general_WhyC">
-        <title>Q: Why is GnuCash written in C?</title>
-        <para>A: The core functionality of GnuCash is written in C, but do not forget that much of this can be accessed through Guile (scheme).  There are a number of reasons for why GnuCash is written in C.  The first is historical, Gnucash was started in 1996 (or maybe even earlier!) and many of the OOP (C++, Java, Python) compilers were not yet mature and standarized enough on the variety of platforms considered at that time, so C was the only option at that time.  A second reason is because the standard GUI GnuCash uses is GTK, which is written in C.</para>
+        <title>Q: Why is &app; written in C?</title>
+        <para>A: The core functionality of &app; is written in C, but do not forget that much of this can be accessed through Guile (scheme).  There are a number of reasons for why &app; is written in C.  The first is historical, &app; was started in 1996 (or maybe even earlier!) and many of the OOP (C++, Java, Python) compilers were not yet mature and standarized enough on the variety of platforms considered at that time, so C was the only option at that time.  A second reason is because the standard GUI &app; uses is GTK, which is written in C.</para>
       </sect2>
 
       <sect2 id="appendixb_general_rewrite">
-        <title>Q: Why don't you rewrite GnuCash in programming language xyz so that I can contribute easily?</title>
-        <para>A: The quick answer is "We won't". The longer answer is complex but still amounts to "We won't". GnuCash is a large body of code maintained by a small group of developers who are comfortable in C and Scheme (Guile). Actually, 80% of it is in C and approx. 13% is in Scheme/Lisp. There is no valid reason that would justify rewriting this amount of existing code in a newer language. Also, creating language bindings to recent languages such as Python or Ruby or (insert your favourite language here) is labor intensive, and we're already stretched pretty thin maintaining and developing the existing code.</para>
-        <para>Having said that, this is an open source project and you're free to do with it or contribute what you want. Just don't expect much support if the reason for your changes is that you're not willing to learn C or Scheme. Also, GnuCash used to have SWIG bindings (<ulink url="http://www.swig.org"></ulink>) which have been used for some perl programming code. According to a list discussion, these SWIG bindings might still be a way to include other languages into GnuCash, but currently they are unused and unmaintained.</para>
+        <title>Q: Why don't you rewrite &app; in programming language xyz so that I can contribute easily?</title>
+        <para>A: The quick answer is "We won't". The longer answer is complex but still amounts to "We won't". &app; is a large body of code maintained by a small group of developers who are comfortable in C and Scheme (Guile). Actually, 80% of it is in C and approx. 13% is in Scheme/Lisp. There is no valid reason that would justify rewriting this amount of existing code in a newer language. Also, creating language bindings to recent languages such as Python or Ruby or (insert your favourite language here) is labor intensive, and we're already stretched pretty thin maintaining and developing the existing code.</para>
+        <para>Having said that, this is an open source project and you're free to do with it or contribute what you want. Just don't expect much support if the reason for your changes is that you're not willing to learn C or Scheme. Also, &app; used to have SWIG bindings (<ulink url="http://www.swig.org"></ulink>) which have been used for some perl programming code. According to a list discussion, these SWIG bindings might still be a way to include other languages into &app;, but currently they are unused and unmaintained.</para>
       </sect2>
 
       <sect2 id="appendixb_general_newFeatures">
-        <title>Q: I really want feature XYZ but GnuCash doesn't have it. How do I get it added?</title>
-        <para>A: Ask nicely. :-) You can file an enhancement request at <ulink url="http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"></ulink>. Please bear in mind to describe your proposed enhancement as verbosely as possible. The trick here is to learn how to give the best information to the programmers about what your proposed new feature should do. If you want to speed up development significantly, consider donating some money as described on GnuCashDevelopment.</para>
+        <title>Q: I really want feature XYZ but &app; doesn't have it. How do I get it added?</title>
+        <para>A: Ask nicely. :-) You can file an enhancement request at <ulink url="http://bugzilla.gnome.org/enter_bug.cgi?product=&app;"></ulink>. Please bear in mind to describe your proposed enhancement as verbosely as possible. The trick here is to learn how to give the best information to the programmers about what your proposed new feature should do. If you want to speed up development significantly, consider donating some money as described on &app;Development.</para>
       </sect2>
 
       <sect2 id="appendixb_software_web">
-        <title>Q: Is there a web interface available for GnuCash?</title>
+        <title>Q: Is there a web interface available for &app;?</title>
         <para>A: No</para>
       </sect2>
 
@@ -89,23 +89,23 @@
       </sect2>
 
       <sect2 id="appendixb_software_contribute">
-        <title>Q: How can I contribute to the GnuCash project?</title>
-        <para>A: We're working on a more formal process, but for now you should subscribe to the mailing list at <ulink url="http://lists.gnucash.org/mailman/listinfo/gnucash-user">http://lists.gnucash.org/mailman/listinfo/gnucash-user</ulink> and <ulink url="http://lists.gnucash.org/mailman/listinfo/gnucash-devel">http://lists.gnucash.org/mailman/listinfo/gnucash-devel</ulink> and discuss what you can contribute with the participants on the lists. Please be aware that GnuCash is a large body of code written in C and Scheme (see the FAQ above, "Why is GnuCash written in C?" if you want to know why). If these are languages that you are not willing to work with, consider contributing in other ways.</para>
+        <title>Q: How can I contribute to the &app; project?</title>
+        <para>A: We're working on a more formal process, but for now you should subscribe to the mailing list at <ulink url="http://lists.gnucash.org/mailman/listinfo/gnucash-user">http://lists.gnucash.org/mailman/listinfo/gnucash-user</ulink> and <ulink url="http://lists.gnucash.org/mailman/listinfo/gnucash-devel">http://lists.gnucash.org/mailman/listinfo/gnucash-devel</ulink> and discuss what you can contribute with the participants on the lists. Please be aware that &app; is a large body of code written in C and Scheme (see the FAQ above, "Why is &app; written in C?" if you want to know why). If these are languages that you are not willing to work with, consider contributing in other ways.</para>
       </sect2>
 
       <sect2 id="appendixb_software_bugs">
         <title>Q: I think I found a bug. How do I report it?</title>
         <para>A: First of all, try to verify that it is indeed a bug and that it has not been reported before. Search the mail list archives (see FAQ above). Then search the <ulink url="http://bugzilla.gnome.org">Gnome Bugzilla</ulink> database.</para>
-        <para>If you feel you have indeed found a bug, you can then report it at <ulink url="http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"></ulink>. Please bear in mind to report your bug as verbosely as possible. The trick here is to learn how to give the best information to the programmers about how to reproduce bugs. A Programmer will usually only be able to fix a bug they can see, if you can't make the programmer see your bug, it won't get fixed!</para>
+        <para>If you feel you have indeed found a bug, you can then report it at <ulink url="http://bugzilla.gnome.org/enter_bug.cgi?product=&app;"></ulink>. Please bear in mind to report your bug as verbosely as possible. The trick here is to learn how to give the best information to the programmers about how to reproduce bugs. A Programmer will usually only be able to fix a bug they can see, if you can't make the programmer see your bug, it won't get fixed!</para>
       </sect2>
 
     </sect1>
     <sect1 id="appendixb_using">
-      <title>Using GnuCash</title>
+      <title>Using &app;</title>
 
       <sect2 id="appendixb_using_moveAtoB">
         <title>Q: How can I move the transactions from account A into account B, thus combining them?</title>
-        <para>A: At present, Gnucash does not offer a way to move groups of splits from one account to another. You will need to move them one at a time. Open the register for account A and select the pulldown menu item <guimenu>View -> Style -> Transaction Journal</guimenu> to expose all the splits.  For every split where the "Account" field shows account A reset it to account B. To do this quickly and safely, first use <emphasis>CTRL-c</emphasis> to copy the destination account name ("account B ") to the clipboard.  Then highlight each reference to account A by double clicking on it and use <emphasis>CTRL-v</emphasis> to paste the destination account name.  Pressing <emphasis>Enter</emphasis> after each paste silently moves the transaction out of the register.</para>
+        <para>A: At present, &app; does not offer a way to move groups of splits from one account to another. You will need to move them one at a time. Open the register for account A and select the pulldown menu item <guimenu>View -> Style -> Transaction Journal</guimenu> to expose all the splits.  For every split where the "Account" field shows account A reset it to account B. To do this quickly and safely, first use <emphasis>CTRL-c</emphasis> to copy the destination account name ("account B ") to the clipboard.  Then highlight each reference to account A by double clicking on it and use <emphasis>CTRL-v</emphasis> to paste the destination account name.  Pressing <emphasis>Enter</emphasis> after each paste silently moves the transaction out of the register.</para>
         <para>Be careful!  If you inadvertently set the "Account" field to an unintended location, you will need to search through all your accounts to find the lost transaction to correct your mistake.</para>
       </sect2>
 

Modified: gnucash-docs/branches/2.2/guide/C/appendixd.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/appendixd.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/appendixd.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -11,21 +11,21 @@
 -->
   <appendix id="appendixd">
     <title>Auxiliary File Formats</title>
-    <para>These are the formats of some auxiliary files used by GnuCash.</para>
+    <para>These are the formats of some auxiliary files used by &app;.</para>
     <sect1 id='check_format_info'>
       <title>Check Format Files (*.chk)</title>
 
       <sect2 id='check_format_overview'>
         <title>Overview</title>
         <para>The check format file is used to tell gnucash how to print a check or checks onto a page of paper.  This file first describes the overall layout of a page (number of checks, orientation, etc) and then describes the layout of the specific items on a single check.  The file is organized as a typical Key/Value file used by many Linux applications.  Keys/values pairs are grouped into sections that begin with the group name enclosed in square brackets.</para>
-        <para>GnuCash looks for check format files in two different locations when you bring up the check printing dialog.  The first location is typically /usr/share/gnucash/checks, where check files distributed with the application can be found.  The second location is the user private ~/.gnucash/checks directory.  Users may add check formats at any time (even while GnuCash is running) simply by dropping a new *.chk file in this directory.  The next time the check printing dialog is opened the new check format will appear in the list of available check formats.</para>
+        <para>&app; looks for check format files in two different locations when you bring up the check printing dialog.  The first location is typically /usr/share/gnucash/checks, where check files distributed with the application can be found.  The second location is the user private ~/.gnucash/checks directory.  Users may add check formats at any time (even while &app; is running) simply by dropping a new *.chk file in this directory.  The next time the check printing dialog is opened the new check format will appear in the list of available check formats.</para>
         <note>
-          <para>Printing functions differently depending on the version of GTK that is installed on your system.  When GnuCash is using a version of GTK prior to 2.10 all offsets are measured from the lower left corner of the page or check.  When using GTK 2.10 or later, all offsets are measured from the upper left corner of the page or check.</para>
+          <para>Printing functions differently depending on the version of GTK that is installed on your system.  When &app; is using a version of GTK prior to 2.10 all offsets are measured from the lower left corner of the page or check.  When using GTK 2.10 or later, all offsets are measured from the upper left corner of the page or check.</para>
         </note>
       </sect2>
       <sect2>
         <title>Example file</title>
-        <para>A typical GnuCash check file is presented below.  The contents of this file will be described in the next sections.</para>
+        <para>A typical &app; check file is presented below.  The contents of this file will be described in the next sections.</para>
 
         <programlisting>
 [Top]
@@ -78,7 +78,7 @@
                   <entry>Guid</entry>
                   <entry>string</entry>
                   <entry>mandatory</entry>
-                  <entry>The guid is used to uniquely identify a check format to GnuCash.  It must be unique across the entire set of application supplied and user supplied check formats.  If you copy an application check file as the basis of your own check format, you must change this value.  The <emphasis>uuidgen</emphasis> program may be used to generate these identifiers.</entry>
+                  <entry>The guid is used to uniquely identify a check format to &app;.  It must be unique across the entire set of application supplied and user supplied check formats.  If you copy an application check file as the basis of your own check format, you must change this value.  The <emphasis>uuidgen</emphasis> program may be used to generate these identifiers.</entry>
                 </row>
                 <row>
                   <entry>Title</entry>
@@ -90,7 +90,7 @@
                   <entry>Font</entry>
                   <entry>string</entry>
                   <entry>optional</entry>
-                  <entry>If supplied, this is the default font used to print all text items on this check.  This field can contain any string that is acceptable by gtk as a font specifier.  If this field is omitted, the default font is the font specified in the GnuCash preferences dialog.  A typical string would be "sans 12".</entry>
+                  <entry>If supplied, this is the default font used to print all text items on this check.  This field can contain any string that is acceptable by gtk as a font specifier.  If this field is omitted, the default font is the font specified in the &app; preferences dialog.  A typical string would be "sans 12".</entry>
                 </row>
                 <row>
                   <entry>Rotation</entry>
@@ -108,13 +108,13 @@
                   <entry>Show_Grid</entry>
                   <entry>boolean</entry>
                   <entry>optional</entry>
-                  <entry>If this value is set to <emphasis>true</emphasis> then GnuCash will draw a grid on the page, starting at the origin with the lines spaced every 50 points. This can be helpful when creating a check format file.</entry>
+                  <entry>If this value is set to <emphasis>true</emphasis> then &app; will draw a grid on the page, starting at the origin with the lines spaced every 50 points. This can be helpful when creating a check format file.</entry>
                 </row>
                 <row>
                   <entry>Show_Boxes</entry>
                   <entry>boolean</entry>
                   <entry>optional</entry>
-                  <entry>If this value is set to <emphasis>true</emphasis> then for each item where the width and height have been specified, GnuCash will draw a box showing location and maximum size of that item . This can be helpful when creating a check format file.</entry>
+                  <entry>If this value is set to <emphasis>true</emphasis> then for each item where the width and height have been specified, &app; will draw a box showing location and maximum size of that item . This can be helpful when creating a check format file.</entry>
                 </row>
               </tbody>
             </tgroup>
@@ -122,7 +122,7 @@
         </sect3>
         <sect3>
           <title>Check Positions Group</title>
-          <para>This group of items specifies how multiple checks are laid out on the same sheet of paper, and gives names to each of these check locations so that a user can specify which check location that GnuCash should print.  This entire group of key/value pairs is optional, and should be omitted if the format file only specifies a single check per page of paper.</para>
+          <para>This group of items specifies how multiple checks are laid out on the same sheet of paper, and gives names to each of these check locations so that a user can specify which check location that &app; should print.  This entire group of key/value pairs is optional, and should be omitted if the format file only specifies a single check per page of paper.</para>
           <table id='check_table_positions'>
             <title>Multiple Checks Per Page Fields</title>
             <tgroup cols="4">
@@ -154,7 +154,7 @@
         <sect3>
           <title>Check Items Group</title>
           <para>This section specifies the individual items that are printed on the check.  There is no limit to the number of items that may be present in this section, and any given type of item can be repeated multiple times.  This allows for the printing of checks that have a side stub, or for the one-per-page business checks that have both the check and multiple check stubs on the same page.  For example, to print the payee name on a business check and on both stubs, simply specify three payee items with differing print coordinates.</para>
-          <para>Each key names in this section explicitly includes the item number to which it applies.  E.G. The key named <guilabel>Type_1</guilabel> applies to the first item to be printed, and the key <guilabel>Coords_3</guilabel> applies to the third item to be printed.  Item numbers start at one and increase sequentially.  Any gap in the numbering sequence is interpreted by GnuCash as the end of the item list.  Items are printed in the order of their item numbers, not in the order in which they appear in the file.</para>
+          <para>Each key names in this section explicitly includes the item number to which it applies.  E.G. The key named <guilabel>Type_1</guilabel> applies to the first item to be printed, and the key <guilabel>Coords_3</guilabel> applies to the third item to be printed.  Item numbers start at one and increase sequentially.  Any gap in the numbering sequence is interpreted by &app; as the end of the item list.  Items are printed in the order of their item numbers, not in the order in which they appear in the file.</para>
           <para>Each item specified must include a type declaration.  The rest of the parameters for that item depend upon the particular type of that item.  See <xref linkend="check_table_types"></xref> for a list of valid item types and their required parameters.</para>
           <table id='check_table_items'>
             <title>Individual Check Item Fields</title>
@@ -184,7 +184,7 @@
                   <entry>Font_<emphasis>n</emphasis></entry>
                   <entry>string</entry>
                   <entry>optional</entry>
-                  <entry>If supplied, this is the font used to print this specific text item.  This field can contain any string that is acceptable by gtk as a font specifier.  If this field is omitted, the default font is the font specified in the <emphasis>Top</emphasis> section of the check description file, or if that was omitted the font specified in the GnuCash preferences dialog.  This field is only recognized when using gtk version 2.10 or later.</entry>
+                  <entry>If supplied, this is the font used to print this specific text item.  This field can contain any string that is acceptable by gtk as a font specifier.  If this field is omitted, the default font is the font specified in the <emphasis>Top</emphasis> section of the check description file, or if that was omitted the font specified in the &app; preferences dialog.  This field is only recognized when using gtk version 2.10 or later.</entry>
                 </row>
                 <row>
                   <entry>Align_<emphasis>n</emphasis></entry>
@@ -202,7 +202,7 @@
                   <entry>Filename_<emphasis>n</emphasis></entry>
                   <entry>string</entry>
                   <entry>optional</entry>
-                  <entry>This field is only used when the item type is <emphasis>PICTURE</emphasis>. It specifies the filename of the image that should be printed on the check.  The string may specify either an absolute path name or as a relative path name.  If a relative path name is specified, GnuCash first looks in in the application check format folder (typically /usr/share/gnucash/checks) for the image file, and if it isn't found there then it looks in the user private ~/.gnucash/checks directory for the image.  This field is only recognized when using gtk version 2.10 or later.</entry>
+                  <entry>This field is only used when the item type is <emphasis>PICTURE</emphasis>. It specifies the filename of the image that should be printed on the check.  The string may specify either an absolute path name or as a relative path name.  If a relative path name is specified, &app; first looks in in the application check format folder (typically /usr/share/gnucash/checks) for the image file, and if it isn't found there then it looks in the user private ~/.gnucash/checks directory for the image.  This field is only recognized when using gtk version 2.10 or later.</entry>
                 </row>
               </tbody>
             </tgroup>

Modified: gnucash-docs/branches/2.2/guide/C/ch_accts.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_accts.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_accts.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -15,7 +15,7 @@
   <title>Accounts</title>
 
   <para>This chapter will discuss some useful concepts for organizing your
-  accounts. Since GnuCash does not impose any specific account tree layout,
+  accounts. Since &app; does not impose any specific account tree layout,
   you are free to design your account structure in any manner you wish.
   However, there are a few basic accounting concepts which you will probably
   want to follow when designing your accounts to maximize their
@@ -29,7 +29,7 @@
     <guilabel>Liabilities</guilabel>, <guilabel>Equity</guilabel>,
     <guilabel>Income</guilabel> and <guilabel>Expenses</guilabel>. We will now
     expand on our understanding of these account types, and show how they are
-    represented in GnuCash. But first, let's divide them into 2 groups, the
+    represented in &app;. But first, let's divide them into 2 groups, the
     balance sheet accounts and the income and expense accounts.</para>
 
     <para>Let's have a quick look at the Accounting Equation (<emphasis>Assets
@@ -106,24 +106,24 @@
   </sect1>
 
   <sect1 id="accts-types1">
-    <title>GnuCash Accounts</title>
+    <title>&app; Accounts</title>
 
-    <para>This section will show how the GnuCash definition of an account fits
+    <para>This section will show how the &app; definition of an account fits
     into the view of the 5 basic accounting types.</para>
 
     <para>But first, let's begin with a definition of an
-    <guilabel>account</guilabel> in GnuCash. A GnuCash
+    <guilabel>account</guilabel> in &app;. A &app;
     <guilabel>account</guilabel> is an entity which contains other
     sub-accounts, or that contains <guilabel>transactions</guilabel>. Since an
     account can contain other accounts, you often see <guilabel>account
-    trees</guilabel> in GnuCash, in which logically associated accounts reside
+    trees</guilabel> in &app;, in which logically associated accounts reside
     within a common parent account.</para>
 
-    <para>A GnuCash account must have a unique name (that you assign) and one
-    of the predefined GnuCash "account types". There are a total of 12 account
-    types in GnuCash. These 12 account types are based on the 5 basic
-    accounting types; the reason there are more GnuCash account types than
-    basic accounting types is that this allows GnuCash to perform specialized
+    <para>A &app; account must have a unique name (that you assign) and one
+    of the predefined &app; "account types". There are a total of 12 account
+    types in &app;. These 12 account types are based on the 5 basic
+    accounting types; the reason there are more &app; account types than
+    basic accounting types is that this allows &app; to perform specialized
     tracking and handling of certain accounts. There are 6 asset accounts
     (<emphasis>Cash</emphasis>, <emphasis>Bank</emphasis>,
     <emphasis>Stock</emphasis>, <emphasis>Mutual Fund</emphasis>,
@@ -134,7 +134,7 @@
     (<emphasis>Income</emphasis>), and 1 expense account
     (<emphasis>Expense</emphasis>).</para>
 
-    <para>These GnuCash account types are presented in more detail
+    <para>These &app; account types are presented in more detail
     below.</para>
 
     <sect2 id="accts-gc-bsa2">
@@ -145,7 +145,7 @@
       section, refers to things you own.</para>
 
       <para>To help you organize your asset accounts and to simplify
-      transaction entry, GnuCash supports several types of asset
+      transaction entry, &app; supports several types of asset
       accounts:</para>
 
       <orderedlist>
@@ -201,7 +201,7 @@
       </orderedlist>
 
       <tip>
-        <para>For all GnuCash asset accounts, a <emphasis>debit</emphasis>
+        <para>For all &app; asset accounts, a <emphasis>debit</emphasis>
         (left-column value entry) increases the account balance and a
         <emphasis>credit</emphasis> (right-column value entry) decreases the
         balance. (See note later in this chapter.)</para>
@@ -214,7 +214,7 @@
       Tracking the liability balances lets you know how much debt you have at
       a given point in time.</para>
 
-      <para>GnuCash offers three liability account types:</para>
+      <para>&app; offers three liability account types:</para>
 
       <orderedlist>
         <listitem>
@@ -252,11 +252,11 @@
       which is synonymous with "net worth". It represents what is left over
       after you subtract your liabilities from your assets, so it is the
       portion of your assets that you own outright, without any debt. In
-      GnuCash, use this type of account as the source of your opening bank
+      &app;, use this type of account as the source of your opening bank
       balances, because these balances represent your beginning net
       worth.</para>
 
-      <para>There is only a single GnuCash equity account, called naturally
+      <para>There is only a single &app; equity account, called naturally
       enough, <guilabel>Equity</guilabel>.</para>
 
       <tip>
@@ -277,7 +277,7 @@
       <title>Income and Expense Accounts</title>
 
       <para><emphasis>Income</emphasis> is the payment you receive for your
-      time, services you provide, or the use of your money. In GnuCash, use an
+      time, services you provide, or the use of your money. In &app;, use an
       <guilabel>Income</guilabel> type account to track these.</para>
 
       <tip>
@@ -294,7 +294,7 @@
       </tip>
 
       <para><emphasis>Expenses</emphasis> refer to money you spend to purchase
-      goods or services provided by someone else. In GnuCash, use an
+      goods or services provided by someone else. In &app;, use an
       <guilabel>Expense</guilabel> type account to track your expenses.</para>
 
       <tip>
@@ -397,7 +397,7 @@
 
     <para>Let's go through the process of building a common personal finance
     <emphasis>chart of accounts</emphasis> using the information we have
-    learned from this chapter. A chart of accounts is simply a new GnuCash
+    learned from this chapter. A chart of accounts is simply a new &app;
     file in which you group your accounts to track your finances. In building
     this chart of accounts, the first task is to divide the items you want to
     track into the basic account types of accounting. This is fairly simple,
@@ -431,10 +431,10 @@
       likely, you want your assets grouped together, your liabilities grouped
       together, your Equity grouped together, your income grouped together,
       and your expenses grouped together. This is the most common way of
-      building a GnuCash chart of accounts, and it is highly recommended that
+      building a &app; chart of accounts, and it is highly recommended that
       you always begin this way.</para>
 
-      <para>Start with a clean GnuCash file (do not select any predefined
+      <para>Start with a clean &app; file (do not select any predefined
       accounts) and build this basic starting account structure
       (<guilabel>File</guilabel> -&gt; <guilabel>New
       Account...</guilabel>).</para>
@@ -490,7 +490,7 @@
       </orderedlist>
 
       <para>When you have created the top-level accounts, the main Account page
-      in GnuCash should look like below</para>
+      in &app; should look like below</para>
 
       <screenshot id="accts-toplevel">
         <mediaobject>

Modified: gnucash-docs/branches/2.2/guide/C/ch_basics.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_basics.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_basics.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -15,18 +15,18 @@
 <chapter id="chapter_basics">
   <title>The Basics</title>
 
-  <para>This chapter will introduce some of the basics of using GnuCash. It is
+  <para>This chapter will introduce some of the basics of using &app;. It is
   recommended that you read through this chapter, before starting to do any
-  real work with GnuCash. The chapters which follow this will begin to show
+  real work with &app;. The chapters which follow this will begin to show
   you hands on examples.</para>
 
   <sect1 id="basics-accounting1">
     <title>Accounting Concepts</title>
 
-    <para>GnuCash is easy enough to use that you do not have to have a
+    <para>&app; is easy enough to use that you do not have to have a
     complete understanding of accounting principles to find it useful.
     However, you will find that some basic accounting knowledge will prove to
-    be invaluable as GnuCash was designed using these principles as a
+    be invaluable as &app; was designed using these principles as a
     template. It is highly recommended that you understand this section of the
     guide before proceeding.</para>
 
@@ -120,8 +120,8 @@
       accounting system. For every change in value of one account in the
       Accounting Equation, there must be a balancing change in another. This
       concept is known as the <emphasis>Principle of Balance</emphasis>, and
-      is of fundamental importance for understanding GnuCash and other double
-      entry accounting systems. When you work with GnuCash, you will always be
+      is of fundamental importance for understanding &app; and other double
+      entry accounting systems. When you work with &app;, you will always be
       concerned with at least 2 accounts, to keep the Accounting Equation
       balanced.</para>
 
@@ -140,7 +140,7 @@
       in a book called a ledger, then copying each part of the transaction to
       separate books called journals. This method is still used in businesses
       today as a way to avoid entry errors and to track the source of those
-      errors. GnuCash simplifies this traditional accounting by copying part
+      errors. &app; simplifies this traditional accounting by copying part
       of each transaction for you, so it may not catch some of the entry
       errors that would show up in traditional accounting. But it will flag
       transactions that are not balanced, and it will let you know when an
@@ -159,21 +159,21 @@
   <sect1 id="basics-entry1">
     <title>Data Entry Concepts</title>
 
-    <para>When entering data in GnuCash, you should be aware of the 3 levels
-    of organization in which GnuCash divides your data: files, accounts and
+    <para>When entering data in &app;, you should be aware of the 3 levels
+    of organization in which &app; divides your data: files, accounts and
     transactions. These levels are presented in their order of complexity, one
     file contains many accounts and one account contains many transactions.
-    This division is fundamental to understanding how to use GnuCash.</para>
+    This division is fundamental to understanding how to use &app;.</para>
 
     <sect2 id="basics-accounts2">
       <title>Files, Accounts and Transactions</title>
 
-      <para>GnuCash uses <emphasis>files</emphasis> for storing information.
-      GnuCash provides three types of files: data files, backup files, and log
+      <para>&app; uses <emphasis>files</emphasis> for storing information.
+      &app; provides three types of files: data files, backup files, and log
       files. The main file that you will use to store your data is a data
       file. You will probably have only one data file that you use for your
-      home data, but GnuCash will automatically save a backup copy for you
-      each time you save that data file. GnuCash also provides log files which
+      home data, but &app; will automatically save a backup copy for you
+      each time you save that data file. &app; also provides log files which
       can be used to help reconstruct data. Backup and log files are described
       later in this chapter.</para>
 
@@ -189,7 +189,7 @@
       statements showing how much you still <emphasis>owe</emphasis> on your
       loan.</para>
 
-      <para>In GnuCash, accounts are also used to categorize money you receive
+      <para>In &app;, accounts are also used to categorize money you receive
       or spend, even though these are not physical accounts that receive
       statements. As we will cover more in <xref linkend="chapter_accts"></xref>,
       income type accounts are
@@ -202,11 +202,11 @@
       <para>A <emphasis>transaction</emphasis> represents the movement of
       money from one account to another account. Whenever you spend or receive
       money, or transfer money between accounts, that is a transaction. In
-      GnuCash, as we will see in the next section, transactions always involve
+      &app;, as we will see in the next section, transactions always involve
       at least two accounts. Examples of transactions are: paying a bill,
       transferring money from savings to checking, buying a pizza, withdrawing
       money, and depositing a paycheck. <xref linkend="chapter_txns"></xref> 
-      goes more in depth on how to enter transactions in GnuCash.</para>
+      goes more in depth on how to enter transactions in &app;.</para>
     </sect2>
 
     <sect2 id="basics-dbentry2">
@@ -225,7 +225,7 @@
       transferring money from your source of income to your bank
       account.</para>
 
-      <para>In GnuCash, these transfers are known as transactions, and each
+      <para>In &app;, these transfers are known as transactions, and each
       transaction requires at least two accounts. To enter the cash
       withdrawal, for example, you would enter a transfer of money from a bank
       account to a cash account. You would record the grocery check as a
@@ -233,7 +233,7 @@
       paycheck deposit is recorded as a transfer from an income account to a
       bank account.</para>
 
-      <para>Unlike traditional accounting packages, GnuCash makes it very easy
+      <para>Unlike traditional accounting packages, &app; makes it very easy
       to enter your double entry transactions. <xref linkend="chapter_txns"></xref> 
       gives more detail on
       entering transactions, but for now let's take a general look at how they
@@ -244,7 +244,7 @@
       (See <xref linkend="chapter_accts"></xref> for more detail
       on creating accounts.) To record the check, you simply enter a
       transaction to transfer money from the checking account to the groceries
-      account. In this example, the GnuCash transactions look like this when
+      account. In this example, the &app; transactions look like this when
       viewed from the register windows of the checking account:</para>
 
       <screenshot id="basics-DoubleEntryIntro-compact">
@@ -269,12 +269,12 @@
       <para>In this transaction, a check is written to <guilabel>Grocery
       Store</guilabel> for <guilabel>$50</guilabel>. Since this is a double
       entry transaction, at least two accounts are affected and must be part
-      of the transaction. GnuCash automatically enters the current account
+      of the transaction. &app; automatically enters the current account
       name (<guilabel>Assets:Checking Account</guilabel>) for you so you only 
       enter the other account name affected
       (<guilabel>Expenses:Groceries</guilabel>).</para>
 
-      <para>To emphasize that GnuCash stores everything as double entry
+      <para>To emphasize that &app; stores everything as double entry
       transactions, we change the view to <guilabel>Transaction
       Journal</guilabel> and see how it looks.</para>
 
@@ -336,14 +336,14 @@
       account, but where does it come from? In double-entry, the money has to
       come from somewhere. Technically, that money comes from your employer,
       but you don't care about tracking your employer's accounts. So how do
-      you account for money coming in? In GnuCash, you create a special income
+      you account for money coming in? In &app;, you create a special income
       type account to track your incoming paychecks. 
       (See <xref linkend="chapter_accts"></xref> for more
       information on creating income accounts.) To record the paychecks, you
       simply enter a transaction to transfer money from the income account to
       a bank account.</para>
 
-      <para>Here's what a paycheck deposit looks like in GnuCash.</para>
+      <para>Here's what a paycheck deposit looks like in &app;.</para>
 
       <screenshot id="basics-DoubleEntryIntro-salary">
         <mediaobject>
@@ -386,7 +386,7 @@
       <para>For example, your gross pay might be $1000, but only $655 of that
       gets deposited in your checking account. The remaining $345 is split
       between your deductions, such as federal taxes, FICA and state taxes.
-      How do you account for this in GnuCash? First, you should have accounts
+      How do you account for this in &app;? First, you should have accounts
       set up for the gross income (salary), checking, and each of the
       deductions (See <xref linkend="chapter_accts"></xref>). 
       Then you enter a transaction to transfer
@@ -430,11 +430,11 @@
       of accounts must equal the total amount transferred to another set of
       accounts. When a transaction transfers an equal sum from accounts to
       other accounts, that transaction is said to be <emphasis>in
-      balance</emphasis>. In GnuCash, as in double-entry accounting, you want
+      balance</emphasis>. In &app;, as in double-entry accounting, you want
       to have all of your transactions in balance.</para>
 
       <para>Why is this important to you? If all of your transactions are in
-      balance, then your money is all accounted for. GnuCash has a record of
+      balance, then your money is all accounted for. &app; has a record of
       where that money came from and where it was used. By storing the names
       of all accounts involved in each transaction, you provide data that can
       be sorted and viewed in report form later. Reports allow you to see
@@ -463,8 +463,8 @@
         accounts must equal the amount transferred <emphasis>to</emphasis>
         other accounts</para>
 
-        <para>You don't have to use the terms debit and credit to use GnuCash,
-        however. GnuCash account registers default to common column headings
+        <para>You don't have to use the terms debit and credit to use &app;,
+        however. &app; account registers default to common column headings
         such as deposit and withdrawal - if you are more comfortable with
         those headings, use them. If you prefer the credit and debit headings,
         you can change the column headings to use accounting labels from the
@@ -477,10 +477,10 @@
   </sect1>
 
   <sect1 id="basics-interface1">
-    <title>The GnuCash Interface</title>
+    <title>The &app; Interface</title>
 
-    <para>The very first time you open GnuCash, you will see the
-    <guilabel>Welcome to GnuCash!</guilabel> dialog. From there, GnuCash
+    <para>The very first time you open &app;, you will see the
+    <guilabel>Welcome to &app;!</guilabel> dialog. From there, &app;
     provides other tools to help you easily find what you are looking for.
     Let's take a look at some of the common screens and dialog boxes you will
     see.</para>
@@ -489,7 +489,7 @@
       <title>Create a new set of accounts</title>
 
       <para>The <guilabel>New Account Hierarchy Setup</guilabel> druid allows
-      you to create several accounts at once. When you open GnuCash the first
+      you to create several accounts at once. When you open &app; the first
       time, you will get this dialog:</para>
 
       <screenshot id="basics-NewAccountHierarchySetup">
@@ -611,14 +611,14 @@
       <para>If you intend to import your data from another program and you
       want to keep the same account names you used in that program, you may
       want to delay setting up default accounts at this time. You can simply
-      import the data and the account names into GnuCash from the other
+      import the data and the account names into &app; from the other
       program (<xref linkend="basics-import1"></xref> explains how to do this).</para>
     </sect2>
 
     <sect2 id="basics-tip2">
       <title>Tip of the Day</title>
 
-      <para>GnuCash provides a <guilabel>Tip of the Day</guilabel> dialog to
+      <para>&app; provides a <guilabel>Tip of the Day</guilabel> dialog to
       give helpful hints for using the program:</para>
 
       <screenshot id="basics-TipOfDay">
@@ -676,7 +676,7 @@
       <para>The Account Tree window provides an overview of the data contained
       in the current file. It contains a list of account names and their
       current balances. From this window, you can open any of the accounts.
-      The individual account windows are called account registers. GnuCash
+      The individual account windows are called account registers. &app;
       allows you to have as many account registers open as you wish.</para>
 
       <para>At the top of this window is the title bar, which displays the
@@ -737,7 +737,7 @@
       account register window,
       information appears about the current location of the cursor.</para>
       
-      <para>You can resize the various columns that GnuCash displays, but keep
+      <para>You can resize the various columns that &app; displays, but keep
       in mind that the description column will automatically expand to fill all unused
         space.  Therefore you should increase the size of all your other columns
         first and then decrease the size of the description column.
@@ -827,10 +827,10 @@
       by users by setting a preference in the "Menu and Toolbar" preference
       panel.</para>
 
-      <para>GnuCash, as a Gnome application, also allows you to define your
+      <para>&app;, as a Gnome application, also allows you to define your
       own menu shortcuts. To define a shortcut, first go to the "Menu and
       Toolbar" preference panel and select the "Editable menu accelerators"
-      check box.  Then return to GnuCash, click on the menu header and move
+      check box.  Then return to &app;, click on the menu header and move
       the mouse pointer over the menu item. While the menu item is
       highlighted, press a key or key combination to set the shortcut. You
       should now see your shortcut choice next to the item in the menu. To
@@ -844,7 +844,7 @@
   <sect1 id="basics-prefs1">
     <title>Setting Preferences</title>
 
-    <para>GnuCash allows you to customize your session by setting several
+    <para>&app; allows you to customize your session by setting several
     preference options. From the menu select <guimenu>Edit</guimenu> -&gt;
     <guimenuitem>Preferences</guimenuitem>, then make your desired changes
     using the list of items shown on the left. The changes you made will be
@@ -865,7 +865,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Accounts</phrase>
+            <phrase>&app; Preferences - Accounts</phrase>
           </textobject>
 
           <caption>
@@ -959,7 +959,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Business</phrase>
+            <phrase>&app; Preferences - Business</phrase>
           </textobject>
 
           <caption>
@@ -1025,7 +1025,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Date/Time</phrase>
+            <phrase>&app; Preferences - Date/Time</phrase>
           </textobject>
 
           <caption>
@@ -1065,7 +1065,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - General</phrase>
+            <phrase>&app; Preferences - General</phrase>
           </textobject>
 
           <caption>
@@ -1103,7 +1103,7 @@
 
         <listitem>
           <para><guilabel>Display negative amounts in red</guilabel> - If you
-          turn off this option, GnuCash will display negative numbers in
+          turn off this option, &app; will display negative numbers in
           black.</para>
         </listitem>
 
@@ -1120,7 +1120,7 @@
 
         <listitem>
           <para><guilabel>Compress files</guilabel> - This option determines
-          whether the GnuCash data file will be compressed or not.</para>
+          whether the &app; data file will be compressed or not.</para>
         </listitem>
 
         <listitem>
@@ -1150,7 +1150,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Online banking</phrase>
+            <phrase>&app; Preferences - Online banking</phrase>
           </textobject>
 
           <caption>
@@ -1197,7 +1197,7 @@
         <listitem>
           <para><guilabel>Commercial Cash Machine fees threshold </guilabel> -
           If the ATM machine automatically adds a small transaction fee,
-          GnuCash will still be able to match it to the transaction as long as
+          &app; will still be able to match it to the transaction as long as
           the difference is below this threshold</para>
         </listitem>
       </itemizedlist>
@@ -1217,7 +1217,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Register</phrase>
+            <phrase>&app; Preferences - Register</phrase>
           </textobject>
 
           <caption>
@@ -1262,7 +1262,7 @@
 
         <listitem>
           <para><guilabel>Use system theme colours</guilabel> - If selected,
-          GnuCash will use the system theme colours instead of the default
+          &app; will use the system theme colours instead of the default
           colours.</para>
         </listitem>
 
@@ -1275,13 +1275,13 @@
 
         <listitem>
           <para><guilabel>Draw horizontal lines between rows</guilabel> - If
-          selected, GnuCash will draw a horizontal line between each
+          selected, &app; will draw a horizontal line between each
           row.</para>
         </listitem>
 
         <listitem>
           <para><guilabel>Draw vertical lines between cells</guilabel> - If
-          selected, GnuCash will draw a vertical line between the cells in
+          selected, &app; will draw a vertical line between the cells in
           each row.</para>
         </listitem>
       </itemizedlist>
@@ -1306,7 +1306,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Register Defaults</phrase>
+            <phrase>&app; Preferences - Register Defaults</phrase>
           </textobject>
 
           <caption>
@@ -1370,7 +1370,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Reports</phrase>
+            <phrase>&app; Preferences - Reports</phrase>
           </textobject>
 
           <caption>
@@ -1410,7 +1410,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Accounting Period</phrase>
+            <phrase>&app; Preferences - Accounting Period</phrase>
           </textobject>
 
           <caption>
@@ -1423,12 +1423,12 @@
       <itemizedlist>
         <listitem>
           <para><guilabel>Include grand total</guilabel> - if this item is
-          selected, GnuCash will include a grand total on the report.</para>
+          selected, &app; will include a grand total on the report.</para>
         </listitem>
 
         <listitem>
           <para><guilabel>Include non-currency totals</guilabel> - if this
-          item is selected, GnuCash will include a total of non-currency items
+          item is selected, &app; will include a total of non-currency items
           (for instance number of shares) in the report.</para>
         </listitem>
 
@@ -1456,7 +1456,7 @@
       <title>Scheduled Transactions</title>
 
       <para>The <guilabel>Scheduled Transactions</guilabel> preferences item
-      affects the behavior of GnuCash for scheduling transactions. More
+      affects the behavior of &app; for scheduling transactions. More
       information about scheduled transactions can be found in 
       <xref linkend="txns-registers1"></xref> of this guide.</para>
 
@@ -1471,7 +1471,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Scheduled Transactions</phrase>
+            <phrase>&app; Preferences - Scheduled Transactions</phrase>
           </textobject>
 
           <caption>
@@ -1484,8 +1484,8 @@
       <itemizedlist>
         <listitem>
           <para><guilabel>Run when data file opened</guilabel> - If selected,
-          the "Since-Last-Run" window will appear on GnuCash start-up (or
-          rather when GnuCash opens the file).</para>
+          the "Since-Last-Run" window will appear on &app; start-up (or
+          rather when &app; opens the file).</para>
         </listitem>
 
         <listitem>
@@ -1524,7 +1524,7 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash Preferences - Windows</phrase>
+            <phrase>&app; Preferences - Windows</phrase>
           </textobject>
 
           <caption>
@@ -1537,7 +1537,7 @@
       <itemizedlist>
         <listitem>
           <para><guilabel>Save window size and position</guilabel> - If
-          selected, next time GnuCash starts it will re-use the window size
+          selected, next time &app; starts it will re-use the window size
           and position of the last run.</para>
         </listitem>
 
@@ -1555,15 +1555,15 @@
   <sect1 id="basics-help1">
     <title>Getting Help</title>
 
-    <para>GnuCash offers help in many ways. We have already covered the
+    <para>&app; offers help in many ways. We have already covered the
     <guilabel>Tip of the Day</guilabel> dialog that gives you helpful hints
-    upon start-up of your GnuCash session. GnuCash also offers an extensive
+    upon start-up of your &app; session. &app; also offers an extensive
     help manual.</para>
 
     <sect2 id="basics-manual2">
       <title>Help Manual</title>
 
-      <para>Once you have opened GnuCash, you will see the <guilabel>Account
+      <para>Once you have opened &app;, you will see the <guilabel>Account
       Tree</guilabel> window <guilabel>Help</guilabel> menu heading, which
       opens the on-line manual. The on-line manual is organized by topic, and
       you can expand each topic into its subtopics.</para>
@@ -1579,7 +1579,7 @@
     <sect2 id="basics-web2">
       <title>Web Access</title>
 
-      <para>The <guilabel>GnuCash Help</guilabel> window also acts as a simple
+      <para>The <guilabel>&app; Help</guilabel> window also acts as a simple
       web browser, so you can pull up a web site for additional information.
       You can open any web site under this window by clicking the
       <guibutton>Open</guibutton> tool bar button and then typing in the URL.
@@ -1589,20 +1589,20 @@
       browser.</para>
 
       <para>The <ulink
-      url="http://www.gnucash.org"><citetitle>GnuCash</citetitle></ulink> web
+      url="http://www.gnucash.org"><citetitle>&app;</citetitle></ulink> web
       site contains helpful information about the program and about any
-      updates to it. It also contains links to the GnuCash mailing lists for
+      updates to it. It also contains links to the &app; mailing lists for
       developers and users, and you can search the <ulink
       url="https://lists.gnucash.org/cgi-bin/namazu.cgi"><citetitle>archives
-      of GnuCash mailing lists</citetitle></ulink> for discussions on a
+      of &app; mailing lists</citetitle></ulink> for discussions on a
       particular topic. If you don't find the answers you are looking for, you
       can post your question to the <ulink
-      url="https://lists.gnucash.org/mailman/listinfo/gnucash-user"><citetitle>GnuCash
+      url="https://lists.gnucash.org/mailman/listinfo/gnucash-user"><citetitle>&app;
       user list</citetitle></ulink>, and someone on the list will attempt to
       answer you.</para>
 
-      <para>The most updated <guilabel>GnuCash FAQ</guilabel> is also located
-      on the <ulink url="http://wiki.gnucash.org/wiki/FAQ"><citetitle>GnuCash
+      <para>The most updated <guilabel>&app; FAQ</guilabel> is also located
+      on the <ulink url="http://wiki.gnucash.org/wiki/FAQ"><citetitle>&app;
       FAQ website</citetitle></ulink>, and contains answers to the popular
       questions.</para>
     </sect2>
@@ -1622,7 +1622,7 @@
   <sect1 id="basics-files1">
     <title>Creating and Saving Files</title>
 
-    <para>If you are using GnuCash for the first time, it will automatically
+    <para>If you are using &app; for the first time, it will automatically
     open a new file when you begin. Follow these steps to save the file under
     a new name:</para>
 
@@ -1630,7 +1630,7 @@
       <listitem>
         <para>Choose <guimenu>File</guimenu> -&gt; <guimenuitem>Save
         As...</guimenuitem> from the menu bar or select the
-        <guibutton>Save</guibutton> toolbar button. GnuCash will bring up this
+        <guibutton>Save</guibutton> toolbar button. &app; will bring up this
         window:</para>
 
         <screenshot id="basics-SaveAs">
@@ -1680,16 +1680,16 @@
       </listitem>
     </orderedlist>
 
-    <para>Before ending each GnuCash session, be sure to save your data
+    <para>Before ending each &app; session, be sure to save your data
     changes using <guimenu>File</guimenu> -&gt;
     <guimenuitem>Save</guimenuitem> or the <guibutton>Save</guibutton> toolbar
     button. In fact, it is a good idea to save your data changes often, since
-    GnuCash does not permanently record your changes until you save them. To
+    &app; does not permanently record your changes until you save them. To
     open an existing file, select <guimenu>File</guimenu> -&gt;
     <guimenuitem>Open</guimenuitem> and choose your file from the list.</para>
 
-    <para>GnuCash is storing its data file without any extension. If you name
-    your GnuCash file to <filename>MyBudget</filename>, the actual file name
+    <para>&app; is storing its data file without any extension. If you name
+    your &app; file to <filename>MyBudget</filename>, the actual file name
     will be <filename>MyBudget.</filename><note>
         <para>Ensure that you do not specify an extension when you specify
         the file name. Per the above example, only specify
@@ -1772,24 +1772,24 @@
       </listitem>
 
       <listitem>
-        <para>Review the GnuCash accounts to be created.</para>
+        <para>Review the &app; accounts to be created.</para>
 
         <para>The importer then matches up your QIF accounts and categories
-        with GnuCash accounts and gives you a brief description of the
+        with &app; accounts and gives you a brief description of the
         matching process. Clicking <guibutton>Next</guibutton> will bring you
-        to a view comparing your QIF accounts with the corresponding GnuCash
+        to a view comparing your QIF accounts with the corresponding &app;
         accounts created. To change an account name, select the row containing
         that account name and edit the name in the dialog box provided. Click
         <guibutton>Next</guibutton> when you have finished making changes, and
         proceed through a similar category matching process. QIF income and
-        expense categories import as GnuCash income and expense accounts (see
+        expense categories import as &app; income and expense accounts (see
         <xref linkend="accts-concepts1"></xref> for more on this). 
         Make changes to these account names if
         necessary, and click <guibutton>Next</guibutton> to continue.</para>
 
         <note>
           <para>If you are not sure what changes are needed, it is safe to
-          accept the GnuCash account names. It is easy to edit the accounts
+          accept the &app; account names. It is easy to edit the accounts
           later if you find you need to make a change.</para>
         </note>
 
@@ -1804,15 +1804,15 @@
       </listitem>
 
       <listitem>
-        <para>Tell GnuCash to import the data.</para>
+        <para>Tell &app; to import the data.</para>
 
         <para>The last step is the import. Once you have verified your account
         names and investment information, click <guibutton>Finish</guibutton>
-        in the <guilabel>Update your GnuCash accounts</guilabel> page to
+        in the <guilabel>Update your &app; accounts</guilabel> page to
         complete the import process. Depending upon the size of your file, the
         import might take a few minutes to complete, so a progress bar
         displays the percentage finished. When the import process is complete,
-        GnuCash will return you to the main window, which should now display
+        &app; will return you to the main window, which should now display
         the names of the accounts you imported.</para>
       </listitem>
     </orderedlist>
@@ -1821,7 +1821,7 @@
   <sect1 id="basics-backup1">
     <title>Backing Up and Recovering Data</title>
 
-    <para>GnuCash creates several types of files to help ensure that your data
+    <para>&app; creates several types of files to help ensure that your data
     is not lost. You may see files with the following file extensions: xac,
     log, LCK, LNK in the same directory as your primary data file. What each
     of these files does is presented below.</para>
@@ -1859,24 +1859,24 @@
     <sect2 id="basics-backuplog2">
       <title>Log file (.log)</title>
 
-      <para>Each time you open a file in GnuCash, a .log is created and saved
+      <para>Each time you open a file in &app;, a .log is created and saved
       with the same name format as the .xac backup files. As you make changes
       to the open data file, the log file saves only those changes. Log files
       are not a full backup of your data file - they simply record changes you
-      have made to the data file in the current GnuCash session.</para>
+      have made to the data file in the current &app; session.</para>
 
-      <para>In case you exit GnuCash inadvertently, possibly due to a power
+      <para>In case you exit &app; inadvertently, possibly due to a power
       outage or a system wide crash, it is possible to recover most of your
-      work since the last time you saved your GnuCash file using this log
+      work since the last time you saved your &app; file using this log
       file. This is the procedure:</para>
 
       <itemizedlist>
         <listitem>
-          <para>Open the last saved GnuCash file.</para>
+          <para>Open the last saved &app; file.</para>
         </listitem>
 
         <listitem>
-          <para>Go to "File" -&gt; "Import" -&gt; "Replay GnuCash .log file"
+          <para>Go to "File" -&gt; "Import" -&gt; "Replay &app; .log file"
           and select the one .log file with the same date as the saved file
           you just opened. Make sure that you picked the right .log file, or
           you will possibly wreak havoc in your accounts.</para>
@@ -1904,17 +1904,17 @@
       store any data, but they are created to prevent more than one user from
       opening the same file at the same time. These files are automatically
       created when you open the file, to lock it so no one else can access it.
-      When you close your GnuCash session or open another file, GnuCash
+      When you close your &app; session or open another file, &app;
       unlocks the first data file by deleting the LCK and LNK files.</para>
 
-      <para>If GnuCash crashes while you have a data file open, the LCK and
-      LNK files are not deleted. The next time you try to open GnuCash, you
+      <para>If &app; crashes while you have a data file open, the LCK and
+      LNK files are not deleted. The next time you try to open &app;, you
       will get a warning message that the file is locked. The warning message
       appears because the LNK and LCK files are still in your directory. It is
       safe to choose Yes to open the file, but you should delete the .LNK and
       .LCK files (using a terminal window or your file manager.) Once those
       files are deleted, you will not get the warning message again unless
-      GnuCash crashes.</para>
+      &app; crashes.</para>
     </sect2>
 
     <sect2 id="basics-backupmanage2">
@@ -1925,13 +1925,13 @@
       good idea to keep some of the more recent .xac files, but you can safely
       delete the .log files since they are not complete copies of your data.
       You should also delete any .LCK and .LNK files that you see after
-      closing GnuCash. If you decide to back up your data file to another
+      closing &app;. If you decide to back up your data file to another
       disk manually, you only need to back up the main data file - not the .xac
       files.</para>
 
       <note>
-        <para>GnuCash will automatically delete any .xac, .log files that are
-        older than 30 days. You can change this behavior in the GnuCash
+        <para>&app; will automatically delete any .xac, .log files that are
+        older than 30 days. You can change this behavior in the &app;
         preferences.</para>
       </note>
     </sect2>
@@ -1953,7 +1953,7 @@
 
     <orderedlist>
       <listitem>
-        <para>First, let's create a file to store your real data. Open GnuCash
+        <para>First, let's create a file to store your real data. Open &app;
         and go through the <guilabel>New Account Hierarchy Setup</guilabel>
         dialog. You will create a file and accounts to be used for your home
         finances, so choose the accounts that pertain to you. If you are not

Modified: gnucash-docs/branches/2.2/guide/C/ch_budgets.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_budgets.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_budgets.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -12,7 +12,7 @@
  <chapter id="chapter_budgets">
  <title>Budgets</title>
  <para>
- This chapter explains how to create and use budgets with GnuCash. 
+ This chapter explains how to create and use budgets with &app;. 
   </para>
  <sect1 id="budget_concepts1">
  <title>Basic Concepts</title>
@@ -23,7 +23,7 @@
  financial transactions for the period compare to your planned
  transactions.</para>
 
- <para>The budgeting concept is quite general, so GnuCash offers a
+ <para>The budgeting concept is quite general, so &app; offers a
 budgeting tool that is both simple and flexible.  You, the user, have
 to decide how complex or simple you want to make your budget.  This
 guide will help you make some of those decisions.</para>
@@ -153,15 +153,15 @@
     There are two ways to enter budget values.  The first way is to
     simply click on the cell and enter an amount.</para>
 
-    <para>If you have past transactions recorded in GnuCash, the
-    second way is to let GnuCash estimate the budget values by looking
+    <para>If you have past transactions recorded in &app;, the
+    second way is to let &app; estimate the budget values by looking
     at those transactions.  First, select the accounts you want
-    GnuCash to estimate.  Then click on the 'Estimate' toolbar button.
+    &app; to estimate.  Then click on the 'Estimate' toolbar button.
     In the Estimate Budget Values dialog, select the date past which
-    GnuCash should look for past transactions.  GnuCash will start at
+    &app; should look for past transactions.  &app; will start at
     that date and look forward for the duration of your budget.  For
     example, if you are making an annual budget, and you select
-    Jan. 1, 2005, GnuCash will look at all the transactions in that
+    Jan. 1, 2005, &app; will look at all the transactions in that
     account from Jan. 1, 2005 through Dec. 31, 2005.</para>
   </sect2>
  </sect1>

Modified: gnucash-docs/branches/2.2/guide/C/ch_bus_ap.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_bus_ap.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_bus_ap.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -22,7 +22,7 @@
 
   <sect1 id="bus-ap-setup1">
   <title>Initial Setup</title>
-  <para>To set up GnuCash to handle accounts payable for a company, two preliminary things must be done.  The first is to build an appropriate Account Hierarchy and the second is to register the company in GnuCash.</para>
+  <para>To set up &app; to handle accounts payable for a company, two preliminary things must be done.  The first is to build an appropriate Account Hierarchy and the second is to register the company in &app;.</para>
 
   <sect2 id="bus-ap-setupacct2">
   <title>Account Setup</title>
@@ -30,7 +30,7 @@
       <para>There are many different ways to set up a business account
       hierarchy. You can start with the Business Accounts setup which is
       available from the New Account Hierarchy druid, or you could build one
-      manually. To access the prebuilt Business Accounts, start GnuCash and
+      manually. To access the prebuilt Business Accounts, start &app; and
       click on <guimenu>File</guimenu> -&gt; <guimenu>New File</guimenu> and
       proceed until you see the list of available accounts, select Business
       Accounts.</para>
@@ -40,7 +40,7 @@
       well with your particular situation. It should be close enough that it
       is recommended you begin with it.</para>
 
-      <para>Accounts Payable (or A/P) refers to products or services bought by your company for which payment has not yet been sent.  This is represented on the balance sheet as a liability because you will have to pay for them.  To use GnuCash's integrated accounts payable system, you must first setup an account of the <emphasis>A/Payable</emphasis> type.  The <emphasis>A/Payable</emphasis> account is usually a sub-account under Liabilities.  It is within this account that the integrated A/P system places transactions.</para>
+      <para>Accounts Payable (or A/P) refers to products or services bought by your company for which payment has not yet been sent.  This is represented on the balance sheet as a liability because you will have to pay for them.  To use &app;'s integrated accounts payable system, you must first setup an account of the <emphasis>A/Payable</emphasis> type.  The <emphasis>A/Payable</emphasis> account is usually a sub-account under Liabilities.  It is within this account that the integrated A/P system places transactions.</para>
   <literallayout>
 Basic A/P Account Hierarchy:
 
@@ -59,7 +59,7 @@
   <sect2 id="bus-ap-setupcname2">
   <title>Company Registration</title>
 
-      <para>After you have built the account structure, register the GnuCash
+      <para>After you have built the account structure, register the &app;
       file as belonging to your company. To register your company, select
       <guimenu>File</guimenu> -&gt; <guimenu>Properties</guimenu>:</para>
 
@@ -81,7 +81,7 @@
 
   <sect1 id="bus-ap-components1">
   <title>System Components</title>
-  <para>GnuCash 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 GnuCash 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>&app; 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 &app; 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>
 
   <itemizedlist>
   <listitem>
@@ -195,7 +195,7 @@
       <para>If many vendors match the search criteria you provide, the
       search can be refined by running an additional search within the current
       results. The current result set is searched when the <guilabel>Refine
-      Current Search</guilabel> radio button is selected. In fact, GnuCash
+      Current Search</guilabel> radio button is selected. In fact, &app;
       selects this option for you after you run the initial search.</para>
 
       <para>If the vendor you are searching for does not match the supplied
@@ -215,10 +215,10 @@
 
   <sect1 id="bus-ap-bills1">
   <title>Bills</title>
- <para>A bill is a request for payment you receive from a vendor.  GnuCash can track bills.</para>
+ <para>A bill is a request for payment you receive from a vendor.  &app; 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 GnuCash, 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 &app;, 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>
   <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>
@@ -517,7 +517,7 @@
   <para><guilabel>Transfer Account</guilabel> - the account from which money for the payments comes from, such as a checking account.</para>
   </listitem>
   </itemizedlist>
-    <para>Below is the GnuCash Accounts Receivable payment window.</para>
+    <para>Below is the &app; Accounts Receivable payment window.</para>
   	<screenshot id="bus-ap-payment">
 	  <mediaobject>
 	    <imageobject>

Modified: gnucash-docs/branches/2.2/guide/C/ch_bus_ar.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_bus_ar.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_bus_ar.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -22,7 +22,7 @@
 
     <para>The accounting needs of a business are quite different from that of
     a person. Businesses have customers that owe money, vendors which are owed
-    money, employee payroll, more complex tax laws, etc. GnuCash offers
+    money, employee payroll, more complex tax laws, etc. &app; offers
     business oriented features to facilitate these needs.</para>
 
     <para>Accounts Receivable (A/R) are used by businesses to record sales for
@@ -46,10 +46,10 @@
   <sect1 id="bus-ar-setup1">
     <title>Initial Setup</title>
 
-    <para>To set up GnuCash to handle accounts receivable for a company two
+    <para>To set up &app; to handle accounts receivable for a company two
     preliminary things must be done. The first is to build an appropriate
     Account Hierarchy and the second is to register the company in
-    GnuCash.</para>
+    &app;.</para>
 
     <sect2 id="bus-ar-setupacct2">
       <title>Account Setup</title>
@@ -57,7 +57,7 @@
       <para>There are many different ways to set up a business account
       hierarchy. You can start with the Business Accounts setup which is
       available from the New Account Hierarchy druid, or you could build one
-      manually. To access the prebuilt Business Accounts, start GnuCash and
+      manually. To access the prebuilt Business Accounts, start &app; and
       click on <guimenu>File</guimenu> -&gt; <guimenu>New File</guimenu> and
       proceed until you see the list of available accounts, select Business
       Accounts.</para>
@@ -70,7 +70,7 @@
       <para>Accounts Receivable (or A/R) refers to products or services
       provided by the company on credit for which payment has not yet been
       received. This is represented on the balance sheet as an asset, because
-      you expect to receive payment soon. To use GnuCash's integrated accounts
+      you expect to receive payment soon. To use &app;'s integrated accounts
       receivable system, you must first set up an account (usually a
       sub-account under Assets) defined with account type
       <emphasis>A/Receivable</emphasis>. It is within this account that the
@@ -94,7 +94,7 @@
 
       <note>
         <para>You do not need to create an individual A/R account for each
-        customer. GnuCash keeps track of customers internally and provides
+        customer. &app; keeps track of customers internally and provides
         per-customer reports based on the internal tracking.</para>
       </note>
     </sect2>
@@ -102,7 +102,7 @@
     <sect2 id="bus-ar-setupcname2">
       <title>Company Registration</title>
 
-      <para>After you have built the account structure, register the GnuCash
+      <para>After you have built the account structure, register the &app;
       file as belonging to your company. To register your company, select
       <guimenu>File</guimenu> -&gt; <guimenu>Properties</guimenu>:</para>
 
@@ -129,10 +129,10 @@
   <sect1 id="bus-ar-components1">
     <title>System Components</title>
 
-    <para>GnuCash has an integrated accounts receivable system. The
+    <para>&app; has an integrated accounts receivable system. The
     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 GnuCash A/R application
+    You generally work with the four integrated &app; A/R application
     components available through the <guimenu>Business</guimenu> -&gt;
     <guimenu>Customer</guimenu> sub-menu. These four components are:</para>
 
@@ -225,7 +225,7 @@
         <listitem>
           <para><guilabel>Billing Information - Credit Limit</guilabel> -
           stores the maximum credit you are willing to extend to the customer.
-          This field is for your reference purposes only. GnuCash does not use
+          This field is for your reference purposes only. &app; does not use
           the value.</para>
         </listitem>
 
@@ -264,7 +264,7 @@
         <listitem>
           <para><guilabel>Shipping Address</guilabel> - records the customer's
           shipping address if it is different from the billing address. The
-          shipping address is for your reference. GnuCash does not use the
+          shipping address is for your reference. &app; does not use the
           value.</para>
         </listitem>
       </itemizedlist>
@@ -316,7 +316,7 @@
       <para>If many customers match the search criteria you provide, the
       search can be refined by running an additional search within the current
       results. The current result set is searched when the <guilabel>Refine
-      Current Search</guilabel> radio button is selected. In fact, GnuCash
+      Current Search</guilabel> radio button is selected. In fact, &app;
       selects this option for you after you run the initial search.</para>
 
       <para>If the customer you are searching for does not match the supplied
@@ -342,7 +342,7 @@
     <title>Invoices</title>
 
     <para>An invoice is the paperwork you send to a customer to request
-    payment for products or services rendered. GnuCash can generate and track
+    payment for products or services rendered. &app; can generate and track
     invoices.</para>
 
     <sect2 id="bus-ar-invoicenew2">
@@ -687,7 +687,7 @@
         <guilabel>Unpost</guilabel> it.</para>
       </note>
 
-      <para>One of the design goals in GnuCash's Account Receivable system was
+      <para>One of the design goals in &app;'s Account Receivable system was
       to allow different processes to get to the same state, so you can reach
       an invoice from different directions based on the way you think about
       the problem:</para>
@@ -716,7 +716,7 @@
       customer. To print an invoice use <guimenu>File</guimenu> -&gt;
       <guimenu>Print Invoice</guimenu> menu item.</para>
 
-      <para>An example of the default GnuCash invoice print output is shown
+      <para>An example of the default &app; invoice print output is shown
       below.</para>
 
       <screenshot id="bus-ar-invoiceprint">
@@ -777,7 +777,7 @@
       <title>Assign Starting Invoice Number</title>
 
       <para>There is no easy way to assign an automatic starting invoice
-      number. GnuCash starts with number 1 and increments from there. You can
+      number. &app; starts with number 1 and increments from there. You can
       manually type an invoice number into the text box each time you create
       an invoice, but this gets tiring and sooner or later leads to duplicate
       numbers.</para>
@@ -789,7 +789,7 @@
       editing.</para>
 
       <note>
-        <para>GnuCash optionally compresses files. Disable compression and
+        <para>&app; 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
         the <guilabel>General</guilabel> tab, and select or deselect the
@@ -928,7 +928,7 @@
       </listitem>
     </itemizedlist>
 
-    <para>Below is the GnuCash Accounts Receivable payment window.</para>
+    <para>Below is the &app; Accounts Receivable payment window.</para>
 
     <screenshot id="bus-ar-payment">
       <mediaobject>

Modified: gnucash-docs/branches/2.2/guide/C/ch_bus_pay.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_bus_pay.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_bus_pay.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -13,13 +13,13 @@
 -->
  <chapter id="chapter_bus_pay">
  <title>Payroll</title>
- <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee.  This chapter demonstrates how to track payroll using GnuCash</para>
+ <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee.  This chapter demonstrates how to track payroll using &app;</para>
  <sect1 id="bus-pay-concepts1">
  <title>Basic Concepts</title>
   <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee.  Basically, anything that relates to giving money or benefits to an employee.  Payroll is one of the more complex tasks in accounting, because there are many different accounts, people, and agencies involved in paying salaries.</para>
   <para>Payroll is typically accounted for as an expense.  Sometimes accountants "store" some payroll expenses in a short term liability account.  This is useful for things such as payroll taxes, which may be paid at a different time than the employee.  The employee might get paid biweekly, while taxes are paid quarterly.  This chapter presents a methodology which expenses payroll immediately for salaries, but stores taxes in liability accounts.</para>
   <note>
-  <para>GnuCash does not have an integrated payroll system.  While you can track payroll expenses in GnuCash, the calculation of taxes and deductions has to be done outside of GnuCash.</para>
+  <para>&app; does not have an integrated payroll system.  While you can track payroll expenses in &app;, the calculation of taxes and deductions has to be done outside of &app;.</para>
   </note>
   </sect1>
 
@@ -53,7 +53,7 @@
 
  <sect1 id="bus-pay-protocol1">
  <title>Protocol</title>
-  <para>GnuCash does not have an integrated payroll system.  GnuCash can track your payroll expenses, but you need to develop a payroll protocol and perform the calculations outside of GnuCash, in a spreadsheet for example.  In this section, one such protocol is presented. You can use the sample protocol as a model.</para>
+  <para>&app; does not have an integrated payroll system.  &app; can track your payroll expenses, but you need to develop a payroll protocol and perform the calculations outside of &app;, in a spreadsheet for example.  In this section, one such protocol is presented. You can use the sample protocol as a model.</para>
 
   <sect2 id="bus-pay-protocolone2">
   <title>Step 1: Deductions list</title>
@@ -86,8 +86,8 @@
 
   <sect2 id="bus-pay-protocoltwo2">
   <title>Step 2: Create the Transaction Map</title>
-  <para>When you record payroll in GnuCash, do so with a single split transaction.  This split transaction populates the appropriate expense and liability accounts.  If you need to look the payroll details at a later time, open the split transaction.</para>
-  <para>With the deductions list from above, an employee split transaction map can be generated.  Each of the items in the list is mapped to a GnuCash account.</para>
+  <para>When you record payroll in &app;, do so with a single split transaction.  This split transaction populates the appropriate expense and liability accounts.  If you need to look the payroll details at a later time, open the split transaction.</para>
+  <para>With the deductions list from above, an employee split transaction map can be generated.  Each of the items in the list is mapped to a &app; account.</para>
 
   <para>
   <table>
@@ -136,7 +136,7 @@
   <para>Go to the account from which the employee will be paid, for example your Assets:Checking account. Open a split transaction and enter the real values using the Transaction Map above as a guide.  Repeat this for all employees.</para>
   <tip>
   <para>This manual process is tedious, especially if you have a large number of employees.</para>
-  <para>One GnuCash tool you certainly want use when entering employee payroll is duplicate transaction (use the <guibutton>Duplicate</guibutton> tool bar button).  This saves you from having to enter all the transaction splits for each employee.  You still need to change the amounts of money to match each employee's real payroll values, but you will not have to build the split for each employee.</para>
+  <para>One &app; tool you certainly want use when entering employee payroll is duplicate transaction (use the <guibutton>Duplicate</guibutton> tool bar button).  This saves you from having to enter all the transaction splits for each employee.  You still need to change the amounts of money to match each employee's real payroll values, but you will not have to build the split for each employee.</para>
   <para>If payroll transactions do not change significantly every pay period, you can also use the duplicate transaction feature to duplicate each employee's most recent payroll transaction for the current pay period.  If you find you are doing so all the time, read about the Schedule Transactions feature and save even more time!</para>
   </tip>
   </sect2>
@@ -253,7 +253,7 @@
         </screenshot>
 
   <tip>
-  <para>When paying employees, enter only the employee name in the Description area.  If you decide to use GnuCash's check printing capabilities, the check is automatically made out to the correct employee.  If you want to record other information in the transaction besides the employee name, use the Notes area, available when viewing the Register in double-line mode.</para>
+  <para>When paying employees, enter only the employee name in the Description area.  If you decide to use &app;'s check printing capabilities, the check is automatically made out to the correct employee.  If you want to record other information in the transaction besides the employee name, use the Notes area, available when viewing the Register in double-line mode.</para>
   </tip>
   <para>Repeat this for the second employee, which leaves the account hierarchy looking like this:</para>
 

Modified: gnucash-docs/branches/2.2/guide/C/ch_capgain.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_capgain.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_capgain.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -60,7 +60,7 @@
 
     <para>As mentioned in the introduction to this chapter, capital gains are
     the profits received from the sale of an asset. This section will describe
-    how to record capital gains in GnuCash.</para>
+    how to record capital gains in &app;.</para>
 
     <para>The accounting methods for handling asset appreciation differs
     somewhat from depreciation because typically you are only concerned with
@@ -119,7 +119,7 @@
     ways to setup capital gains accounts. We will present here a general
     method which should be flexible enough to handle most situations. The
     first account you will need is an <emphasis>Asset Cost</emphasis> account
-    (GnuCash account type "asset"), which is simply a place where you record
+    (&app; account type "asset"), which is simply a place where you record
     the original purchase of the asset. Usually this purchase is accomplished
     by a transaction from your bank account.</para>
 

Modified: gnucash-docs/branches/2.2/guide/C/ch_cbook.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_cbook.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_cbook.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -15,20 +15,20 @@
   <title>Checkbook</title>
 
   <para>This chapter will give you all the specific information you need to
-  manage your checkbook with GnuCash. Managing your checkbook register is the
-  first step of tracking your finances, and GnuCash makes it much easier to
+  manage your checkbook with &app;. Managing your checkbook register is the
+  first step of tracking your finances, and &app; makes it much easier to
   manage than the traditional paper register does.</para>
 
   <para>For one thing, as discussed in <xref linkend="chapter_txns"></xref>, 
   data entry of common
-  transactions is practically done for you in GnuCash, because of its
-  auto-completion feature. GnuCash keeps a running balance of each account,
+  transactions is practically done for you in &app;, because of its
+  auto-completion feature. &app; keeps a running balance of each account,
   and it makes reconciling these accounts easy. And the double-entry method
   helps you account for your spending by requiring a transfer account for
   withdrawals, so you can easily find out how much money you spend in
   different areas.</para>
 
-  <para>Once you are comfortable with using GnuCash for your checking and
+  <para>Once you are comfortable with using &app; for your checking and
   other bank accounts, you may wish to continue on with tracking other
   financial accounts. Chapters 6 through 9 examine methods to manage your
   other accounts.</para>
@@ -37,15 +37,15 @@
     <title>Setting up Accounts</title>
 
     <para>The first step in managing your checkbook is to set up the necessary
-    accounts. You can either use the default GnuCash accounts or set up your
+    accounts. You can either use the default &app; accounts or set up your
     own. For more detail on how to set up a new account, refer to 
     <xref linkend="accts-examples-toplevel2"></xref>.
     For instructions on importing your accounts from another program, refer to
     <xref linkend="basics-import1"></xref>.</para>
 
-    <para>Let's start with the bank accounts you'll need. You need one GnuCash
+    <para>Let's start with the bank accounts you'll need. You need one &app;
     bank type account for each physical bank account you wish to track. If you
-    are setting up your own accounts or using the default GnuCash accounts,
+    are setting up your own accounts or using the default &app; accounts,
     make sure that you have an opening balance transaction for each bank
     account you own. The easiest way to get this number is to use the balance
     from your last bank statement as your opening balance. You can enter this
@@ -104,10 +104,10 @@
     <para>Before you start entering paycheck deposits, decide how much detail
     you want to track. The basic level of detail is to enter your net pay,
     just like you would in your paper register. This is easiest, but you can
-    get even more information out of GnuCash if you enter your gross pay with
+    get even more information out of &app; if you enter your gross pay with
     deductions. It takes a bit more effort to enter the deductions, but
     entering your tax withholding information throughout the year allows you
-    to run useful tax status reports in GnuCash at any time. These reports can
+    to run useful tax status reports in &app; at any time. These reports can
     help you determine whether you are withholding enough tax, and they can
     help you estimate your tax bill ahead of time. If you are unsure about the
     level of detail, start by entering net pay. You can always go back and
@@ -119,7 +119,7 @@
 
     <para>When you withdraw money from your bank account, for whatever reason,
     you are transferring money from your bank account to some other location.
-    In GnuCash, this other location is tracked as an account. The more
+    In &app;, this other location is tracked as an account. The more
     detailed accounts you create and use for your spending, the more
     information you will get about where your money goes.</para>
 
@@ -129,13 +129,13 @@
     you might also have service charges, where the bank withdraws the money
     from your account. Transfers of money out to another account are also
     withdrawals. We will take a look at each of these types of withdrawals and
-    how to record them in GnuCash.</para>
+    how to record them in &app;.</para>
 
     <sect2 id="cbook-atm2">
       <title>ATM/Cash Withdrawals</title>
 
       <para>Cash withdrawals are handled as a transfer from a bank account to
-      a cash account. GnuCash provides special <emphasis>Cash</emphasis> type
+      a cash account. &app; provides special <emphasis>Cash</emphasis> type
       accounts for tracking your cash purchases, so you should set up a cash
       account to record your ATM and other cash withdrawals.</para>
 
@@ -163,7 +163,7 @@
   <sect1 id="cbook-reconacct1">
     <title>Reconciling Your Accounts</title>
 
-    <para>GnuCash makes reconciliation of your bank account with your monthly
+    <para>&app; makes reconciliation of your bank account with your monthly
     bank statement much easier. <xref linkend="txns-reconcile1"></xref> 
     gives instructions on how to
     reconcile your transactions with the monthly bank statement. This is the
@@ -175,7 +175,7 @@
     account statement, the savings account statement, and the credit card
     statement. Credit card statements and credit card transactions are covered
     in the <xref linkend="chapter_cc"></xref>, so if you are interested in 
-    tracking your credit cards in GnuCash, take a look at the instructions 
+    tracking your credit cards in &app;, take a look at the instructions 
     provided there.</para>
 
     <para>Income and expense accounts are usually not reconciled, because
@@ -549,8 +549,8 @@
 
       <para>Notice that you have not yet used one of the accounts listed in your
         chart, the <guilabel>Credit Card</guilabel> account. Now that you know how
-        to keep track of your bank and cash accounts in GnuCash, you may want to
-        start tracking your credit cards as well. GnuCash provides a special type
+        to keep track of your bank and cash accounts in &app;, you may want to
+        start tracking your credit cards as well. &app; provides a special type
         of account for credit cards, and this is discussed in the next
         chapter.
       </para>

Modified: gnucash-docs/branches/2.2/guide/C/ch_cc.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_cc.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_cc.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -15,7 +15,7 @@
   <title>Credit Cards</title>
 
   <para>This chapter will show you how to manage your credit cards using
-  GnuCash.</para>
+  &app;.</para>
 
   <sect1 id="cc-concepts1">
     <title>Concepts</title>
@@ -37,7 +37,7 @@
     any information about your credit card balance or credit card
     purchases.</para>
 
-    <para>A more complete way to track your credit card in GnuCash is to enter
+    <para>A more complete way to track your credit card in &app; is to enter
     each purchase and payment as a separate transaction. Using the credit card
     account register, you enter your receipts throughout the month. When your
     credit card statement arrives, you reconcile the credit card account to
@@ -51,7 +51,7 @@
   <sect1 id="cc-accounts1">
     <title>Setting Up Accounts</title>
 
-    <para>To begin managing your credit cards in GnuCash, you should set up a
+    <para>To begin managing your credit cards in &app;, you should set up a
     "Liability" top level account and under this parent account create credit
     card type accounts for each credit card you use. If you are tracking only
     the payments you make to the credit card company, then all you need is a
@@ -213,7 +213,7 @@
 
         <note>
           <para>Since we had not created the Expense:Clothes account
-          previously, GnuCash will prompt us to create it. Just remember to
+          previously, &app; will prompt us to create it. Just remember to
           create it as an Expense account</para>
         </note>
       </listitem>
@@ -279,7 +279,7 @@
       </listitem>
 
       <listitem>
-        <para>Save the GnuCash data file.</para>
+        <para>Save the &app; data file.</para>
       </listitem>
     </orderedlist>
   </sect1>
@@ -289,13 +289,13 @@
 
     <para>Now that we have covered the basic ideas behind the various
     transactions you must make to successfully track your credit card in
-    GnuCash, let's go through an example. In this example, we will make credit
+    &app;, let's go through an example. In this example, we will make credit
     card purchases, refund two of the purchases, get charged interest on
     the unpaid balance, reconcile the credit card account, and finally make a
     partial payoff of the credit card.</para>
 
     <sect2 id="cc-puttoget-openfile">
-      <title>Open GnuCash file</title>
+      <title>Open &app; file</title>
 
       <para>Start with opening the previous datafile we stored,
       <filename>gcashdata_5</filename>, and store it as
@@ -362,7 +362,7 @@
       your credit card. Enter a transaction for the credit card refund for the
       full $100 amount. Remember to use the same transfer account you used for
       the original purchase, and enter the amount under the Payment column.
-      GnuCash will automatically complete the name and transfer account for
+      &app; will automatically complete the name and transfer account for
       you, but it will also automatically enter the $100 in the Charge column.
       You will need to reenter the amount in the Payment column. The
       transaction looks like this:</para>
@@ -417,7 +417,7 @@
       <title>Reconciliation</title>
 
       <para>When your credit card bill arrives you should reconcile your
-      credit card account to this document. This is done using GnuCash's
+      credit card account to this document. This is done using &app;'s
       built-in reconciliation application. Highlight the credit card account
       and click on <guimenu>Actions</guimenu> -&gt;
       <guimenu>Reconcile...</guimenu>. This reconciliation procedure is
@@ -447,9 +447,9 @@
 
       <para>During the reconciliation process, you check off each transaction
       in the account as you confirm that the transaction appears in both your
-      GnuCash account and the credit card statement. For this example, as
+      &app; account and the credit card statement. For this example, as
       shown in the figure below, there is a $300 difference between your
-      GnuCash accounts and the credit card statement.</para>
+      &app; accounts and the credit card statement.</para>
 
       <screenshot id="cc-reconcile">
         <mediaobject>
@@ -472,7 +472,7 @@
       <para>Some investigation uncovers that you forgot to record a payment
       you made on March 5th to the credit card company for $300, you
       must enter this payment transaction from your bank account to the credit
-      card. Now the credit card statement and your GnuCash account can be
+      card. Now the credit card statement and your &app; account can be
       reconciled, with a balance of $455.</para>
     </sect2>
 
@@ -517,11 +517,11 @@
           </imageobject>
 
           <textobject>
-            <phrase>GnuCash main window</phrase>
+            <phrase>&app; main window</phrase>
           </textobject>
 
           <caption>
-            <para>GnuCash Chart of Accounts after account reconciliation and
+            <para>&app; Chart of Accounts after account reconciliation and
             payment.</para>
           </caption>
         </mediaobject>
@@ -530,7 +530,7 @@
     
     <sect2 id="cc-puttoget-save">
       <title>Save file</title>
-      <para>Last, save the GnuCash data file (<filename>gcashdata_6</filename>).</para>
+      <para>Last, save the &app; data file (<filename>gcashdata_6</filename>).</para>
     </sect2>
  
     <sect2 id="cc-puttoget-reports">

Modified: gnucash-docs/branches/2.2/guide/C/ch_currency.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_currency.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_currency.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -14,13 +14,13 @@
 <chapter id="chapter_currency">
   <title>Multiple Currencies</title>
 
-  <para>This chapter will show you how to setup your GnuCash accounts to use
+  <para>This chapter will show you how to setup your &app; accounts to use
   multiple currencies.</para>
 
   <sect1 id="currency_concepts1">
     <title>Basic Concepts</title>
 
-    <para>GnuCash supports the use of multiple currencies in different
+    <para>&app; supports the use of multiple currencies in different
     accounts. For example, you can have a bank account setup in Euros, and
     another using Hong Kong Dollars.</para>
 
@@ -41,7 +41,7 @@
 
     <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
-    of currencies supported by GnuCash by simply selecting it from the
+    of currencies supported by &app; by simply selecting it from the
     currency commodity list. You will notice that the default currency is
     always whatever you have defined in the preferences. So, if you mostly
     work with Euros, but have the occasional Ethiopian Birr account, be sure
@@ -113,9 +113,9 @@
   </sect1>
 
   <sect1 id="currency_support1">
-    <title>GnuCash Currency Support</title>
+    <title>&app; Currency Support</title>
 
-    <para>GnuCash supports over a hundred currencies, from the Andorran Franc
+    <para>&app; supports over a hundred currencies, from the Andorran Franc
     to the Zimbabwe Dollar. You will also find supports for some lesser
     popular currencies like the US Dollar, Canadian Dollar, European Euro, and
     British Pound.</para>
@@ -124,7 +124,7 @@
   <sect1 id="currency_prefs1">
     <title>Setting International Preferences</title>
 
-    <para>GnuCash allows you to specify the following international related
+    <para>&app; allows you to specify the following international related
     preferences</para>
 
     <itemizedlist>
@@ -153,7 +153,7 @@
   <sect1 id="currency_howto1">
     <title>Recording/Updating Currency Exchange (How-To)</title>
 
-    <para>GnuCash allows you to update the Currency Exchange Rates in two
+    <para>&app; allows you to update the Currency Exchange Rates in two
     different ways, manual and automatic. In the following two sections we
     will work through both ways.</para>
 
@@ -271,8 +271,8 @@
         </mediaobject>
       </screenshot>
 
-      <para>Observe that since you have no exchange rate for HKD, GnuCash do
-      not convert the HKD accounts to USD. This will be added in the next
+      <para>Observe that since you have no exchange rate for HKD, &app;
+      doesn't convert the HKD accounts to USD. This will be added in the next
       section.</para>
     </sect2>
 
@@ -328,14 +328,14 @@
           </mediaobject>
         </screenshot></para>
 
-      <para>You noticed that GnuCash will download exchange rates for all
-      currencies you are using in your various accounts. This will happend
-      everytime you click on <guibutton>Get Quotes</guibutton> or have GnuCash
+      <para>You can observe that &app; will download exchange rates for all
+      currencies you are using in your various accounts. This will happen
+      every time you click on <guibutton>Get Quotes</guibutton> or have &app;
       downloading quotes/exchange rates automatically as per <xref
       linkend="invest-stockprice-auto2" /></para>
 
-      <para>And if you check the main Chart of Accounts you now see that
-      GnuCash has automatically converted the HKD amount to USD amount on the
+      <para>And if you check the main Chart of Accounts you will see that
+      &app; has automatically converted the HKD amount to USD amount on the
       parent accounts that are in USD, as well as on the Total (USD) column.
       Also the Euro accounts have been been updated with the latest exchange
       rate.</para>
@@ -360,7 +360,7 @@
       <title>Disabling Exchange Rate Retrieval</title>
       <para>Whenever you create an account that uses a non-default currency,
       exchange rate retrieval will be automatically enabled for that currency.
-      However, if you later delete that account, GnuCash will not automatically
+      However, if you later delete that account, &app; will not automatically
       disable exchange rate retrieval for that currency.</para>
       <para>If you have deleted the last account for a particular currency, and
       you do not wish to retrieve exchange rates for that currency anymore, do
@@ -396,7 +396,7 @@
 
     <para>You can do it in two different ways.</para>
 
-    <para>1) Use GnuCash build in currency exchange between accounts when you
+    <para>1) Use &app; build in currency exchange between accounts when you
     do your transactions. This is mainly used for one time transactions, and
     nothing which happens regurarly.</para>
 
@@ -419,7 +419,7 @@
       money from US, and then purchased your dream boat (smallest
       version)</para>
 
-      <para>To record this in GnuCash we use the following basic account
+      <para>To record this in &app; we use the following basic account
       structure</para>
 
       <literallayout>
@@ -497,7 +497,7 @@
       </screenshot>
 
       <para>You find the boat, and since it's a bargain at JMD 509,000 you
-      decide to buy it. To record this transaction in GnuCash, you will need
+      decide to buy it. To record this transaction in &app;, you will need
       to enter a simple transaction in Assets:Current Assets:Jamaican Bank
       withdrawing 509,000 and transfering it to Assets:Fixed
       Assets:Boat</para>
@@ -522,7 +522,7 @@
       boat account has been increased with the same amount. If you also have turned
       on the CoA (Column Choice) "Total (USD)" you will see the corresponding
       value in USD. The USD value will always reflect the latest currency exchange
-      rate you have either automatically or manually updated GnuCash with.
+      rate you have either automatically or manually updated &app; with.
       </para>
     </sect2>
 
@@ -666,7 +666,7 @@
       </screenshot>
 
       <para>However, as you can see, the USD totals may be zero if
-      GnuCash doesn't have an exchange rate between USD and HKD.
+      &app; doesn't have an exchange rate between USD and HKD.
       To fix this, go to
       <guimenu>Tools</guimenu> -&gt; <guimenu>Price Editor</guimenu>
       and click the <guibutton>Get Quotes</guibutton> button to
@@ -696,7 +696,7 @@
     countries currency, and hope that their currency will raise in value
     relative your own currency.</para>
 
-    <para>When you enter these transactions into GnuCash, you will have to
+    <para>When you enter these transactions into &app;, you will have to
     decide on how much details you would like to have.</para>
 
     <para>If you are not interested in details at all, a very simple account
@@ -721,7 +721,7 @@
     <note><para>
        There is currently (30 April 2006) a small bug ( 
        <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=340041"><citetitle>340041</citetitle>
-       </ulink>) in GnuCash, that makes it impossible to track currency investments 
+       </ulink>) in &app;, that makes it impossible to track currency investments 
        capital gains. 
     </para></note>
 
@@ -858,7 +858,7 @@
           <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=340041"><citetitle>340041</citetitle>
           </ulink>
 
-           ) in GnuCash, that makes it impossible to track currency investments capital gains. 
+           ) in &app;, that makes it impossible to track currency investments capital gains. 
       </para></note>
     </sect2>
   </sect1>
@@ -948,7 +948,7 @@
       <note>
         <para>Again these samples are not to be consider a valid and
           accurate advice. They are only to be considered as an sample for
-          the techniques used in GnuCash, and not as a Invenstment Advice.
+          the techniques used in &app;, and not as a Investment Advice.
           Please consult a proper financial advisor for more information
           regarding international investments/loans.</para>
         </note>
@@ -959,7 +959,7 @@
     <sect2>
       <title>Configure Accounts</title>
 
-      <para>This time let's start with a fresh and new GnuCash data file, so
+      <para>This time let's start with a fresh and new &app; data file, so
       <guimenu>File</guimenu> -&gt; <guimenuitem>New</guimenuitem>, and edit
       preferences (<guimenu>Edit</guimenu> -&gt; <guimenuitem>Preferences</guimenuitem>) 
       to set Default Currency as AUD. Since you have
@@ -1287,7 +1287,7 @@
         </mediaobject>
       </screenshot>
 
-      <para>Next section will ensure you get the various exchange rates so GnuCash can show your
+      <para>Next section will ensure you get the various exchange rates so &app; can show your
       total worth in the local currency (AUD in this case)</para>
     </sect2>
 

Modified: gnucash-docs/branches/2.2/guide/C/ch_dep.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_dep.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_dep.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -447,18 +447,18 @@
     ways to setup depreciation accounts. We will present here a general method
     which should be flexible enough to handle most situations. The first
     account you will need is an <emphasis>Asset Cost</emphasis> account
-    (GnuCash account type "asset"), which is simply a place where you record
+    (&app; account type "asset"), which is simply a place where you record
     the original purchase of the asset. Usually this purchase is accomplished
     by a transaction from your bank account.</para>
 
     <para>In order to keep track of the depreciation of the asset, you will
     need two depreciation accounts. The first is an <emphasis>Accumulated
     Depreciation</emphasis> account in which to collect the sum of all of the
-    depreciation amounts, and will contain negative values. In GnuCash, this
+    depreciation amounts, and will contain negative values. In &app;, this
     is an account type <emphasis>asset</emphasis>. The Accumulated
     Depreciation account is balanced by a <emphasis>Depreciation
     Expense</emphasis> account, in which all periodic depreciation expenses
-    are recorded. In GnuCash, this is an account type
+    are recorded. In &app;, this is an account type
     <emphasis>expense</emphasis>.</para>
 
     <para>Below is a generic account hierarchy for tracking the depreciation
@@ -500,7 +500,7 @@
     a way that works best for you.</para>
 
     <para>The actual input of the depreciation amounts is done by hand every
-    accounting period. There is no way in GnuCash (as of yet) to perform the
+    accounting period. There is no way in &app; (as of yet) to perform the
     depreciation scheme calculations automatically, or to input the values
     automatically into the appropriate accounts. However, since an accounting
     period is typically one year, this really is not much work to do by

Modified: gnucash-docs/branches/2.2/guide/C/ch_invest.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_invest.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_invest.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -15,10 +15,10 @@
 <chapter id="chapter_invest">
   <title>Investments</title>
 
-  <para>This chapter explains how to manage your investments with GnuCash.
+  <para>This chapter explains how to manage your investments with &app;.
   Most people have an investment plan, whether its just putting money into a
   CD account, investing through a company sponsored plan at your workplace or
-  buying and selling stocks and bonds through a brokerage. GnuCash gives you
+  buying and selling stocks and bonds through a brokerage. &app; gives you
   tools to help you manage these investments such as the <emphasis>Price
   Editor </emphasis> which allows you to record changes in the prices of
   stocks you own.</para>
@@ -32,7 +32,7 @@
     investments: the house you live in, a valuable painting, stocks in
     publicly traded companies, your savings account at the bank, or a
     certificate of deposit. These many types of investments will be discussed
-    in this chapter in terms of how to track them using GnuCash.</para>
+    in this chapter in terms of how to track them using &app;.</para>
 
     <sect2 id="invest_terms2">
       <title>Terminology</title>
@@ -234,7 +234,7 @@
   <sect1 id="invest_accounts1">
     <title>Setting Up Accounts</title>
 
-    <para>To setup investment accounts in GnuCash you can either use the
+    <para>To setup investment accounts in &app; you can either use the
     predefined investment account hierarchy or create your own. The minimum
     you need to do to track investments is to setup an asset account for each
     type of investment you own. However, as we have seen in previous chapters,
@@ -252,7 +252,7 @@
       <title>Predefined Accounts</title>
 
       <para>To use the predefined investment account hierarchy, you
-      <emphasis>must</emphasis> create a new GnuCash file. This will run the
+      <emphasis>must</emphasis> create a new &app; file. This will run the
       <guilabel>New Account Hierarchy Setup</guilabel> druid. After choosing
       the default currency to use, you will be asked to <guilabel>Choose
       accounts to create</guilabel>. At this point, choose the "Investment
@@ -288,11 +288,11 @@
 
       <para>You can also manually setup your own investment account hierarchy.
       The following is a somewhat more complicated example of setting up
-      GnuCash to track your investments, which has the advantage that it
+      &app; to track your investments, which has the advantage that it
       groups each different investment under the brokerage that deals with the
       investments. This way it is easier to compare the statements you get
-      from your brokerage with the accounts you have in GnuCash and spot where
-      GnuCash differs from the statement. <literallayout>
+      from your brokerage with the accounts you have in &app; and spot where
+      &app; differs from the statement. <literallayout>
  Assets
     Investments
        Brokerage Accounts
@@ -357,7 +357,7 @@
     bearing investments include your bank account, a certificate of deposit,
     or any other kind of investment in which you receive interest from the
     principal. This section will describe how to handle these kinds of
-    investments in GnuCash.</para>
+    investments in &app;.</para>
 
     <sect2 id="invest_intacct2">
       <title>Account Setup</title>
@@ -436,7 +436,7 @@
         </mediaobject>
       </screenshot>
 
-      <para>And this is the main GnuCash window:</para>
+      <para>And this is the main &app; window:</para>
 
       <screenshot id="invest-int3">
         <mediaobject>
@@ -454,7 +454,7 @@
         </mediaobject>
       </screenshot>
 
-      <para>From the above image of the main GnuCash account window you see a
+      <para>From the above image of the main &app; account window you see a
       nice summary of what happened to these investments over the 6 months.
       While the yield on the CD is double that of the savings account, the
       return on the CD was $50.21 versus $13.03 for the savings account, or
@@ -474,7 +474,7 @@
     <para>Now that you have built an account hierarchy in the previous
     section, this section will show you how to create and populate the accounts with your
     investment portfolio. After this initial setup of your portfolio, you may have
-    shares of stock purchased from before you started using GnuCash. For these stocks,
+    shares of stock purchased from before you started using &app;. For these stocks,
     follow the instructions in the <link linkend="invest-buy-stock2"><emphasis>Entering
     Preexisting Shares</emphasis></link> section below. If your have just purchased your stocks,
     then use the <link linkend="invest-buy-new2"><emphasis>Buying New Shares</emphasis>
@@ -484,7 +484,7 @@
       <title>Setup Accounts for Stocks and Mutual Funds</title>
 
       <para>This section will show you how to add stocks and mutual fund
-      accounts to GnuCash. In this section, we will assume you are using the
+      accounts to &app;. In this section, we will assume you are using the
       basic account setup introduced in the previous section, but
       the principles can be applied to any account hierarchy.</para>
 
@@ -901,7 +901,7 @@
           usually give their quotes as one of bid, ask or last. Mutual funds
           are often given as net asset value. For other commodities, simply
           choose "Unknown". This option is for informational purposes only, it
-          is not used by GnuCash.</para>
+          is not used by &app;.</para>
         </listitem>
 
         <listitem>
@@ -963,7 +963,7 @@
       <title>Configuring for Automatic Retrieval of Quotes</title>
 
       <para>If you have more than a couple of commodities, you will tire of
-      having to update their prices constantly. GnuCash has the ability to
+      having to update their prices constantly. &app; has the ability to
       automatically download the most recent price for your commodities using
       the Internet. This is accomplished through the Perl module
       Finance::Quote, which must be installed in order to activate this
@@ -979,8 +979,8 @@
       <sect3 id="invest-stockprice-auto-install3">
         <title>Installing Finance::Quote</title>
 
-        <para>To install Finance::Quote begin by first closing any GnuCash
-        applications you have running. Second, locate the folder where GnuCash
+        <para>To install Finance::Quote begin by first closing any &app;
+        applications you have running. Second, locate the folder where &app;
         is installed by searching for <quote>gnc-fq-update</quote> (without the quotes).
         Change to that directory, open a root shell and run the command
         <quote>gnc-fq-update</quote> (without the quotation marks). This will
@@ -992,13 +992,13 @@
         continue automatically from that point.</para>
 
         <para>After installation is complete, you should run the <quote>gnc-fq-dump</quote>
-        test program, in the same directory, distributed with GnuCash to test
+        test program, in the same directory, distributed with &app; to test
         if Finance::Quote is installed and working properly.</para>
 
         <note>
           <para>If you feel uncomfortable about performing any of these steps,
-          please either email the GnuCash-user mailing list
-          (<email>gnucash-user at gnucash.org</email>) for help or come to the GnuCash IRC
+          please either email the &app;-user mailing list
+          (<email>gnucash-user at gnucash.org</email>) for help or come to the &app; IRC
           channel on irc.gnome.org. You can also leave out this step and
           manually update your stock prices.</para>
         </note>
@@ -1008,7 +1008,7 @@
         <title>Configuring Securities for Online Quotes</title>
 
         <para>With Finance::Quote installed and functioning correctly, you
-        must configure your GnuCash securities to use this feature to
+        must configure your &app; 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
         security and check the <guilabel>Get Online Quotes</guilabel> box. You will
@@ -1022,7 +1022,7 @@
         can be used to fetch the current prices of your stocks.  The file specified
         <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 GnuCash window,
+        This can be determined by the name displayed in the top frame of the &app; 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
         open file.</para>
@@ -1078,7 +1078,7 @@
     <sect2 id="invest-stockprice-report">
       <title>Selecting "Price Source" in Stock Value Reports</title>
 
-      <para>Most GnuCash Asset reports have options to set/modify a number of parameters for the report.  The
+      <para>Most &app; 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
        resulting window contains various parameters for the report.  One of these is "Price Source" which of offers
@@ -1476,7 +1476,7 @@
 
       <para>Note: You may either enter the loss as a positive number in the
       <quote>buy</quote> column or as a negative number in the <quote>sell</quote>
-      column, GnuCash will move the <quote>negative profit</quote> to the other column.</para>
+      column, &app; will move the <quote>negative profit</quote> to the other column.</para>
 
       <screenshot id="invest-sellstockLoss">
         <mediaobject>
@@ -1572,7 +1572,7 @@
       </para>
 
       <para>Starting with the purchase of 100 shares on Jan. 3, 2005, all dividends will be
-      reinvested and an account is created to track the dividend to the specific stock.  GnuCash
+      reinvested and an account is created to track the dividend to the specific stock.  &app;
       simplifies the entry by allowing calculations within the cells of the transaction.  If the
       first dividend is $.29/share, enter $53.38 in the share price and 100*.29 in the Buy cell.
       </para>
@@ -1824,7 +1824,7 @@
           <para><guilabel>Shares</guilabel> -  The number of shares increased (or decreased)
           in the transaction.</para>
           <para>In our example it is a .77942 for 1 split so the number of shares will
-          decrease from the number of shares currently in the register.  You may use GnuCash's
+          decrease from the number of shares currently in the register.  You may use &app;'s
           ability to preform calculations on an entry form by entering data directly
           (E.g. <quote>(.77942*100)-100</quote>) to calculate the decrease in shares
           from the split.</para>

Modified: gnucash-docs/branches/2.2/guide/C/ch_loans.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_loans.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_loans.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -14,7 +14,7 @@
 <chapter id="chapter_loans">
   <title>Loans</title>
 
-  <para>This chapter explains how to manage your loans with GnuCash.</para>
+  <para>This chapter explains how to manage your loans with &app;.</para>
 
   <sect1 id="loans_concepts1">
     <title>Basic Concepts</title>
@@ -27,7 +27,7 @@
     <sect2 id="loans_conceptsterms2">
       <title>Terminology</title>
 
-      <para>Before discussing tracking loan in GnuCash specifically, it will
+      <para>Before discussing tracking loan in &app; specifically, it will
       be helpful to present a glossary of terminology. The terms presented
       below represent some of the basic concepts found concerning loans. It is
       a good idea to become familiar with these terms, or at least, refer back
@@ -140,7 +140,7 @@
    -Mortgage Adm Fees
   </literallayout>
 
-    <para>GnuCash has a number of predefined loan account hierarchies
+    <para>&app; has a number of predefined loan account hierarchies
     available, including Car Loans and Home Mortgage Loans. To access these
     predefined account structures, click on 
     <menuchoice>
@@ -154,7 +154,7 @@
 
     <para>Determining loan amortization schedules, periodic payment amounts,
     total payment value, or interest rates can be somewhat complex. To help
-    facilitate these kinds of calculations, GnuCash has a built-in Financial
+    facilitate these kinds of calculations, &app; has a built-in Financial
     Calculator. To access the calculator, go to <menuchoice>
         <guimenu>Tools</guimenu>
 
@@ -172,7 +172,7 @@
           <phrase>Financial Calculator</phrase>
         </textobject>
 
-        <caption><para>The GnuCash Financial Calculator.</para></caption>
+        <caption><para>The &app; Financial Calculator.</para></caption>
       </mediaobject>
     </screenshot>
 
@@ -335,7 +335,7 @@
         <para>From this equation, functions which solve for the individual
         variables can be derived. For a detailed explanation of the derivation
         of this equation, see the comments in the file src/calculation/fin.c
-        from the GnuCash source code. The A, B, and C variables are defined
+        from the &app; source code. The A, B, and C variables are defined
         first, to make the later equations simpler to read.</para>
 
         <literallayout>
@@ -568,7 +568,7 @@
 
       <para>You have a number of different options, like paper and pen, 
       Linux Calculator, Open Office's Calc module, but the easiest is to use
-      GnuCash Financial Calculater. This gives you that the Monthly Payment
+      &app; Financial Calculater. This gives you that the Monthly Payment
       should be 115.56$.</para>
 
       <para>But you need to know how much of this is Interest and how much is
@@ -694,7 +694,7 @@
         </listitem>
       </itemizedlist>
 
-      <para>This can be translated to the following GnuCash entry</para>
+      <para>This can be translated to the following &app; entry</para>
 
       <screenshot id="loans_PrivateLoanFirstPayment">
         <mediaobject>
@@ -744,7 +744,7 @@
         </listitem>
       </itemizedlist>
 
-      <para>This can be translated to the following GnuCash entry</para>
+      <para>This can be translated to the following &app; entry</para>
 
       <screenshot id="loans_PrivateLoanSecondPayment">
         <mediaobject>
@@ -849,7 +849,7 @@
   <sect1>
     <title>Selling a house or a car (How-To)</title>
 
-    <para>When you will record the selling of your house in GnuCash you have 
+    <para>When you will record the selling of your house in &app; you have 
     some different options. Here we will go through two of them, one in which 
     you only recorded the purchase amount, and now the selling amount. The other
     where you have followed the ups and downs on the property market and registered

Modified: gnucash-docs/branches/2.2/guide/C/ch_oview.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_oview.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_oview.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -17,20 +17,20 @@
   <sect1 id="oview-intro1">
     <title>Introduction</title>
 
-    <para>GnuCash is the personal finance software package made for you. It is
+    <para>&app; is the personal finance software package made for you. It is
     versatile enough to keep track of all your financial information, from the
     simple to the very complex. It is one of the few financial software
     packages that supports global currencies, and it is the only open-source
-    program of its kind. Best of all, GnuCash is easy to learn and use!</para>
+    program of its kind. Best of all, &app; is easy to learn and use!</para>
 
-    <para>So, what can GnuCash do for you? It can keep track of your personal
+    <para>So, what can &app; do for you? It can keep track of your personal
     finances in as much detail as you prefer. If you are just starting out,
-    use GnuCash to keep track of your checkbook. You may then decide to track
+    use &app; to keep track of your checkbook. You may then decide to track
     cash as well as credit card purchases to better determine where your money
-    is being spent. When you start investing, you can use GnuCash to help
-    monitor your portfolio. Buying a vehicle or a home? GnuCash will help you
+    is being spent. When you start investing, you can use &app; to help
+    monitor your portfolio. Buying a vehicle or a home? &app; will help you
     plan the investment and track loan payments. If your financial records
-    span the globe, GnuCash provides all the multiple-currency support you
+    span the globe, &app; provides all the multiple-currency support you
     need.</para>
 
     <screenshot id="oview-intro">
@@ -41,7 +41,7 @@
         </imageobject>
 
         <textobject>
-          <phrase>GnuCash Chart of Accounts - Teaser</phrase>
+          <phrase>&app; Chart of Accounts - Teaser</phrase>
         </textobject>
 
         <caption>
@@ -50,7 +50,7 @@
       </mediaobject>
     </screenshot>
 
-    <para>While GnuCash is well suited for personal finances, it is also
+    <para>While &app; is well suited for personal finances, it is also
     powerful enough for business use. There are many business features, from
     integrated accounts receivable and payable systems, to tax table
     construction. You will find these and the many other business features
@@ -66,26 +66,26 @@
       <para>Within a matter of minutes you will be able to enter your personal
       finance information and generate color graphs that represent your
       financial status. If you can use the register in the back of your
-      checkbook - you can use GnuCash! Type directly into the register, tab
+      checkbook - you can use &app;! Type directly into the register, tab
       between fields, and use quick-fill to automatically complete
       transactions. The interface is customizable from within the application
       itself.</para>
 
       <itemizedlist>
         <listitem>
-          <para><emphasis>Easy to Use Menus</emphasis>: GnuCash menus conform
+          <para><emphasis>Easy to Use Menus</emphasis>: &app; menus conform
           with the GNOME Human Interface Guidelines. This means that they are
           simple and similar in appearance to many other GNOME
           applications.</para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Documentation</emphasis>: GnuCash has built in Help
+          <para><emphasis>Documentation</emphasis>: &app; has built in Help
           and extensive User Guide documentation.</para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Import Methods</emphasis>: GnuCash supports many
+          <para><emphasis>Import Methods</emphasis>: &app; supports many
           ways to input transactions besides manual entry. If you can access
           your bank accounts on-line, this is especially useful, as most banks
           and credit card companies support one of the following import
@@ -101,14 +101,14 @@
 
             <listitem>
               <para><emphasis>Open Financial Exchange (OFX)</emphasis>:
-              GnuCash is the first free software application to support the
+              &app; is the first free software application to support the
               Open Financial Exchange protocol. Many financial institutions
               are moving towards this format.</para>
             </listitem>
 
             <listitem>
               <para><emphasis>Home Banking Computer Interface
-              (HBCI)</emphasis>: GnuCash is the first free software
+              (HBCI)</emphasis>: &app; is the first free software
               application to support the German Home Banking Computer
               Interface protocol. This protocol includes statement download,
               initiates bank transfers, and makes direct debits
@@ -118,7 +118,7 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Reports</emphasis>: GnuCash comes with over 30
+          <para><emphasis>Reports</emphasis>: &app; comes with over 30
           prebuilt reports, including Account Summary, Income, Expenses,
           Transaction Report, Balance Sheet, Profit&amp;Loss, Portfolio
           Valuation, and many others. Reports support graphical views of the
@@ -128,7 +128,7 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Scheduled Transactions</emphasis>: GnuCash now has
+          <para><emphasis>Scheduled Transactions</emphasis>: &app; now has
           the ability to automatically create and enter transactions, or
           remind you when these transactions are due, giving you the choice of
           entering, postponing or removing the automated transaction.</para>
@@ -141,17 +141,17 @@
 
         <listitem>
           <para><emphasis>Easy Account Reconciliation</emphasis>: Integrated
-          reconciliation makes reconciling your GnuCash accounts with
+          reconciliation makes reconciling your &app; accounts with
           statements simple and effective.</para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Multi-platform Compatibility</emphasis>: GnuCash is
+          <para><emphasis>Multi-platform Compatibility</emphasis>: &app; is
           supported on a variety of platforms and operating systems. The list
-          of fully supported operating systems (and platforms) for GnuCash
+          of fully supported operating systems (and platforms) for &app;
           v2.0.x is: GNU/Linux (x86, Sparc, PPC), FreeBSD (x86), OpenBSD
           (x86), Solaris (Sparc), and MacOS X (PPC). Previous versions of
-          GnuCash have been known to work with, SGI IRIX (MIPS), IBM AIX 4.1.5
+          &app; have been known to work with, SGI IRIX (MIPS), IBM AIX 4.1.5
           (RS/6000), Unixware 7 (Intel), and SCO OpenServer 5.0.4 (Intel), but
           their current status is unknown.</para>
         </listitem>
@@ -161,8 +161,8 @@
     <sect2 id="oview-featuresinvest2">
       <title>Tracks Your Investments</title>
 
-      <para>GnuCash has a number of investment features. From simple
-      certificates of deposit, to publicly traded stocks, GnuCash will track
+      <para>&app; has a number of investment features. From simple
+      certificates of deposit, to publicly traded stocks, &app; will track
       all your investments.</para>
 
       <itemizedlist>
@@ -174,7 +174,7 @@
 
         <listitem>
           <para><emphasis>On-line Stock and Mutual Fund Quotes</emphasis>:
-          With GnuCash, you no longer need look up your stock values one at a
+          With &app;, you no longer need look up your stock values one at a
           time. The process can be automated, to always present you with the
           latest value of your stocks.</para>
         </listitem>
@@ -184,14 +184,14 @@
     <sect2 id="oview-featuresintl2">
       <title>International Support</title>
 
-      <para>GnuCash is truly an application that works with and understands
+      <para>&app; is truly an application that works with and understands
       users from all around the world. There are many built-in features to
       facilitate interaction with the international world we live in
       today.</para>
 
       <itemizedlist>
         <listitem>
-          <para><emphasis>Native Languages</emphasis>: GnuCash has been fully
+          <para><emphasis>Native Languages</emphasis>: &app; has been fully
           translated into 12 languages: Chinese, Czech, Dutch, English,
           French, German, Italian, Portuguese, Russian, Slovak, Spanish and
           Swedish. More than 13 other languages are partially
@@ -206,7 +206,7 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>International Date Handling</emphasis>: GnuCash
+          <para><emphasis>International Date Handling</emphasis>: &app;
           understands that different countries display the date differently.
           You are able to work with the date format you are accustomed
           to.</para>
@@ -214,7 +214,7 @@
 
         <listitem>
           <para><emphasis>On-line exchange rates</emphasis>:
-          With GnuCash, you no longer need look up your exchange rates one at a
+          With &app;, you no longer need look up your exchange rates one at a
           time. The process can be automated, to always present you with the
           account values converted to your preferred currency using the latest 
           exchange rates.</para>
@@ -225,24 +225,24 @@
     <sect2 id="oview-featuresbus2">
       <title>Business Support</title>
 
-      <para>GnuCash has many features to support the needs of the business
+      <para>&app; has many features to support the needs of the business
       accounting community.</para>
 
       <itemizedlist>
         <listitem>
-          <para><emphasis>Accounts Receivable/Payable</emphasis>: GnuCash has
+          <para><emphasis>Accounts Receivable/Payable</emphasis>: &app; has
           an integrated Accounts Receivable and Accounts Payable system. You
           can track Customers, Vendors, Invoicing and Bill Payment, and use
           different Tax and Billing Terms in a small business.</para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Depreciation</emphasis>: GnuCash can track
+          <para><emphasis>Depreciation</emphasis>: &app; can track
           depreciation of capital assets.</para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Reports</emphasis>: GnuCash offers a wide variety of
+          <para><emphasis>Reports</emphasis>: &app; offers a wide variety of
           ready-to-use business reports.</para>
         </listitem>
       </itemizedlist>
@@ -251,7 +251,7 @@
     <sect2 id="oview-featuresaccounting2">
       <title>Accounting Features</title>
 
-      <para>For those knowledgeable in accounting, here is a list of GnuCash's
+      <para>For those knowledgeable in accounting, here is a list of &app;'s
       accounting features.</para>
 
       <itemizedlist>
@@ -300,21 +300,21 @@
           <listitem>
             <para><emphasis>Gnome 2.0 (Gtk2)</emphasis></para>
 
-            <para>GnuCash is now using the latest tool-kits from gtk, and
+            <para>&app; is now using the latest tool-kits from gtk, and
             follows the normal Gnome2 HIG standards.</para>
           </listitem>
 
           <listitem>
             <para><emphasis>UTF-8 support</emphasis></para>
 
-            <para>GnuCash now stores and reads each country's special
+            <para>&app; now stores and reads each country's special
             character sets by using UTF-8.</para>
           </listitem>
 
           <listitem>
             <para><emphasis>Budget</emphasis></para>
 
-            <para>GnuCash now comes with a budget feature that can help you
+            <para>&app; now comes with a budget feature that can help you
             keep your expenses under control.</para>
           </listitem>
 
@@ -323,16 +323,16 @@
 
             <para>Data files with transactions in MT940 format (as can be
             downloaded from some banks) can now be imported into
-            GnuCash.</para>
+            &app;.</para>
           </listitem>
 
           <listitem>
             <para><emphasis>Bug fixes</emphasis></para>
 
-            <para>GnuCash is now more stable and secure than ever before due
+            <para>&app; is now more stable and secure than ever before due
             to the long testing phase before we reached 2.0, as well as using
             more stable and mature libraries (gtk2 for instance). Numerous
-            corrections has been made in every part of GnuCash, and too many
+            corrections has been made in every part of &app;, and too many
             for us to highlight any special area.</para>
           </listitem>
         </itemizedlist></para>
@@ -343,7 +343,7 @@
     <title>About this Book</title>
 
     <para>This manual's goal is to save you time. It will get you started
-    using GnuCash as quickly as possible.</para>
+    using &app; as quickly as possible.</para>
 
     <para>Each chapter follows a simple format. A chapter begins with a
     <quote>Concepts</quote> discussion which introduces general themes and
@@ -377,7 +377,7 @@
       </itemizedlist></para>
 
     <para><emphasis>Getting Started</emphasis> provides you with the most
-    basic information needed to begin using GnuCash. Use this part as a
+    basic information needed to begin using &app;. Use this part as a
     quick-start guide. Its chapters will get you up and running: <itemizedlist>
         <listitem>
            <para><xref linkend="chapter_oview"></xref></para>
@@ -397,9 +397,9 @@
       </itemizedlist></para>
 
     <para><emphasis>Managing Your Personal Finances</emphasis> addresses
-    common applications and features of GnuCash in greater detail. You will
+    common applications and features of &app; in greater detail. You will
     see more specific cases, based on frequently asked questions about
-    applying GnuCash to everyday situations. Here are the applications and
+    applying &app; to everyday situations. Here are the applications and
     features covered in this part: <itemizedlist>
         <listitem>
           <para><xref linkend="chapter_cbook"></xref></para>
@@ -427,7 +427,7 @@
       </itemizedlist></para>
 
     <para><emphasis>Managing Your Business Finances</emphasis> discusses the
-    use of GnuCash in business accounting: <itemizedlist>
+    use of &app; in business accounting: <itemizedlist>
         <listitem>
           <para><xref linkend="chapter_dep"></xref></para>
         </listitem>
@@ -477,17 +477,17 @@
   </sect1>
 
   <sect1 id="oview-reasons1">
-    <title>Top Ten Reasons to Use GnuCash</title>
+    <title>Top Ten Reasons to Use &app;</title>
 
     <para>We've already discussed some of the general advantages of using
-    GnuCash. Here are some specific features offered by GnuCash that may not
+    &app;. Here are some specific features offered by &app; that may not
     exist in other programs.</para>
 
     <orderedlist>
       <listitem>
         <para>Simple user interface</para>
 
-        <para>GnuCash is as easy to use as a checkbook register. It's simpler
+        <para>&app; is as easy to use as a checkbook register. It's simpler
         than a paper register, because auto-completion and other entry
         shortcuts not only do work for you, but reduce data entry
         errors.</para>
@@ -496,26 +496,26 @@
       <listitem>
         <para>Easy import</para>
 
-        <para>GnuCash allows you to import data from on-line bank statements
+        <para>&app; allows you to import data from on-line bank statements
         and software packages using QIF (<trademark
         class="registered">Quicken</trademark> Interchange Format), OFX and
         HBCI files. An easy-to-use <quote>druid</quote> walks you through
         reviewing resulting changes and actually importing them into
-        GnuCash.</para>
+        &app;.</para>
       </listitem>
 
       <listitem>
         <para>Statement reconciliation</para>
 
         <para>Reconcile monthly statements quickly by entering the statement
-        ending balance and checking off transactions. GnuCash helps you catch
+        ending balance and checking off transactions. &app; helps you catch
         any discrepancies between your data and statements you receive.</para>
       </listitem>
 
       <listitem>
         <para>Investment tracking</para>
 
-        <para>GnuCash offers a host of ways to track your investment
+        <para>&app; offers a host of ways to track your investment
         portfolio. Special investment accounts simplify data entry, and
         on-line tools allow you to update prices of your holdings as the
         markets change. Reports complete the picture, allowing you to analyze
@@ -525,9 +525,9 @@
       <listitem>
         <para>Multiple currency support</para>
 
-        <para>GnuCash allows you to track multiple currencies. If you have
+        <para>&app; allows you to track multiple currencies. If you have
         bank accounts, investments or other financial data in different
-        currencies, use GnuCash to monitor them.</para>
+        currencies, use &app; to monitor them.</para>
       </listitem>
 
       <listitem>
@@ -535,7 +535,7 @@
 
         <para>Reports and graphs give you valuable information for filing
         taxes, budgeting, or simply figuring out where your money goes.
-        GnuCash offers a variety of easy-to-use reports and graphs to help
+        &app; offers a variety of easy-to-use reports and graphs to help
         analyze your financial position. It gives you the freedom to customize
         your own reports to suit your unique needs.</para>
       </listitem>
@@ -543,11 +543,11 @@
       <listitem>
         <para>Double entry</para>
 
-        <para>To provide complete records, GnuCash uses the double entry
+        <para>To provide complete records, &app; uses the double entry
         method of bookkeeping. Double entry simply means that money doesn't
         just appear or disappear - an equal amount must come from one location
         and go to another location. By tracking the transaction in both
-        locations, GnuCash will give you detailed reports from the perspective
+        locations, &app; will give you detailed reports from the perspective
         of either account.</para>
       </listitem>
 
@@ -555,9 +555,9 @@
         <para>Sources of help</para>
 
         <para>A Tip of the Day dialog gives helpful tips to new users about
-        GnuCash features. Within the program, a searchable Help menu guides
-        you to information or connects to the GnuCash web page for further
-        assistance. GnuCash also has strong, helpful developer and user
+        &app; features. Within the program, a searchable Help menu guides
+        you to information or connects to the &app; web page for further
+        assistance. &app; also has strong, helpful developer and user
         communities who provide help through mailing lists as well as through 
         the IRC channel.</para>
       </listitem>
@@ -565,44 +565,44 @@
       <listitem>
         <para>Shortcuts</para>
 
-        <para>GnuCash offers many shortcuts to help you enter data. Type the
-        first few characters of a common entry and GnuCash will automatically
+        <para>&app; offers many shortcuts to help you enter data. Type the
+        first few characters of a common entry and &app; will automatically
         fill in the rest! You can also use copy, paste and duplicate functions
         to save typing time. Keyboard shortcuts let you quickly choose a menu
         option or to enter numerical data. Many numeric entry fields can act
-        as a calculator: enter "92.18+33.26" and watch GnuCash input the
+        as a calculator: enter "92.18+33.26" and watch &app; input the
         corresponding sum for you!</para>
       </listitem>
 
       <listitem>
         <para>Open source</para>
 
-        <para>GnuCash doesn't hide its methods. If you wonder how GnuCash
+        <para>&app; doesn't hide its methods. If you wonder how &app;
         computed a number, you can find it out. In addition, you can set
-        preferences that tell GnuCash how much information to display to you.
-        There is no <quote>secret code</quote> used in GnuCash - it continues
+        preferences that tell &app; how much information to display to you.
+        There is no <quote>secret code</quote> used in &app; - it continues
         to be an open-source program.</para>
       </listitem>
     </orderedlist>
 
     <para>These are only a few of the advantages you'll discover when you
-    start using GnuCash to track your financial information. Now get ready to
-    enjoy the benefits of GnuCash for yourself!</para>
+    start using &app; to track your financial information. Now get ready to
+    enjoy the benefits of &app; for yourself!</para>
   </sect1>
 
   <sect1 id="oview-install1">
     <title>Installation</title>
 
-    <para>Installation of GnuCash can be simple, as most modern linux
-    distributions come with GnuCash precompiled and ready to go. In fact, most
-    likely, GnuCash is already installed. If you do not have GnuCash
+    <para>Installation of &app; can be simple, as most modern linux
+    distributions come with &app; precompiled and ready to go. In fact, most
+    likely, &app; is already installed. If you do not have &app;
     installed, the simplest method for installing it is to insert the
     installation CD that came with your distribution and follow the
     instructions.</para>
 
-    <para>The <ulink url="http://www.gnucash.org/"><citetitle>GnuCash home
+    <para>The <ulink url="http://www.gnucash.org/"><citetitle>&app; home
     page</citetitle></ulink> contains detailed instructions on how to install
-    GnuCash in the event your current distribution does not include it or you
+    &app; in the event your current distribution does not include it or you
     want to install a different version. You can also read the README file in
     the source code.</para>
   </sect1>

Modified: gnucash-docs/branches/2.2/guide/C/ch_reports.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_reports.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_reports.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -17,12 +17,12 @@
 
  <sect1 id="reports_concepts1">
  <title>Report Concepts</title>
- <para>GnuCash has a powerful built-in report generation capabilities.</para>
+ <para>&app; has a powerful built-in report generation capabilities.</para>
  <para>The reports are presented in this chapter in the order that they appear in the Reports menu.  Each section will follow a similar organization.  First, a short introduction which explains what the report is intended to show, next the options for the report will be shown, and finally an example will be given.</para>
 
  <sect2 id="reports_overview2">
  <title>Overview</title>
- <para>There are more than 20 standard reports pre-built in GnuCash, all available from the <guimenu>Reports</guimenu> pulldown menu in the main account window.  </para>
+ <para>There are more than 20 standard reports pre-built in &app;, all available from the <guimenu>Reports</guimenu> pulldown menu in the main account window.  </para>
  <table>
  <title>Report Overview - Assets &amp; Liabilities</title>
  <tgroup cols="3">

Modified: gnucash-docs/branches/2.2/guide/C/ch_txns.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/ch_txns.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/ch_txns.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -15,7 +15,7 @@
   <title>Transactions</title>
 
   <para>This chapter will give you the basic information you need to
-  understand and use transactions in GnuCash. Whereas accounts are the
+  understand and use transactions in &app;. Whereas accounts are the
   framework and structure of a chart of accounts, transactions are the data
   which fills each account.</para>
 
@@ -23,11 +23,11 @@
     <title>Basic Concepts</title>
 
     <para>A <emphasis>transaction</emphasis> in a double entry accounting
-    system such as GnuCash is an exchange between at least 2 accounts. Thus, a
+    system such as &app; is an exchange between at least 2 accounts. Thus, a
     single transaction must always consist of at least two parts, a "from" and
     a "to" account. The "from" account is passing value to the "to" account.
     Accountants call these parts of a transaction <emphasis>Ledger
-    Entries</emphasis>. In GnuCash, they are called
+    Entries</emphasis>. In &app;, they are called
     <emphasis>Splits</emphasis>.</para>
 
     <para>For example, you receive a paycheck and deposit it into your savings
@@ -36,7 +36,7 @@
     account. Two accounts are affected, and in this case there is a net
     increase in your equity.</para>
 
-    <para>Working with transactions in GnuCash is performed using what is
+    <para>Working with transactions in &app; is performed using what is
     known as the <emphasis>account register</emphasis>. Every account you
     create has an account register. It will appear familiar to you as it looks
     very similar to the log used to track checkbooks.</para>
@@ -45,13 +45,13 @@
   <sect1 id="txns-registers1">
     <title>The Account Register</title>
 
-    <para>The <emphasis>account register</emphasis> is the GnuCash window
+    <para>The <emphasis>account register</emphasis> is the &app; window
     which allows you to view or edit preexisting transactions, or add new
     transactions for a particular account. To enter the account register,
     simply highlight the account name in the account tree window and
     double-click to open it. You can also click the
     <guibutton>Open</guibutton> button in the tool bar or use the right mouse
-    button menu to open the account. GnuCash will display the account register
+    button menu to open the account. &app; will display the account register
     window.</para>
 
     <sect2 id="txns-registers-twoaccount2">
@@ -61,7 +61,7 @@
       previous chapter <filename>gcashdata_3</filename>, double click on the
       <guilabel>checking</guilabel> asset account. Let's add a simple
       transaction to the checking account. When you first create your accounts
-      in GnuCash, it is common to start them off with an initial
+      in &app;, it is common to start them off with an initial
       balance.</para>
 
       <para>In the first transaction row, enter a date (eg: March, 1, 2006), a
@@ -177,7 +177,7 @@
       the basic register is a summary of the splits affecting the current
       account. In the Transfer column, you can see the other account from
       which money is <emphasis>transferred</emphasis> into or out of this
-      account. If the transaction affects more than two accounts, GnuCash
+      account. If the transaction affects more than two accounts, &app;
       displays <guilabel>-- Split Transaction --</guilabel> to show it is a
       multiple-split transaction. You can see the individual splits of each
       transaction by clicking the <guilabel>Split</guilabel> button in the
@@ -241,7 +241,7 @@
       <guilabel>Jump</guilabel> button on the tool bar.</para>
 
       <para>In this example, if you jump to the
-      <guilabel>Income:Salary</guilabel> account, GnuCash brings up the same
+      <guilabel>Income:Salary</guilabel> account, &app; brings up the same
       transaction in the <guilabel>Income:Salary - Register</guilabel>:</para>
 
       <screenshot id="txns-registersplit3">
@@ -267,7 +267,7 @@
       exactly the same, but the transaction line now reflects the credit to
       the <guilabel>Income:Salary</guilabel> account.</para>
 
-      <para>At the bottom left of the register window, GnuCash displays
+      <para>At the bottom left of the register window, &app; displays
       helpful messages as you move about the register. To the right, you can
       see the current account balance and the total of cleared splits.</para>
     </sect2>
@@ -277,7 +277,7 @@
   <sect1 id="txns-regstyle1">
     <title>Choosing a Register Style</title>
 
-    <para>GnuCash offers several options for viewing your registers. The
+    <para>&app; offers several options for viewing your registers. The
     default style is <guilabel>Basic Ledger</guilabel> mode, which displays
     only the summary of splits affecting the current account. This is the
     style that most closely resembles other popular personal financial
@@ -371,7 +371,7 @@
   <sect1 id="txns-shortcuts1">
     <title>Using Entry Shortcuts</title>
 
-    <para>GnuCash provides several time-saving shortcuts for entering your
+    <para>&app; provides several time-saving shortcuts for entering your
     data. When you type the first few characters of a description that you
     have used before, the QuickFill feature automatically fills in the rest of
     the transaction as you last entered it. When you type in the first
@@ -382,9 +382,9 @@
     fields: simply type the first characters of the parent account name
     followed by a colon and the first characters of the sub-account name. For
     example, to enter <guilabel>Assets:Checking</guilabel>, you might type
-    <userinput>A:C</userinput> and let GnuCash fill in the rest.</para>
+    <userinput>A:C</userinput> and let &app; fill in the rest.</para>
 
-    <para>Register keyboard shortcuts also save you time, and GnuCash provides
+    <para>Register keyboard shortcuts also save you time, and &app; provides
     several of them. In the date field, you can type:</para>
 
     <itemizedlist>
@@ -433,11 +433,11 @@
     the split line, if you choose to enter split numbers there. The
     <guilabel>Action</guilabel> field also supports QuickFill - if you type
     the first characters of a common action (such as
-    <guilabel>Deposit</guilabel>), GnuCash will fill in the rest.</para>
+    <guilabel>Deposit</guilabel>), &app; will fill in the rest.</para>
 
     <para>The <guilabel>Transfer</guilabel> field supports QuickFill
     of account names.  You can start typing an account name and
-    GnuCash will fill in the remaining part of the name.  Typing the
+    &app; will fill in the remaining part of the name.  Typing the
     separator character at any time will complete the current level of
     the account name, leaving the cursor positioned to start the next
     level of account name.  For example, typing "A:C" with the
@@ -449,7 +449,7 @@
     <para>In any of the amount fields, you can use a built-in calculator.
     Simply type in the first value, followed by <keycap>+</keycap>,
     <keycap>-</keycap>, <keycap>*</keycap>, or <keycap>/</keycap>, then type
-    in the second value. GnuCash will perform the calculation and return the
+    in the second value. &app; will perform the calculation and return the
     resulting value to the amount field when you press the
     <keycap>Tab</keycap> key.</para>
 
@@ -532,7 +532,7 @@
     <title>Reconciliation</title>
 
     <para>Transactions are typically checked against bank statements - a
-    process known as "reconciliation". GnuCash keeps track of the
+    process known as "reconciliation". &app; keeps track of the
     reconciliation status of each transaction.</para>
 
     <para>The reconciliation status of a transaction is shown by the
@@ -550,7 +550,7 @@
     <sect2 id="txns-reconcile-window2">
       <title>Reconcile Window</title>
 
-      <para>The Reconciliation Window is used to reconcile a GnuCash account
+      <para>The Reconciliation Window is used to reconcile a &app; account
       with a statement that a bank or other institution has sent you.
       Reconciliation is useful not only to double-check your records against
       those of your bank, but also to get a better idea of outstanding
@@ -563,14 +563,14 @@
       includes outstanding transactions.</para>
 
       <para>For example, when you write a check for something, you should
-      enter the transaction into GnuCash. The reconciliation (R) field of the
+      enter the transaction into &app;. The reconciliation (R) field of the
       transaction will initially contain n (new). Your new entry will
       contribute to the "total" balance, but not to the "cleared and
       reconciled" balance. Later, if you think that the check has been cashed,
       you might click on the transaction's R field to change it to c
       (cleared). When you do this, the "cleared and reconciled" balance will
       change to include this amount. When the bank statement arrives, you can
-      then compare it to what you've recorded in GnuCash in the Reconciliation
+      then compare it to what you've recorded in &app; in the Reconciliation
       window. There, you will be able to change the R field to y (reconciled).
       You cannot reconcile in the register window, you must use the
       reconciliation window. Once a transaction has been marked "reconciled",
@@ -663,7 +663,7 @@
 
       <para>When you find the item in the Reconcile window, compare the amount
       in the item to the amount on the statement. If they disagree, you may
-      have made an error when you entered the transaction in GnuCash. You can
+      have made an error when you entered the transaction in &app;. You can
       use the <guibutton>Edit</guibutton> button on the tool bar, or the
       <guimenu>Edit</guimenu> menu item in the Transaction menu, to open a
       register window and correct the transaction.</para>
@@ -675,13 +675,13 @@
       item as reconciled.</para>
 
       <para>You then repeat this for each item that appears on the bank
-      statement, verifying that the amounts match with the amounts in GnuCash,
-      and marking off transactions in GnuCash as they are reconciled.</para>
+      statement, verifying that the amounts match with the amounts in &app;,
+      and marking off transactions in &app; as they are reconciled.</para>
 
       <para>At the bottom of the "Reconcile" window is a "Difference" field,
       which should show $0.00 when you are done reconciling. If it shows some
       other value, then either you have missed transactions, or some amounts
-      may be incorrect in GnuCash. (Or, less likely, the bank may have made an
+      may be incorrect in &app;. (Or, less likely, the bank may have made an
       error.)</para>
 
       <para>When you have marked off all the items on the bank statement, and
@@ -724,13 +724,13 @@
     operations, like subscriptions, insurances or taxes. By using scheduled
     transactions, you only have to enter the concerned transaction once, set a
     few parameters like start date, frequency and a little description, and
-    then GnuCash will tell you whenever a scheduled transaction is ready to
+    then &app; will tell you whenever a scheduled transaction is ready to
     create, and create it for you.</para>
 
     <para>In this howto, we'll take a monthly Internet subscription of 20 USD
     as example, which is taken on the 28th of each month.</para>
 
-    <para>In GnuCash, there are two ways of creating scheduled transactions,
+    <para>In &app;, there are two ways of creating scheduled transactions,
     from the ledger or from the scheduled transactions editor.</para>
 
     <sect2 id="txns-sxn-ledger2">
@@ -757,7 +757,7 @@
       </screenshot>
 
       <note>
-        <para>Since we did not create the Expence:Internet account, GnuCash
+        <para>Since we did not create the Expence:Internet account, &app;
         will prompt us to create it.</para>
       </note>
 
@@ -821,7 +821,7 @@
       </screenshot>
 
       <para>Click the OK button, and the transaction will be scheduled.
-      GnuCash now has memorized this scheduled transaction and on the 28th of
+      &app; now has memorized this scheduled transaction and on the 28th of
       next month, it will pop up a window asking if it should create it (see
       far below for a screenshot of this window).</para>
     </sect2>
@@ -918,12 +918,12 @@
 
         <listitem>
           <para>"Remind me n days in advance" is explicit and used for example
-          when you have to pay something by check, GnuCash can remind you one
+          when you have to pay something by check, &app; can remind you one
           week before so you send your check before the deadline.</para>
         </listitem>
       </itemizedlist>
 
-      <para>The End tab allows you to tell GnuCash that this scheduled
+      <para>The End tab allows you to tell &app; that this scheduled
       transaction won't last for ever, for example if you are repaying a loan,
       you can enter the loan end date.</para>
 
@@ -991,13 +991,13 @@
 
       <note>
         <para>What comes below is just an illustration, and is not meant to be
-        entered into the GnuCash database at this stage. As per this example,
+        entered into the &app; database at this stage. As per this example,
         the below dialogs will appear when the scheduled transaction is
         supposed to run.</para>
       </note>
 
       <para>From now on, on each first day of month (or the next time you
-      launch GnuCash after this day) a windows will pop up to remind you to
+      launch &app; after this day) a windows will pop up to remind you to
       create this transaction :</para>
 
       <screenshot id="txns-sxn-editor-6">
@@ -1068,7 +1068,7 @@
 
       <note>
         <para>If you entered the transaction for 28 of April at this stage,
-        then please revert back to the last saved GnuCash file.
+        then please revert back to the last saved &app; file.
         <guimenu>File</guimenu> -&gt;<guimenuitem> Open</guimenuitem> and
         choose <filename>gcashdata_3</filename></para>
       </note>
@@ -1079,13 +1079,13 @@
     <title>Putting It All Together</title>
 
     <para>In the previous sections of this chapter the concepts and mechanics
-    of working with transactions in GnuCash have been discussed. This section
+    of working with transactions in &app; have been discussed. This section
     will expand upon the chart of accounts initially built in the previous
     chapter, by setting some opening balances, adding transactions and a
     scheduled transaction.</para>
 
     <sect2 id="txns-puttoget-openfile">
-      <title>Open GnuCash file</title>
+      <title>Open &app; file</title>
 
       <para>Start with opening the previous datafile we stored,
       <filename>gcashdata_3emptyAccts</filename>, and store it as
@@ -1222,7 +1222,7 @@
           clicking on the current rent transaction, and click on the
           <guilabel>Duplicate</guilabel> icon. Enter the transaction date a
           month out in the future (eg: April 28, 2006), and notice the blue
-          line separator that GnuCash uses to separate future transactions
+          line separator that &app; uses to separate future transactions
           from current ones. In this way, you can enter transactions before
           they occur.</para>
 
@@ -1304,7 +1304,7 @@
     <sect2 id="txns-puttoget-save">
       <title>Save file</title>
 
-      <para>Before we go to the report section, let's save the GnuCash data
+      <para>Before we go to the report section, let's save the &app; data
       file (<filename>gcashdata_4</filename>).</para>
     </sect2>
 
@@ -1312,7 +1312,7 @@
       <title>Reports</title>
 
       <para>But only having data available on the computer screen will not
-      make your accountant happy, therefore GnuCash comes with a large number
+      make your accountant happy, therefore &app; comes with a large number
       of highly customizable reports.</para>
 
       <note>

Modified: gnucash-docs/branches/2.2/guide/C/gnucash-guide.xml
===================================================================
--- gnucash-docs/branches/2.2/guide/C/gnucash-guide.xml	2010-08-29 13:22:27 UTC (rev 19500)
+++ gnucash-docs/branches/2.2/guide/C/gnucash-guide.xml	2010-08-29 13:38:16 UTC (rev 19501)
@@ -81,7 +81,7 @@
    -->
 
     <publisher>
-       <publishername> GnuCash Documentation Team </publishername>
+       <publishername> &app; Documentation Team </publishername>
     </publisher>
 
     &legal;
@@ -102,7 +102,7 @@
      <firstname>Chris</firstname>
      <surname>Lyttle</surname>
      <affiliation>
-          <orgname>GnuCash Documentation Team</orgname>
+          <orgname>&app; Documentation Team</orgname>
           <address> <email>chris at wilddev.net</email> </address>
      </affiliation>
     </author>
@@ -111,7 +111,7 @@
      <firstname>Jon</firstname>
      <surname>Lapham</surname>
      <affiliation>
-          <orgname>GnuCash Documentation Team</orgname>
+          <orgname>&app; Documentation Team</orgname>
           <address> <email>lapham at extracta.com.br</email> </address>
      </affiliation>
     </author>
@@ -119,7 +119,7 @@
      <firstname>Bengt</firstname>
      <surname>Thuree</surname>
      <affiliation>
-          <orgname>GnuCash Documentation Team</orgname>
+          <orgname>&app; Documentation Team</orgname>
           <address> <email>bengt at thuree.com</email> </address>
      </affiliation>
     </author>
@@ -127,7 +127,7 @@
      <firstname>Dave</firstname>
      <surname>Herman</surname>
      <affiliation>
-          <orgname>GnuCash Documentation Team</orgname>
+          <orgname>&app; Documentation Team</orgname>
           <address> <email>dvherman at bigfoot.com</email> </address>
      </affiliation>
     </author>
@@ -161,11 +161,11 @@
           <para role="author">Dave Herman
             <email>dvherman at bigfoot.com</email>
           </para>
-          <para role="publisher">GnuCash Documentation Team</para>
+          <para role="publisher">&app; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>GnuCash Tutorial and Concepts Guide V2.0.0</revnumber>
+        <revnumber>&app; Tutorial and Concepts Guide V2.0.0</revnumber>
         <date>July 2006</date>
         <revdescription>
           <para role="author">Jon Lapham
@@ -177,74 +177,74 @@
           <para role="author">Dave Herman
             <email>dvherman at bigfoot.com</email>
           </para>
-          <para role="publisher">GnuCash Documentation Team</para>
+          <para role="publisher">&app; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>GnuCash Tutorial and Concepts Guide V1.8.3</revnumber>
+        <revnumber>&app; Tutorial and Concepts Guide V1.8.3</revnumber>
         <date>Aug 2003</date>
         <revdescription>
           <para role="author">Jon Lapham
             <email>lapham at extracta.com.br</email>
           </para>
-          <para role="publisher">GnuCash Documentation Team</para>
+          <para role="publisher">&app; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>GnuCash Tutorial and Concepts Guide V1.8.2</revnumber>
+        <revnumber>&app; Tutorial and Concepts Guide V1.8.2</revnumber>
         <date>Aug 2003</date>
         <revdescription>
           <para role="author">Jon Lapham
             <email>lapham at extracta.com.br</email>
           </para>
-          <para role="publisher">GnuCash Documentation Team</para>
+          <para role="publisher">&app; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>GnuCash Tutorial and Concepts Guide V1.8.1</revnumber>
+        <revnumber>&app; Tutorial and Concepts Guide V1.8.1</revnumber>
         <date>May 2003</date>
         <revdescription>
           <para role="author">Chris Lyttle
             <email>chris at wilddev.net</email>
           </para>
-          <para role="publisher">GnuCash Documentation Team</para>
+          <para role="publisher">&app; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>GnuCash Tutorial and Concepts Guide V1.8.0</revnumber>
+        <revnumber>&app; Tutorial and Concepts Guide V1.8.0</revnumber>
         <date>Jan 2003</date>
         <revdescription>
           <para role="author">Chris Lyttle
             <email>chris at wilddev.net</email>
           </para>
-          <para role="publisher">GnuCash Documentation Team</para>
+          <para role="publisher">&app; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>GnuCash User Guide V1.6.5</revnumber>
+        <revnumber>&app; User Guide V1.6.5</revnumber>
         <date>June 2002</date>
         <revdescription>
           <para role="author">Chris Lyttle
             <email>chris at wilddev.net</email>
           </para>
-          <para role="publisher">GnuCash Documentation Team</para>
+          <para role="publisher">&app; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>GnuCash User Guide V1.6.0</revnumber>
+        <revnumber>&app; User Guide V1.6.0</revnumber>
         <date>October 2001</date>
         <revdescription>
           <para role="author">Carol Champagne
             <email>carol at io.com</email>
           </para>
-          <para role="publisher">GnuCash Documentation Team</para>
+          <para role="publisher">&app; Documentation Team</para>
         </revdescription>
       </revision>
     </revhistory>
 
   <releaseinfo>
-   This Guide contains a tutorial for using GnuCash and describes the concepts
-   behind GnuCash.
+   This Guide contains a tutorial for using &app; and describes the concepts
+   behind &app;.
   </releaseinfo>
   <legalnotice>
     <title>Feedback</title>



More information about the gnucash-changes mailing list