[Koha-patches] [PATCH] Bug 8945: Administration Help Files

Nicole C. Engard nengard at bywatersolutions.com
Fri Oct 19 15:25:03 CEST 2012


This patch adds the help file for the transport cost matrix
and updates all others. Still needed is a help file for
'did you mean'.
---
 .../prog/en/modules/help/admin/admin-home.tt       |    4 +-
 .../prog/en/modules/help/admin/aqbudgetperiods.tt  |   32 +++++--
 .../prog/en/modules/help/admin/aqbudgets.tt        |    4 +-
 .../prog/en/modules/help/admin/aqplan.tt           |   12 ++--
 .../modules/help/admin/auth_subfields_structure.tt |    3 +-
 .../en/modules/help/admin/auth_tag_structure.tt    |    2 +-
 .../en/modules/help/admin/authorised_values.tt     |   55 +++++++-----
 .../prog/en/modules/help/admin/authtypes.tt        |    2 +-
 .../prog/en/modules/help/admin/biblio_framework.tt |    2 +-
 .../modules/help/admin/branch_transfer_limits.tt   |    2 +-
 .../prog/en/modules/help/admin/branches.tt         |    2 +-
 .../prog/en/modules/help/admin/categorie.tt        |   16 +++-
 .../prog/en/modules/help/admin/checkmarc.tt        |    2 +-
 .../prog/en/modules/help/admin/cities.tt           |    2 +-
 .../prog/en/modules/help/admin/classsources.tt     |    8 +-
 .../prog/en/modules/help/admin/currency.tt         |    2 +-
 .../prog/en/modules/help/admin/fieldmapping.tt     |    2 +-
 .../modules/help/admin/item_circulation_alerts.tt  |    2 +-
 .../prog/en/modules/help/admin/itemtypes.tt        |    2 +-
 .../prog/en/modules/help/admin/koha2marclinks.tt   |    2 +-
 .../modules/help/admin/marc_subfields_structure.tt |    2 +-
 .../prog/en/modules/help/admin/marctagstructure.tt |    2 +-
 .../prog/en/modules/help/admin/matching-rules.tt   |    2 +-
 .../prog/en/modules/help/admin/oai_set_mappings.tt |    2 +-
 .../prog/en/modules/help/admin/oai_sets.tt         |    2 +-
 .../en/modules/help/admin/patron-attr-types.tt     |   22 +++---
 .../prog/en/modules/help/admin/preferences.tt      |   38 ++++----
 .../prog/en/modules/help/admin/roadtype.tt         |    2 +-
 .../prog/en/modules/help/admin/smart-rules.tt      |   94 ++++++++++----------
 .../prog/en/modules/help/admin/stopwords.tt        |    2 +-
 .../en/modules/help/admin/transport-cost-matrix.tt |   15 +++
 .../prog/en/modules/help/admin/z3950servers.tt     |    4 +-
 32 files changed, 194 insertions(+), 151 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/transport-cost-matrix.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
index 944ba79..47cbeab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
@@ -16,7 +16,7 @@
 
 <p>"Basic Parameters" is where library policies are set and governed. It is best to set your system preferences and then work through the basic parameters in the order that they appear on this page.</p>
 
-<p>Please note that it is not required to set all the basic parameters. For example, if you do not plan to use budget based acquisitions, then 'Funds,' 'Budgets,' and 'Currencies and Exchange Rates' can be ignored.</p>
+<p>Please note that it is not required to set all the basic parameters. For example, if you do not plan to use acquisitions, then 'Funds,' 'Budgets,' and 'Currencies and Exchange Rates' can be ignored.</p>
 
 <h3>Patrons and Circulation</h3>
 
@@ -30,6 +30,6 @@
 
 <p>This list of parameters includes functionalities that didn't fit in any other category.  These items are optional and may not need to be altered, depending on your library's needs.</p>
 
-<p><strong>See the full documentation for system Administration in the <a href="http://manual.koha-community.org/3.8/en/administration.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for system Administration in the <a href="http://manual.koha-community.org/3.10/en/administration.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
index 44c6f26..9311221 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
@@ -2,24 +2,38 @@
 
 <h1>Budgets</h1>
 
-<p>The 'Budgets' functionality is used for tracking accounting values related to acquisitions.</p>
+<p>Budgets are used for tracking accounting values related to acquisitions. For example you could create a Budget for the current year (ex. 2012) and then break that into Funds for different areas of the library (ex. Books, Audio, etc).</p>
 
-<p>'Budgets' can be used to create a budget for the current year and then break it into Funds for different areas of the library.</p>
+<p>When visiting the main budget administration you will see two tabs, one for active and one for inactive budgets.</p>
 
 <h2>Add a budget</h2>
 
-<p>To add a budget, click the 'New Budget' button.</p>
+<p>Budgets can either be created from scratch or by duplicating the previous year's budget.</p>
+
+<p>To duplicate a budget from a previous year, click on the link for the budget name from the list of budgets.</p>
+
+<p>On the screen listing the budget breakdown click the Edit button at the top and choose to Duplicate budget.</p>
+
+<p>You will be presented with a form where you simply need to enter the new start and end date and save the budget.</p>
+
+<p>This will not only duplicate your budget, but all of the funds associated with that budget so that you can reuse budgets and funds from year to year.</p>
+
+<p>If you haven't used Koha before for acquisitions then you'll need to start fresh with a new budget. To add a new budget click the 'New Budget' button.</p>
 
 <ul>
