From 48242d4a03ce79429021fe60415c6713a05608e5 Mon Sep 17 00:00:00 2001
From: "Nicole C. Engard" <nengard@bywatersolutions.com>
Date: Sat, 30 Mar 2013 11:25:36 -0400
Subject: [PATCH] Bug 9850: Offline Circ Help Files for 3.12

This updates the text and links in the offline circulation tool help files.

To test:

Visit all offline circulation pages in the staff client and review the text and links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---
 .../prog/en/modules/help/offline_circ/list.tt  |  8 ++++----
 .../modules/help/offline_circ/process_koc.tt   | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/list.tt
index 5dc1351fa0..bf0ee2fef1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/list.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Offline Circulation</h1>
+<h1>Offline circulation</h1>
 
-<p>From this page you can manage offline circulation actions tracked in the Firefox plugin found at: <a class="ulink" href="https://addons.mozilla.org/en/firefox/addon/koct/" target="_top">https://addons.mozilla.org/en/firefox/addon/koct/</a></p>
+<p>From this page you can manage offline circulation actions tracked in the Firefox plugin found at: <a class="ulink" href="https://addons.mozilla.org/en/firefox/addon/koct/" target="_top">https://addons.mozilla.org/en/firefox/addon/koct/</a> and the Windows Offline Circulation tool found at <a href="http://kylehall.info/index.php/projects/koha/koha-offline-circulation/" target="_top">http://kylehall.info/index.php/projects/koha/koha-offline-circulation/</a>.</p>
 
-<p>When you use the 'Commit to Koha' option in the offline circulation plugin you will come to this page to manage the data.</p>
+<p>When you use the 'Commit to Koha' option in the Firefox plugin or the 'View pending offline circulation actions' after uploading your *.koc file you will come to this page to manage the data.</p>
 
 <p>Once all of the logs from all of the circulation computers are loaded you will be able to check them all or select just those you want to process into Koha.</p>
 
@@ -20,6 +20,6 @@
     <li>Once finished you will have a summary of all of your transactions</li>
 </ul>
 
-<p><strong>See the full documentation for Offline Circulation in the <a href="http://manual.koha-community.org/3.10/en/offlinecirc.html#firefoxofflinecirc">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Offline Circulation in the <a href="http://manual.koha-community.org/3.12/en/offlinecirc.html#firefoxofflinecirc">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
index 6b9c4ed10c..09597220a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
@@ -1,17 +1,21 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Offline Circulation File (.koc) Uploader</h1>
+<h1>Upload offline circulation file (*.koc)</h1>
 
-<p>The Offline Circulation Utility can be downloaded at: <a href="http://millruntech.com/koha/koha-offline-circulation">http://millruntech.com/koha/koha-offline-circulation</a></p>
+<p>The Offline Circulation Utility can be downloaded at: <a href="http://kylehall.info/index.php/projects/koha/koha-offline-circulation/" target="_top">http://kylehall.info/index.php/projects/koha/koha-offline-circulation/</a></p>
 
-<p>The offline circulation tool for Windows generates a KOC file which you can upload into Koha once your system comes back up.</p>
+<p>The offline circulation tool for Windows will generate a KOC file that you can upload into Koha once your system comes back up.</p>
 
-<p>Browse your computer for the *.koc file.</p>
+<p>On the Circulation menu click 'Upload offline circulation file (.koc)'</p>
 
-<p>Once the file is uploaded, click the 'Process Offline Circulation' button.</p>
+<p>Browse your computer for the *.koc file</p>
 
-<p>When this process  is complete, you will see a summary of actions from when you were offline (including any errors).</p>
+<p>Once the file is uploaded, click the process the file</p>
 
-<p><strong>See the full documentation for the Offline Circulation File Uploader in the <a http://manual.koha-community.org/3.10/en/offlinecirc.html#uploadofflinecirc">manual</a> (online).</strong></p>
+<p>When this is complete you'll be able to upload another file or tend to pending offline circulation actions.</p>
+
+<p>You can also tend to pending circulation actions by going to Circulation > Pending offline circulation actions.</p>
+
+<p><strong>See the full documentation for Uploading the Offline Circulation File in the <a http://manual.koha-community.org/3.12/en/offlinecirc.html#uploadofflinecirc">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
2.39.5