Merge branch 'sitka_2_8' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/acquisit...

diff --git a/acq/acq-add-records.xml b/acq/acq-add-records.xml
index 33b75de..db19d50 100644 (file)
--- a/acq/acq-add-records.xml
+++ b/acq/acq-add-records.xml
@@ -93,7 +93,7 @@ records can be added to new or existing selection lists.  Brief records can also
 <alt>screenshot of brief record</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/new-brief-addrecord-7.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/new-brief-addrecord-7.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -154,7 +154,7 @@ records can be added to new or existing selection lists.  Brief records can also
 <alt>screenshot of brief record</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/new-brief-addrecord-7.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/new-brief-addrecord-7.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -205,7 +205,7 @@ records can be added to new or existing selection lists.  Brief records can also
 <alt>screenshot of new line item</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/newbrief2.png" width="100%" scalefit="0"></imagedata>\r
+<imagedata fileref="media/newbrief2.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -385,7 +385,8 @@ in the name of the selection list you would like to create.</para>
 <para>Select <guilabel>Merge Using Existing Record</guilabel> from the <guilabel>Merge Profile</guilabel> drop down menu.</para>\r
 </listitem>\r
 <listitem>\r
-<para>Select <guilabel>oclc</guilabel> from the <guilabel>Record Source</guilabel> drop down menu.</para>\r
+<para>Select <guilabel>provider</guilabel> from the <guilabel>Record Source</guilabel> drop down\r
+                           menu.</para>\r
 </listitem>\r
 <listitem>\r
 <para>Check the box for <guilabel>Import Non-Matching Records</guilabel> to automatically import MARC records from the file if they are not already in the Sitka catalogue.</para>\r
@@ -552,7 +553,7 @@ in the name of the selection list you would like to create.</para>
 <alt>screenshot of MARC federated search</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/MARC-federated-addrecord-6.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/MARC-federated-addrecord-6.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -754,7 +755,7 @@ an additional file of record IDs.</para>
 <alt>screenshot of load catalog IDs</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/load-catalog-record-7.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/load-catalogue-record-7.png" width="100%" scalefit="0"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -856,7 +857,7 @@ of titles to be ordered.</para>
 <alt>screenshot of view/place orders</alt>\r
 \r
 <imageobject>\r
-   <imagedata fileref="media/view_order.png" width="100%" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/view_order.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r

diff --git a/acq/acq-claim-items.xml b/acq/acq-claim-items.xml
index 2ab1af7..f7b7901 100644 (file)
--- a/acq/acq-claim-items.xml
+++ b/acq/acq-claim-items.xml
@@ -13,7 +13,8 @@
      \r
 \r
       <abstract>\r
-         <para>All claiming is currently manual; electronic claiming is not available in the 2.4 release.</para>  \r
+         <para>All claiming is currently manual; electronic claiming is not available in the 2.8\r
+            release.</para>  \r
 <para>Evergreen uses the default claiming policies set for each provider to compile a claim-ready list of items based on order date.  This list can aid staff when \r
 claiming items.  Staff can use Evergreen to track items that have been manually claimed.</para>\r
 <para>Default claiming policies have been set Sitka-wide.  These defaults can be found in the <link linkend="claiming-acq">Claiming</link> section of \r

diff --git a/acq/acq-load-bib.xml b/acq/acq-load-bib.xml
index 1e8490f..66cbdcf 100644 (file)
--- a/acq/acq-load-bib.xml
+++ b/acq/acq-load-bib.xml
@@ -197,7 +197,7 @@ duplicate record.</para>
 <alt>screenshot of Vandelay Interface</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/load-bibs-vandelay-1.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/acq-vandelay-1.png" scalefit="0"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -308,7 +308,7 @@ found a match in the database and were not automatically imported.</para>
 <alt>screenshot of Vandelay Interface</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/load-bibs-vandelay-3.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/load-bibs-vandelay-3.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -319,7 +319,7 @@ found a match in the database and were not automatically imported.</para>
 <alt>screenshot of Vandelay Interface</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/load-bibs-vandelay-4.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/load-bibs-vandelay-4.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r

diff --git a/acq/acq-purchase-orders.xml b/acq/acq-purchase-orders.xml
index 4ecfaaf..93f413e 100644 (file)
--- a/acq/acq-purchase-orders.xml
+++ b/acq/acq-purchase-orders.xml
@@ -38,7 +38,7 @@ purchase orders are also covered.</para></abstract>
 <alt>screenshot of line item status</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/mark-order-purchaseorder-1.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/mark-order-purchaseorder-1.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -90,7 +90,7 @@ purchase orders are also covered.</para></abstract>
 <alt>screenshot of line item status</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/mark-order-purchaseorder-3.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/mark-order-purchaseorder-3.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -164,6 +164,21 @@ when the purchase order is activated. The <guilabel>Total Spent</guilabel> colum
 </mediaobject></para>\r
 </informalfigure>\r
 </step>\r