-    <li>Choose a time period for the budget, be it an academic year, a fiscal year, a quarter, or other unit of time.</li>
-    <li>The description should help you identify the budget when ordering.</li>
-    <li>Do not use any symbols other than the decimal separator in the amount box.</li>
-    <li>Marking a budget 'Active' makes it usable when placing orders in the acquisitions module, even if an order is placed after the budget end date. This will allow you to record orders that were placed in a previous budget period.</li>
-    <li>Locking a budget prevents other librarians from modifying that fund.</li>
+    <li>Choose the time period this budget is for, whether it's an academic year, a fiscal year, a quarter, etc.</li>
+
+    <li>The Description should be something that will help you identify the budget when ordering</li>
+
+    <li>In the amount box do not use any symbols, simply enter the amount of the budget with numbers and decimals.</li>
+
+    <li>Marking a budget active makes it usable when placing orders in the acquisitions module, even if the order is placed after the budget end date. This will allow you to record orders that were places in a previous budget period.</li>
+
+    <li>Locking a budget means that Funds will not be able to be modified by librarians</li>
 </ul>
 
 <p>Once you have made your edits, click the 'Save Changes' button. You will be brought to a list of your existing budgets.</p>
 
-<p><strong>See the full documentation for Budgets in the <a href="http://manual.koha-community.org/3.8/en/acqadmin.html#budgetplanning">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Budgets in the <a href="http://manual.koha-community.org/3.10/en/acqadmin.html#budgetplanning">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
index f57bbc2..6575f47 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
@@ -24,13 +24,13 @@
     <li>Choose which library will use the fund</li>
     <li>You can restrict who can order from a fund by selecting an owner or a library from the 'Restrict access to' menu.</li>
     <li>The 'Notes' field is for descriptions to detail when librarians should use the fund.</li>
-    li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the Planning Category FAQ.</li>
+    <li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the Planning Category FAQ.</li>
 </ul>
 
 <p>When complete, click 'Submit' and you will be brought to a list of all of the funds for the budget.</p>
 
 <p>To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add Child Fund' options. A Child Fund a sub-fund of the parent fund. For example, one might have a parent fund for 'Fiction,' and Child Funds for 'New Releases' and 'Science Fiction.' It is an optional way to further organize your finances.</p>
 
-<p><strong>See the full documentation for Funds in the <a href="http://manual.koha-community.org/3.8/en/acqadmin.html#funds">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Funds in the <a href="http://manual.koha-community.org/3.10/en/acqadmin.html#funds">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
index 4667748..64c03ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
@@ -2,16 +2,16 @@
 
 <h1>Budget Planning</h1>
 
-<p>When viewing the list of funds, click the 'Budget Planning' button and choose how you would like to plan to spend your budget.</p>
+<p>When viewing the list of funds click the 'Planning' button and choose how you would like to plan to spend your budget.</p>
 
-<p>If you choose 'Plan by Months' you will see the budgeted amount broken down by months.</p>
+<p>If you choose 'Plan by MONTHS' you will see the budgeted amount broken down by months.</p>
 
-<p>To hide some of the columns, click the minus sign (-) to the right or below the dates. To add more columns, click the plus sign (+) found above the 'Auto-fill row' buttons.</p>
+<p>To hide some of the columns you can click the 'hide' link to the right the dates. To add more columns you can click the 'Show a column' link found below the 'Fund Remaining' heading.</p>
 
-<p>From here, you can plan your budget spending by manually entering values or by clicking the 'Auto-fill row' button. If you choose to auto-fill the form, the system will automatically divide the total. Therefore, you may have to adjust the allocations manually to better reflect your library's needs.</p>
+<p>From here you can plan your budget spending by manually entering values or by clicking the 'Auto-fill row' button. If you choose to auto-fill the form the system will try to divide the amount accordingly, you may have to make some edits to split things more accurately.</p>
 
-<p>Once your changes are made, click the 'Save' button. If you would like to export your data as a CSV file, enter a file name in the 'Output to a file named' field and click the 'Output' button.</p>
+<p>Once your changes are made, click the 'Save' button. If you would like to export your data as a CSV file you can do so by entering a file name in the 'Output to a file named' field and clicking the 'Output' button.</p>
 
-<p><strong>See the full documentation for Budget Planning in the <a href="http://manual.koha-community.org/3.8/en/acqadmin.html#fundsplanning">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Budget Planning in the <a href="http://manual.koha-community.org/3.10/en/acqadmin.html#fundsplanning">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
index 8a4333c..9cfdf55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
@@ -63,7 +63,6 @@
     <li>To save your changes, click the 'Save Changes' button at the top of the screen.</li>
 </ul>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
index 77c7be1..8e7aaf9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
@@ -19,6 +19,6 @@
 
 <p>To the right of the new field is a link to 'Subfields.' You will need to add subfields before this tag will appear in your MARC editor.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
index e44d213..26ac3ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
@@ -6,29 +6,38 @@
 
 <h2>Existing Values</h2>
 
