[Koha-patches] [PATCH] Bug 6966 Update tools help files

Nicole C. Engard nengard at bywatersolutions.com
Fri Oct 7 21:31:12 CEST 2011


This updates the tools help files.
---
 .../prog/en/modules/help/tools/batchMod.tt         |   10 ++-
 .../prog/en/modules/help/tools/cleanborrowers.tt   |   28 +++---
 .../prog/en/modules/help/tools/csv-profiles.tt     |   45 ++++++++--
 .../prog/en/modules/help/tools/export.tt           |   42 ++++++---
 .../prog/en/modules/help/tools/holidays.tt         |   95 +++++++++-----------
 .../prog/en/modules/help/tools/import_borrowers.tt |   83 ++++++++++++------
 .../prog/en/modules/help/tools/inventory.tt        |    3 +
 .../prog/en/modules/help/tools/koha-news.tt        |   33 +++++---
 .../prog/en/modules/help/tools/letter.tt           |   53 +++++++----
 .../en/modules/help/tools/manage-marc-import.tt    |   49 +++++++---
 .../prog/en/modules/help/tools/overduerules.tt     |   25 +++---
 .../prog/en/modules/help/tools/picture-upload.tt   |   68 +++++----------
 .../prog/en/modules/help/tools/scheduler.tt        |   44 +++++----
 .../en/modules/help/tools/stage-marc-import.tt     |   38 ++++++---
 .../prog/en/modules/help/tools/tools-home.tt       |   11 ++-
 .../prog/en/modules/help/tools/viewlog.tt          |   27 +++----
 16 files changed, 380 insertions(+), 274 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
index 103769e..09563fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
@@ -3,15 +3,15 @@
 
 <h1>Batch Modify Items</h1>
 
-<p>This tool will allow you to modify a batch of item records from Koha.</p>
+<p>This tool will allow you to modify a batch of item records in Koha.</p>
 
 <p>From the tool you can choose to upload a file of barcodes or item ids, or you can scan items one by one into the box below the upload tool. Once you have your file uploaded or the barcodes listed you can click 'Continue.'</p>
 
-<p>You will be presented with a confirmation screen. From here you can uncheck the items you don't want to modify.</p>
+<p>You will be presented with a summary of the items you want to modify. From here you can uncheck the items you don't want to modify before making changes in the form below. You can also hide columns you don't need to see to prevent having to scroll from left to right to see the entire item form.</p>
 
-<p>Below the list of items there will be an item editor.  Using this form you can choose which fields you want to edit on all of the records (like applying a note to all of them, or moving them from one library to another).</P>
+<p>Using the edit form you can choose which fields to make edits to.  By checking the checkbox to the right of each field you can clear the values in that field for the records you are modifying.</p>
 
-<p>Once you have made your changes, you can click the 'Go' button and your items will be updated.</p>
+<p>Once you have made you changes you will be presented with the resulting items.</p>
 
 <h1>Batch Delete Items</h1>
 
@@ -23,4 +23,6 @@
 
 <p>If the items can be deleted they will be and you will be presented with a confirmation of your deletion.</p>
 
+<p><strong>See the full documentation for <a href="http://manual.koha-community.org/3.6/en/batchmodifyitems.html">Batch Item Modifications</a> and <a href="http://manual.koha-community.org/3.6/en/batchdeleteitems.html">Batch Item Deletions</a> in the manual (online).</strong></p>
+
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
index d2273bf..df1a6c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
@@ -2,20 +2,20 @@
 
 <h1>Patrons (anonymize, bulk-delete)</h1>
 
-<p>This tool allows you to bulk anonymize circulation histories or bulk delete patron records. This  means that the system keeps a link between old loans and their items but severs the link to the borrower.</p>
+<p>This tool allows you to bulk anonymize circulation histories (this means that you keep records of how many times items were checked out - but not the patrons who checked the items out) or bulk delete patrons (remove them from the system completely).</p>
 
-		<ul>
-			<li>Once in the tool, you have two options</li>
-			<li>Check the box next to the action(s) you'd like to perform
-			<ul>
-				<li>To delete borrowers, enter the date since the last time they borrowed</li>
-				<li>To anonymize circulation history enter the date before which you'd like that data deleted</li>
-			</ul></li>
-		</ul>
-		
-<h2>Is there a way to run this tool automatically?</h2>
-<p>Not at this time.</p>
-<h2>Will running this report sever the connection between patrons and items that are checked out to them currently?</h2>
-<p>No, this report will only remove connections between patrons and items they have checked out in the past but have returned to the library.</p>
+<p style="color: #990000;">Important: Patrons with outstanding fines or items checked out are not saved. They are not completely removed from the system (moved to the delete_borrowers table), but this tool does not provide as many checks as one may desire.</p
+
+<p>To either delete or anonymize patrons</p>
+
+<ul>
+	<li>Check the task you would like to perform (Delete or Anonymize)</li>
+	<li>Enter a date before which you want to alter the data</li>
+	<li>Click 'Next'</li>
+	<li>A confirmation will appear asking if you're sure this is what you want to happen</li>
+	<li>Clicking 'Finish' will delete or anonymize your data</li>
+</ul>
+
+<p><strong>See the full documentation for Anonymizing Patrons in the <a href="http://manual.koha-community.org/3.6/en/anonpatrons.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
index 9542af2..86cb391 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
@@ -4,21 +4,50 @@
 
 <p>CSV Profiles are created to define how you would like your cart or list to export.</p>
 
-<p>To add a CSV Profile enter the following info:</p>
+<h2>Add CSV Profiles</h2>
+
+<p>To add a CSV Profile</p>
+
+<ul>
+	<li>Click 'CSV Profiles' from the Tools menu
+<ul>
+	<li>The 'Profile name' will appear on the export pull down list when choosing 'Download' from your cart or list</li>
+	<li>The 'Profile description' is for your own benefit</li>
+	<li>The 'CSV separator' is the character used to separate values and value groups</li>
+	<li>The 'Field separator' is the character used to separate duplicate fields
+<ul>
+	<li>Example: You may have multiple 650 fields</li>
+</ul>
+</li>
+	<li>The 'Subfield separator' is the character used to separate duplicate subfields
+<ul>
+	<li>Example: You may have multiple $a subfields in a field</li>
+</ul>
+</li>
+	<li>The 'Encoding' field lets you define the encoding used when saving the file</li>
+	<li>Finally format your CSV file using the 'Profile marcfields' fields
 <ul>
