Clean up root.xml.

diff --git a/root.xml b/root.xml
index e1c9a98..aa7fd99 100755 (executable)
--- a/root.xml
+++ b/root.xml
@@ -1,128 +1,132 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<book xml:id="evergreen" xmlns="http://docbook.org/ns/docbook"\r
-      xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:lang="EN"\r
-      xmlns:xlink="http://www.w3.org/2001/xlink">\r
-      <info>\r
-            <title>Evergreen 2.0 Documentation</title>\r
-               <subtitle>Draft Version</subtitle>\r
-               <corpauthor>Documentation Interest Group</corpauthor>\r
-                <mediaobject>\r
-                       <imageobject>\r
-                       <imagedata scalefit="0" fileref="../media/main_logo.jpg"/>\r
-               </imageobject>\r
-               </mediaobject>\r
-\r
-               <copyright>\r
-                  <year>2011</year>\r
-                  <holder><link linkend="attributions">Members of the Evergreen Project</link></holder>\r
-               <inlinemediaobject>                   \r
-                </inlinemediaobject>    \r
-            </copyright>\r
-                 <legalnotice>\r
-                  <para><link xlink:title="Creative Commons license"\r
-                              xlink:href="http://creativecommons.org/licenses/by-sa/3.0/">  \r
-                                <inlinemediaobject>\r
-                                    <imageobject>\r
-                                          <imagedata scalefit="0"\r
-                                                fileref="http://i.creativecommons.org/l/by-sa/3.0/80x15.png"\r
-                                          />\r
-                                    </imageobject>\r
-                              </inlinemediaobject>    \r
-                  </link></para>\r
-                    <para>This document was updated <?dbtimestamp format="Y-m-d"?>.</para>    \r
-               </legalnotice>\r
-       </info>\r
-       <part xml:id="intro">\r
-               <info>\r
-                       <title>Introduction</title>\r
-               </info>\r
-               <xi:include href="intro/intro_intro.xml"/>\r
-               <xi:include href="intro/about_evergreen.xml"/>\r
-               <xi:include href="intro/releasenotes.xml"/>\r
-       </part>\r
-       <part xml:id="opac">\r
-               <info>\r
-                       <title>Public Access Catalog</title>\r
-               </info>\r
-               <xi:include href="opac/opac_intro.xml"/>\r
-       </part>\r
-       <part xml:id="core_tasks">\r
-               <info>\r
-                       <title>Core Staff Tasks</title>\r
-               </info>\r
-               <xi:include href="stafftasks/stafftasks_intro.xml"/>\r
-               <xi:include href="stafftasks/booking.xml"/>\r
-               <xi:include href="stafftasks/acquisitions.xml"/>\r
-               <xi:include href="stafftasks/serials-gpls.xml"/>\r
-               <xi:include href="stafftasks/alternate_serial_control.xml"/>\r
-               <xi:include href="stafftasks/cataloging.xml"/>\r
-       </part>\r
-       <part xml:id="admin">\r
-               <info>\r
-                       <title>Administration</title>\r
-               </info>\r
-               <xi:include href="admin/admin-intro.xml"/>      \r
-               <xi:include href="admin/serversideinstallation_2.0.xml"/>\r
-               <xi:include href="admin/staffclientinstallation.xml"/>  \r
-               <xi:include href="admin/Upgrading-Evergreen-2.0.xml"/>\r
-               <xi:include href="admin/migratingdata_2.0.xml"/>\r
-               <xi:include href="admin/AdminMisc.xml"/>\r
-               <xi:include href="admin/sip.xml"/>\r
-               <xi:include href="admin/z3950.xml"/>\r
-               <xi:include href="admin/troubleshooting.xml"/>          \r
-               <xi:include href="admin/admin-lsa_2.0.xml"/>\r
-               <xi:include href="admin/actiontriggers.xml"/>\r
-               <xi:include href="admin/admin-booking.xml"/>\r
-               <xi:include href="admin/acquisitions_admin_functions.xml"/>\r
-               <xi:include href="admin/localization.xml"/>\r
-               \r
-       </part>\r
-       <part xml:id="reports">\r
-               <info>\r
-                       <title>Reports</title>\r
-               </info>\r
-               <xi:include href="reports/report-intro.xml"/>\r
-               <xi:include href="reports/report-startingreporter.xml"/>\r
-               <xi:include href="reports/report-folder.xml"/>\r
-               <xi:include href="reports/report-create-template.xml"/>\r
-               <xi:include href="reports/report-generate-report.xml"/>\r
-               <xi:include href="reports/report-view-output.xml"/>\r
-               <xi:include href="reports/report-shared-template.xml"/>         \r
-               <xi:include href="reports/report-add-data-source.xml"/>\r
-               <xi:include href="reports/report-recurring-report.xml"/>\r
-               <xi:include href="reports/report-template-terminology.xml"/>\r
-               <xi:include href="reports/report-exporting-report-templates-using-phppgadmin.xml"/>\r
-       </part>\r
-\r
-       <part xml:id="software_integration">\r
-               <info>\r
-                       <title>Third Party System Integration</title>\r
-               </info>\r
-       </part>\r
-       <part xml:id="Development">\r
-               <info>\r
-                       <title>Development</title>\r
-               </info>\r
-               <xi:include href="development/development_intro.xml"/>\r
-               <xi:include href="development/directoriesandFiles.xml"/>        \r
-               <xi:include href="development/customizingstaffclient.xml"/>\r
-               <xi:include href="development/customize_opac.xml"/>\r
-               <xi:include href="development/OpenSRF_intro.xml"/>\r
-               <xi:include href="development/datamodelsandaccess.xml"/>\r
-               <xi:include href="development/introduction_to_sql.xml"/>\r
-               <xi:include href="development/json.xml"/>       \r
-               <xi:include href="development/supercat.xml"/>\r
-\r
-       </part>\r
-       <part xml:id="Appendices">\r
-               <info>\r
-                       <title>Appendices</title>\r
-               </info>\r
-               <xi:include href="appendices/permissions.xml"/>\r
-               <xi:include href="appendices/schema.xml"/>\r
-               <xi:include href="appendices/about_this_documentation.xml"/>\r
-               <xi:include href="appendices/more_info.xml"/>\r
-               <xi:include href="appendices/glossary.xml"/>\r
-               <xi:include href="appendices/bookindex.xml"/>\r
-       </part>\r
-</book>\r
+<?xml version="1.0" encoding="utf-8"?>
+<book xml:id="evergreen" xmlns="http://docbook.org/ns/docbook"
+      xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:lang="EN"
+      xmlns:xlink="http://www.w3.org/2001/xlink">
+      <info>
+<<<<<<< rel_2_0
+            <title>Evergreen 2.0 Documentation</title>
+               <subtitle>Draft Version</subtitle>
+=======
+            <title>Evergreen 2.1 Documentation</title>
+>>>>>>> local
+               <corpauthor>Documentation Interest Group</corpauthor>
+                <mediaobject>
+                       <imageobject>
+                       <imagedata scalefit="0" fileref="../media/main_logo.jpg"/>
+               </imageobject>
+               </mediaobject>
+
+               <copyright>
+                  <year>2011</year>
+                  <holder><link linkend="attributions">Members of the Evergreen Project</link></holder>
+               <inlinemediaobject>                   
+                </inlinemediaobject>    
+            </copyright>
+                 <legalnotice>
+                  <para><link xlink:title="Creative Commons license"
+                              xlink:href="http://creativecommons.org/licenses/by-sa/3.0/">  
+                                <inlinemediaobject>
+                                    <imageobject>
+                                          <imagedata scalefit="0"
+                                                fileref="http://i.creativecommons.org/l/by-sa/3.0/80x15.png"
+                                          />
+                                    </imageobject>
+                              </inlinemediaobject>    
+                  </link></para>
+                    <para>This document was updated <?dbtimestamp format="Y-m-d"?>.</para>    
+               </legalnotice>
+       </info>
+       <part xml:id="intro">
+               <info>
+                       <title>Introduction</title>
+               </info>
+               <xi:include href="intro/intro_intro.xml"/>
+               <xi:include href="intro/about_evergreen.xml"/>
+               <xi:include href="intro/releasenotes.xml"/>
+       </part>
+       <part xml:id="opac">
+               <info>
+                       <title>Public Access Catalog</title>
+               </info>
+               <xi:include href="opac/opac_intro.xml"/>
+       </part>
+       <part xml:id="core_tasks">
+               <info>
+                       <title>Core Staff Tasks</title>
+               </info>
+               <xi:include href="stafftasks/stafftasks_intro.xml"/>
+               <xi:include href="stafftasks/booking.xml"/>
+               <xi:include href="stafftasks/acquisitions.xml"/>
+               <xi:include href="stafftasks/serials-gpls.xml"/>
+               <xi:include href="stafftasks/alternate_serial_control.xml"/>
+               <xi:include href="stafftasks/cataloging.xml"/>
+       </part>
+       <part xml:id="admin">
+               <info>
+                       <title>Administration</title>
+               </info>
+               <xi:include href="admin/admin-intro.xml"/>      
+               <xi:include href="admin/serversideinstallation_2.0.xml"/>
+               <xi:include href="admin/staffclientinstallation.xml"/>  
+               <xi:include href="admin/Upgrading-Evergreen-2.0.xml"/>
+               <xi:include href="admin/migratingdata_2.0.xml"/>
+               <xi:include href="admin/AdminMisc.xml"/>
+               <xi:include href="admin/sip.xml"/>
+               <xi:include href="admin/z3950.xml"/>
+               <xi:include href="admin/troubleshooting.xml"/>          
+               <xi:include href="admin/admin-lsa_2.0.xml"/>
+               <xi:include href="admin/actiontriggers.xml"/>
+               <xi:include href="admin/admin-booking.xml"/>
+               <xi:include href="admin/acquisitions_admin_functions.xml"/>
+               <xi:include href="admin/localization.xml"/>
+               
+       </part>
+       <part xml:id="reports">
+               <info>
+                       <title>Reports</title>
+               </info>
+               <xi:include href="reports/report-intro.xml"/>
+               <xi:include href="reports/report-startingreporter.xml"/>
+               <xi:include href="reports/report-folder.xml"/>
+               <xi:include href="reports/report-create-template.xml"/>
+               <xi:include href="reports/report-generate-report.xml"/>
+               <xi:include href="reports/report-view-output.xml"/>
+               <xi:include href="reports/report-shared-template.xml"/>         
+               <xi:include href="reports/report-add-data-source.xml"/>
+               <xi:include href="reports/report-recurring-report.xml"/>
+               <xi:include href="reports/report-template-terminology.xml"/>
+               <xi:include href="reports/report-exporting-report-templates-using-phppgadmin.xml"/>
+       </part>
+
+       <part xml:id="software_integration">
+               <info>
+                       <title>Third Party System Integration</title>
+               </info>
+       </part>
+       <part xml:id="Development">
+               <info>
+                       <title>Development</title>
+               </info>
+               <xi:include href="development/development_intro.xml"/>
+               <xi:include href="development/directoriesandFiles.xml"/>        
+               <xi:include href="development/customizingstaffclient.xml"/>
+               <xi:include href="development/customize_opac.xml"/>
+               <xi:include href="development/OpenSRF_intro.xml"/>
+               <xi:include href="development/datamodelsandaccess.xml"/>
+               <xi:include href="development/introduction_to_sql.xml"/>
+               <xi:include href="development/json.xml"/>       
+               <xi:include href="development/supercat.xml"/>
+
+       </part>
+       <part xml:id="Appendices">
+               <info>
+                       <title>Appendices</title>
+               </info>
+               <xi:include href="appendices/permissions.xml"/>
+               <xi:include href="appendices/schema.xml"/>
+               <xi:include href="appendices/about_this_documentation.xml"/>
+               <xi:include href="appendices/more_info.xml"/>
+               <xi:include href="appendices/glossary.xml"/>
+               <xi:include href="appendices/bookindex.xml"/>
+       </part>
+</book>