+   \r
+   <step>\r
+      <informalfigure>\r
+         <para>In the <guilabel>Name</guilabel> field, enter the name for the Purchase Order. .</para>\r
+         <para>If the selected name is already in use by another PO at or below the ordering agency for the PO, the save button is disabled, and you will see a link to the existing Purchase Order. The link opens the related Purchase Order in a new tab when clicked.</para>  \r
+            \r
+         <para><mediaobject>\r
+            <alt>screenshot of line item status</alt>\r
+            \r
+            <imageobject>\r
+               <imagedata fileref="media/create-new-purchaseorder-9.png" scalefit="0"></imagedata>\r
+            </imageobject>\r
+         </mediaobject></para>\r
+      </informalfigure>\r
+   </step>   \r
 \r
 <step>\r
 <informalfigure>\r
@@ -890,7 +905,7 @@ corner of the top half of the screen.</para>
 <alt>screenshot of split purchase order</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/split-line-purchase-order-1.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/split-line-purchase-order-1.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -1032,7 +1047,7 @@ remain encumbered for the purchase while the purchase order has the status of ca
 <alt>screenshot of cancel order</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/purchase-order-cancel-5.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/purchase-order-cancel-5.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -1110,7 +1125,7 @@ remain encumbered for the purchase while the purchase order has the status of ca
 <alt>screenshot of cancel order</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/cancel4.png" width="100%" scalefit="0"></imagedata>\r
+<imagedata fileref="media/cancel4.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -1266,7 +1281,7 @@ on the printed purchase order.</para>
 <alt>screenshot of receiving</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/purchaseorder-receive-3.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/purchaseorder-receive-3.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -1332,7 +1347,7 @@ un-receive the purchase order. The purchase order must have the status of <guila
 <alt>screenshot of receiving</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/purchaseorder-un-receive-3.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/purchaseorder-un-receive-3.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r

diff --git a/acq/acq-search-module.xml b/acq/acq-search-module.xml
index 515fba6..b3e4fcd 100644 (file)
--- a/acq/acq-search-module.xml
+++ b/acq/acq-search-module.xml
@@ -144,7 +144,7 @@ option you chose. </para>
 <alt>screenshot of the General Search</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/general-search-5.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/general-search-5.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -242,7 +242,7 @@ are not placed for items that your library already owns or is in the process of
 <alt>screenshot of the General Search</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/lineitem-catalogue-search-3.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/lineitem-catalogue-search-3.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r

diff --git a/acq/acq-selection-lists.xml b/acq/acq-selection-lists.xml
index 10ba128..1a30b5f 100644 (file)
--- a/acq/acq-selection-lists.xml
+++ b/acq/acq-selection-lists.xml
@@ -390,7 +390,7 @@ your selection list before clicking <guilabel>Delete Selected</guilabel>.</para>
 <alt>screenshot of selection lists</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/mark-selector-selection-1.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/mark-selector-selection-1.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -443,7 +443,7 @@ your selection list before clicking <guilabel>Delete Selected</guilabel>.</para>
 <alt>screenshot of selection lists</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/mark-selector-selection-5.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/mark-selector-selection-5.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -503,6 +503,18 @@ your selection list before clicking <guilabel>Delete Selected</guilabel>.</para>
 </mediaobject></para>\r
 </informalfigure>\r
 </step>\r
+   \r
+<step>\r
+   <informalfigure>\r
+   <para>Enter the Name for the <guilabel>Purchase Order</guilabel>. This field is optional.</para>\r
+   <para><mediaobject>\r
+   <alt>screenshot of selection lists</alt>\r
+            <imageobject>\r
+               <imagedata fileref="media/convert-selection-9.png" scalefit="0"></imagedata>\r
+            </imageobject>\r
+         </mediaobject></para>\r
+      </informalfigure>\r
+   </step>   \r
 \r
 <step>\r
 <informalfigure>\r

diff --git a/acq/media/MARC-federated-addrecord-6.png b/acq/media/MARC-federated-addrecord-6.png
index 80e933b..1f31e90 100644 (file)
Binary files a/acq/media/MARC-federated-addrecord-6.png and b/acq/media/MARC-federated-addrecord-6.png differ

diff --git a/acq/media/Thumbs.db b/acq/media/Thumbs.db
index a51e136..bf93e43 100644 (file)
Binary files a/acq/media/Thumbs.db and b/acq/media/Thumbs.db differ

diff --git a/acq/media/acq-vandelay-1.png b/acq/media/acq-vandelay-1.png
index ba602c3..f7b9cd3 100644 (file)
Binary files a/acq/media/acq-vandelay-1.png and b/acq/media/acq-vandelay-1.png differ

