Index: help/C/Help_ch_Reports.xml
===================================================================
--- help/C/Help_ch_Reports.xml	(revision 18472)
+++ help/C/Help_ch_Reports.xml	(working copy)
@@ -1,12 +1,14 @@
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
-   Last modified: May 13th 2007
+   Last modified: December 7th 2009
+        modified: May 13th 2007
         modified: November 28th 2006
         modified: August 12th 2006
 	modified: February 28th 2005
 
   Maintainers:
+               Alex Aycinena <alex.aycinena@gmail.com>
                Chris Lyttle <chris@wilddev.net>
                Neil Williams <linux@codehelp.co.uk>
 
@@ -33,7 +35,7 @@
      <sect1 id="report-general">
       <title>General Reports</title>
 
-       <para>The General Reports includes the Tax Report and TXF Export, the Account
+       <para>The General Reports includes the Tax Schedule Report and TXF Export, the Account
         Summary and the Transaction Reports and also the reports in the Sample &amp; Custom menu.</para>
 
         <itemizedlist>
@@ -42,17 +44,17 @@
          </listitem>
 
          <listitem id="report-taxreport">
-          <para>Tax Report and TXF Export: The tax report is used to export all tax
-           related Income and Expenses to a TXF (Tax eXchange Format) file. This is in
-           addition to the HTML format that all reports allow. The TXF file can be imported
-           into tax filing programs such as TaxCut or TurboTax.</para>
+          <para>Tax Schedule Report and TXF Export: The income tax schedule report is used
+           to export all tax related Income and Expenses to a TXF (Tax eXchange Format) file.
+           This is in addition to the HTML format that all reports allow. The TXF file can
+           be imported into tax filing programs such as TaxCut or TurboTax.</para>
 
           <note><para>For this to work, the user has to segregate taxable and non taxable
            income to different accounts, as well as deductible and non deductible expenses.
-           The Tax Information dialog is used for this. To access the Tax Information dialog
-           go to <guimenu>Edit -&gt; Tax Options</guimenu>. The user also must set the TXF category of each tax
-           related account. The Tax Information dialog is described in the Setting Tax Options
-           section.</para></note>
+           The Income Tax Information dialog is used for this. To access the Income Tax
+           Information dialog go to <guimenu>Edit -&gt; Income Tax Options</guimenu>. The user
+           also must set the TXF category of each tax related account. The Income Tax
+           Information dialog is described in the Setting Income Tax Options section.</para></note>
 
          </listitem>
 
Index: help/C/Help_ch_Customize.xml
===================================================================
--- help/C/Help_ch_Customize.xml	(revision 18472)
+++ help/C/Help_ch_Customize.xml	(working copy)
@@ -1,12 +1,14 @@
 <!--
       (Do not remove this comment block.)
   Version: 2.0.1
-  Last modified: August 2nd 2008
+  Last modified: December 7th 2009
+       modified: August 2nd 2008
        modified: March 21th 2007
        modified: August 2nd 2006
        modified: July 9th 2006
        modified: February 28th 2005
   Maintainers:
+               Alex Aycinena <alex.aycinena@gmail.com>
                Chris Lyttle <chris@wilddev.net>
                Neil Williams <linux@codehelp.co.uk>
   Author:
@@ -1190,20 +1192,110 @@
     </sect1>
 
     <sect1 id="set-tax-options">
-      <title>Setting Tax Options</title>
+      <title>Setting Income Tax Options</title>
 
-      <para>The Tax Information dialog is used to set Tax Options. The settings on accounts
-       in this dialog are used by the TXF Export function in reports to select the accounts
-       for export. To access this dialog go to Edit -&gt; Tax Options.</para>
+      <para>The Income Tax Information dialog is used to set Income Tax Options. The settings
+       on accounts in this dialog are used by the TXF Export function in reports to select the
+       accounts for export. To access this dialog go to Edit -&gt; Income Tax Options.</para>
 