-<p>Koha installs with pre-defined values that your library is likely to use, for instance, 'Lost.'</p> By default, this includes:
+<p>Koha installs with pre-defined values that your library is likely to use, for instance, 'Lost.'</p> 
+
+<p>By default, this includes:</p>
+
+<ul>
+	<li>'Asort1,' for acquisitions statistical purposes.</li>
+	<li>'Asort2,' used for acquisitions statistical purposes.</li>
+	<li>'BOR_NOTES' is for values for custom patron notes that appear on the circulation screen and the OPAC.</li>
+	<li>'Bsort1' is for patron statistical purposes.</li>
+	<li>'Bsort2' is used for patron statistical purposes.</li>
+	<li>'CART' is the shelving cart location, used by InProcessingToShelvingCart and ReturnToShelvingCart</li>
+	<li>'CCODE' is for collection codes (appears when cataloging and working with items).</li>
+	<li>'DAMAGED' is for descriptions of damaged items, and appears when cataloging and working with items.</li>
+	<li>'HINGS_AS' is for General Holdings: Acquisition Status Designator, a data element that specifies the acquisition status for the unit at the time of the holdings report.</li>
+	<li>'HINGS_C' is for General Holdings: Completeness Designator.</li>
+	<li>'HINGS_PF' is for Physical Form Designators</li>
+	<li>'HINGS_RD' is for General Holdings: Retention Designator, a data element that specifies the retention policy for the unit at the time of the holdings report.</li>
+	<li>'HINGS_UT' is for General Holdings: Type of Unit Designator.</li>
+	<li>'LOC' is for the shelving location and usually appears when adding or editing an item.</li>
+	<li>'LOST' is for descriptions for items marked as lost. It appears when adding or editing an item. Values given to lost statuses should be numeric (not alphabetical) in order for statuses to appear properly.
 <ul>
-    <li>'Asort1,' for acquisitions statistical purposes.</li>
-    <li>'Asort2,' used for acquisitions statistical purposes.</li>
-    <li>'BOR_NOTES' is for values for custom patron notes that appear on the circulation screen and the OPAC.</li>
-    <li>'Bsort1' is for patron statistical purposes.</li>
-    <li>'Bsort2' is used for patron statistical purposes.</li>
-    <li>'CART' is the shelving cart location, used by InProcessingToShelvingCart and ReturnToShelvingCart</li>
-    <li>'CCODE' is for collection codes (appears when cataloging and working with items).</li>
-    <li>'DAMAGED' is for descriptions of damaged items, and appears when cataloging and working with items.</li>
-    <li>'HINGS_AS' is for General Holdings: Acquisition Status Designator, a data element that specifies the acquisition status for the unit at the time of the holdings report.</li>
-    <li>'HINGS_C' is for General Holdings: Completeness Designator.</li>
-    <li>'HINGS_PF' is for Physical Form Designators</li>
-    <li>'HINGS_RD' is for General Holdings: Retention Designator, a data element that specifies the retention policy for the unit at the time of the holdings report.</li>
-    <li>'HINGS_UT' is for General Holdings: Type of Unit Designator.</li>
-    <li>'LOC' is for the shelving location and usually appears when adding or editing an item.</li>
-    <li>'LOST' is for descriptions for items marked as lost. It appears when adding or editing an item. Values given to lost statuses should be numeric (not alphabetical) in order for statuses to appear properly.</li>
-    <li>'MANUAL_INV' includes values for manual invoicing.</li>
-    <li>'NOT_LOAN' is used to list reasons why a title is not for loan.</li>
-    <li>'PROC' is for the location to be used for NewItemsDefaultLocation (change description as desired), also the location expected by InProcessingToShelvingCart.</li>
-    <li>'RESTRICTED' is used for the restricted status of an item</li>
-    <li>'SUGGEST' is for a list of reasons to accept or reject patron suggestions. It appears when managing suggestions.</li>
-    <li>'WITHDRAWN' is for a description of a withdrawn item. It appears when adding or editing an item.</li>
+	<li style="color: #990000;">Important: Values given to lost statuses should be numeric and not alphabetical in order for statuses to appear properly</li>
+</ul>
+</li>
+	<li>'MANUAL_INV' includes values for manual invoicing.</li>
+	<li>'NOT_LOAN' is used to list reasons why a title is not for loan.</li>
+	<li>'PROC' is for the location to be used for NewItemsDefaultLocation (change description as desired), also the location expected by InProcessingToShelvingCart.</li>
+	<li>'REPORT_GROUP' provides a way to sort and filter your reports, the default values in this category include the Koha modules (Accounts, Acquitisions, Catalog, Circulation, Patrons)</li>
+	<li>'REPORT_SUBGROUP' can be used to further sort and filter your reports. This category is empty by default. Values here need to include the authorized value code from REPORT_GROUP in the Description (OPAC) field to link the subgroup to the appropriate group.</li>
+	<li>'RESTRICTED' is used for the restricted status of an item</li>
+	<li>'SUGGEST' is for a list of reasons to accept or reject patron suggestions. It appears when managing suggestions.</li>
+	<li>'WITHDRAWN' is for a description of a withdrawn item. It appears when adding or editing an item.</li>
 </ul>
 
 <h2>Add New Authorized Value Category</h2>
@@ -60,6 +69,6 @@
     <li>The new value will appear in the list along with existing values.</li>
 </ul>
 
-<p><strong>See the full documentation for Authorized Values in the <a href="http://manual.koha-community.org/3.8/en/basicparams.html#authorizedvalues">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorized Values in the <a href="http://manual.koha-community.org/3.10/en/basicparams.html#authorizedvalues">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
index efe74a3..1163d1b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
@@ -6,6 +6,6 @@
 
 <p>Koha comes with many of the necessary Authority frameworks already installed.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
index faa53a4..45883b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
@@ -34,6 +34,6 @@
 
 <p>To make edits to the fields associated with the Framework you must first click 'MARC Structure' and then follow the instructions for editing subfields</p>
 
-<p><strong>See the full documentation for Frameworks in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Frameworks in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#marcbibframeworks">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/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
index baac455..4037d92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
@@ -16,6 +16,6 @@
 
 <p>In the above example, Centerville library will allow patrons to return items from all libraries except Liberty and Franklin to their library.</p>
 
-<p><strong>See the full documentation for Library Transfer Limits in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Library Transfer Limits in the <a href="http://manual.koha-community.org/3.10/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
index da2d595..8404f8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
@@ -47,6 +47,6 @@
 
 <p>Properties are then applied to libraries via the add or edit library form.</p>
 