diff --git a/acq/media/briefrecord.png b/acq/media/briefrecord.png
index 9b79eb6..c8b7ac7 100644 (file)
Binary files a/acq/media/briefrecord.png and b/acq/media/briefrecord.png differ

diff --git a/acq/media/cancel.png b/acq/media/cancel.png
index 770fa0b..ba8d227 100644 (file)
Binary files a/acq/media/cancel.png and b/acq/media/cancel.png differ

diff --git a/acq/media/cancel1.png b/acq/media/cancel1.png
index cf9d8a0..df96c24 100644 (file)
Binary files a/acq/media/cancel1.png and b/acq/media/cancel1.png differ

diff --git a/acq/media/cancel2.png b/acq/media/cancel2.png
index bdbf322..d3994b2 100644 (file)
Binary files a/acq/media/cancel2.png and b/acq/media/cancel2.png differ

diff --git a/acq/media/cancel4.png b/acq/media/cancel4.png
index 13fde66..d27a190 100644 (file)
Binary files a/acq/media/cancel4.png and b/acq/media/cancel4.png differ

diff --git a/acq/media/convert-selection-2.png b/acq/media/convert-selection-2.png
index 13addf4..a0e36c1 100644 (file)
Binary files a/acq/media/convert-selection-2.png and b/acq/media/convert-selection-2.png differ

diff --git a/acq/media/convert-selection-3.png b/acq/media/convert-selection-3.png
index d461a4f..897fbb8 100644 (file)
Binary files a/acq/media/convert-selection-3.png and b/acq/media/convert-selection-3.png differ

diff --git a/acq/media/convert-selection-4.png b/acq/media/convert-selection-4.png
index 3dc1828..4ad810c 100644 (file)
Binary files a/acq/media/convert-selection-4.png and b/acq/media/convert-selection-4.png differ

diff --git a/acq/media/convert-selection-8.png b/acq/media/convert-selection-8.png
index eaaf8af..ce4012c 100644 (file)
Binary files a/acq/media/convert-selection-8.png and b/acq/media/convert-selection-8.png differ

diff --git a/acq/media/convert-selection-9.png b/acq/media/convert-selection-9.png
new file mode 100644 (file)
index 0000000..aaa132a
Binary files /dev/null and b/acq/media/convert-selection-9.png differ

diff --git a/acq/media/create-new-purchaseorder-2.png b/acq/media/create-new-purchaseorder-2.png
index 4669a12..e5a5c17 100644 (file)
Binary files a/acq/media/create-new-purchaseorder-2.png and b/acq/media/create-new-purchaseorder-2.png differ

diff --git a/acq/media/create-new-purchaseorder-3.png b/acq/media/create-new-purchaseorder-3.png
index fef90de..a943b14 100644 (file)
Binary files a/acq/media/create-new-purchaseorder-3.png and b/acq/media/create-new-purchaseorder-3.png differ

diff --git a/acq/media/create-new-purchaseorder-5.png b/acq/media/create-new-purchaseorder-5.png
index 3bb063e..0db9ec6 100644 (file)
Binary files a/acq/media/create-new-purchaseorder-5.png and b/acq/media/create-new-purchaseorder-5.png differ

diff --git a/acq/media/create-new-purchaseorder-9.png b/acq/media/create-new-purchaseorder-9.png
new file mode 100644 (file)
index 0000000..feee8f1
Binary files /dev/null and b/acq/media/create-new-purchaseorder-9.png differ

diff --git a/acq/media/general-search-5.png b/acq/media/general-search-5.png
index fd13b5d..217fe14 100644 (file)
Binary files a/acq/media/general-search-5.png and b/acq/media/general-search-5.png differ

diff --git a/acq/media/lineitem-catalogue-search-1.png b/acq/media/lineitem-catalogue-search-1.png
index 23d68b8..6c6faed 100644 (file)
Binary files a/acq/media/lineitem-catalogue-search-1.png and b/acq/media/lineitem-catalogue-search-1.png differ

diff --git a/acq/media/lineitem-catalogue-search-3.png b/acq/media/lineitem-catalogue-search-3.png
index 33cb854..645aa45 100644 (file)
Binary files a/acq/media/lineitem-catalogue-search-3.png and b/acq/media/lineitem-catalogue-search-3.png differ

diff --git a/acq/media/load-bibs-vandelay-3.png b/acq/media/load-bibs-vandelay-3.png
index 1a4b529..f2a8767 100644 (file)
Binary files a/acq/media/load-bibs-vandelay-3.png and b/acq/media/load-bibs-vandelay-3.png differ

diff --git a/acq/media/load-bibs-vandelay-4.png b/acq/media/load-bibs-vandelay-4.png
index f1de74d..3c2862f 100644 (file)
Binary files a/acq/media/load-bibs-vandelay-4.png and b/acq/media/load-bibs-vandelay-4.png differ

