Fix PDF overflow issues in admin part.

diff --git a/1.6/admin/Upgrading-Evergreen_1.6.xml b/1.6/admin/Upgrading-Evergreen_1.6.xml
index b6f6295..5c2bae1 100644 (file)
--- a/1.6/admin/Upgrading-Evergreen_1.6.xml
+++ b/1.6/admin/Upgrading-Evergreen_1.6.xml
@@ -229,8 +229,9 @@ tar xzf Evergreen-ILS-1.6.1.2.tar.gz
                                bootstrapping scripts and <filename>offline-config.pl</filename> for the offline staff client data uploader:</para>\r
 <screen><userinput>\r
 cd /home/opensrf/Evergreen-ILS-1.6.1.2\r
-perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-offline --user evergreen \\r
---password evergreen --hostname localhost --port 5432 --database evergreen\r
+perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-offline \ \r
+--user evergreen --password evergreen --hostname localhost --port 5432 \\r
+--database evergreen\r
 </userinput></screen>\r
                        </step>\r
                        <step>\r

diff --git a/1.6/admin/migratingdata.xml b/1.6/admin/migratingdata.xml
index ed47b7a..074c753 100644 (file)
--- a/1.6/admin/migratingdata.xml
+++ b/1.6/admin/migratingdata.xml
@@ -192,10 +192,11 @@ http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd">
                                <indexterm><primary>sql</primary></indexterm> \r
 <programlisting language="sql">\r
 CREATE TABLE students (\r
-        student_id int, barcode text, last_name text, first_name text, program_number text, program_name text,\r
-        email text, address_type text, street1 text, street2 text, city text, province text, country text, \r
-        postal_code text, phone text, profile int, ident_type int, home_ou int, \r
-        claims_returned_count int DEFAULT 0, usrname text, net_access_level int DEFAULT 2, password text\r
+        student_id int, barcode text, last_name text, first_name text, program_number text, \r
+       program_name text, email text, address_type text, street1 text, street2 text, \r
+       city text, province text, country text, postal_code text, phone text, profile int, \r
+       ident_type int, home_ou int, claims_returned_count int DEFAULT 0, usrname text, \r
+       net_access_level int DEFAULT 2, password text\r
 ); \r
 </programlisting>\r
                                <para>Note the <varname>DEFAULT</varname> variables. These allow you to set default for your library or to populate required fields if you data allows \r
@@ -214,10 +215,10 @@ substring(phone from 10), '(', ''), ')', ''), ' ', '-');
                                <para>Insert records from the staging table into the <link linkend="actor.table.usr">actor.usr</link> Evergreen table:</para>\r
 <programlisting language="sql">\r
  INSERT INTO actor.usr (\r
-       profile, usrname, email, passwd, ident_type, ident_value, first_given_name, family_name, day_phone, \r
-       home_ou, claims_returned_count, net_access_level) \r
-       SELECT profile, students.usrname, email, student_id, ident_type, student_id, first_name, last_name, \r
-       phone, home_ou, claims_returned_count, net_access_level \r
+       profile, usrname, email, passwd, ident_type, ident_value, first_given_name, \r
+       family_name, day_phone, home_ou, claims_returned_count, net_access_level) \r
+       SELECT profile, students.usrname, email, student_id, ident_type, student_id, \r
+       first_name, last_name, phone, home_ou, claims_returned_count, net_access_level \r
        FROM students;\r
 </programlisting>                      \r
                        </step>\r
@@ -279,19 +280,20 @@ BEGIN;
 \r
 -- Create staging table.\r
 CREATE TABLE students (\r
-       student_id int, barcode text, last_name text, first_name text, program_number text, program_name text, \r
-       email text, address_type text, street1 text, street2 text, city text, province text, country text, \r
-       postal_code text, phone text, profile int, ident_type int, home_ou int, \r
-       claims_returned_count int DEFAULT 0, usrname text, net_access_level int DEFAULT 2, password text\r
+       student_id int, barcode text, last_name text, first_name text, program_number text, \r
+       program_name text, email text, address_type text, street1 text, street2 text, \r
+       city text, province text, country text, postal_code text, phone text, profile int, \r
+       ident_type int, home_ou int, claims_returned_count int DEFAULT 0, usrname text, \r
+       net_access_level int DEFAULT 2, password text\r
 ); \r
 \r
 \r
 --Insert records from the staging table into the actor.usr table.\r
 INSERT INTO actor.usr (\r
-       profile, usrname, email, passwd, ident_type, ident_value, first_given_name, family_name, day_phone, \r
-       home_ou, claims_returned_count, net_access_level) \r
-       SELECT profile, students.usrname, email, student_id, ident_type, student_id, first_name, last_name, \r
-       phone, home_ou, claims_returned_count, net_access_level FROM students;\r
+       profile, usrname, email, passwd, ident_type, ident_value, first_given_name, family_name, \r
+       day_phone, home_ou, claims_returned_count, net_access_level) \r
+       SELECT profile, students.usrname, email, student_id, ident_type, student_id, first_name, \r
+       last_name, phone, home_ou, claims_returned_count, net_access_level FROM students;\r
 \r
 --Insert records from the staging table into the actor.usr table.\r
 INSERT INTO actor.card (usr, barcode) \r

diff --git a/1.6/admin/staffclientinstallation.xml b/1.6/admin/staffclientinstallation.xml
index 259d6bd..de727ac 100644 (file)
--- a/1.6/admin/staffclientinstallation.xml
+++ b/1.6/admin/staffclientinstallation.xml
@@ -168,7 +168,8 @@
                                                        (adjust for your version of Evergreen):</para>\r
 <programlisting language="xml"><![CDATA[\r
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\r
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" \r
+       "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\r
 <plist version="1.0">\r
 <dict>\r
        <key>CFBundleExecutable</key>\r