-<p><strong>See the full documentation for Libraries &amp; Groups in the <a href="http://manual.koha-community.org/3.8/en/basicparams.html#libsgroups">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Libraries &amp; Groups in the <a href="http://manual.koha-community.org/3.10/en/basicparams.html#libsgroups">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/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
index cd6b054..e66fee6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
@@ -44,7 +44,7 @@
 <p>To add a new patron category click 'New Category' at the top of the page</p>
 
 <ul>
-      <li>The 'Category Code' is an identifier for your new code.
+	<li>The 'Category Code' is an identifier for your new code.
 <ul>
 	<li style="color: #990000;">Important: The category code is limited to 10 characters (numbers and letters)</li>
 </ul>
@@ -55,8 +55,16 @@
 	<li style="color: #990000;">Important: You cannot enter both a month limit and a date until. Choose to enter either one or the other.</li>
 </ul>
 </li>
-	<li>Some patron categories can have a minimum age (in years) requirement associated with them, enter this age in the 'Age required'</li>
-	<li>Patron categories can also have a maximum age (in years) associated with them (such as children), enter this age in the 'Upperage limit'</li>
+	<li>Some patron categories can have a minimum age (in years) requirement associated with them, enter this age in the 'Age required'
+<ul>
+	<li style="color: #990000;">Important: This value will only be checked if BorrowerMandatoryField defines the dateofbirth as a required field on the patron record</li>
+</ul>
+</li>
+	<li>Patron categories can also have a maximum age (in years) associated with them (such as children), enter this age in the 'Upperage limit'
+<ul>
+	<li style="color: #990000;">Important: This value will only be checked if BorrowerMandatoryField defines the dateofbirth as a required field on the patron record</li>
+</ul>
+</li>
 	<li>If you charge a membership fee for your patrons (such as those who live in another region) you can enter that in the 'Enrollment fee' field.
 <ul>
 	<li style="color: #990000;">Important: Only enter numbers and decimals in this field</li>
@@ -77,6 +85,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Categories in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#patcats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Categories in the <a href="http://manual.koha-community.org/3.10/en/patscirc.html#patcats">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/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
index 1e43fb0..a6d0af6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
@@ -6,6 +6,6 @@
 
 <p>If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</p>
 
-<p><strong>See the full documentation for the MARC Bibliographic Framework Test in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#marcbibframeworkstest">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the MARC Bibliographic Framework Test in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#marcbibframeworkstest">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/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
index 98b1b4d..3f89b19 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
@@ -18,6 +18,6 @@
 
 <p>This will allow for easy entry of local cities into the patron record without risking the potential for typos or mistaken zip/postal codes.</p>
 
-<p><strong>See the full documentation for Cities and Towns in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#citytowns">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Cities and Towns in the <a href="http://manual.koha-community.org/3.10/en/patscirc.html#citytowns">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/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
index 3e4c79b..8fb5478 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
@@ -7,7 +7,7 @@
 <p>Commonly used values of this field are:</p>
 
 <ul>
-        <li>ddc - Dewey Decimal Classification</li>
+	<li>ddc - Dewey Decimal Classification</li>
     <li>lcc - Library of Congress Classification</li>
 </ul>
 
@@ -16,8 +16,8 @@
 <ul>
 	<li>ANSCR (sound recordings)</li>
 	<li>SuDOC classification</li>
- <li>Universal Decimal Classification</li>
-      <li>Other/Generic Classification</li>
+	<li>Universal Decimal Classification</li>
+	<li>Other/Generic Classification</li>
 </ul>
 
 <h2>Adding/Editing Classification Sources</h2>
@@ -53,6 +53,6 @@
 	<li>Choose an appropriate filing routine - dewey, generic or lcc</li>
 </ul>
 
-<p><strong>See the full documentation for Classification Sources in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#classificationsources">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Classification Sources in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#classificationsources">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/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
index ff4245c..0552f78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
@@ -8,6 +8,6 @@
 
 <p>The active currency is the main currency you use in your library. Your active currency will have a check mark in the 'Active' column. If you don't have an active currency you will see an error message telling you to choose an active currency.</p>
 
-<p><strong>See the full documentation for Currencies and Exchange Rates in the <a href="http://manual.koha-community.org/3.8/en/acqadmin.html#currexchangeadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Currencies and Exchange Rates in the <a href="http://manual.koha-community.org/3.10/en/acqadmin.html#currexchangeadmin">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/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
index 9981403..3e8650b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
@@ -20,6 +20,6 @@
 
 <p>Future developments will include additional keyword assigned fields.</p>
 
-<p><strong>See the full documentation for Keyword to MARC Mapping in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#keywordmapping">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Keyword to MARC Mapping in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#keywordmapping">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/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
index f9bafcc..655e516 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
@@ -19,6 +19,6 @@
 	<li>By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item/patron type combo that you would like to stop notices for.</li>
 </ul>
 
-<p><strong>See the full documentation for Item Circulation Alerts in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#itemcircalerts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Circulation Alerts in the <a href="http://manual.koha-community.org/3.10/en/patscirc.html#itemcircalerts">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/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
index 6759063..03dcfe6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
@@ -57,6 +57,6 @@
 
 <p>You will not be able to delete item types that are being used by items within your system.</p>
 
-<p><strong>See the full documentation for Item Types in the <a href="http://manual.koha-community.org/3.8/en/basicparams.html#itemtypeadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Types in the <a href="http://manual.koha-community.org/3.10/en/basicparams.html#itemtypeadmin">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/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
index 6b7c75a..b5fc55f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
@@ -12,6 +12,6 @@
 
 <p style="color: #990000;">Important: At this time you can map only 1 MARC field to 1 Koha field. This means that you won't be able to map both the 100a and the 700a to the author field, you need to choose one or the other.</p>
 