diff --git a/acq/media/load-catalogue-record-7.png b/acq/media/load-catalogue-record-7.png
new file mode 100644 (file)
index 0000000..b5b2f8c
Binary files /dev/null and b/acq/media/load-catalogue-record-7.png differ

diff --git a/acq/media/mark-order-purchaseorder-1.png b/acq/media/mark-order-purchaseorder-1.png
index 4da66cd..32de0d9 100644 (file)
Binary files a/acq/media/mark-order-purchaseorder-1.png and b/acq/media/mark-order-purchaseorder-1.png differ

diff --git a/acq/media/mark-order-purchaseorder-3.png b/acq/media/mark-order-purchaseorder-3.png
index 5982c4e..df4e2ee 100644 (file)
Binary files a/acq/media/mark-order-purchaseorder-3.png and b/acq/media/mark-order-purchaseorder-3.png differ

diff --git a/acq/media/mark-selector-selection-1.png b/acq/media/mark-selector-selection-1.png
index ce0d58a..89a73f8 100644 (file)
Binary files a/acq/media/mark-selector-selection-1.png and b/acq/media/mark-selector-selection-1.png differ

diff --git a/acq/media/mark-selector-selection-5.png b/acq/media/mark-selector-selection-5.png
index 924676e..f827b47 100644 (file)
Binary files a/acq/media/mark-selector-selection-5.png and b/acq/media/mark-selector-selection-5.png differ

diff --git a/acq/media/new-brief-addrecord-6.png b/acq/media/new-brief-addrecord-6.png
index bdbc905..3dff634 100644 (file)
Binary files a/acq/media/new-brief-addrecord-6.png and b/acq/media/new-brief-addrecord-6.png differ

diff --git a/acq/media/new-brief-addrecord-7.png b/acq/media/new-brief-addrecord-7.png
index 0a4be10..420c6d2 100644 (file)
Binary files a/acq/media/new-brief-addrecord-7.png and b/acq/media/new-brief-addrecord-7.png differ

diff --git a/acq/media/newbrief.png b/acq/media/newbrief.png
index 45c43a4..8fc28c4 100644 (file)
Binary files a/acq/media/newbrief.png and b/acq/media/newbrief.png differ

diff --git a/acq/media/newbrief2.png b/acq/media/newbrief2.png
index 0ee84d7..5c8f52e 100644 (file)
Binary files a/acq/media/newbrief2.png and b/acq/media/newbrief2.png differ

diff --git a/acq/media/purchase-order-cancel-2.png b/acq/media/purchase-order-cancel-2.png
index 8ce56d2..8bde75b 100644 (file)
Binary files a/acq/media/purchase-order-cancel-2.png and b/acq/media/purchase-order-cancel-2.png differ

diff --git a/acq/media/purchase-order-cancel-3.png b/acq/media/purchase-order-cancel-3.png
index f789e49..fa1f663 100644 (file)
Binary files a/acq/media/purchase-order-cancel-3.png and b/acq/media/purchase-order-cancel-3.png differ

diff --git a/acq/media/purchase-order-cancel-5.png b/acq/media/purchase-order-cancel-5.png
index 5a44823..e8bf335 100644 (file)
Binary files a/acq/media/purchase-order-cancel-5.png and b/acq/media/purchase-order-cancel-5.png differ

diff --git a/acq/media/purchaseorder-receive-3.png b/acq/media/purchaseorder-receive-3.png
index 7320f6d..5ffa7a9 100644 (file)
Binary files a/acq/media/purchaseorder-receive-3.png and b/acq/media/purchaseorder-receive-3.png differ

diff --git a/acq/media/purchaseorder-un-receive-3.png b/acq/media/purchaseorder-un-receive-3.png
index f38f9f8..00e80c3 100644 (file)
Binary files a/acq/media/purchaseorder-un-receive-3.png and b/acq/media/purchaseorder-un-receive-3.png differ

diff --git a/acq/media/split-line-purchase-order-1.png b/acq/media/split-line-purchase-order-1.png
index 70161a7..6d56b5c 100644 (file)
Binary files a/acq/media/split-line-purchase-order-1.png and b/acq/media/split-line-purchase-order-1.png differ