-<li>The 'Profile name' will appear on the export pull down list when choosing 'Download' from your cart or list</li>
-<li>The 'Profile description' is for your own benefit</li>
-<li>Finally format your CSV file using the 'Profile marcfields' fields
-<ul><li>Define which fields or subfields you want to export, separated by pipes. Example : 200|210$a|301</li></ul>
+	<li>Define which fields or subfields you want to export, separated by pipes. Example : 200|210$a|301</li>
+	<li style="background-color: #ffe599;">Tip: You can also use your own headers (instead of the ones from Koha) by prefixing the field number with an header, followed by the equal sign. Example : Personal name=200|Entry element=210$a|300|009</li>
+</ul>
 </li>
 </ul>
+</li>
+</ul>
+
+<h2>Modify CSV Profiles</h2>
 
-<p>Once you have created at least one CSV Profile an option to 'Modify CSV Profiles' will appear below the Add form
-<ul><li>Choose the profile you would like to edit and alter the necessary fields.</li>
-<li>To delete a profile, check the 'Delete selelcted profile' option before clicking 'Submit Query'</li></ul>
+<p>Once you have created at least one CSV Profile an 'Edit profile' tab will appear next to the 'New profile' button.</p>
+
+<ul>
+	<li>Choose the profile you would like to edit and alter the necessary fields.</li>
+	<li>To delete a profile, check the 'Delete selected profile' option before clicking 'Submit Query'</li>
+</ul>
 
 <h2>Using CSV Profiles</h2>
+
 <p>Your CSV Profiles will appear on the export list or cart menu under the 'Download' button</p>
 
+<p><strong>See the full documentation for CSV Profiles in the <a href="http://manual.koha-community.org/3.6/en/csvprofiles.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
index d3a53c0..df3425a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
@@ -4,20 +4,32 @@
 
 <p>Koha comes with a tool that will allow you to export your bibliographic and/or holdings data in bulk. This can be used to send your records to fellow libraries, organizations or services; or simply for backup purposes.</p>
 
-<ul><li>Fill in the form in order to limit your export to a specific range (all fields are optional)</li>
-<ul><li>Choose to limit your export by any one or more of the following options</li>
-<ul><li>Limit to a bib number range</li>
-<li>Limit to a specific item type</li>
-<li>Limit to a specific library</li>
-<li>Limit to a call number range</li>
-<li>Limit to an acquisition date range</li></ul>
-<li>Next choose what to skip when exporting</li>
-<ul><li>By default items will be exported, if you would like to only export bibliographic data, check the 'Don't export items' box</li>
-<li>To limit your export only to items from the library you're logged in as (if you leave the 'Library' field set to 'All') or to the library you selected above check the 'Remove non-local items' box</li>
-<li>You can also choose what fields you don't want to export. This can be handy if you're sharing your data, you can remove all local fields before sending your data to another library</li></ul>
-<li>Finally choose the file type and file name</li>
-<ul><li>Choose to export your data in marc or marcxml format</li>
-<li>Choose the name you want your file to save as</li></ul>
-<li>Click 'Export'</li></ul></ul>
+<ul>
+	<li>Fill in the form in order to limit your export to a specific range (all fields are optional)</li>
+<ul>
+	<li>Choose to limit your export by any one or more of the following options</li>
+<ul>
+	<li>Limit to a bib number range</li>
+	<li>Limit to a specific item type</li>
+	<li>Limit to a specific library</li>
+	<li>Limit to a call number range</li>
+	<li>Limit to an acquisition date range</li>
+</ul>
+	<li>Next choose what to skip when exporting</li>
+<ul>
+	<li>By default items will be exported, if you would like to only export bibliographic data, check the 'Don't export items' box</li>
+	<li>To limit your export only to items from the library you're logged in as (if you leave the 'Library' field set to 'All') or to the library you selected above check the 'Remove non-local items' box</li>
+	<li>You can also choose what fields you don't want to export. This can be handy if you're sharing your data, you can remove all local fields before sending your data to another library</li>
+</ul>
+	<li>Finally choose the file type and file name</li>
+<ul>
+	<li>Choose to export your data in marc or marcxml format</li>
+	<li>Choose the name you want your file to save as</li>
+</ul>
+	<li>Click 'Export'</li>
+</ul>
+</ul>
+
+<p><strong>See the full documentation for Exporting MARC Records in the <a href="http://manual.koha-community.org/3.6/en/exportbibs.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
index 505661c..5ff99ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
@@ -2,65 +2,58 @@
 
 <h1>Holidays Calendar</h1>
 