-<p><strong>See the full documentation for Koha to MARC Mapping in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#kohamarcmapping">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Koha to MARC Mapping in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#kohamarcmapping">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/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
index 65b53b9..ca8f434 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
@@ -144,6 +144,6 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
       <li>To save your changes simply click the 'Save Changes' button at the top of the screen</li>
 </ul>
 
-<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
index 3ba7a39..0ee89b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
@@ -21,6 +21,6 @@
 
 <p>To the right of the new field is a link to 'Subfields,' you will need to add subfields before this tag will appear in your MARC editor.</p>
 
-<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#marcbibframeworks">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/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
index 4e51c56..77e301a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
@@ -46,6 +46,6 @@
    <li>Required Match checks: none (remove the blank one)</li>
 </ul>
 
-<p><strong>See the full documentation for Record Matching Rules in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#recordmatchingrules">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Record Matching Rules in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#recordmatchingrules">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
index 7e59c5a..979ac12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
@@ -18,6 +18,6 @@
 
 <p>And it is case sensitive : a record having 999$9 = 'xxx' will not belong to a set where condition is 999$9 = 'XXX'.</p>
 
-<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
index 9944c40..f345b75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
@@ -29,6 +29,6 @@
 
 <p>Once you have configured all your sets, you have to build the sets. This is done by calling the script misc/migration_tools/build_oai_sets.pl.</p>
 
-<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.10/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
index c14ee80..e46ab64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
@@ -15,21 +15,21 @@
 <p>To add a new Patron Attribute Type, click the 'New Patron Attribute Type' button at the top of the page</p>
 
 <ul>
-     <li>In the 'Patron attribute type code', enter a short code to identify this field
+	<li>In the 'Patron attribute type code', enter a short code to identify this field
 <ul>
-        <li style="color: #990000;">Important: This field is limited to 10 characters (numbers and letters only)</li>
-  <li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
+	<li style="color: #990000;">Important: This field is limited to 10 characters (numbers and letters only)</li>
+	<li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
 </ul>
 </li>
 	<li>In the 'Description' field, enter a longer (plain text) explanation of what this field will contain</li>
 	<li>Check the box next to 'Repeatable' to let a patron record have multiple values of this attribute.
 <ul>
- <li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
+	<li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
 </ul>
 </li>
 	<li>If 'Unique identifier' is checked, the attribute will be a unique identifier which means, if a value is given to a patron record, the same value cannot be given to a different record.
 <ul>
- <li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
+	<li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
 </ul>
 </li>
 	<li>Check 'Allow password' to make it possible to associate a password with this attribute.</li>
@@ -38,16 +38,16 @@
 	<li>Check 'Display in check-out' to make this attribute visible in the patron's short detail display on the left of the checkout screen and other patron pages</li>
 	<li>Authorized value category; if one is selected, the patron record input page will only allow values to be chosen from the authorized value list.
 <ul>
- <li>You will first need to add an authorized value list for it to appear in this menu
+	<li>You will first need to add an authorized value list for it to appear in this menu
 <ul>
-     <li><em>Get there: </em>More &gt; Administration &gt; Basic Parameters &gt; Authorized Values</li>
+	<li><em>Get there: </em>More &gt; Administration &gt; Basic Parameters &gt; Authorized Values</li>
 </ul>
 </li>
- <li style="color: #990000;"> Important: an authorized value list is not enforced during batch patron import.</li>
+	<li style="color: #990000;">Important: an authorized value list is not enforced during batch patron import.</li>
 </ul>
 </li>
-  <li>If you'd like to only show this attribute on patrons of one type choose that patron type from the 'Category' pull down</li>
-        <li>If you have a lot of attributes it might be handy to group them so that you can easily find them for editing. If you create an Authorized Value for PA_CLASS it will show in the 'Class' pull down and you can then change your attributes page to have sections of attributes</li>
+	<li>If you'd like to only show this attribute on patrons of one type choose that patron type from the 'Category' pull down</li>
+	<li>If you have a lot of attributes it might be handy to group them so that you can easily find them for editing. If you create an Authorized Value for PA_CLASS it will show in the 'Class' pull down and you can then change your attributes page to have sections of attributes</li>
 	<li>Click Save to save your new attribute</li>
 </ul>
 
@@ -69,6 +69,6 @@
 
 <p>You will be unable to delete an attribute if it's in use.</p>
 
-<p><strong>See the full documentation for Patron Attribute Types in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#patronattributetypes">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Attribute Types in the <a href="http://manual.koha-community.org/3.10/en/patscirc.html#patronattributetypes">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/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
index 7e5ae7e..20f149c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
@@ -14,25 +14,25 @@
 
 <p>Each of the tabs on the left holds several different preferences:</p>
 