diff --git a/admin/admin-acq-funding.xml b/admin/admin-acq-funding.xml
index 65615a1..2acafc0 100644 (file)
--- a/admin/admin-acq-funding.xml
+++ b/admin/admin-acq-funding.xml
@@ -137,7 +137,7 @@ funding source can only be altered by <link linkend="apply-credit">applying cred
 <alt>screenshot of funding sources</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/edit-funding-1.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/edit-funding-1.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -150,7 +150,7 @@ funding source can only be altered by <link linkend="apply-credit">applying cred
 <alt>screenshot of funding sources</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/edit-funding-2.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/edit-funding-2.png" scalefit="0"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -194,7 +194,7 @@ the incorrect amount that has been allocated.</para></caution>
 <alt>screenshot of funding sources</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/apply-credit-funding-1.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/apply-credit-funding-1.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -207,7 +207,7 @@ the incorrect amount that has been allocated.</para></caution>
 <alt>screenshot of funding sources</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/apply-credit-funding-2.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/apply-credit-funding-2.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -280,7 +280,7 @@ applied to the funding source.  You may need to click <guibutton>Reload</guibutt
 <alt>screenshot of funding sources</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/funding-source-funding-1.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/apply-credit-funding-1.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -350,7 +350,7 @@ See <link linkend="track-debit-credit">Track Debits and Credits</link> for more
 <alt>screenshot of funding sources</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-debit-funding-1.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/track-debit-funding-1.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -362,7 +362,7 @@ See <link linkend="track-debit-credit">Track Debits and Credits</link> for more
 <alt>screenshot of funding sources</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-debit-funding-2.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/track-debit-funding-2.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -374,7 +374,7 @@ See <link linkend="track-debit-credit">Track Debits and Credits</link> for more
 <alt>screenshot of funding sources</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-debit-funding-3.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/track-debit-funding-3.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r

diff --git a/admin/admin-acq-funds.xml b/admin/admin-acq-funds.xml
index a9912d0..ffcd55a 100644 (file)
--- a/admin/admin-acq-funds.xml
+++ b/admin/admin-acq-funds.xml
@@ -345,7 +345,7 @@ for the next year.</para>
 <alt>screenshot of funds</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-balance-fund-11.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/allocate_credit_fund_1.png" scalefit="0"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -584,7 +584,7 @@ un-check <guilabel>Same as Source amount?</guilabel>, enter 100 as your <guilabe
 <alt>screenshot of funds</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-balance-fund-11.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/allocate-credit-fund-1.png" scalefit="0"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -632,7 +632,7 @@ included encumbrances.</para>
 <alt>screenshot of funds</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-debit-fund-2.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/track-debit-fund-2.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -645,7 +645,7 @@ included encumbrances.</para>
 <alt>screenshot of funds</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-debit-fund-3.png" scalefit="0"></imagedata>\r
+   <imagedata fileref="media/track-debit-fund-3.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -770,7 +770,7 @@ on each separate fund.</para>
 <alt>screenshot of fund tags</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-balance-fund-11.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/allocate-credit-fund-1.png" scalefit="0"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -845,7 +845,7 @@ on each separate fund.</para>
 <alt>screenshot of fund tags</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/track-balance-fund-11.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/allocate-credit-fund-1.png" scalefit="0"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r

diff --git a/admin/admin-acqdefaults.xml b/admin/admin-acqdefaults.xml
index a751b4c..bdcdf2e 100644 (file)
--- a/admin/admin-acqdefaults.xml
+++ b/admin/admin-acqdefaults.xml
@@ -57,9 +57,6 @@ module.  Libraries that wish to request additional defaults may do so by followi
 <listitem>\r
 <para>German Duetsche Marks</para>\r
 </listitem>\r
-<listitem>\r
-<para>Dutch Guilders</para>\r
-</listitem>\r
 </itemizedlist>\r
 <para><mediaobject>\r
 <alt>screenshot of funding sources</alt>\r
@@ -123,7 +120,9 @@ the money to the currency of the receiving fund.</para>
 </mediaobject></para>\r
 </informalfigure>\r
 \r
-<para>Sitka is currently in the process of determining an official source to use for exchange rates and the frequency of updates.</para>\r
+<para>Co-op support staff update the exchange rates on the first business day of each month using\r
+            the <link xlink:href="http://www.bankofcanada.ca/rates/exchange/daily-converter/">Bank\r
+               of Canada Daily Currency Converter</link>.</para>\r
 <!-- <para>Sitka uses the Bank of Canada to determine exchange rates.  All exchange rates are updated overnight to the closing rate of the previous day.</para> -->\r
 \r
 <para>If you require an exchange rate not listed here, please follow the \r
@@ -137,7 +136,8 @@ the money to the currency of the receiving fund.</para>
 \r
    <section xml:id="claiming-acq">\r
       <title>Claiming</title>\r
-      <para>Evergreen 2.0 provides minimal claiming functionality. Currently, all claiming is manual.</para>\r
+      <para>Evergreen 2.8 provides minimal claiming functionality. Currently, all claiming is\r
+         manual.</para>\r
 \r
 <para><link linkend="claim-defaults">Sitka Claim Policy Defaults</link></para>\r
 <para><link linkend="claim-type-defaults">Sitka Claim Type (Claim Reason) Defaults</link></para>\r
@@ -240,117 +240,117 @@ the money to the currency of the receiving fund.</para>
 \r
 <itemizedlist>\r
 <listitem>\r
-<para>Account cancelled</para>\r
+<para>Canceled: Account cancelled</para>\r
 </listitem>\r
 <listitem>\r
