Add images and update migrating to fix PDF genrerating errors.

diff --git a/1.6/admin/migratingdata_1.6.xml b/1.6/admin/migratingdata_1.6.xml
index 4fe4851..305f916 100644 (file)
--- a/1.6/admin/migratingdata_1.6.xml
+++ b/1.6/admin/migratingdata_1.6.xml
@@ -163,8 +163,10 @@ make install
                                </para> \r
 <screen>\r
 <userinput>\r
-export PATH=[<emphasis class="italic">path to Evergreen</emphasis>]/Open-ILS/src/extras/import:/[<emphasis class="italic">path to migration-tools</emphasis>]/migration-tools:$PATH:.\r
-export PERL5LIB=/openils/lib/perl5:/[<emphasis class="italic">path to migration-tools directory</emphasis>]/migration-tools/Equinox-Migration/lib\r
+export PATH=[<emphasis class="italic">path to Evergreen</emphasis>]/Open-ILS/src/extras/import: \\r
+/[<emphasis class="italic">path to migration-tools</emphasis>]/migration-tools:$PATH:.\r
+export PERL5LIB=/openils/lib/perl5: \\r
+/[<emphasis class="italic">path to migration-tools directory</emphasis>]/migration-tools/Equinox-Migration/lib\r
 </userinput>\r
 </screen>\r
 </step>\r
@@ -217,7 +219,8 @@ fingerprinter -o incumbent.fp -x incumbent.ex clean.marc.xml
                                have existing bibliographic records in your system previously imported:</para>\r
 <screen>\r
 <userinput>\r
-fingerprinter -o production.fp -x production.fp.ex --marctype=MARC21 existing_marc_records.mrc --tag=901 --subfield=c\r
+fingerprinter -o production.fp -x production.fp.ex --marctype=MARC21 existing_marc_records.mrc \\r
+--tag=901 --subfield=c\r
 </userinput>\r
 </screen>\r
                                <para><systemitem>fingerprinter</systemitem> is used for deduplification of the incumbant records.</para>\r
@@ -244,8 +247,10 @@ match_fingerprints [-t start id] -o records.merge dedupe.fp
                                <para>Extract all of the currently used TCN's an generate the .bre and .ingest files to prepare for the bibliographic record load.</para>\r
 <screen>\r
 <userinput>\r