-	<ul>
-		<li><strong>Acquisitions:</strong> holds preferences related to acquisitions such as handling patron suggestions and local taxes.</li>
-		<li><strong>Administration:</strong> holds administrative preferences such as admin email address, sessions and timout.</li>
-		<li><strong>Authorities:</strong> holds preference related to handling authority records.</li>
-		<li><strong>Cataloging:</strong> holds preferences that control the cataloging functions.  This is where you choose your MARC flavor, set up Z39.50 and barcoding.</li>
-		<li><strong>Circulation:</strong> holds preferences that control circulation functions such as holds and  fines.</li>
-		<li><strong>Creators:</strong> this tab contains preferences related to modules that create objects.</li>
-          <li><strong>Enhanced Content:</strong> holds preferences that will add content from outside sources to your OPAC and Staff Client.  This is where you can turn on cover images, FRBR and tagging.</li>
-		<li><strong>I18N/L10N:</strong> holds preferences related to internationalization and localization such as date formats and languages.</li>
-           <li><strong>Local Use:</strong> this tab will usually be empty unless your library has a preference just for your library.</li>
-		<li><strong>Logs:</strong> turn on/off logging functionality in your system.</li>
-		<li><strong>OPAC:</strong> customize the OPAC and OPAC functions (aside from the Enhanced Content preferences).</li>
-		<li><strong>Patrons:</strong> holds preferences that control how your system handles patron functions.  Some preferences include the minimum password length and membership number settings.</li>
-		<li><strong>Searching:</strong> holds preference related to advanced search functions such as removing stop words or allowing stemming.</li>
-		<li><strong>Serials</strong> holds all preferences related to managing serial subscriptions.</li>
-              <li><strong>Staff Client:</strong> customize the staff client by editing the stylesheet and navigation menu.</li>
-              <li><strong>Web Services:</strong> includes preferences related to services like OAI-PMH.</li>
-	</ul>
+<ul>
+	<li><strong>Acquisitions:</strong> holds preferences related to acquisitions such as handling patron suggestions and local taxes.</li>
+	<li><strong>Administration:</strong> holds administrative preferences such as admin email address, sessions and timout.</li>
+	<li><strong>Authorities:</strong> holds preference related to handling authority records.</li>
+	<li><strong>Cataloging:</strong> holds preferences that control the cataloging functions. This is where you choose your MARC flavor, set up Z39.50 and barcoding.</li>
+	<li><strong>Circulation:</strong> holds preferences that control circulation functions such as holds and fines.</li>
+	<li><strong>Creators:</strong> this tab contains preferences related to modules that create objects.</li>
+	<li><strong>Enhanced Content:</strong> holds preferences that will add content from outside sources to your OPAC and Staff Client. This is where you can turn on cover images, FRBR and tagging.</li>
+	<li><strong>I18N/L10N:</strong> holds preferences related to internationalization and localization such as date formats and languages.</li>
+	<li><strong>Local Use:</strong> this tab will usually be empty unless your library has a preference just for your library.</li>
+	<li><strong>Logs:</strong> turn on/off logging functionality in your system.</li>
+	<li><strong>OPAC:</strong> customize the OPAC and OPAC functions (aside from the Enhanced Content preferences).</li>
+	<li><strong>Patrons:</strong> holds preferences that control how your system handles patron functions. Some preferences include the minimum password length and membership number settings.</li>
+	<li><strong>Searching:</strong> holds preference related to advanced search functions such as removing stop words or allowing stemming.</li>
+	<li><strong>Serials</strong> holds all preferences related to managing serial subscriptions.</li>
+	<li><strong>Staff Client:</strong> customize the staff client by editing the stylesheet and navigation menu.</li>
+	<li><strong>Web Services:</strong> includes preferences related to services like OAI-PMH.</li>
+</ul>
 	
-<p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/3.8/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/3.10/en/administration.html#globalsysprefs">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/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
index 926175a..cc5a39e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
@@ -10,6 +10,6 @@
 
 <p>When adding or editing a patron, if you have road types defined, there will be a pull down to choose the road type from.</p>
 
-<p><strong>See the full documentation for Road Types in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#roadtypes">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Road Types in the <a href="http://manual.koha-community.org/3.10/en/patscirc.html#roadtypes">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/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
index 583a637..ddc96e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
@@ -4,10 +4,6 @@
 
 <p>These rules define how your items are circulated, how/when fines are calculated and how holds are handled.</p>
 
-<ul>
-    <li><em>Get there:</em> More &gt; Administration &gt; Patrons &amp; Circulation &gt; Circulation and fines rules</li>
-</ul>
-
 <p>The rules are applied from most specific to less specific, using the first found in this order:</p>
 
 <ul>
@@ -21,13 +17,13 @@
 	<li>all libraries, all patron types, all item types</li>
 </ul>
 
-<p style="background-color: #ffe599;">Tip: If you are a single library system choose your branch name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)
+<p>Tip: If you are a single library system choose your branch name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)</p>
 
-<p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.
+<p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.</p>
 
-<h3>Default Circulation Rules</h3>
+<h4>Default Circulation Rules</h4>
 
-<p>Using the issuing rules matrix you can define rules that depend on patron/item type combos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all branches)</p>
+<p>Using the issuing rules matrix you can define rules that depend on patron/item typecombos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all branches)</p>
 
 <p>From the matrix you can choose any combination of patron categories and item types to apply the rules to</p>
 
@@ -35,29 +31,33 @@
 	<li>First choose which patron category you'd like the rule to be applied to. If you leave this to 'All' it will apply to all patron categories</li>
 	<li>Choose the 'Item Type' you would like this rule to apply to. If you leave this to 'All' it will apply to all item types</li>
 	<li>Limit the number of items a patron can have checked out at the same time by entering a number in the 'Current Checkouts Allowed' field</li>
-     <li>Define the period of time an item can be checked out to a patron by entering the number of units (days or hours) in the 'Loan Period' box.</li>
-    <li>Choose which unit of time, Days or Hours, that the loan period and fines will be calculate in</li>
-	<li>You can also define a hard due date for a specific patron category and item type. A hard due date ignores your usual circulation rules and makes it so that all items of the type defined are due on, before or after the date you specify.</li>
-   <li>'Fine Amount' should have the amount you would like to charge for overdue items
+	<li>Define the period of time an item can be checked out to a patron by entering the number of units (days or hours) in the 'Loan Period' box.</li>
+	<li>Choose which unit of time, Days or Hours, that the loan period and fines will be calculate in</li>
+	<li>You can also define a hard due date for a specific patron category and item type. A hard due date ignores your usual circulation rules and makes it so that allitems of the type defined are due on, before or after the date you specify.</li>
+	<li>'Fine Amount' should have the amount you would like to charge for overdue items
 <ul>