-<p>Libraries can define library closings and holidays to be used when
-      calculating due dates. You can make use of the Calendar by turning on
-      the proper system preferences:</p><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Get there: </em></span>More &gt; Administration &gt;
-          Global System Preferences &gt; Circulation &gt; useDaysMode</p><ul class="itemizedlist" type="circle"><li class="listitem"><p>Choose the method for calculating due date - either
-              include days the library is closed in the calculation or don't
-              include them.</p></li></ul></li><li class="listitem"><p><span class="emphasis"><em>Get there:</em></span> More &gt; Administration &gt;
-          Global System Preferences &gt; Circulation &gt; finescalendar</p><ul class="itemizedlist" type="circle"><li class="listitem"><p>This will check the holiday calendar before charging
-              fines</p></li></ul></li></ul>
-              <h3>Adding Events</h3>
-              <p>Before adding events, choose the library you would like to apply
-        the closings to. When adding events you will be asked if you would
-        like to apply the event to one branch or all branches. To add events,
-        simply</p><ul class="itemizedlist" type="disc"><li class="listitem"><p>Click on the date on the calendar that you would like to
-            apply the closing to</p></li><li class="listitem"><p>In the form that appears above the calendar, enter the
-            closing information</p><ul class="itemizedlist" type="circle"><li class="listitem"><p>Library will be filled in automatically based on the
-                library you chose from the pull down at the top of the
-                page</p></li><li class="listitem"><p>The day information will also be filled in automatically
-                based on the date you clicked on the calendar</p></li><li class="listitem"><p>In the description enter the reason the library is
-                closed</p></li><li class="listitem"><p>Next you can choose if this event is a one time event or
-                if it is repeatable.</p></li><li class="listitem"><p>Finally decide if this event should be applied to all
-                libraries or just the one you have originally selected</p></li></ul></div></li><li class="listitem"><p>After saving you will see the event listed in the summary
-            below the calendar</p></li></ul>
-            <h3>Editing Events</h3><p>To edit events</p><ul class="itemizedlist" type="disc"><li class="listitem"><p>Click on the event on the calendar that you want to change
-            (do this by clicking on the date on the calendar, not the event
-            listed in the summary)</p></li><li class="listitem"><p>From this form you can make edits to the holiday or delete
-            the holiday completely. Both actions require that you click 'Save'
-            before the change will be made.</p></li><li class="listitem"><p>Clicking on repeatable events will offer slightly different
-            options</p>
-            <ul class="itemizedlist" type="circle"><li class="listitem"><p>In the form above you will note that there is now an
-                option to 'Generate an exception for this repeated holiday,'
-                choosing this option will allow you to make it so that this
-                date is not closed even though the library is usually closed
-                on this date.</p></li></ul></li></ul>
-                <h3 class="title">Additional Help</h3><p>When adding or editing events you can get additional help by
-        clicking on the blue plus sign next to various different options on
-        the form</p>
-        
-<h2>Questions</h2>
+<p>Libraries can define library closings and holidays to be used when calculating due dates. You can make use of the Calendar by turning on the proper system preferences:</p>
 
-<p><strong>Why do I want to add holidays for my branch?</strong></p>
+<ul>
+	<li>Get there: More &gt; Administration &gt; Global System Preferences &gt; Circulation &gt; useDaysMode
+<ul>
+	<li>Choose the method for calculating due date - either include days the library is closed in the calculation or don't include them.</li>
+</ul>
+</li>
+	<li>Get there: More &gt; Administration &gt; Global System Preferences &gt; Circulation &gt; finescalendar
+<ul>
+	<li>This will check the holiday calendar before charging fines</li>
+</ul>
+</li>
+</ul>
+
+<h2>Adding Events</h2>
+
+<p>Before adding events, choose the library you would like to apply the closings to. When adding events you will be asked if you would like to apply the event to one branch or all branches. To add events, simply</p>
 
-After holidays are entered on the calendar, circulation rules are then recalculated to taken in to account that library is closed and there will be no one present to return items.
+<ul>
+	<li>Click on the date on the calendar that you would like to apply the closing to</li>
+	<li>In the form that appears above the calendar, enter the closing information
+<ul>
+	<li>Library will be filled in automatically based on the library you chose from the pull down at the top of the page</li>
+	<li>The day information will also be filled in automatically based on the date you clicked on the calendar</li>
+	<li>In the description enter the reason the library is closed</li>
+	<li>Next you can choose if this event is a one time event or if it is repeatable.</li>
+	<li>Finally decide if this event should be applied to all libraries or just the one you have originally selected</li>
+</ul>
+</li>
+	<li>After saving you will see the event listed in the summary to the right the calendar</li>
+</ul>
 
- 
-<p><strong>How do I enable the Holiday Calendar?</strong></p>
+<h2>Editing Events</h2>
 
-You can make use of the Holidays Calendar by turning on the proper system preferences
+<p>To edit events</p>
+
+<ul>
+	<li>Click on the event on the calendar that you want to change (do this by clicking on the date on the calendar, not the event listed in the summary)</li>
+	<li>From this form you can make edits to the holiday or delete the holiday completely. Both actions require that you click 'Save' before the change will be made.</li>
+	<li>Clicking on repeatable events will offer slightly different options
 <ul>
-<li><em>Get there:</em> More > Administration > Global System Preferences > Circulation > useDaysMode</li>
-        <ul> <li>Choose the method for calculating due date: select Calendar to use the holidays module, and Days to ignore the holidays module</li></ul>
-<li><em>Get there:</em> More > Administration > Global System Preferences > Circulation > finescalendar</li>
-        <ul> <li>This will use the check the holiday calendar before charging fines</li></ul>
+	<li>In the form above you will note that there is now an option to 'Generate an exception for this repeated holiday,' choosing this option will allow you to make it so that this date is not closed even though the library is usually closed on this date.</li>
 </ul>
- 
-<p><strong>How is the dropbox date determined?</strong></p>
+</li>
+</ul>
+
+<h2>Additional Help</h2>
 
-<p>Is it the last open date for the checkout branch? Is it today's date minus one? Can the dropbox checkin date be set? If the library is closed for four days for repairs, for example, there would be more than one day needed for the dropbox date.</p>
+<p>When adding or editing events you can get additional help by clicking on the question mark next to various different options on the form</p>
 
-<p>You will only have one dropbox date and that will be the last day that the library open (determined by the holiday calendar) because there is no real way to know what day the books were dropped into the box during the 4 closed days. The only way to change the effective checkin date in dropbox mode is to modify the calendar.</p>
+<p><strong>See the full documentation for the Calendar in the <a href="http://manual.koha-community.org/3.6/en/calholidays.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
index 23f7d0f..6f8a0bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
@@ -2,30 +2,59 @@
 
 <h1>Patron Import</h1>
 