-<para>Already delivered</para>\r
+<para>Canceled: Already delivered</para>\r
 </listitem>\r
 <listitem>\r
-<para>Already owned</para>\r
+<para>Canceled: Already owned</para>\r
 </listitem>\r
 <listitem>\r
-<para>Backordered</para>\r
+   <para>Delayed: Backordered</para>\r
 <para>Set to <guilabel>Keep Debits</guilabel></para>\r
 </listitem>\r
 <listitem>\r
-<para>Cancelled order</para>\r
+<para>Canceled: Canceled order</para>\r
 </listitem>\r
 <listitem>\r
-<para>Damaged</para>\r
+   <para>Delayed: Damaged</para>\r
 <para>Set to <guilabel>Keep Debits</guilabel></para>\r
 </listitem>\r
 <listitem>\r
-<para>Delivered But Lost</para>\r
+   <para>Delayed: Delivered But Lost</para>\r
 <para>Set to <guilabel>Keep Debits</guilabel></para>\r
 </listitem>\r
 <listitem>\r
-<para>Discontinued</para>\r
+<para>Canceled: Discontinued</para>\r
 </listitem>\r
 <listitem>\r
-<para>Duplicate</para>\r
+<para>Canceled: Duplicate</para>\r
 </listitem>\r
 <listitem>\r
-<para>Duplicate order</para>\r
+<para>Canceled: Duplicate order</para>\r
 </listitem>\r
 <listitem>\r
-<para>Incorrect order</para>\r
+<para>Canceled: Incorrect order</para>\r
 </listitem>\r
 <listitem>\r
-<para>Invalid ISBN</para>\r
+<para>Canceled: Invalid ISBN</para>\r
 </listitem>\r
 <listitem>\r
-<para>Items blocked from crossing border</para>\r
+<para>Canceled: Items blocked from crossing border</para>\r
 </listitem>\r
 <listitem>\r
-<para>Lost goods</para>\r
+<para>Canceled: Lost goods</para>\r
 </listitem>\r
 <listitem>\r
-<para>Miscellaneous</para>\r
+<para>Canceled: Miscellaneous</para>\r
 </listitem>\r
 <listitem>\r
-<para>Never received</para>\r
+<para>Canceled: Never received</para>\r
 </listitem>\r
 <listitem>\r
-<para>No longer available</para>\r
+<para>Canceled: No longer available</para>\r
 </listitem>\r
 <listitem>\r
-<para>No longer needed</para>\r
+<para>Canceled: No longer needed</para>\r
 </listitem>\r
 <listitem>\r
-<para>Not found</para>\r
+<para>Canceled: Not found</para>\r
 </listitem>\r
 <listitem>\r
-<para>Not in process</para>\r
+<para>Canceled: Not in process</para>\r
 </listitem>\r
 <listitem>\r
-<para>Not in stock</para>\r
+<para>Canceled: Not in stock</para>\r
 </listitem>\r
 <listitem>\r
-<para>Out of business</para>\r
+<para>Canceled: Out of business</para>\r
 </listitem>\r
 <listitem>\r
-<para>Out of print</para>\r
+<para>Canceled: Out of print</para>\r
 </listitem>\r
 <listitem>\r
-<para>Out of stock indefinitely</para>\r
+<para>Canceled: Out of stock indefinitely</para>\r
 </listitem>\r
 <listitem>\r
-<para>Overbudget</para>\r
+<para>Canceled: Overbudget</para>\r
 </listitem>\r
 <listitem>\r
-<para>Provider will not fill order</para>\r
+<para>Canceled: Provider will not fill order</para>\r
 </listitem>\r
 <listitem>\r
-<para>Postponed</para>\r
+   <para>Delayed: Postponed</para>\r
 <para>Set to <guilabel>Keep Debits</guilabel></para>\r
 </listitem>\r
 <listitem>\r
-<para>Publication cancelled</para>\r
+<para>Canceled: Publication cancelled</para>\r
 </listitem>\r
 <listitem>\r
-<para>Quantity change</para>\r
+<para>Canceled: Quantity change</para>\r
 </listitem>\r
 <listitem>\r
-<para>Repriced</para>\r
+<para>Canceled: Repriced</para>\r
 </listitem>\r
 <listitem>\r
-<para>Reprint under consideration</para>\r
+<para>Delayed: Reprint under consideration</para>\r
 <para>Set to <guilabel>Keep Debits</guilabel></para>\r
 </listitem>\r
 <listitem>\r
-<para>Unauthorized order</para>\r
+<para>Canceled: Unauthorized order</para>\r
 </listitem>\r
 <listitem>\r
-<para>Wrong author</para>\r
+<para>Canceled:Wrong author</para>\r
 </listitem>\r
 <listitem>\r
-<para>Wrong edition</para>\r
+               <para>Canceled: Wrong edition</para>\r
 </listitem>\r
 <listitem>\r