-       <li style="color: #990000;">Important: Enter only numbers and decimal points (no currency symbols).</li>
-
+	<li style="color: #990000;">Important: Enter only numbers and decimal points (no currency symbols).</li>
+</ul>
+</li>
+	<li>Enter the 'Fine Charging Interval' in the unit you set (ex. charge fines every 1 day, or every 2 hours)</li>
+	<li>The 'Fine Grace Period' is the period of time an item can be overdue before you start charging fines.
+<ul>
+	<li style="color: #990000;">Important: This can only be set for the Day unit, not in Hours</li>
 </ul>
 </li>
-  <li>Enter the 'Fine Charging Interval' in the unit you set (ex. charge fines every 1 day, or every 2 hours)</li>
-       <li>The 'Fine Grace Period' is the period of time an item can be overdue before you start charging fines.
+	<li>The 'Overdue Fines Cap' is the maximum fine for this patron and item combination
 <ul>
- <li style="color: #990000;">Important: This can only be set for the Day unit, not in Hours</li>
+	<li style="color: #990000;">Important: If this field is left blank then Koha will not put a limit on the fines this item will accrue. A maximum fine amount can be set using the MaxFinesystem preference.</li>
 </ul>
 </li>
-    <li>If your library 'fines' patrons by suspending their account you can enter the number of days their fine should be suspended in the 'Suspension in Days' field
+	<li>If your library 'fines' patrons by suspending their account you can enter the number of days their fine should be suspended in the 'Suspension in Days' field
 <ul>
- <li style="color: #990000;">Important: This can only be set for the Day unit, not in Hours</li>
+	<li style="color: #990000;">Important: This can only be set for the Day unit, not in Hours</li>
 </ul>
 </li>
-    <li>Next decide if the patron can renew this item type and if so, enter how many times they can renew it in the 'Renewals Allowed' box</li>
-    <li>If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds Allowed' field</li>
- <li>Finally, if you charge a rental fee for the item type and want to give a specific patron type a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental Discount' field</li>
+	<li>Next decide if the patron can renew this item type and if so, enter how many times they can renew it in the 'Renewals Allowed' box</li>
+	<li>If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds Allowed' field</li>
+	<li>Finally, if you charge a rental feefor the item type and want to give a specific patron type a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental Discount' field</li>
 </ul>
 
 <p>When finished, click 'Add' to save your changes. To modify a rule, create a new one with the same patron type and item type. If you would like to delete your rule, simply click the 'Delete' link to the right of the rule.</p>
@@ -66,28 +66,28 @@
 
 <p>After choosing to clone you will be presented with a confirmation message.</p>
 
-<h3>Default Checkouts and Hold Policy</h3>
+<h4>Default Checkouts and Hold Policy</h4>
 
 <p>You can set a default maximum number of checkouts and hold policy that will be used if none is defined below for a particular item type or category.</p>
 
 <p>From this menu you can set a default to apply to all item types and patrons in the library.</p>
 
 <ul>
-  <li>In 'Total Current Checkouts Allowed' enter the total number of items patrons can have checked out at one time</li>
- <li>Control where patrons can place holds from using the 'Hold Policy' menu
+	<li>In 'Total Current Checkouts Allowed' enter the total number of items patrons can have checked out at one time</li>
+	<li>Control where patrons can place holds from using the 'Hold Policy' menu
 <ul>
-       <li>From Any Library: Patrons from any library may put this item on hold. (default if none is defined)</li>
-    <li>From Home Library: Only patrons from the item's home library may put this book on hold.</li>
-       <li>No Holds Allowed: No patron may put this book on hold.</li>
+	<li>From Any Library: Patrons from any library may put this item on hold. (default if none is defined)</li>
+	<li>From Home Library: Only patrons from the item's home library may put this book on hold.</li>
+	<li>No Holds Allowed: No patron may put this book on hold.</li>
 </ul>
 </li>
-    <li>Control where the item returns to once it is checked in
+	<li>Control where the item returns to once it is checked in
 <ul>
-       <li>Item returns home</li>
-     <li>Item returns to issuing branch</li>
-        <li>Item floats
+	<li>Item returns home</li>
+	<li>Item returns to issuing branch</li>
+	<li>Item floats
 <ul>
-   <li>When an item floats it stays where it was checked in and does not ever return 'home'</li>
+	<li>When an item floats it stays where it was checked in and does not ever return 'home'</li>
 </ul>
 </li>
 </ul>
@@ -95,44 +95,44 @@
 	<li>Once your policy is set, you can unset it by clicking the 'Unset' link to the right of the rule</li>
 </ul>
 
-<h3>Checkouts Per Patron</h3>
+<h4>Checkouts Per Patron</h4>
 
 <p>For this library, you can specify the maximum number of loans that a patron of a given category can make, regardless of the item type.</p>
 
-<p style="background-color: #ffe599;">Tip: If the total amount loanable for a given patron category is left blank, no limit applies, except possibly for a limit you define for a specific item type.</p>
+<p>Tip: If the total amount loanable for a given patron category is left blank, no limit applies, except possibly for a limit you define for a specific item type.</p>
 
-<h3>Item Hold Policies</h3>
+<h4>Item Hold Policies</h4>
 