-		<ul>
-			<li>Create a CSV file for your patron data<br/>
-			<ul>
-				<li>Format your file with the following fields
-				<ul>
-					<li>'surname', 'firstname', 'title', 'othernames', 'initials', 'streetnumber', 'streettype', 'address', 'address2', 'city', 'state', 'zipcode', 'country', 'email', 'phone', 'mobile', 'fax', 'emailpro', 'phonepro', 'B_streetnumber', 'B_streettype', 'B_address', 'B_address2', 'B_city', 'B_state', 'B_zipcode', 'B_country', 'B_email', 'B_phone', 'dateofbirth', 'branchcode', 'categorycode', 'dateenrolled', 'dateexpiry', 'gonenoaddress', 'lost', 'debarred', 'contactname', 'contactfirstname', 'contacttitle', 'guarantorid', 'borrowernotes', 'relationship', 'ethnicity', 'ethnotes', 'sex', 'password', 'flags', 'userid', 'opacnote', 'contactnote', 'sort1', 'sort2', 'altcontactfirstname', 'altcontactsurname', 'altcontactaddress1', 'altcontactaddress2', 'altcontactaddress3', 'altcontactstate', 'altcontactzipcode', 'altcontactcountry', 'altcontactphone', 'smsalertnumber', 'patron_attributes'
-					<ul>
-						<li>
-					    <span style="background-color: #ffe599">
-TIP: Consult your system administrator if you are unsure of how to fill in the above fields.</span></li>
-						<li>					   
-					   IMPORTANT: Make sure the 'branchcode' and 'categorycode' are valid entries in your database.</li>
-						<li>Passwords should be stored in plain text, and will be encrypted as they're imported
-						<ul>
-							<li>
-						    <span style="background-color: #ffe599">
-TIP: If your passwords are already encrypted, talk to your systems administrator about options.</span></li>
-						</ul></li>
-					</ul></li>
-				</ul></li>
-			</ul></li>
-			<li>Select a file to import into the borrowers table</li>
-			<li>If a cardnumber exists in the table, you can choose whether to ignore the new one or overwrite the old one.</li>
-			<li>Click 'Import'</li>
-			<li>You will be brought to a confirmation screen.</li>
-		</ul>
-	</div>	[% INCLUDE 'help-bottom.inc' %]
+<p>The patron import tool can be used at any time to add patrons in bulk. It is commonly used in universities and schools when a new batch of students registers.</p>
+
+<h2>Creating Patron File</h2>
+
+<p>Your Koha installation comes with a blank CSV file that you can use as a template for your patron records. If you would like to create the file yourself, make sure that your file has the following fields in this order as the header row:</p>
+
+<blockquote>borrowernumber, cardnumber, surname, firstname, title, othernames, initials, streetnumber, streettype, address, address2, city, zipcode, country, email, phone, mobile, fax, emailpro, phonepro, B_streetnumber, B_streettype, B_address, B_address2, B_city, B_zipcode, B_country, B_email, B_phone, dateofbirth, branchcode, categorycode, dateenrolled, dateexpiry, gonenoaddress, lost, debarred, contactname, contactfirstname, contacttitle, guarantorid, borrowernotes, relationship, ethnicity, ethnotes, sex, password, flags, userid, opacnote, contactnote, sort1, sort2, altcontactfirstname, altcontactsurname, altcontactaddress1, altcontactaddress2, altcontactaddress3, altcontactzipcode, altcontactcountry, altcontactphone, smsalertnumber, patron_attributes</blockquote>
+
+<p style="color: #990000;">Important: The 'password' value should be stored in plain text, and will be converted to a md5 hash (which is an encrypted version of the password).</p>
+
+<ul>
+    <li>If your passwords are already encrypted, talk to your systems administrator about options</li>
+</ul>
+
+<p style="color: #990000;">Important: Date formats should match your system preference, and must be zero-padded, e.g. '01/02/2008'.</p>
+
+<p style="color: #990000;">Important: The fields 'branchcode' and 'categorycode' are required and must match valid entries in your database.</p>
+
+<p style="background-color: #ffe599">Tip: If loading patron attributes, the 'patron_attributes' field should contain a comma-separated list of attribute types and values.</p>
+
+<ul>
+	<li>The attribute type code and a colon should precede each value.
+<ul>
+	<li>For example: INSTID:12345,LANG:fr or STARTDATE:January 1 2010,TRACK:Day</li>
+	<li>If an input record has more than one attribute, the fields should either be entered as an unquoted string (previous examples), or with each field wrapped in separate double quotes and delimited by a comma:
+<ul>
+	<li>"STARTDATE:January 1, 2010","TRACK:Day"</li>
+	<li>This syntax would be required if the data might have a comma in it, like a date string.</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+
+<h2>Importing Patrons</h2>
+
+<p>Once you have created your file, you can use the Patron Import Tool to bring the data into Koha.</p>
+
+<ul>
+	<li>Choose your CSV file and choose to match on 'Cardnumber' to prevent adding of duplicate card numbers to the system</li>
+	<li>Next you can choose default values to apply to all patrons you are importing
+<ul>
+	<li>ex. If you're importing patrons specific to one branch you can use the field on the Import form to apply the branch code to all those you are importing.</li>
+</ul>
+</li>
+	<li>Finally you need to decide on what data you want to replace if there are duplicates.
+<ul>
+	<li>A matching record is found using the field you chose for matching criteria to prevent duplication</li>
+	<li>If you included patron attributes in your file you can decide whether to add your values to existing values or erase existing values and enter only your new values.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong>See the full documentation for Patron Import in the <a href="http://manual.koha-community.org/3.6/en/patronimport.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
index 55f4ad9..070de90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
@@ -15,4 +15,7 @@
 <p>If you have a portable scanner (or a laptop and USB scanner) you can walk through the library with the scanner in hand and scan barcodes as you come across them. Once finished you can then upload the text file generated by the scanner to Koha</p>
 
 <p>Choose the text file and the date you want to mark all times as seen and click 'Submit.'</p>
+
+<p><strong>See the full documentation for Inventory in the <a href="http://manual.koha-community.org/3.6/en/inventory.html">manual</a> (online).</strong></p>
+
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
index 9c5a374..95916f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
@@ -2,15 +2,26 @@
 
 <h1>News</h1>
 
-<p>Koha's news module allows librarians to post news to the OPAC and the staff interface.
+<p>Koha's news module allows librarians to post news to the OPAC, staff interface and circulation receipts.</p>
 