-<para>Wrong provider</para>\r
+<para>Canceled: Wrong provider</para>\r
 </listitem>\r
 <listitem>\r
-<para>Wrong title</para>\r
+<para>Canceled: Wrong title</para>\r
 </listitem>\r
 </itemizedlist>\r
 \r
@@ -360,7 +360,7 @@ the money to the currency of the receiving fund.</para>
 <alt>screenshot of default cancel reasons</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/default-cancel-reasons.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/default-cancel-reasons.png" width="100%" scalefit="1"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r

diff --git a/admin/media/Thumbs.db b/admin/media/Thumbs.db
new file mode 100644 (file)
index 0000000..5aa6700
Binary files /dev/null and b/admin/media/Thumbs.db differ

diff --git a/admin/media/add-fund-tag-3.png b/admin/media/add-fund-tag-3.png
index 0cd8c7a..1de73b0 100644 (file)
Binary files a/admin/media/add-fund-tag-3.png and b/admin/media/add-fund-tag-3.png differ

diff --git a/admin/media/allocate-credit-fund-1.png b/admin/media/allocate-credit-fund-1.png
index 3e185e2..0825991 100644 (file)
Binary files a/admin/media/allocate-credit-fund-1.png and b/admin/media/allocate-credit-fund-1.png differ

diff --git a/admin/media/allocate-credit-fund-2.png b/admin/media/allocate-credit-fund-2.png
index d7e7575..775e59d 100644 (file)
Binary files a/admin/media/allocate-credit-fund-2.png and b/admin/media/allocate-credit-fund-2.png differ

diff --git a/admin/media/allocate-credit-fund-3.png b/admin/media/allocate-credit-fund-3.png
index d2835e8..7fb59a0 100644 (file)
Binary files a/admin/media/allocate-credit-fund-3.png and b/admin/media/allocate-credit-fund-3.png differ

diff --git a/admin/media/allocate-credit-fund-4.png b/admin/media/allocate-credit-fund-4.png
index d9f1624..2cc527f 100644 (file)
Binary files a/admin/media/allocate-credit-fund-4.png and b/admin/media/allocate-credit-fund-4.png differ

diff --git a/admin/media/allocate-credit-funding-1.png b/admin/media/allocate-credit-funding-1.png
index 90aaf30..a266a8a 100644 (file)
Binary files a/admin/media/allocate-credit-funding-1.png and b/admin/media/allocate-credit-funding-1.png differ

diff --git a/admin/media/allocate-credit-funding-2.png b/admin/media/allocate-credit-funding-2.png
index 24f9419..e6ca010 100644 (file)
Binary files a/admin/media/allocate-credit-funding-2.png and b/admin/media/allocate-credit-funding-2.png differ

diff --git a/admin/media/allocate-credit-funding-3.png b/admin/media/allocate-credit-funding-3.png
index 311c8e3..b6ed65e 100644 (file)
Binary files a/admin/media/allocate-credit-funding-3.png and b/admin/media/allocate-credit-funding-3.png differ

diff --git a/admin/media/apply-credit-funding-1.png b/admin/media/apply-credit-funding-1.png
index d23d2b0..c5cee4a 100644 (file)
Binary files a/admin/media/apply-credit-funding-1.png and b/admin/media/apply-credit-funding-1.png differ

diff --git a/admin/media/apply-credit-funding-2.png b/admin/media/apply-credit-funding-2.png
index 9c8bd21..9b830bb 100644 (file)
Binary files a/admin/media/apply-credit-funding-2.png and b/admin/media/apply-credit-funding-2.png differ

diff --git a/admin/media/apply-credit-funding-4.png b/admin/media/apply-credit-funding-4.png
index 53e908c..d488ee3 100644 (file)
Binary files a/admin/media/apply-credit-funding-4.png and b/admin/media/apply-credit-funding-4.png differ

diff --git a/admin/media/create-distribution-formula-1.png b/admin/media/create-distribution-formula-1.png
index a3b61f1..6a9a292 100644 (file)
Binary files a/admin/media/create-distribution-formula-1.png and b/admin/media/create-distribution-formula-1.png differ

diff --git a/admin/media/create-fund-1.png b/admin/media/create-fund-1.png
index 66f1b92..8a2f7f0 100644 (file)
Binary files a/admin/media/create-fund-1.png and b/admin/media/create-fund-1.png differ

diff --git a/admin/media/create-fund-4.png b/admin/media/create-fund-4.png
index 1da1297..027c756 100644 (file)
Binary files a/admin/media/create-fund-4.png and b/admin/media/create-fund-4.png differ

diff --git a/admin/media/create-funding-1.png b/admin/media/create-funding-1.png
index 0341d02..13643ae 100644 (file)
Binary files a/admin/media/create-funding-1.png and b/admin/media/create-funding-1.png differ