-      <para>A given TXF code can be assigned to multiple accounts. The Tax report will 
+      <para>If the Income Tax features are used, it is strongly recommended that the 'Tax Info'
+       column be made visible on the accounts tab (click large downward-pointing arrow and
+       select 'Tax Info' checkbox). The 'Tax Info' column will display the Form/Schedule and
+       tax category assigned to an account, if any. Alternatively, it will display the following
+       error messages which can be corrected through  Edit -&gt; Income Tax Options:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Tax-related but has no tax code</para>
+        </listitem>
+
+        <listitem>
+          <para>Tax entity type not specified</para>
+        </listitem>
+
+        <listitem>
+          <para>Tax type "tax_type": invalid code "code" for account type"</para>
+        </listitem>
+
+        <listitem>
+          <para>Not tax-related; tax type "tax_type": invalid code "code" for account type</para>
+        </listitem>
+
+        <listitem>
+          <para>Invalid code "code" for tax type "tax_type"</para>
+        </listitem>
+
+        <listitem>
+          <para>Not tax-related; invalid code "code" for tax type "tax_type"</para>
+        </listitem>
+
+        <listitem>
+          <para>No form: code "code", tax type "tax_type"</para>
+        </listitem>
+
+        <listitem>
+          <para>Not tax-related; no form: code "code", tax type "tax_type"</para>
+        </listitem>
+
+        <listitem>
+          <para>No description: form "form", code "code", tax type "tax_type"</para>
+        </listitem>
+
+        <listitem>
+          <para>Not tax-related; no description: form "form", code "code", tax type "tax_type"</para>
+        </listitem>
+
+        <listitem>
+          <para>Not tax-related; "form"("copy") "desc" (code "code", tax type "tax_type")</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The Income Tax Identity must be set in order to assign codes to individual accounts.
+       Click 'Edit' to set the identity. The Tax Name is optional. If entered, it will be printed
+       at the top of the report. A 'type' must be selected in order to activate the tax category
+       selections. The choices are:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Individual, Joint, etc. - Files US Form 1040 Tax Return </para>
+        </listitem>
+
+        <listitem>
+          <para>Partnership - Files US Form 1065 Tax Return</para>
+        </listitem>
+
+        <listitem>
+          <para>Corporation - Files US Form 1120 Tax Return</para>
+        </listitem>
+
+        <listitem>
+          <para>S Corporation - Files US Form 1120S Tax Return</para>
+        </listitem>
+
+        <listitem>
+          <para>None - No Income Tax Options Provided</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>While the Income Tax Entity Type can be changed after tax categories have been
+       assigned to accounts, you should be cautioned that you will need to manually change
+       each one if you do so, which could be quite tedious. The tax categories are unique for
+       each Income Tax Entity Type, so changing the type will make all previously assigned
+       categories invalid. It is assumed that each gnucash file is for only one type of tax
+       entity. You should not keep, for example, personal and partnership accounts mixed in
+       one gnucash file if you plan to use the Income Tax Reporting features.</para>
+
+      <para>A given TXF code can be assigned to multiple accounts. The Tax Schedule Report will 
        combine accounts by code and generate a detailed TXF record for each account and a
        summary TXF record for the total as calculated by the report. For codes for which
        the "Payer Name Source" is not grayed, the payer on the TXF record will be based on
        what is specified here, either the account name of the account or the account name
        of the account's parent account. This feature is typically used for interest accounts
        or stocks or mutual funds that pay dividends where the individual payees are shown on
-       the tax schedule.</para>
+       the tax schedule. Some tax Forms/Schedules need to have multiple copies filed under
+       some circumstances (for example, Schedule C if a taxpayer and spouse have seperate
+       businesses). For tax categories on these Forms/Schedules, the 'Copy Number' is not
+       greyed out and can be used to segregate accounts by  copy number.</para>
 
       <itemizedlist>
         <listitem>
@@ -1227,6 +1319,13 @@
            of the account. This is usually the name of a bank, stock, or mutual fund that pays
            dividends or interest. Occasionally, it is a description of a deduction.</para>
         </listitem>
+
+        <listitem>
+          <para>Copy Number: A copy number that is exported along with the value
+           of the account. This is used to segregate amounts between different copies of the
+           same Form/Schedule that may need to be filed (e.g., Schedule C(1), Schedule C(2),
+           etc.).</para>
+        </listitem>
       </itemizedlist>
 
       <sect2 id="txf-probs">
@@ -1273,7 +1372,7 @@
           </listitem>
         </itemizedlist>
 
-        <para>Information from only one job may be imported. </para>
+        <para>Use Copy Number to seperate information from more than one job. </para>
 
         <para>TurboTax 1999, 2000 </para>
 