-<p>To add news to either the OPAC or the Staff Client:</li>
-<ul><li>Click 'New Entry'</li>
-<ul><li>Under 'Display Location' choose whether to put the news on the OPAC or the Librarian (Staff) Interface.</li>
-<li>Choose a title for your entry</li>
-<li>Using the publication and expiration date fields you can control how long your item appears</li>
-<li>'Appear in position' lets you decide what order your news items appear in</li>
-<li>The 'News' box allows for the use of html for formatting of your news item</li></ul>
-<i>After filling in all of the fields, click 'Submit'</li>
-<li>News in the OPAC will appear above the OpacMainUserBlock</li>
-<li>News in the Staff Client will appear on the far left of the screen</li></ul>
\ No newline at end of file
+<p>To add news to either the OPAC, the Staff Client or a Circulation receipt:</p>
+
+<ul>
+	<li>Click 'New Entry'
+<ul>
+	<li>Under 'Display Location' choose whether to put the news on the OPAC, Slip (circulation receipt) or the Librarian (Staff) Interface.</li>
+	<li>Choose a title for your entry</li>
+	<li>Using the publication and expiration date fields you can control how long your item appears</li>
+	<li>'Appear in position' lets you decide what order your news items appear in</li>
+	<li>The 'News' box allows for the use of HTML for formatting of your news item</li>
+</ul>
+</li>
+	<li>After filling in all of the fields, click 'Submit'</li>
+	<li>News in the OPAC will appear above the OpacMainUserBlock</li>
+	<li>News in the Staff Client will appear on the far left of the screen</li>
+	<li>News on the circulation receipts will appear below the items that are checked out</li>
+</ul>
+
+<p><strong>See the full documentation for News in the <a href="http://manual.koha-community.org/3.6/en/tools.html#newstool">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]    
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
index 85f731b..b44cdbd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
@@ -1,12 +1,15 @@
 [% INCLUDE 'help-top.inc' %]
 
 <h1>Notices</h1>
-All notices sent by Koha can be customized using the Notices Tool. The system comes with several predefined templates that will appear when you first visit the Notices Tool
 
-Each notice can be edited, but only a few can be deleted, this is to prevent system errors should a message try to send without a template.
+<p>All notices sent by Koha can be customized using the Notices Tool. The system comes with several predefined templates that will appear when you first visit the Notices Tool</p>
+
+<p>Each notice can be edited, but only a few can be deleted, this is to prevent system errors should a message try to send without a template.</p>
+
 <h2>Adding Notices</h2>
-<ul>
-	<li>To add a new notice
+
+<p>To add a new notice</p>
+
 <ul>
 	<li>Click 'New Notice'</li>
 	<li>Choose the module this notice is related to</li>
@@ -15,16 +18,17 @@ Each notice can be edited, but only a few can be deleted, this is to prevent sys
 	<li>Message Subject is what will appear in the subject line of the email</li>
 	<li>In the message body feel free to type whatever message you feel is best, use the fields on the left hand side to enter individualized data from the from database.
 <ul>
-	<li style="color: #ff0000;">Important: On overdue notices make sure to use &lt;&lt;items.content&gt;&gt; to print out the data related to all items that are overdue. The other option is to use the &lt;item&gt;&lt;/item&gt; tags to span the line so that it will print out multiple lines</li>
-	<li style="color: #ff0000;">Important: Only the overdue notices take advantage of the &lt;item&gt;&lt;/item&gt; tags, all other notices referencing items need to use &lt;&lt;items.content&gt;&gt;</li>
-</ul>
-</li>
+	<li style="color: #990000;">Important: On overdue notices make sure to use &lt;&lt;items.content&gt;&gt; to print out the data related to all items that are overdue. The other option is to use the &lt;item&gt;&lt;/item&gt; tags to span the line so that it will print out multiple lines</li>
+	<li style="color: #990000;">Important: Only the overdue notices take advantage of the &lt;item&gt;&lt;/item&gt; tags, all other notices referencing items need to use &lt;&lt;items.content&gt;&gt;</li>
 </ul>
 </li>
 </ul>
+
 <h3>Notice Markup</h3>
-When creating your overdue notices there are two tags in addition to the various database fields that you can use in your notices.
-<p style="color: #ff0000;">Important: These new tags only work on the overdue notices, not other circulation related notices at this time.</p>
+
+<p>When creating your overdue notices there are two tags in addition to the various database fields that you can use in your notices.</p>
+
+<p style="color: #990000;">Important: These new tags only work on the overdue notices, not other circulation related notices at this time.</p>
 
 <ul>
 	<li>&lt;item&gt;&lt;/item&gt; which should enclose all fields from the biblio, biblioitems, and items tables.</li>
@@ -34,17 +38,26 @@ When creating your overdue notices there are two tags in addition to the various
 </ul>
 </li>
 </ul>
-An example of using these two tags in a notice template might be like:
-<pre>The following item(s) is/are currently overdue:
 
+<p>An example of using these two tags in a notice template might be like:
+
+<blockquote>
+<pre>The following item(s) is/are currently overdue:
    &lt;item&gt;"&lt;&lt;biblio.title&gt;&gt;" by &lt;&lt;biblio.author&gt;&gt;, &lt;&lt;items.itemcallnumber&gt;&gt;, Barcode: &lt;&lt;items.barcode&gt;&gt; Fine: &lt;fine&gt;GBP&lt;/fine&gt;&lt;/item&gt;</pre>
-Which, assuming two items were overdue, would result in a notice like:
+</blockquote>
+
+<p>Which, assuming two items were overdue, would result in a notice like:</p>
+
+<blockquote>
 <pre>The following item(s) is/are currently overdue:
+"A Short History of Western Civilization" by Harrison, John B, 909.09821 H2451, Barcode: 08030003 Fine: £3.50 
+"History of Western Civilization" by Hayes, Carlton Joseph Huntley, 909.09821 H3261 v.1, Barcode: 08030004 Fine: £3.50</pre>
+</blockquote>
 
-   "A Short History of Western Civilization" by Harrison, John B, 909.09821 H2451, Barcode: 08030003 Fine: £3.50
-   "History of Western Civilization" by Hayes, Carlton Joseph Huntley, 909.09821 H3261 v.1, Barcode: 08030004 Fine: £3.50</pre>
 <h2>Existing Notices</h2>
-Among the default notices are notices for several common actions within Koha, here are some of what those notices do
+
+<p>Among the default notices are notices for several common actions within Koha, here are some of what those notices do</p>
+
 <ul>
 	<li>ACCTDETAILS
 <ul>
@@ -65,7 +78,7 @@ Among the default notices are notices for several common actions within Koha, he
 	<li>The patron has requested to receive this notice
 <ul>
 	<li>Get there: OPAC &gt; Login &gt; my messaging</li>
-	<li>Get there: Staff Client &gt; Patron Record &gt; Messaging</li>
+	<li>Get there: Staff Client &gt; Patron Record &gt; Notices</li>
 </ul>
 </li>
 </ul>