diff --git a/admin/media/create-litem-alert-1.png b/admin/media/create-litem-alert-1.png
index 063b5c3..2f7c304 100644 (file)
Binary files a/admin/media/create-litem-alert-1.png and b/admin/media/create-litem-alert-1.png differ

diff --git a/admin/media/create-providers-1.png b/admin/media/create-providers-1.png
index db59732..6544c77 100644 (file)
Binary files a/admin/media/create-providers-1.png and b/admin/media/create-providers-1.png differ

diff --git a/admin/media/default-cancel-reasons.png b/admin/media/default-cancel-reasons.png
index 4cb4fc0..0c6f725 100644 (file)
Binary files a/admin/media/default-cancel-reasons.png and b/admin/media/default-cancel-reasons.png differ

diff --git a/admin/media/edit-funding-1.png b/admin/media/edit-funding-1.png
index 6eeb831..3342b66 100644 (file)
Binary files a/admin/media/edit-funding-1.png and b/admin/media/edit-funding-1.png differ

diff --git a/admin/media/edit-funding-2.PNG b/admin/media/edit-funding-2.PNG
new file mode 100644 (file)
index 0000000..99b6fe7
Binary files /dev/null and b/admin/media/edit-funding-2.PNG differ

diff --git a/admin/media/fund-filter-1.png b/admin/media/fund-filter-1.png
index cf2b7fc..1c463f9 100644 (file)
Binary files a/admin/media/fund-filter-1.png and b/admin/media/fund-filter-1.png differ

diff --git a/admin/media/fund-tags-1.png b/admin/media/fund-tags-1.png
index addc2b5..beb4c45 100644 (file)
Binary files a/admin/media/fund-tags-1.png and b/admin/media/fund-tags-1.png differ

diff --git a/admin/media/onorder-invisible-1.png b/admin/media/onorder-invisible-1.png
index 76dc789..dc24a46 100644 (file)
Binary files a/admin/media/onorder-invisible-1.png and b/admin/media/onorder-invisible-1.png differ

diff --git a/admin/media/onorder-invisible-6.png b/admin/media/onorder-invisible-6.png
index 449c09b..8acf0ff 100644 (file)
Binary files a/admin/media/onorder-invisible-6.png and b/admin/media/onorder-invisible-6.png differ

diff --git a/admin/media/track-debit-fund-1.png b/admin/media/track-debit-fund-1.png
index 6756c91..e7b173a 100644 (file)
Binary files a/admin/media/track-debit-fund-1.png and b/admin/media/track-debit-fund-1.png differ

diff --git a/admin/media/track-debit-fund-2.png b/admin/media/track-debit-fund-2.png
index a46848d..2b91c80 100644 (file)
Binary files a/admin/media/track-debit-fund-2.png and b/admin/media/track-debit-fund-2.png differ

diff --git a/admin/media/track-debit-fund-3.png b/admin/media/track-debit-fund-3.png
index f5b419e..621a7a7 100644 (file)
Binary files a/admin/media/track-debit-fund-3.png and b/admin/media/track-debit-fund-3.png differ

diff --git a/admin/media/track-debit-funding-1.png b/admin/media/track-debit-funding-1.png
index a8dca5e..c1b1f91 100644 (file)
Binary files a/admin/media/track-debit-funding-1.png and b/admin/media/track-debit-funding-1.png differ

diff --git a/admin/media/track-debit-funding-2.png b/admin/media/track-debit-funding-2.png
index 03a978b..8dbb08f 100644 (file)
Binary files a/admin/media/track-debit-funding-2.png and b/admin/media/track-debit-funding-2.png differ

diff --git a/admin/media/track-debit-funding-3.png b/admin/media/track-debit-funding-3.png
index 3c02506..a20b143 100644 (file)
Binary files a/admin/media/track-debit-funding-3.png and b/admin/media/track-debit-funding-3.png differ

diff --git a/admin/media/transfer-credit-fund-2.png b/admin/media/transfer-credit-fund-2.png
index 6a213bd..3dd94df 100644 (file)
Binary files a/admin/media/transfer-credit-fund-2.png and b/admin/media/transfer-credit-fund-2.png differ

diff --git a/admin/media/transfer-credit-fund-3.png b/admin/media/transfer-credit-fund-3.png
index 3607f00..1c0ce5e 100644 (file)
Binary files a/admin/media/transfer-credit-fund-3.png and b/admin/media/transfer-credit-fund-3.png differ

diff --git a/intro/media/Thumbs.db b/intro/media/Thumbs.db
index f4530ee..75033f1 100644 (file)
Binary files a/intro/media/Thumbs.db and b/intro/media/Thumbs.db differ

diff --git a/media/Thumbs.db b/media/Thumbs.db
index f881c74..9f2a7c3 100644 (file)
Binary files a/media/Thumbs.db and b/media/Thumbs.db differ