@@ -1302,9 +1401,9 @@
          record for the sum. Codes that let you select "Payer Name Source" will generate a
          separate summary TXF account with each change in payer. Selecting the "Print TXF
          export parameters" option will cause the report to show to which codes this applies
-         (Multiple Copies Y) and, for the accounts assigned to those codes, the Name Source
-         each account is set to and the TXF Line that will be assigned to each. A summary TXF
-         record will be generated for each change in assigned line number. These may not be 
+         (Payer Name Source option Y) and, for the accounts assigned to those codes, the Name Source
+         each account is set to and the TXF item number that will be assigned to each. A summary TXF
+         record will be generated for each change in assigned item line number. These may not be 
          handled the same by TaxCut and TurboTax.</para>
 
       </sect2>
Index: help/C/Help_ch_Account-Actions.xml
===================================================================
--- help/C/Help_ch_Account-Actions.xml	(revision 18472)
+++ help/C/Help_ch_Account-Actions.xml	(working copy)
@@ -1,11 +1,13 @@
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
-  Last modified: March 28th 2007
-        modified: August 12th 2006
-	modified: February 28th 2005
+  Last modified: December 7th 2009
+       modified: March 28th 2007
+       modified: August 12th 2006
+	   modified: February 28th 2005
 
   Maintainers:
+               Alex Aycinena <alex.aycinena@gmail.com>
                Chris Lyttle <chris@wilddev.net>
                Neil Williams <linux@codehelp.co.uk>
 
@@ -292,7 +294,8 @@
           <para>The General Information tab is used to access the basic information about the
            account. It provides a way of connecting the account to stock information if it is
            one of the currency, mutual fund or stock account types. It can also be flagged as
-           a Placeholder account. It displays if it is flagged as a Tax Related account (which is set through the Edit->Tax Options dialog).</para>
+           a Placeholder account. It displays if it is flagged as a Tax Related account (which
+           is set through the Edit -&gt; Income Tax Options dialog).</para>
 
           <para>There are six panes in the Identification section of this tab.</para>
 
@@ -356,13 +359,16 @@
           </listitem>
          </orderedlist>
 
-           <para> Below the panes are check-boxes: one to show if the account is <guilabel>Tax Related</guilabel> (which is set through the Edit->Tax Options dialog), and two to mark the account as a
-            <guilabel>Placeholder</guilabel>, and/or a <guilabel>Hidden</guilabel> account.
+           <para> Below the panes are check-boxes: one to show if the account is <guilabel>Tax
+           Related</guilabel> (which is set through the Edit -&gt; Income Tax Options dialog), and
+           two to mark the account as a <guilabel>Placeholder</guilabel>, and/or a
+           <guilabel>Hidden</guilabel> account.
            </para>
 
-           <para>The <guilabel>Tax Related</guilabel> check-box means that this account has been flagged to be
-           included in Tax Exports. This flag should only be set for Income and Expense type accounts. See the
-           Tax Report and TXF Export section in Reports Chapter (<xref linkend="report-general"></xref>).</para>
+           <para>The <guilabel>Tax Related</guilabel> check-box means that this account has been
+           flagged to be included in the Tax Schedule Report. This flag is only displayed on the Edit
+           Account dialog and is set in the Income Tax Information dialog (Edit->Income Tax
+           Options). See the Tax Schedule Report and TXF Export section in Reports Chapter (<xref linkend="report-general"></xref>).</para>
 
            <para>The check-box <guilabel>Placeholder</guilabel> marks this account as solely a placeholder in the
            hierarchy, it is used to enable a hierarchy or chart of accounts to be setup. A Placeholder means this
Index: help/C/Help_ch_GUIMenus.xml
===================================================================
--- help/C/Help_ch_GUIMenus.xml	(revision 18472)
+++ help/C/Help_ch_GUIMenus.xml	(working copy)
@@ -1,11 +1,13 @@
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
-   Last modified: April 23th 2007
+   Last modified: December 7th 2009
+        modified: April 23th 2007
         modified: August 12th 2006
-	modified: February 28th 2005
+	    modified: February 28th 2005
 
   Maintainers:
+               Alex Aycinena <alex.aycinena@gmail.com>
                Chris Lyttle <chris@wilddev.net>
                Neil Williams <linux@codehelp.co.uk>
 
@@ -475,7 +477,7 @@
               </row>
 
               <row>