@@ -85,7 +98,6 @@ Among the default notices are notices for several common actions within Koha, he
 	<li>ODUE (Overdue Notice)
 <ul>
 	<li>This notice is used to send Overdue Notices to Patrons</li>
-	<li>See a Sample Overdue Notice</li>
 	<li>Requires that you set Overdue Notice/Status Triggers</li>
 </ul>
 </li>
@@ -97,8 +109,11 @@ Among the default notices are notices for several common actions within Koha, he
 </ul>
 </li>
 	<li>You have the option to select the 'Routing List' notice when creating a new subscription (Choose from the 'Patron notification' drop down).</li>
-	<li style="background-color: #ffe599;">Tip: Notice also that if you'd like to notify patrons of new serial issues, you can click on 'define a notice' which will take you to the 'Notices' tool</li>
+	<li style="background-color: #ffe599">Tip: Notice also that if you'd like to notify patrons of new serial issues, you can click on 'define a notice' which will take you to the 'Notices' tool</li>
 </ul>
 </li>
 </ul>
+
+<p><strong>See the full documentation for Notices in the <a href="http://manual.koha-community.org/3.6/en/notices.html">manual</a> (online).</strong></p>
+
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
index e2fa546..54bd3f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
@@ -4,24 +4,43 @@
 
 <p>Once you have staged your records for import you can complete the import using this tool.</p>
 
-<ul><li>From the list of staged records, click on the file name that you want to finish importing</li>
-<ul><li>You will note that records that have already been imported will say so under 'Status'</li></ul>
-<li>A summary of your import will appear along with the option to change your matching rules</li>
-<li>Below the summary there will be a list of the records that will be imported</li>
-<ul><li>Review your summary before completing your import to make sure that your matching rule worked and that the records appear as you expect them to</li></ul>
-<li>Click 'Import into catalog' to complete the import</li>
-<li>Once your import is complete a link to the new bib records will appear to the right of each title that was imported</li>
-<li>You can also undo your import by clicking the 'Undo import into catalog' button</li>
-<li>Records imported using this tool remain in the 'reservoir' until they are cleaned. These items will appear when searching the catalog from the Cataloging tool.</li></ul>
+<ul>
+	<li>From the list of staged records, click on the file name that you want to finish importing
+<ul>
+	<li>You will note that records that have already been imported will say so under 'Status'</li>
+</ul>
+</li>
+	<li>A summary of your import will appear along with the option to change your matching rules</li>
+	<li>Below the summary is the option to import the batch of bib records using a specific framework
+<ul>
+	<li>Choosing a framework other than 'Default' isn't necessary, but it's helpful for running reports and having the right bib level item type selected on import.</li>
+</ul>
+</li>
+	<li>Below the framework selection there will be a list of the records that will be imported
+<ul>
+	<li>Review your summary before completing your import to make sure that your matching rule worked and that the records appear as you expect them to</li>
+</ul>
+</li>
+	<li>Click 'Import into catalog' to complete the import</li>
+	<li>Once your import is complete a link to the new bib records will appear to the right of each title that was imported</li>
+	<li>You can also undo your import by clicking the 'Undo import into catalog' button</li>
+</ul>
+
+<p>Records imported using this tool remain in the 'reservoir' until they are cleaned. These items will appear when searching the catalog from the Cataloging tool:</p>
 
 <p>To clean items out of the 'reservoir':</p>
 
-<ul><li>Visit the main screen of the Manage Staged MARC Records tool</li>
-<li>To clean a batch, click the 'Clean' button to the right</li>
-<li>You will be presented with a confirmation message</li>
-<ul><li>Accept the deletion and the records will be removed from the reservoir and the status will be changed to 'cleaned'</li></ul>
-<li>This action cannot be undone, so make sure you confirm that you are cleaning the correct import</li></ul>
+<ul>
+	<li>Visit the main screen of the Manage Staged MARC Records tool</li>
+	<li>To clean a batch, click the 'Clean' button to the right</li>
+	<li>You will be presented with a confirmation message
+<ul>
+	<li>Accept the deletion and the records will be removed from the reservoir and the status will be changed to 'cleaned'</li>
+</ul>
+</li>
+</ul>
+
+<p><strong>See the full documentation for the the Managing Staged MARC Records in the <a href="http://manual.koha-community.org/3.6/en/managestaged.html">manual</a> (online).</strong></p>
 
-	
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
index 7b7704b..65e5a85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
@@ -1,22 +1,23 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Overdue 'Notice/Status Triggers'</h1>
-
-<p>This tool lets you define triggers for overdue notices. You can send a borrower up to three reminder emails (depending on your library workflow)</p>
+<h1>Overdue Notice/Status Triggers</h1>
 
 <p>In order to send the overdue notices that you defined using the Notices tool, you need to first set the triggers to have these messages.</p>
 
-<p>In order to have overdue notices sent to your patrons, you need to set that patron category to require overdue notices.</p>
+<p style="color: #990000;">Important: In order to have overdue notices sent to your patrons, you need to set that patron category to require overdue notices.</p>
 
 <p>The Overdue Notice/Status Triggers tool gives the librarian the power to send up to three notices to each patron type notifying them of overdue items</p>
 
-<ul><li>Delay is the number of days after an issue is due before an action is triggered.</li>
-<ul><li style="color:#990000;"><strong>Important: These rules should not be used for Advanced Notices.  Advanced Notices should be set using the Enhanched Messaging Preferences on the Patron Profile.</strong></li>
-<li style="color:#990000;"><strong>Important: If you want Koha to trigger an action (send a letter or restrict a member), a delay value is required.</strong></li></ul>
-<li>To send additional notices, click on the tabs for 'Second' and 'Third' notice</li>
-<li>If you would like to prevent a patron from checking items out because of their overdue items, check the 'Restrict' box, this will put a notice on the patron's record at checkout informing the librarian that the patron cannot check out due to overdue items.</li></ul>
-
-<p>If the numbers you've entered in a give row beneath the 'delay' columns are logically inconsistent, Koha will give you an alert, and explain the inconsistency.</p>
+<ul>
+	<li>Delay is the number of days after an issue is due before an action is triggered.
+<ul>
+	<li style="color: #990000;">Important: If you want Koha to trigger an action (send a letter or restrict member), a delay value is required.</li>
+</ul>
+</li>
+	<li>To send additional notices, click on the tabs for 'Second' and 'Third' notice</li>
+	<li>If you would like to prevent a patron from checking items out because of their overdue items, check the 'Restrict' box, this will put a notice on the patron's record at checkout informing the librarian that the patron cannot check out due to overdue items.</li>
+	<li>See a Sample Overdue Notice</li>
+</ul>
 
 <h3>Sample Overdue Notice</h3>
 