-psql -U evergreen -c "select tcn_value from biblio.record_entry where not deleted" | perl -npe 's/^\s+//;' > used_tcns\r
-marc2bre.pl --idfield 903 [--startid=#] --marctype=XML -f final.xml --used_tcn_file=used_tcns > evergreen_bre_import_file.bre\r
+psql -U evergreen -c "select tcn_value from biblio.record_entry where not deleted" \\r
+| perl -npe 's/^\s+//;' > used_tcns\r
+marc2bre.pl --idfield 903 [--startid=#] --marctype=XML -f final.xml \\r
+--used_tcn_file=used_tcns > evergreen_bre_import_file.bre\r
 </userinput>\r
 </screen>\r
                                <note>\r
@@ -327,7 +332,8 @@ BEGIN;
 \r
 <emphasis class="bold">TRUNCATE TABLE staging_items;</emphasis>\r
 \r
-<emphasis class="bold">INSERT INTO staging_items (</emphasis>egid, hseq, l_call_num, l_barcode, l_location, l_owning_lib, l_circ_modifier <emphasis>FROM stdin;</emphasis> \r
+<emphasis class="bold">INSERT INTO staging_items (</emphasis>egid, hseq, l_call_num, l_barcode, \r
+l_location, l_owning_lib, l_circ_modifier <emphasis>FROM stdin;</emphasis> \r
 40      0       HD3616.K853 U54 1997    30731100751928  STACKS  FENNELL BOOK\r
 41      1       HV6548.C3 S984 1998     30731100826613  STACKS  FENNELL BOOK\r
 41      2       HV6548.C3 S984 1998     30731100804958  STACKS  BRANTFORD       BOOK\r
@@ -648,8 +654,8 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
        JOIN asset.call_number AS acn ON acn.record-bre.id \r
        WHERE bre.deleted='false' and ownling_lib=101 \g /home/opensrf/records.txt;\r
 </programlisting>\r
-                               <para>This query will create a file called <filename>ids.txt</filename> containing a column of distinct ids of items owned by the organizational unit with the \r
-                               <table class="field">id</table> <literal>101</literal>.</para>\r
+                               <para>This query will create a file called <filename>records.txt</filename> containing a column of distinct ids of items owned by the organizational unit with the \r
+                               <database class="field">id</database> <literal>101</literal>.</para>\r
                        </step>\r
                        <step>\r
                                <para>Navigate to the support-scripts folder</para>\r
@@ -660,7 +666,8 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
                        <step>\r
                                <para>Run <command>marc_export</command>, using the id file you created in step 1 to define which files to export.</para>\r
 <screen>\r
-<userinput>cat /home/opensrf/records.txt | ./marc_export -i -c /openils/conf/opensrf_core.xml -x /openils/conf/fm_IDL.xml -f XML --timeout 5 > exported_files.xml\r
+<userinput>cat /home/opensrf/records.txt | ./marc_export -i -c /openils/conf/opensrf_core.xml \\r
+-x /openils/conf/fm_IDL.xml -f XML --timeout 5 > exported_files.xml\r
 </userinput>\r
 </screen>\r
                                <para>The example above export the records into MARCXML format.</para>\r

diff --git a/1.6/media/1.png b/1.6/media/1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/10.png b/1.6/media/10.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/11.png b/1.6/media/11.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/12.png b/1.6/media/12.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/13.png b/1.6/media/13.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/14.png b/1.6/media/14.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/15.png b/1.6/media/15.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/2.png b/1.6/media/2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/3.png b/1.6/media/3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/4.png b/1.6/media/4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/5.png b/1.6/media/5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/6.png b/1.6/media/6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/7.png b/1.6/media/7.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/8.png b/1.6/media/8.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/9.png b/1.6/media/9.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/add_holdings-1.png b/1.6/media/add_holdings-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/add_holdings-2.png b/1.6/media/add_holdings-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/add_holdings-3.png b/1.6/media/add_holdings-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/add_holdings-4.png b/1.6/media/add_holdings-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/add_holdings-5.png b/1.6/media/add_holdings-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-10.png b/1.6/media/catalogue-10.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-11.png b/1.6/media/catalogue-11.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-3.png b/1.6/media/catalogue-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-4.png b/1.6/media/catalogue-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-5.png b/1.6/media/catalogue-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-6.png b/1.6/media/catalogue-6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-7.png b/1.6/media/catalogue-7.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-8.png b/1.6/media/catalogue-8.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/catalogue-9.png b/1.6/media/catalogue-9.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/caution.png b/1.6/media/caution.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-1.png b/1.6/media/create-template-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-10.png b/1.6/media/create-template-10.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-11.png b/1.6/media/create-template-11.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-12.png b/1.6/media/create-template-12.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-13.png b/1.6/media/create-template-13.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-15.png b/1.6/media/create-template-15.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-16.png b/1.6/media/create-template-16.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-17.png b/1.6/media/create-template-17.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-19.png b/1.6/media/create-template-19.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-2.png b/1.6/media/create-template-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-20.png b/1.6/media/create-template-20.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-21.png b/1.6/media/create-template-21.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-22.png b/1.6/media/create-template-22.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-23.png b/1.6/media/create-template-23.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-24.png b/1.6/media/create-template-24.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-25.png b/1.6/media/create-template-25.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-26.png b/1.6/media/create-template-26.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-27.png b/1.6/media/create-template-27.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-28.png b/1.6/media/create-template-28.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-29.png b/1.6/media/create-template-29.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-3.png b/1.6/media/create-template-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-30.png b/1.6/media/create-template-30.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-31.png b/1.6/media/create-template-31.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-32.png b/1.6/media/create-template-32.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-33.png b/1.6/media/create-template-33.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-34.png b/1.6/media/create-template-34.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-35.png b/1.6/media/create-template-35.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-4.png b/1.6/media/create-template-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-5.png b/1.6/media/create-template-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-6.png b/1.6/media/create-template-6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-7.png b/1.6/media/create-template-7.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-8.png b/1.6/media/create-template-8.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/create-template-9.png b/1.6/media/create-template-9.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/evergreen_logo.gif b/1.6/media/evergreen_logo.gif
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/folder-1.png b/1.6/media/folder-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/folder-10.png b/1.6/media/folder-10.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/folder-11.png b/1.6/media/folder-11.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/folder-12.png b/1.6/media/folder-12.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/folder-13.png b/1.6/media/folder-13.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/folder-14.png b/1.6/media/folder-14.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/folder-7a.png b/1.6/media/folder-7a.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/generate-report-1.png b/1.6/media/generate-report-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/generate-report-10.png b/1.6/media/generate-report-10.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/generate-report-14.png b/1.6/media/generate-report-14.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/generate-report-2.png b/1.6/media/generate-report-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/generate-report-3.png b/1.6/media/generate-report-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/generate-report-8.png b/1.6/media/generate-report-8.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/generate-report-9.png b/1.6/media/generate-report-9.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-1.png b/1.6/media/lsa-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-10.jpg b/1.6/media/lsa-10.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-11.jpg b/1.6/media/lsa-11.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-12.jpg b/1.6/media/lsa-12.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-14.jpg b/1.6/media/lsa-14.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-16.jpg b/1.6/media/lsa-16.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-17.jpg b/1.6/media/lsa-17.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-18.jpg b/1.6/media/lsa-18.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-2.jpg b/1.6/media/lsa-2.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-22.png b/1.6/media/lsa-22.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-23.jpg b/1.6/media/lsa-23.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-25.jpg b/1.6/media/lsa-25.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-26.jpg b/1.6/media/lsa-26.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-27.jpg b/1.6/media/lsa-27.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-28.jpg b/1.6/media/lsa-28.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-32.jpg b/1.6/media/lsa-32.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-33.jpg b/1.6/media/lsa-33.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-4.jpg b/1.6/media/lsa-4.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-5.jpg b/1.6/media/lsa-5.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-7.jpg b/1.6/media/lsa-7.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-8.jpg b/1.6/media/lsa-8.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-closed-mountain-1.png b/1.6/media/lsa-closed-mountain-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-closed-mountain-2.png b/1.6/media/lsa-closed-mountain-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-group-0.png b/1.6/media/lsa-group-0.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-group-1.png b/1.6/media/lsa-group-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-group-1a.png b/1.6/media/lsa-group-1a.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-group-2.png b/1.6/media/lsa-group-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-group-3.png b/1.6/media/lsa-group-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-group-4.png b/1.6/media/lsa-group-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-group-5.png b/1.6/media/lsa-group-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/lsa-group-6.png b/1.6/media/lsa-group-6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/main_logo.jpg b/1.6/media/main_logo.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-bookbags.png b/1.6/media/myaccount-bookbags.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-itemrenew.png b/1.6/media/myaccount-itemrenew.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-itemscheckedout.png b/1.6/media/myaccount-itemscheckedout.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-itemsonhold.png b/1.6/media/myaccount-itemsonhold.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-login-arrow.png b/1.6/media/myaccount-login-arrow.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-login-info.png b/1.6/media/myaccount-login-info.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-login.png b/1.6/media/myaccount-login.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-loginpasswordupdate.png b/1.6/media/myaccount-loginpasswordupdate.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/myaccount-summary.png b/1.6/media/myaccount-summary.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/note.png b/1.6/media/note.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/passwordresetmessage.png b/1.6/media/passwordresetmessage.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/pdf_icon.gif b/1.6/media/pdf_icon.gif
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/profile-5.png b/1.6/media/profile-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/profile-6.png b/1.6/media/profile-6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/profile-7.png b/1.6/media/profile-7.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-10.jpg b/1.6/media/receipt-10.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-11.jpg b/1.6/media/receipt-11.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-12.jpg b/1.6/media/receipt-12.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-13.jpg b/1.6/media/receipt-13.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-14.jpg b/1.6/media/receipt-14.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-15.jpg b/1.6/media/receipt-15.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-16.png b/1.6/media/receipt-16.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-17.jpg b/1.6/media/receipt-17.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-18.jpg b/1.6/media/receipt-18.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-19.jpg b/1.6/media/receipt-19.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-2.jpg b/1.6/media/receipt-2.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-20.jpg b/1.6/media/receipt-20.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-21.jpg b/1.6/media/receipt-21.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-22.jpg b/1.6/media/receipt-22.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-23.jpg b/1.6/media/receipt-23.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-24.jpg b/1.6/media/receipt-24.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-3.jpg b/1.6/media/receipt-3.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-4.jpg b/1.6/media/receipt-4.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-5.jpg b/1.6/media/receipt-5.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-6.jpg b/1.6/media/receipt-6.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-7.jpg b/1.6/media/receipt-7.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-8.jpg b/1.6/media/receipt-8.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/receipt-9.jpg b/1.6/media/receipt-9.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/server-3.png b/1.6/media/server-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/server-4.png b/1.6/media/server-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/server-5.png b/1.6/media/server-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/server-6.png b/1.6/media/server-6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-staffclient-running-1.png b/1.6/media/serversideinstallation-staffclient-running-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-staffclient-running-2.png b/1.6/media/serversideinstallation-staffclient-running-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-staffclient-running-3.png b/1.6/media/serversideinstallation-staffclient-running-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-staffclient-running-4.png b/1.6/media/serversideinstallation-staffclient-running-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-testing-1.png b/1.6/media/serversideinstallation-testing-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-testing-2.png b/1.6/media/serversideinstallation-testing-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vbox-install-1.png b/1.6/media/serversideinstallation-virtual-vbox-install-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vbox-install-2.png b/1.6/media/serversideinstallation-virtual-vbox-install-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vbox-install-3.png b/1.6/media/serversideinstallation-virtual-vbox-install-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-12.png b/1.6/media/serversideinstallation-virtual-vm-install-12.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-13.png b/1.6/media/serversideinstallation-virtual-vm-install-13.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-14.png b/1.6/media/serversideinstallation-virtual-vm-install-14.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-15.png b/1.6/media/serversideinstallation-virtual-vm-install-15.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-16.png b/1.6/media/serversideinstallation-virtual-vm-install-16.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-17.png b/1.6/media/serversideinstallation-virtual-vm-install-17.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-18.png b/1.6/media/serversideinstallation-virtual-vm-install-18.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-19.png b/1.6/media/serversideinstallation-virtual-vm-install-19.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-20.png b/1.6/media/serversideinstallation-virtual-vm-install-20.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-21.png b/1.6/media/serversideinstallation-virtual-vm-install-21.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-3.png b/1.6/media/serversideinstallation-virtual-vm-install-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-5.png b/1.6/media/serversideinstallation-virtual-vm-install-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-6.png b/1.6/media/serversideinstallation-virtual-vm-install-6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-7.png b/1.6/media/serversideinstallation-virtual-vm-install-7.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/serversideinstallation-virtual-vm-install-8.png b/1.6/media/serversideinstallation-virtual-vm-install-8.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/shared-template-6.png b/1.6/media/shared-template-6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/shared-template-7.png b/1.6/media/shared-template-7.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/shared-template-9.png b/1.6/media/shared-template-9.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/small_logo_white.jpg b/1.6/media/small_logo_white.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-proxy-putty-1.png b/1.6/media/staffclientinstallation-proxy-putty-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-proxy-socks-1.png b/1.6/media/staffclientinstallation-proxy-socks-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-proxy-socks-2.png b/1.6/media/staffclientinstallation-proxy-socks-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-staffclient-1.png b/1.6/media/staffclientinstallation-staffclient-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-staffclient-2.png b/1.6/media/staffclientinstallation-staffclient-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-staffclient-3.png b/1.6/media/staffclientinstallation-staffclient-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-staffclient-4.png b/1.6/media/staffclientinstallation-staffclient-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-staffclient-workstationnames-1.png b/1.6/media/staffclientinstallation-staffclient-workstationnames-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-staffclient-workstationnames-2.png b/1.6/media/staffclientinstallation-staffclient-workstationnames-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-staffclient-workstationnames-3.png b/1.6/media/staffclientinstallation-staffclient-workstationnames-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/staffclientinstallation-tabbed-1.png b/1.6/media/staffclientinstallation-tabbed-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-1.png b/1.6/media/survey-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-10.png b/1.6/media/survey-10.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-2.png b/1.6/media/survey-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-3.png b/1.6/media/survey-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-4.png b/1.6/media/survey-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-5.png b/1.6/media/survey-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-6.png b/1.6/media/survey-6.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-7.png b/1.6/media/survey-7.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-8.png b/1.6/media/survey-8.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/survey-9.png b/1.6/media/survey-9.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/tip.png b/1.6/media/tip.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/view-output-1.png b/1.6/media/view-output-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/view-output-2.png b/1.6/media/view-output-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/view-output-3.png b/1.6/media/view-output-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/view-output-4.png b/1.6/media/view-output-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/view-output-5.png b/1.6/media/view-output-5.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/1.6/media/warning.png b/1.6/media/warning.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/admin/migratingdata_2.0.xml b/2.0/admin/migratingdata_2.0.xml
index db86f3e..f1121f0 100644 (file)
--- a/2.0/admin/migratingdata_2.0.xml
+++ b/2.0/admin/migratingdata_2.0.xml
@@ -159,9 +159,10 @@ make install
                                        </itemizedlist>\r
                                </para> \r
 <screen>\r
-<userinput>\r
-export PATH=[<emphasis class="italic">path to Evergreen</emphasis>]/Open-ILS/src/extras/import:/[<emphasis class="italic">path to migration-tools</emphasis>]/migration-tools:$PATH:.\r
-export PERL5LIB=/openils/lib/perl5:/[<emphasis class="italic">path to migration-tools directory</emphasis>]/migration-tools/Equinox-Migration/lib\r
+<userinput>export PATH=[<emphasis class="italic">path to Evergreen</emphasis>]/Open-ILS/src/extras/import: \\r
+/[<emphasis class="italic">path to migration-tools</emphasis>]/migration-tools:$PATH:.\r
+export PERL5LIB=/openils/lib/perl5: \ \r
+/[<emphasis class="italic">path to migration-tools</emphasis>/Equinox-Migration/lib\r
 </userinput>\r
 </screen>\r
 </step>\r
@@ -214,7 +215,8 @@ fingerprinter -o incumbent.fp -x incumbent.ex clean.marc.xml
                                have existing bibliographic records in your system previously imported:</para>\r
 <screen>\r
 <userinput>\r
-fingerprinter -o production.fp -x production.fp.ex --marctype=MARC21 existing_marc_records.mrc --tag=901 --subfield=c\r
+fingerprinter -o production.fp -x production.fp.ex --marctype=MARC21 existing_marc_records.mrc \\r
+--tag=901 --subfield=c\r
 </userinput>\r
 </screen>\r
                                <para><systemitem>fingerprinter</systemitem> is used for deduplification of the incumbant records.</para>\r
@@ -241,8 +243,10 @@ match_fingerprints [-t start id] -o records.merge dedupe.fp
                                <para>Extract all of the currently used TCN's an generate the .bre and .ingest files to prepare for the bibliographic record load.</para>\r
 <screen>\r
 <userinput>\r
-psql -U evergreen -c "select tcn_value from biblio.record_entry where not deleted" | perl -npe 's/^\s+//;' > used_tcns\r
-marc2bre.pl --idfield 903 [--startid=#] --marctype=XML -f final.xml --used_tcn_file=used_tcns > evergreen_bre_import_file.bre\r
+psql -U evergreen -c "select tcn_value from biblio.record_entry where not deleted" \\r
+| perl -npe 's/^\s+//;' > used_tcns\r
+marc2bre.pl --idfield 903 [--startid=#] --marctype=XML -f final.xml \\r
+--used_tcn_file=used_tcns > evergreen_bre_import_file.bre\r
 </userinput>\r
 </screen>\r
                                <note>\r
@@ -323,7 +327,8 @@ BEGIN;
 \r
 <emphasis class="bold">TRUNCATE TABLE staging_items;</emphasis>\r
 \r
-<emphasis class="bold">INSERT INTO staging_items (</emphasis>egid, hseq, l_call_num, l_barcode, l_location, l_owning_lib, l_circ_modifier <emphasis>FROM stdin;</emphasis> \r
+<emphasis class="bold">INSERT INTO staging_items (</emphasis>egid, hseq, l_call_num, l_barcode, l_location, \r
+l_owning_lib, l_circ_modifier <emphasis>FROM stdin;</emphasis> \r
 40      0       HD3616.K853 U54 1997    30731100751928  STACKS  FENNELL BOOK\r
 41      1       HV6548.C3 S984 1998     30731100826613  STACKS  FENNELL BOOK\r
 41      2       HV6548.C3 S984 1998     30731100804958  STACKS  BRANTFORD       BOOK\r
@@ -644,8 +649,8 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
        JOIN asset.call_number AS acn ON acn.record-bre.id \r
        WHERE bre.deleted='false' and ownling_lib=101 \g /home/opensrf/records.txt;\r
 </programlisting>\r
-                               <para>This query will create a file called <filename>ids.txt</filename> containing a column of distinct ids of items owned by the organizational unit with the \r
-                               <table class="field">id</table> <literal>101</literal>.</para>\r
+                               <para>This query will create a file called <filename>records.txt</filename> containing a column of distinct ids of items owned by the organizational unit with the \r
+                               <database class="field">id</database> <literal>101</literal>.</para>\r
                        </step>\r
                        <step>\r
                                <para>Navigate to the support-scripts folder</para>\r
@@ -656,7 +661,8 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
                        <step>\r
                                <para>Run <command>marc_export</command>, using the id file you created in step 1 to define which files to export.</para>\r
 <screen>\r
-<userinput>cat /home/opensrf/records.txt | ./marc_export -i -c /openils/conf/opensrf_core.xml -x /openils/conf/fm_IDL.xml -f XML --timeout 5 > exported_files.xml\r
+<userinput>cat /home/opensrf/records.txt | ./marc_export -i -c /openils/conf/opensrf_core.xml \\r
+-x /openils/conf/fm_IDL.xml -f XML --timeout 5 > exported_files.xml\r
 </userinput>\r
 </screen>\r
                                <para>The example above export the records into MARCXML format.</para>\r

diff --git a/2.0/media/1.png b/2.0/media/1.png
new file mode 100755 (executable)
index 0000000..7d47343
Binary files /dev/null and b/2.0/media/1.png differ

diff --git a/2.0/media/10.png b/2.0/media/10.png
new file mode 100755 (executable)
index 0000000..997bbc8
Binary files /dev/null and b/2.0/media/10.png differ

diff --git a/2.0/media/11.png b/2.0/media/11.png
new file mode 100755 (executable)
index 0000000..ce47dac
Binary files /dev/null and b/2.0/media/11.png differ

diff --git a/2.0/media/12.png b/2.0/media/12.png
new file mode 100755 (executable)
index 0000000..31daf4e
Binary files /dev/null and b/2.0/media/12.png differ

diff --git a/2.0/media/13.png b/2.0/media/13.png
new file mode 100755 (executable)
index 0000000..14021a8
Binary files /dev/null and b/2.0/media/13.png differ

diff --git a/2.0/media/14.png b/2.0/media/14.png
new file mode 100755 (executable)
index 0000000..64014b7
Binary files /dev/null and b/2.0/media/14.png differ

diff --git a/2.0/media/15.png b/2.0/media/15.png
new file mode 100755 (executable)
index 0000000..0d65765
Binary files /dev/null and b/2.0/media/15.png differ

diff --git a/2.0/media/2.png b/2.0/media/2.png
new file mode 100755 (executable)
index 0000000..5d09341
Binary files /dev/null and b/2.0/media/2.png differ

diff --git a/2.0/media/3.png b/2.0/media/3.png
new file mode 100755 (executable)
index 0000000..ef7b700
Binary files /dev/null and b/2.0/media/3.png differ

diff --git a/2.0/media/4.png b/2.0/media/4.png
new file mode 100755 (executable)
index 0000000..adb8364
Binary files /dev/null and b/2.0/media/4.png differ

diff --git a/2.0/media/5.png b/2.0/media/5.png
new file mode 100755 (executable)
index 0000000..4d7eb46
Binary files /dev/null and b/2.0/media/5.png differ

diff --git a/2.0/media/6.png b/2.0/media/6.png
new file mode 100755 (executable)
index 0000000..0ba694a
Binary files /dev/null and b/2.0/media/6.png differ

diff --git a/2.0/media/7.png b/2.0/media/7.png
new file mode 100755 (executable)
index 0000000..472e96f
Binary files /dev/null and b/2.0/media/7.png differ

diff --git a/2.0/media/8.png b/2.0/media/8.png
new file mode 100755 (executable)
index 0000000..5e60973
Binary files /dev/null and b/2.0/media/8.png differ

diff --git a/2.0/media/9.png b/2.0/media/9.png
new file mode 100755 (executable)
index 0000000..a0676d2
Binary files /dev/null and b/2.0/media/9.png differ

diff --git a/2.0/media/batch-receive-apply.png b/2.0/media/batch-receive-apply.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/batch-receive-autogen-1.png b/2.0/media/batch-receive-autogen-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/batch-receive-autogen-2.png b/2.0/media/batch-receive-autogen-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/batch-receive-choose-iss.png b/2.0/media/batch-receive-choose-iss.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/batch-receive-partial.png b/2.0/media/batch-receive-partial.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/batch-receive-print-routing.png b/2.0/media/batch-receive-print-routing.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/batch-receive-receive.png b/2.0/media/batch-receive-receive.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/batch-receive-received.png b/2.0/media/batch-receive-received.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/batch-receive-simple.png b/2.0/media/batch-receive-simple.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/caption-pattern-tab.png b/2.0/media/caption-pattern-tab.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/caution.png b/2.0/media/caution.png
new file mode 100755 (executable)
index 0000000..cdc6568
Binary files /dev/null and b/2.0/media/caution.png differ

diff --git a/2.0/media/create-copy-template.png b/2.0/media/create-copy-template.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/create-distrib.png b/2.0/media/create-distrib.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/create-iss-1.png b/2.0/media/create-iss-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/create-iss-2.png b/2.0/media/create-iss-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/create-many-streams.png b/2.0/media/create-many-streams.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/create-sub.png b/2.0/media/create-sub.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/distribs-to-streams.png b/2.0/media/distribs-to-streams.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/evergreen_logo.gif b/2.0/media/evergreen_logo.gif
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/find-copy-template-menu.png b/2.0/media/find-copy-template-menu.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/generated-iss-delete-dummy.png b/2.0/media/generated-iss-delete-dummy.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/main_logo.jpg b/2.0/media/main_logo.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/new-stream.png b/2.0/media/new-stream.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/note.png b/2.0/media/note.png
new file mode 100755 (executable)
index 0000000..198ada5
Binary files /dev/null and b/2.0/media/note.png differ

diff --git a/2.0/media/pdf_icon.gif b/2.0/media/pdf_icon.gif
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/predict-how-many.png b/2.0/media/predict-how-many.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/received-items-in-catalog.png b/2.0/media/received-items-in-catalog.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/routing-list-add.png b/2.0/media/routing-list-add.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/routing-list-drag.png b/2.0/media/routing-list-drag.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/routing-list-manage.png b/2.0/media/routing-list-manage.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/save-scap.png b/2.0/media/save-scap.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/scap-wiz-page-1.png b/2.0/media/scap-wiz-page-1.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/scap-wiz-page-2.png b/2.0/media/scap-wiz-page-2.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/scap-wiz-page-3.png b/2.0/media/scap-wiz-page-3.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/scap-wiz-page-4.png b/2.0/media/scap-wiz-page-4.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/small_logo_white.jpg b/2.0/media/small_logo_white.jpg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/start-from-catalog.png b/2.0/media/start-from-catalog.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/sub-details.png b/2.0/media/sub-details.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/subscription-manage.png b/2.0/media/subscription-manage.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/2.0/media/tip.png b/2.0/media/tip.png
new file mode 100755 (executable)
index 0000000..eaabe82
Binary files /dev/null and b/2.0/media/tip.png differ

diff --git a/2.0/media/warning.png b/2.0/media/warning.png
new file mode 100755 (executable)
index 0000000..cdc6568
Binary files /dev/null and b/2.0/media/warning.png differ

diff --git a/2.0/root.xml b/2.0/root.xml
index 9eb5360..d14b1de 100755 (executable)
--- a/2.0/root.xml
+++ b/2.0/root.xml
@@ -37,6 +37,7 @@
                        <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

diff --git a/tools/2.0Convert.sh b/tools/2.0Convert.sh
index 8a8e7d7..9cfe9ae 100755 (executable)
--- a/tools/2.0Convert.sh
+++ b/tools/2.0Convert.sh
@@ -13,7 +13,7 @@ cd ~/Evergreen-DocBook/2.0/
  ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/2.0/draft/pdf/Evergreen_Documentation.pdf 
 
 # remove temporary .fo file
-rm pdf/temp.fo
+#rm pdf/temp.fo
 
 #generate 1.6 draft html
 # xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/1.6/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml

diff --git a/tools/docbookConvert.sh b/tools/docbookConvert.sh
index a871727..75e27f2 100755 (executable)
--- a/tools/docbookConvert.sh
+++ b/tools/docbookConvert.sh
@@ -13,7 +13,7 @@ cd ~/Evergreen-DocBook/2.0/
  ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/2.0/draft/pdf/Evergreen_Documentation.pdf 
 
 # remove temporary .fo file
-rm pdf/temp.fo
+# rm pdf/temp_2.0.fo
 
 #generate 1.6 draft html
  xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/1.6/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml
@@ -28,4 +28,4 @@ cd ~/Evergreen-DocBook/1.6/
  ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/1.6/draft/pdf/Evergreen_Documentation.pdf 
 
 # remove temporary .fo file
-rm pdf/temp.fo
+# rm pdf/temp.fo