-For this library, you can edit rules for given itemtypes, regardless of the patron's category. Currently, this means hold policies.
+<p>For this library, you can edit rules for given itemtypes, regardless of the patron's category. Currently, this means hold policies.</p>
 
 <p>The various Hold Policies have the following effects:</p>
 
 <ul>
-   <li>From Any Library: Patrons from any library may put this item on hold. (default if none is defined)</li>
-    <li>From Home Library: Only patrons from the item's home library may put this book on hold.</li>
-       <li>No Holds Allowed: No patron may put this book on hold.</li>
+	<li>From Any Library: Patrons from any library may put this item on hold. (default if none is defined)</li>
+	<li>From Home Library: Only patrons from the item's home library may put this book on hold.</li>
+	<li>No Holds Allowed: No patron may put this book on hold.</li>
 </ul>
 
-<p style="color: #990000;">Important: Note that if the system preference AllowHoldPolicyOverride set to 'allow', these policies can be overridden by your circulation staff.</p>
+<p style="color: #990000;">Important: Note that if the system preference AllowHoldPolicyOverrideset to 'allow', these policies can be overridden by your circulation staff.</p>
 
 <p style="color: #990000;">Important: These policies are based on the patron's home branch, not the branch that the reserving staff member is from.</p>
 
 <p>The various Return Policies have the following effects:</p>
 
 <ul>
- <li>Item returns home: The item will prompt the librarian to transfer the item to its home library
+	<li>Item returns home: The item will prompt the librarian to transfer the item to its home library
 <ul>
-        <li style="color: #990000;">Important: If the AutomaticItemReturn preference is set to automatically transfer the items home, then a prompt will not appear</li>
+	<li style="color: #990000;">Important: If the AutomaticItemReturnpreference is set to automatically transfer the items home, then a prompt will not appear</li>
 </ul>
 </li>
-   <li>Item returns to issuing branch: The item will prompt the librarian to transfer the item back to the library where it was checked out
+	<li>Item returns to issuing branch: The item will prompt the librarian to transfer the item back to the library where it was checked out
 <ul>
-  <li style="color: #990000;">Important: If the AutomaticItemReturn preference is set to automatically transfer the items home, then a prompt will not appear</li>
+	<li style="color: #990000;">Important: If the AutomaticItemReturnpreference is set to automatically transfer the items home, then a prompt will not appear</li>
 </ul>
 </li>
-   <li>Item floats: The item will not be transferred from the branch it was checked in at, instead it will remain there until transferred manually or checked in at another branch</li>
+	<li>Item floats: The item will not be transferred from the branch it was checked in at, instead it will remain there until transferred manually or checked in at another branch</li>
 </ul>
 
-<p><strong>See the full documentation for Circulation and Fine Rules in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation and Fine Rules in the <a href="http://manual.koha-community.org/3.10/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
index bbdda18..05e1640 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
@@ -12,6 +12,6 @@
 
 <p style="color: #990000">Important: If you change something in this table, ask your administrator to run misc/batchRebuildBiblioTables.pl script.</p>
 
-<p><strong>See the full documentation for Stop Words in the <a href="http://manual.koha-community.org/3.8/en/additionaladmin.html#stopwordsadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Stop Words in the <a href="http://manual.koha-community.org/3.10/en/additionaladmin.html#stopwordsadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/transport-cost-matrix.tt
new file mode 100644
index 0000000..9e6486c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/transport-cost-matrix.tt
@@ -0,0 +1,15 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Transport cost matrix</h1>
+
+<p>The Transport cost matrix lets a library system define relative costs to transport books to one another. In order for the system to use this matrix you must first set the UseTransportCostMatrix preference to 'Use'.</p>
+
+<p>Costs are decimal values between some arbitrary maximum value (e.g. 1 or 100) and 0 which is the minimum (no) cost. For example, you could just use the distance between each library in miles as your 'cost', if that would accurately reflect the cost of transferring them. Perhaps post offices would be a better measure. Libraries sharing a post office would have a cost of 1, adjacent post offices would have a cost of 2, etc.</p>
+
+<p>To enter transport costs simply click in the cell you would like to alter, uncheck the 'Disable' box and enter your 'cost'</p>
+
+<p>After entering in your cost, hit 'Enter' on your keyboard or click the 'Save' button at the bottom of the matrix to save your changes.</p>
+
+<p><strong>See the full documentation for the Transport Cost Matrix in the <a href="http://manual.koha-community.org/3.10/en/patscirc.html#transportcostmatrix">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
index 431f9f7..df8cbad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
@@ -22,8 +22,6 @@
 <p>The following targets have been used successfully by other Koha libraries (in the Americas):</p>
 
 <ul>
-	<li>BIBLIOS z3950.biblios.net:210 bibliographic</li>
-	<li>BIG COUNTRY KOHA bcls.kohalibrary.com:210 bcls_koha</li>
 	<li>CUYAHOGA COUNTY PUBLIC webcat.cuyahoga.lib.oh.us:210 INNOPAC</li>
 	<li>GREATER SUDBURY PUBLIC 216.223.90.51:210 INNOPAC</li>
 	<li>HALIFAX PUBLIC catalogue.halifaxpubliclibraries.ca:210 horizon</li>
@@ -38,6 +36,6 @@
 	<li>VANCOUVER PUBLIC LIBRARY z3950.vpl.ca:210 Horizon</li>
 </ul>
 
-<p><strong>See the full documentation for Z39.50 Servers in the <a href="http://manual.koha-community.org/3.8/en/additionaladmin.html#z3950admin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Z39.50 Servers in the <a href="http://manual.koha-community.org/3.10/en/additionaladmin.html#z3950admin">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