@@ -40,5 +41,7 @@
 
 <p>Sincerely, Library Staff</p>
 
+<p><strong>See the full documentation for the the Overdue Notice/Status Triggers in the <a href="http://manual.koha-community.org/3.6/en/noticetriggers.html">manual</a> (online).</strong></p>
+
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
index 10f1604..a1e70de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
@@ -1,51 +1,25 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>	   
-	   Upload Patron Images</h1><p>This tool allows you to upload multiple patron images as a batch.</p>
-	   
-	   <p style="color: #990000;">IMPORTANT: Requires that the 'patronimages' system preference is set to 'ON' to use this feature.</p>
-		<ul>
-			<li><em>Get there: </em>More &gt; Administration &gt; Global System Preferences &gt; Patrons &gt; patronimages</li>
-		</ul><h2>Upload images in bulk</h2>
-		<ul>
-			<li>Go to the 'Tools' module (usually under 'More' in your Global Nav)</li>
-			<li>Choose 'Upload patron images'</li>
-			<li>You can choose to upload images in bulk by making a zip file with the images and a text file entitled &quot;DATALINK.TXT&quot; or &quot;IDLINK.TXT&quot;</li>
-			<li>For each group of pictures that has the cardnumber of the patron and the file containing that patrons picture. One patron per line separated by either commas or tabs.<br/>
-			<ul>
-				<li style="color: #990000;">			   
-			   IMPORTANT: Make sure that your TXT file is a plain text document, not RTF.</li>
-				<li style="color: #990000;">			   
-IMPORTANT: Make sure that you use either a comma or a tab to separate IDs from image names</li>
-			</ul></li>
-			<li>Add the images and the TXT file to a .ZIP file</li>
-			<li>Browse for the file from the Koha interface</li>
-			<li>Click 'Unpack' and you will receive a confirmation screen</li>
-			<li>To see the image(s) you imported search for the patron(s) and view their profile</li>
-			<li>If you'd like to change the image, just upload a new image</li>
-			<li>If you'd like to delete the patron image, click the 'Delete' button under 'Manage Patron Image'</li>
-		</ul>	   
-	   <p><strong>Uploading Single Images</strong>
-If you only have one patron image you might want to upload it via the patron information page instead of using this bulk tool.</p>
+<h1>Upload Patron Images</h1>
+
+<p>Patron images can be uploaded in bulk if you are allowing patron images to be attached to patron records. These images can also be used when creating patron cards.</p>
+
+<ul>
+	<li>Create a txt file and title it "DATALINK.TXT" or "IDLINK.TXT"</li>
+	<li>On each line in the text file enter the patron's card number followed by comma (or tab) and then the image file name
+<ul>
+	<li>Make sure that your TXT file is a plain text document, not RTF.</li>
+</ul>
+</li>
+	<li>Zip up the text file and the image files</li>
+	<li>Go to the Upload Patron Images Tool</li>
+	<li>For a single image, simply point to the image file and enter the patron card number</li>
+	<li>For multiple images, choose to upload a zip file</li>
+	<li>After uploading you will be presented with a confirmation</li>
+</ul>
+
+<p style="color:#990000;">Important: There is a limit of 520K on the size of the picture uploaded and it is recommended that the image be 200x300 pixels, but smaller images will work as well.</p>
+
+<p><strong>See the full documentation for the the Patron Image Uploader in the <a href="http://manual.koha-community.org/3.6/en/uploadpatronimages.html">manual</a> (online).</strong></p>
 
-		<ul>
-			<li>Go to the Patrons menu at the top of the staff client</li>
-			<li>Search for the patron you have the image for</li>
-			<li>If there is more than one result, click on the name of the patron you'd like to add an image to</li>
-			<li>Scroll down to the image upload form</li>
-			<li>Browse for the image on your computer and click 'Upload'</li>
-			<li>If you'd like to change the image, just upload a new image</li>
-			<li>If you'd like to delete the patron image, click the 'Delete' button under 'Manage Patron Image'</li>
-		</ul><h3>Why can't I upload patron images?</h3>
-<p>First you will need
-	    <span class="ex">
-a patronimages/</span>directory.  If you do not have this directory you will see an error.</p>
-			<ul>
-				<li>Contact your system administrator to create this directory and you'll be set to go.</li>
-			</ul>
-<h3>What size should my images be?</h3>
-<p>There is a limit of 520K on the size of the picture uploaded and it is recommended that the image be 200x300 pixels, but smaller images will work as well.</p>
-<h3>What image formats are supported?</h3>
-<p>Only PNG, GIF, JPEG, XPM formats are supported.</p>
-	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
index af36018..55537b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
@@ -1,22 +1,28 @@
 [% INCLUDE 'help-top.inc' %]
+
 <h1>Task Scheduler</h1>