-                <entry><para>Tax Options</para></entry>
+                <entry><para>Income Tax Options</para></entry>
 
                 <entry nameend="c3" namest="c2">
                   <para>Set tax characteristics on account(s) (US). Assign tax form and
@@ -1349,7 +1351,7 @@
 
               <row>
                 <entry namest="c1">
-                  <para>Tax Report &amp; TXF Export</para></entry>
+                  <para>Tax Schedule Report &amp; TXF Export</para></entry>
 
                 <entry namest="c2" nameend="c3">
                   <para>Create a Tax report (US) and/or export data for tax
@@ -2015,7 +2017,7 @@
                 </row>
 
                 <row>
-                  <entry><para>Tax Options</para></entry>
+                  <entry><para>Income Tax Options</para></entry>
 
                   <entry nameend="c3" namest="c2">
                     <para>Set tax characteristics on account(s) (US). Assign tax form and
@@ -3078,7 +3080,7 @@
 
               <row>
                 <entry namest="c1">
-                  <para>Tax Report &amp; TXF Export</para></entry>
+                  <para>Tax Schedule Report &amp; TXF Export</para></entry>
 
                 <entry namest="c2" nameend="c3">
                   <para>Create a Tax report (US) and/or export data for tax
@@ -3797,7 +3799,7 @@
                 </row>
 
                 <row>
-                  <entry><para>Tax Options</para></entry>
+                  <entry><para>Income Tax Options</para></entry>
 
                   <entry nameend="c3" namest="c2">
                     <para>Set tax characteristics on account(s) (US). Assign tax form and
@@ -4566,7 +4568,7 @@
 
               <row>
                 <entry namest="c1">
-                  <para>Tax Report &amp; TXF Export</para></entry>
+                  <para>Tax Schedule Report &amp; TXF Export</para></entry>
 
                 <entry namest="c2" nameend="c3">
                   <para>Create a Tax report (US) and/or export data for tax
Index: guide/C/ch_invest.xml
===================================================================
--- guide/C/ch_invest.xml	(revision 18472)
+++ guide/C/ch_invest.xml	(working copy)
@@ -1,9 +1,11 @@
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
-  Last modified: January 10th 2007
+  Last modified: December 7th 2009
+       modified: January 10th 2007
        modified: July 9th 2006
   Maintainers: 
+               Alex Aycinena <alex.aycinena@gmail.com>
                Chris Lyttle <chris@wilddev.net>
   Author:
   		Jon Lapham <lapham@extracta.com.br>
@@ -723,8 +725,9 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Tax Related</emphasis> - Check box if this account's
-          transactions will relate to Tax Reports.</para>
+          <para><emphasis>Tax Related</emphasis> - Go to Edit -&gt; Income Tax
+          Options to check this box if this account's transactions will relate to
+          Income Taxes.</para>
         </listitem>
 
         <listitem>
Index: guide/C/ch_currency.xml
===================================================================
--- guide/C/ch_currency.xml	(revision 18472)
+++ guide/C/ch_currency.xml	(working copy)
@@ -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 GnuCash, and not as a Investment Advice.
           Please consult a proper financial advisor for more information
           regarding international investments/loans.</para>
         </note>
Index: guide/C/ch_cbook.xml
===================================================================
--- guide/C/ch_cbook.xml	(revision 18472)
+++ guide/C/ch_cbook.xml	(working copy)
@@ -1,8 +1,10 @@
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
-  Last modified: July 9th 2006
+  Last modified: December 7th 2009
+       modified: July 9th 2006
   Maintainers: 
+               Alex Aycinena <alex.aycinena@gmail.com>
                Chris Lyttle <chris@wilddev.net>
   Author:
   		Jon Lapham <lapham@extracta.com.br>
@@ -94,8 +96,9 @@
     income.</para>
 
     <tip>
-      <para>Be sure to check the Tax-Related box in the Account Information
-      Dialog when you set up taxable income accounts. Some types of income,
+      <para>Be sure to check the Tax-Related box and assign an appropriate tax
+      category in the Income Tax Information Dialog (Edit -&gt; Income Tax Options)
+      when you set up taxable income accounts. Some types of income,
       such as gift income, may not be considered taxable, so check the
       appropriate tax rules to determine what is taxable. For ways to track
       capital gains income, refer to <xref linkend="chapter_capgain"></xref>.</para>