-<p>The task scheduler is a way to schedule reports to run whenever
-      you want.</p><p>To schedule a task, visit the Task Scheduler and fill in the
-      form</p>
-      <ul class="itemizedlist" type="disc"><li class="listitem"><p>Current Server Time shows the time on your server (schedule
-          all of your reports to run based on that time - not on your local
-          time)</p></li><li class="listitem"><p>Time should be entered as hh:mm (2 digit hour, 2 digit
-          minute)</p></li><li class="listitem"><p>Date should be entered using the calendar pop up</p></li><li class="listitem"><p>From Report choose the report you want to schedule</p></li><li class="listitem"><p>Choose whether to receive the text of or a link to the
-          results</p></li><li class="listitem"><p>In the Email filed enter the email of the person you want to
-          receive your report</p></li></ul><p>Below the task scheduler form, there is a list of scheduled
-      reports</p>
-      <p>You can also schedule reports directly from the list of saved
-      reports by clicking the 'Schedule' link</p>
-      <h3>Troubleshooting</h3><p>Task scheduler will not work if the user the webserver runs as
-        doesn't have the permission to use it. To find out if the right user
-        has the permissions necessary, check /etc/at.allow to see what users
-        are in it. If you don't have that file, check etc/at.deny. If at.deny
-        exists but is blank, then every user can use it. Talk to your system
-        admin about adding the user to the right place to make the task
-        scheduler work.</p>
+
+<p>The task scheduler is a way to schedule reports to run whenever you want.</p>
+
+<p>To schedule a task, visit the Task Scheduler and fill in the form</p>
+
+<ul>
+	<li>Current Server Time shows the time on your server (schedule all of your reports to run based on that time - not on your local time)</li>
+	<li>Time should be entered as hh:mm (2 digit hour, 2 digit minute)</li>
+	<li>Date should be entered using the calendar pop up</li>
+	<li>From Report choose the report you want to schedule</li>
+	<li>Choose whether to receive the text of or a link to the results</li>
+	<li>In the Email filed enter the email of the person you want to receive your report</li>
+</ul>
+
+<p>Below the task scheduler form, there is a list of scheduled reports</p>
+
+<p>You can also schedule reports directly from the list of saved reports by clicking the 'Schedule' link</p>
+
+<h2>Troubleshooting</h2>
+
+<p>Task scheduler will not work if the user the web server runs as doesn't have the permission to use it. To find out if the right user has the permissions necessary, check /etc/at.allow to see what users are in it. If you don't have that file, check etc/at.deny. If at.deny exists but is blank, then every user can use it. Talk to your system admin about adding the user to the right place to make the task scheduler work.</p>
+
+<p><strong>See the full documentation for the the Task Scheduler in the <a href="http://manual.koha-community.org/3.6/en/taskscheduler.html">manual</a> (online).</strong></p>
+
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
index 34ca8a7..fbee311 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
@@ -4,17 +4,31 @@
 
 <p>Importing records into Koha includes two steps. The first is to stage records for import.</p>
 
-<ul><li>First find the MARC file on your computer</li>
-<li>Next you will be presented with options for record matching and item imports</li>
-<ul><li>Enter 'Comments about this file' to identify your upload when going to the 'Manage Staged MARC Records' tool</li>
-<li>Choose the character encoding</li>
-<li>Choose whether or not you want to look for matching records</li>
-<ul><li>You can set up record matching rules through the administration area</li></ul>
-<li>Next choose what to do with matching records if they are found</li>
-<li>Finally choose what to do with records that are unique</li>
-<li>Next you can choose whether or not to import the item data found in the MARC records</li></ul>
-<li>Click 'Stage for import'</li>
-<li>You will be presented with a confirmation of your MARC import</li>
-<li>To complete the process continue to the Managed Staged MARC Records Tool</li></ul>
+<ul>
+	<li>First find the MARC file on your computer</li>
+	<li>Next you will be presented with options for record matching and item imports
+<ul>
+	<li>Enter 'Comments about this file' to identify your upload when going to the 'Manage Staged MARC Records' tool</li>
+	<li>Choose the character encoding
+<ul>
+	<li>If you leave this set to Default Koha will try to guess the encoding, but it should be noted that this is almost always wrong for non-UTF8 records with non-ASCII characters. Specifying a character set is much more reliable if you're not using UTF-8.</li>
+</ul>
+</li>
+	<li>Choose whether or not you want to look for matching records
+<ul>
+	<li>You can set up record matching rules through the administration area</li>
+</ul>
+</li>
+	<li>Next choose what to do with matching records if they are found</li>
+	<li>Finally choose what to do with records that are unique</li>
+	<li>Next you can choose whether or not to import the item data found in the MARC records</li>
+</ul>
+</li>
+	<li>Click 'Stage for import'</li>
+	<li>You will be presented with a confirmation of your MARC import</li>
+	<li>To complete the process continue to the Managed Staged MARC Records Tool</li>
+</ul>
+
+<p><strong>See the full documentation for the MARC Import in the <a href="http://manual.koha-community.org/3.6/en/stagemarc.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
index c4b6f88..6823273 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
@@ -1,8 +1,9 @@
 [% INCLUDE 'help-top.inc' %]
+
 <h1>Tools</h1>
 
-		<p>Many of the subsidiary modules can be found under Tools.</p>
-		 
-		<p>To move forward, select the task you would like to complete.</p>
-		 
-		<p>Specialized help will be available after that point.</p> 	[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+<p>Tools in Koha all perform some sort of action. Often many of the items listed under Tools in Koha are referred to as 'Reports' in other library management systems.</p>
+
+<p><strong>See the full documentation for Tools in the <a href="http://manual.koha-community.org/3.6/en/tools.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
index 31048b1..6bf9cb1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
@@ -1,18 +1,13 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Log View</h1>
-		<ul>
-			<li>The log viewer will show you what actions are being taking in your ILS during a set time period</li>
-			<li>Choose the start and end date you'd like to see and click 'Go' to see the results on your screen</li>
-			<li>You also have the option of exporting this data to use in a different format just by choosing to export to an application.
-			<ul>
-				<li>This will result in a comma separated value (csv) file.</li>
-			</ul></li>
-			<li>You can also choose to filter what you see by any of the fields visible.</li>
-		</ul>
-<p><strong>Why aren't my cataloging actions being logged?</strong>
-You may not have the 'Logs' system preference turned on</p>
-		<ul>
-			<li><em>Get there:</em> More &gt; Administration &gt; Global System Preferences &gt; Logs</li>
-		</ul>
-	</div>	[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+<h1>Log Viewer</h1>
+
+<p>Actions within the Koha system are tracked in log files. Your system preferences can be changed to prevent the logging of different actions. These logs can be viewed using the Log Viewer Tool.</p>
+
+<p>Choosing different combinations of menu options will produce the log file for that query.</p>
+
+<p>You will note that real names do not appear on the log, only identifying numbers. You need to use the identifying numbers when searching the logs as well.</p>
+
+<p><strong>See the full documentation for the Log Viewer in the <a href="http://manual.koha-community.org/3.6/en/logviewer.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3



More information about the Koha-patches mailing list