[Koha-patches] [PATCH] Bug 5940: Admin Help Files for 3.4

Nicole C. Engard nengard at bywatersolutions.com
Tue Mar 29 21:14:24 CEST 2011


Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
 .../prog/en/modules/help/admin/admin-home.tmpl     |    8 +
 .../en/modules/help/admin/aqbudgetperiods.tmpl     |   16 +-
 .../prog/en/modules/help/admin/aqbudgets.tmpl      |   22 +-
 .../prog/en/modules/help/admin/aqplan.tmpl         |    4 +-
 .../help/admin/auth_subfields_structure.tmpl       |  161 ++++++++++--
 .../en/modules/help/admin/auth_tag_structure.tmpl  |   24 ++
 .../en/modules/help/admin/authorised_values.tmpl   |  274 ++++++++++----------
 .../prog/en/modules/help/admin/authtypes.tmpl      |   40 +---
 .../en/modules/help/admin/biblio_framework.tmpl    |   36 +++-
 .../modules/help/admin/branch_transfer_limits.tmpl |   41 ++--
 .../prog/en/modules/help/admin/branches.tmpl       |   95 +++----
 .../prog/en/modules/help/admin/categorie.tmpl      |  101 ++++++--
 .../prog/en/modules/help/admin/checkmarc.tmpl      |    5 +-
 .../prog/en/modules/help/admin/cities.tmpl         |   32 ++-
 .../prog/en/modules/help/admin/classsources.tmpl   |   86 ++++---
 .../prog/en/modules/help/admin/currency.tmpl       |    8 +-
 .../prog/en/modules/help/admin/fieldmapping.tmpl   |   12 +-
 .../help/admin/item_circulation_alerts.tmpl        |   44 +--
 .../prog/en/modules/help/admin/itemtypes.tmpl      |   97 ++++---
 .../prog/en/modules/help/admin/koha2marclinks.tmpl |   12 +-
 .../help/admin/marc_subfields_structure.tmpl       |  181 ++++++++++----
 .../en/modules/help/admin/marctagstructure.tmpl    |   34 +--
 .../prog/en/modules/help/admin/matching-rules.tmpl |   48 +++-
 .../en/modules/help/admin/patron-attr-types.tmpl   |   88 ++++---
 .../prog/en/modules/help/admin/preferences.tmpl    |   18 +-
 .../prog/en/modules/help/admin/roadtype.tmpl       |   24 +-
 .../prog/en/modules/help/admin/smart-rules.tmpl    |  125 +++++----
 .../prog/en/modules/help/admin/stopwords.tmpl      |   15 +-
 .../prog/en/modules/help/admin/z3950servers.tmpl   |   38 +++-
 29 files changed, 1045 insertions(+), 644 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tmpl
index 9024cf5..7559477 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tmpl
@@ -5,21 +5,29 @@
 <p>The administration area is where you set all of your preferences for the system. Preference are broken down into several categories.</p>
 
 <h3>Global System Preferences</h3>
+
 <p>Koha has an extensive set of system preferences. The system preferences control all the various features within Koha and whether they are active in your install or not. System preferences are generally set once at install and then not changed.</p>
+
 <p>If  you are not sure what combination of system preferences to use, try using one of the sample profiles at install. </p>
+
 <p style="color: #990000">IMPORTANT: many preferences interact with each other. Turning on one system preference may require that others are also set.</p>
 
 <h3>Basic Parameters</h3>
+
 <p>Basic parameters is where library policies are set and governed. It is best to set your system preferences, and then to work through the Basic Parameters in the order that they appear on this page.</p>
+
 <p>Note not all basic parameters are required to be set. For example if you do not plan to use budget based acquisitions, then Accounts and Budgets, Currencies and Exchange Rates can be ignored.</p>
 
 <h3>Patrons and Circulation</h3>
+
 <p>These parameters help with the control of patron records and circulation rules.  It is best to make sure you set the basic parameters before visiting this section.</p>
 
 <h3>Catalog</h3>
+
 <p>Catalog parameters assist in configuring the cataloging functionality within Koha.  
 
 <h3>Additional Parameters</h3>
+
 <p>This list of parameters includes functionality that didn't fit in any other category.  These items are optional and may not need to be altered depending on how your library is using Koha.</p>
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tmpl
index de90fec..a763c55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tmpl
@@ -2,18 +2,20 @@
 
 <h1>Budgets</h1>
 
-<p>Budgets are the top level used for tracking accounting values related to acquisitions. An example would be to create a budget for the current year and then breaking that into Funds for different areas of the library.</p>
+<p>Budgets are the top level used for tracking accounting values related to acquisitions.</p>
 
-<h3>Add a budget</h3>
+<p>An example would be to create a budget for the current year and then breaking that into Funds for different areas of the library.</p>
+
+<h2>Add a budget</h2>
 
 <p>To add a budget click the 'New Budget' button.</p>
 
 <ul>
-<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>
+	<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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tmpl
index 34d9640..9c1261a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tmpl
@@ -2,9 +2,13 @@
 
 <h1>Funds</h1>
 
+<p>Budgets are broken in to funds.</p>
+
+<h2>Add a Fund</h2>
+
 <p>A fund is added to a budget.</p>
 
-<p style="color: rgb(153, 0, 0);">IMPORTANT: A budget must be defined before a fund can be created.</p>
+<p style="color: #990000;">Important: A budget must be defined before a fund can be created.</p>
 
 <p>To add a new fund click the New button and then choose which Budget you would like to add the fund to.</p>
 
@@ -13,14 +17,14 @@
 <p>The three first fields are required, the rest are optional</p>
 
 <ul>
-<li>Fund Code is a unique identifer for your fund</li>
-<li>The Fund Name should be something that librarians will understand</li>
-<li>Amount should be entered with only numbers and decimals, no other characters</li>
-<li>You can choose to assign this fund to a librarian. Doing so will make it so that only that librarian can make changes to the Fund</li>
-<li>Choose which library will be using this fund</li>
-<li>You can restrict who can order from this fund by choosing either the owner or the library from the 'Restrict access to' menu</li>
-<li>Notes are simply for any descriptive notes you might want to add so that librarians know when to use this fund</li>
-<li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the Planning Category FAQ.</li>
+	<li>Fund Code is a unique identifier for your fund</li>
+	<li>The Fund Name should be something that librarians will understand</li>
+	<li>Amount should be entered with only numbers and decimals, no other characters</li>
+	<li>You can choose to assign this fund to a librarian. Doing so will make it so that only that librarian can make changes to the Fund</li>
+	<li>Choose which library will be using this fund</li>
+	<li>You can restrict who can order from this fund by choosing either the owner or the library from the 'Restrict access to' menu</li>
+	<li>Notes are simply for any descriptive notes you might want to add so that librarians know when to use this fund</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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tmpl
index 1b03ec0..b9d09fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tmpl
@@ -4,7 +4,9 @@
 
 <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 you can click the minus sign (-) to the right (or below as in the screenshot above) the dates. To add more columns you can click the plus sign (+) found above the 'Auto-fill row' buttons.</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>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
index 36c026e..9b68e96 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
@@ -1,37 +1,142 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>MARC tag structure administration</h1>
+<h1>MARC Record Subfields</h1>
 
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
+<p>Frameworks are made up of MARC fields and subfields. To make edits to most Frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
 
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : whether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : whether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. </li>
-<!-- <li>hidden : allows you to select possible visibility conditions. Each section OPAC INTRANET or Editor can be set separately:</li> -->
- <li>Display: allows you to select possible visibility conditions. It is used only with the 'MARC View'. </li> 
-<li><b>Is a linking field : Select this if you want to use this field for linking other authorities to this authority. The kohafield should be set to auth_header.linkid in this subfield(preferred) or any other subfield in this field :</b>
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorized value list of the selected type</li>
-<li>thesaurus : shows the authority type</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>
-<li><b>Example MARC21 Subject Headings Authority</b>
-<ul><li>Use field 035$a for your auth_header.authid and 035$8 for auth_header.authtypecode. Make sure your zebra authorities index these fields</li>
-<li>Use field 150 for your subject headings</li>
-<li>Use field 750$9 (add subfield if not present) for auth_header.linkid . Select <b>Is a linking field</b>. You may use any subfield for linking as $9 is not hardcoded
-<li>When you add or modify an authority clicking on ... that will appear next to 750$9 will let you search any authority and link it to this record. You may repeat tag 750 and add as many linkages as you like</li></ul>
+<ul>
+	<li>Each field has a tag (which is the MARC tag)
+<ul>
+	<li>The 'Label for lib' is what will show in the staff client if you have advancedMARCeditor set to display labels</li>
+	<li>The 'Label for OPAC' is what will show on the MARC view in the OPAC</li>
+	<li>If you check 'Repeatable' then the field will have a plus sign next to it allowing you to add multiples of that tag</li>
+	<li>If you check 'Mandatory' the record will not be allowed to save unless you have a value assigned to this tag</li>
+	<li>'Authorized value' is where you define an authorized value that your catalogers can choose from a pull down to fill this field in
+To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC Structure' listing</li>
+</ul>
+</li>
+	<li>From the list of subfields you can click 'Delete' to the right of each to delete the subfields</li>
+	<li>To edit the subfields click 'Edit Subfields'</li>
+	<li>For each subfield you can set the following values
+<ul>
+	<li>Text for librarian
+<ul>
+	<li>what appears before the subfield in the librarian interface</li>
+</ul>
+</li>
+	<li>Text for OPAC
+<ul>
+	<li>what appears before the field in the OPAC.</li>
+	<li>If left empty, the text for librarian is used instead</li>
+</ul>
+</li>
+	<li>Repeatable
+<ul>
+	<li>the field will have a plus sign next to it allowing you to add multiples of that tag</li>
+</ul>
 </li>
+	<li>Mandatory
+<ul>
+	<li>the record will not be allowed to save unless you have a value assigned to this tag</li>
+</ul>
+</li>
+	<li>Managed in tab
+<ul>
+	<li>defines the tab where the subfield is shown. All subfields of a given field must be in the same tab or ignored. Ignore means that the subfield is not managed.</li>
 </ul>
+</li>
+</ul>
+<ul>
+	<li>Default value
+<ul>
+	<li>defines what you want to appear in the field by default, this will be editable, but it saves time if you use the same note over and over or the same value in a field often.</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>hidden
+<ul>
+	<li>allows you to select from 19 possible visibility conditions, 17 of which are implemented. They are the following:
+<ul>
+	<li>-9 =&gt; Future use</li>
+	<li>-8 =&gt; Flag</li>
+	<li>-7 =&gt; OPAC !Intranet !Editor Collapsed</li>
+	<li>-6 =&gt; OPAC Intranet !Editor !Collapsed</li>
+	<li>-5 =&gt; OPAC Intranet !Editor Collapsed</li>
+	<li>-4 =&gt; OPAC !Intranet !Editor !Collapsed</li>
+	<li>-3 =&gt; OPAC !Intranet Editor Collapsed</li>
+	<li>-2 =&gt; OPAC !Intranet Editor !Collapsed</li>
+	<li>-1 =&gt; OPAC Intranet Editor Collapsed</li>
+	<li>0 =&gt; OPAC Intranet Editor !Collapsed</li>
+	<li>1 =&gt; !OPAC Intranet Editor Collapsed</li>
+	<li>2 =&gt; !OPAC !Intranet Editor !Collapsed</li>
+	<li>3 =&gt; !OPAC !Intranet Editor Collapsed</li>
+	<li>4 =&gt; !OPAC Intranet Editor !Collapsed</li>
+	<li>5 =&gt; !OPAC !Intranet !Editor Collapsed</li>
+	<li>6 =&gt; !OPAC Intranet !Editor !Collapsed</li>
+	<li>7 =&gt; !OPAC Intranet !Editor Collapsed</li>
+	<li>8 =&gt; !OPAC !Intranet !Editor !Collapsed</li>
+	<li>9 =&gt; Future use URL : if checked, the subfield is an URL, and can be clicked</li>
+</ul>
+</li>
+	<li>( ! means 'not visible' or in the case of Collapsed 'not Collapsed')</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Is a URL
+<ul>
+	<li>if checked, it means that the subfield is a URL and can be clicked</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Link
+<ul>
+	<li>If you enter a field/subfield here (200b), a link appears after the subfield in the MARC Detail view. This view is present only in the staff client, not the OPAC. If the librarian clicks on the link, a search is done on the database for the field/subfield with the same value. This can be used for 2 main topics :
+<ul>
+	<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all bib records with the same author.</li>
+	<li>on a field that is a link (4xx) to reach another bib record. For example, put 011a in 464$x, will find the serials that are with this ISSN.</li>
+</ul>
+</li>
+	<li style="color: #990000;">Important: This value should not change after data has been added to your catalog</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Koha link
+<ul>
+	<li>Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC). So, in this list you can "map" a MARC subfield to its meaning. Koha constantly maintains consistency between a subfield and its meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Authorized value
+<ul>
+	<li>means the value cannot by typed by the librarian, but must be chosen from a pull down generated by the authorized value list</li>
+	<li>In the example above, the 504a field will show the MARC504 Authorized Values when cataloging</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Thesaurus
+<ul>
+	<li>means that the value is not free text, but must be searched in the authority/thesaurus of the selected category</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Plugin
+<ul>
+	<li>means the value is calculated or managed by a plugin. Plugins can do almost anything.</li>
+	<li>For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
+</ul>
+</li>
+</ul>
+</li>
+	<li>To save your changes simply click the 'Save Changes' button at the top of the screen</li>
+</ul>
+
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tmpl
new file mode 100644
index 0000000..eab5f7f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tmpl
@@ -0,0 +1,24 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h1>Authority Record Tags</h1>
+
+<p>To add a field to a Authority Framework click the 'New Tag' button at the top of the Authority Framework definition</p>
+
+<p>This will open up a blank form for entering MARC field data</p>
+
+<p>Enter the information about your new tag:</p>
+
+<ul>
+	<li>The 'Tag' is the MARC field number</li>
+	<li>The 'Label for lib' is the text that will appear in the staff client when in the cataloging module</li>
+	<li>The 'Label for OPAC' is the text that will appear in the OPAC when viewing the MARC version of the record</li>
+	<li>If this field can be repeated, check the 'Repeatable' box</li>
+	<li>If this field is mandatory, check the 'Mandatory' box</li>
+	<li>If you want this field to be a pull down with limited possible answers, choose which 'Authorized value' list you want to use</li>
+</ul>
+
+<p>When you're finished, click 'Save Changes' and you will be presented with your new field</p>
+
+<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>
+
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tmpl
index 8f917a9..6f258a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tmpl
@@ -1,141 +1,149 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Authorized values management</h1>
+<h1>Authorized Values</h1>
 
-<p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined &quot;authorized&quot; values. These authorized values are defined here.</p>
-	<ul>
-		<li>HINT : if a subfield is non mandatory, Koha automatically adds an empty value to the authorized value list, that is selected by default. If the subfield is mandatory, no empty value is added (and you should NOT add it in the list, as it's an illegal value !)</li>
-		<li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set &quot;ENG&quot; as authorized value and &quot; English&quot; as text. The space will order &quot;ENG&quot; as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
-	</ul>
-<p>Koha automatically sets up authorized value categories for your item types and branch codes, and you can link these authorized values to MARC subfields when you set up your MARC tag structure.</p>
-<p> </p>
-<h3>Why would I want to define authorized values for MARC tags?</h3>
-<p>Authorized Values create a 'controlled vocabulary' for your staff. As an example, let us assume that your Koha installation is used by several libraries, and you use MARC 21. You might want to restrict the 850a MARC subfield to the institution codes for just those libraries. In that case, you could define an authorized values category (perhaps called &quot;INST&quot;) and enter the institution codes as the authorized values for that category.</p>
-    <span style="background-color: #ffe599">
-TIP: Koha automatically sets up authorized value categories for your item types and branch codes, and you can link these authorized values to MARC subfields when you set up your MARC tag structure</span>.
-   
-   <strong>Existing Authorized Values</strong>
-Koha comes with several other categories and pre-defined values your library is likely to use, for instance 'Lost'.
+<p>Authorized values can be used in several areas of Koha. One reason you would add an authorized value category would be to control the values that can be entered into MARC fields by catalogers.</p>
 
-	<ul>
-		<li>Asort1
-		<ul>
-			<li>attached to acquisitions, that can be used for stats purposes</li>
-		</ul></li>
-		<li>Asort2
-		<ul>
-			<li>attached to acquisitions, that can be used for stats purposes</li>
-		</ul></li>
-		<li>Bsort1
-		<ul>
-			<li>attached to patrons, that can be used for stats purposes</li>
-		</ul></li>
-		<li>Bsort2
-		<ul>
-			<li>attached to patrons, that can be used for stats purposes</li>
-		</ul></li>
-		<li>CCODE
-		<ul>
-			<li>collection code (appears when editing at item)</li>
-		</ul></li>
-		<li>DAMAGED
-		<ul>
-			<li>descriptions for items marked as damaged (appears when editing an item)</li>
-		</ul></li>
-		<li>HINGS_AS
-		<ul>
-			<li>
-		    
-holdings coded value<strong style="color: #0000ff">??</strong></li>
-		</ul></li>
-		<li>HINGS_C
-		<ul>
-			<li>
-		    
-holdings coded value<strong style="color: #0000ff">??</strong></li>
-		</ul></li>
-		<li>HINGS_PF
-		<ul>
-			<li>
-		    
-holdings coded value<strong style="color: #0000ff">??</strong></li>
-		</ul></li>
-		<li>HINGS_RD
-		<ul>
-			<li>
-		    
-holdings coded value<strong style="color: #0000ff">??</strong></li>
-		</ul></li>
-		<li>HINGS_UT
-		<ul>
-			<li>
-		    
-holdings coded value<strong style="color: #0000ff">??</strong></li>
-		</ul></li>
-		<li>LOC
-		<ul>
-			<li>		    
-shelving location (usually appears when editing an item)</li>
-		</ul></li>
-		<li>LOST
-		<ul>
-			<li>descriptions for the items marked as lost (appears when editing an item)</li>
-		</ul></li>
-		<li>NOT_LOAN
-		<ul>
-			<li>reasons why a title is not for loan</li>
-		</ul></li>
-		<li>RESTRICTED
-		<ul>
-			<li><strong style="color: #0000ff">??</strong></li>
-		</ul></li>
-		<li>STACK
-		<ul>
-			<li><strong style="color: #0000ff">??</strong></li>
-		</ul></li>
-		<li>SUGGEST
-		<ul>
-			<li>list of patron suggestion reject or accept reasons (appears when managing suggestions)</li>
-		</ul></li>
-		<li>WITHDRAWN
-		<ul>
-			<li>description of a withdrawn item (appears when editing an item)</li>
-		</ul></li>
-	</ul>   
-   <strong>View Authorized Values</strong>
+<h2>Existing Values</h2>
 
-	<ul>
-		<li>To view the authorized values defined for a category that already exists like 'Lost', choose 'Lost' from the category dropdown menu</li>
-		<li>Then, you can see the values defined for the category &quot;Lost&quot; and edit them if you like.</li>
-	</ul><strong>   
-   Add Authorized Value</strong>
+<p>Koha installs with pre-defined values that your library is likely to use, for instance 'Lost'.</p>
 
-	<ul>
-		<li>To add a new value under an existing category, click &quot;New authorized value for&quot;</li>
-		<li>Enter the value and description and choose an icon if you'd like</li>
-		<li>When finished, click 'Save'</li>
-	</ul><h1>   
-   Edit authorized values<br/></h1>
-	<ul>
-		<li>Choose a category from the 'Show Category' dropdown menu</li>
-		<li>Click 'Edit' beside the authorized value you wish to edit</li>
-		<li>Make the changes you'd like and click 'Save'</li>
-		<li>
-	    <span style="background-color: #ffe599">
-TIP: Be careful about changing the 'Authorized value' as it may be associated with existing records</span>.</li>
-	</ul><h2></h2> <h1><strong>   
-   Add a new Authorized Value Category<br/></strong></h1>
+<ul>
+	<li>Asort1
+<ul>
+	<li>Used for acquisitions statistical purposes</li>
+</ul>
+</li>
+	<li>Asort2
+<ul>
+	<li>Used for acquisitions statistical purposes</li>
+</ul>
+</li>
+	<li>BOR_NOTES
+<ul>
+	<li>Values for custom patron notes that appear on the circulation screen and the OPAC</li>
+</ul>
+</li>
+	<li>Bsort1
+<ul>
+	<li>Used for patron statistical purposes</li>
+</ul>
+</li>
+	<li>Bsort2
+<ul>
+	<li>Used for patron statistical purposes</li>
+</ul>
+</li>
+	<li>CART
+<ul>
+	<li>Is the shelving cart location, used by InProcessingToShelvingCart and ReturnToShelvingCart</li>
+</ul>
+</li>
+	<li>CCODE
+<ul>
+	<li>Collection codes (appears when cataloging and working with items)</li>
+</ul>
+</li>
+	<li>DAMAGED
+<ul>
+	<li>Descriptions for items marked as damaged (appears when cataloging and working with items)</li>
+</ul>
+</li>
+	<li>HINGS_AS
+<ul>
+	<li>General Holdings: Acquisition Status Designator :: This data element specifies acquisition status for the unit at the time of the holdings report.a</li>
+</ul>
+</li>
+	<li>HINGS_C
+<ul>
+	<li>General Holdings: Completeness Designator</li>
+</ul>
+</li>
+	<li>HINGS_PF
+<ul>
+	<li>Physical Form Designators</li>
+</ul>
+</li>
+	<li>HINGS_RD
+<ul>
+	<li>General Holdings: Retention Designator :: This data element specifies the retention policy for the unit at the time of the holdings report.</li>
+</ul>
+</li>
+	<li>HINGS_UT
+<ul>
+	<li>General Holdings: Type of Unit Designator</li>
+</ul>
+</li>
+	<li>LOC
+<ul>
+	<li>Shelving location (usually appears when adding or editing an item)</li>
+</ul>
+</li>
+	<li>LOST
+<ul>
+	<li>Descriptions for the items marked as lost (appears when adding or editing an item)</li>
+	<li>Values given to lost statuses should be numeric and not alphabetical in order for statuses to appear properly</li>
+</ul>
+</li>
+	<li>MANUAL_INV
+<ul>
+	<li>Values for manual invoicing types</li>
+</ul>
+</li>
+	<li>NOT_LOAN
+<ul>
+	<li>Reasons why a title is not for loan</li>
+</ul>
+</li>
+	<li>PROC
+<ul>
+	<li>The location to be used for NewItemsDefaultLocation (change description as desired), also the location expected by InProcessingToShelvingCart.</li>
+</ul>
+</li>
+	<li>RESTRICTED
+<ul>
+	<li>Restricted status of an item</li>
+</ul>
+</li>
+	<li>SUGGEST
+<ul>
+	<li>List of patron suggestion reject or accept reasons (appears when managing suggestions)</li>
+</ul>
+</li>
+	<li>WITHDRAWN
+<ul>
+	<li>Description of a withdrawn item (appears when adding or editing an item)</li>
+</ul>
+</li>
+</ul>
+
+<h2>Add new Authorized Value Category</h2>
+
+<p>In addition to the existing categories that come by default with Koha, librarians can add their own authorized value categories to control data that is entered into the system. To add a new category:</p>
+
+<ul>
+	<li>Click 'New Category'</li>
+	<li>Limit your Category to 11 characters (something short to make it clear what the category is for)</li>
+	<li>When adding a new category you're asked to create at least one authorized value
+<ul>
+	<li>Enter a code for your Authorized Value into the 'Authorized value' field</li>
+	<li>Use the Description field for the actual value that will be entered</li>
+</ul>
+</li>
+	<li>Click 'Save'</li>
+	<li>Your new category and value will appear on the list of Authorized Values</li>
+</ul>
+
+<h2>Add new Authorized Value</h2>
+
+<p>New authorized values can be added to any existing or new category. To add a value:</p>
+
+<ul>
+	<li>Click 'New authorized value for ...'</li>
+	<li>Enter a code for your Authorized Value into the 'Authorized value' field</li>
+	<li>Use the Description field for the actual value that will be entered</li>
+	<li>Click 'Save'</li>
+	<li>The new value will appear in the list along with existing values</li>
+</ul>
 
-<h2></h2> <strong><br/></strong>
-	<ul>
-		<li>To add a new category, click 'New Category'</li>
-		<li>Fill in the 'Category', 'Authorized value' and 'Description' fields<br/>
-		<ul>
-			<li>
-		    <span style="color: #ff0000">
-IMPORTANT: The category name must be 8 characters or less. Also, just input one authorized value for the category. You can edit and add more after you save the category.</span></li>
-		</ul></li>
-		<li>Click 'Save'</li>
-		<li>You've added a new category and can immediately start adding more authorized values to that category by clicking &quot;New authorized value for...&quot;</li>
-	</ul>
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tmpl
index 1ac50a6..c28ee3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tmpl
@@ -2,42 +2,8 @@
 
 <h1>Authority types</h1>
 
-<p>You can define as many Authority types as you want.</p>
-	<ul>
-		<li>with the MARC structure button, you can define the MARC structure of a given authority type</li>
-		<li>The tag reported must contain a MARC tag number. Every subfield in the selected tag will be copied to the &quot;destination tag&quot; in the biblio. for example, in UNIMARC, the tag 200 ot personal authority will be reported to 600, 700, 701, depending on what is cliqued in the biblio MARC editor.</li>
-		<li>The summary contains an &quot;ISBD&quot; like description to explain how the entry must be shown in the result list. The syntax is :
-		<ul>
-			<li>[xxxFFFSyyy] where are up to 3 digits BEFORE the field, FFF the field number, S the subfield code, yyy up to 3 digits AFTER the field.</li>
-			<li>things outside [] are kept as is (including HTML)</li>
-			<li>repeatable fields are managed.
-			<ul>
-			</ul></li>
-<p>IMPORTANT</p>
-<p>In the biblio framework, the reported tag <strong>MUST</strong> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)</p>
-		</ul></li>
-	</ul>
-	<h1>Create Authority Types</h1>
+<p>Authority Types are basically MARC Frameworks for Authority records and because of that the rules below refer to the bibliographic frameworks.</p>
 
-<p>Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions).
-To create a new framework...</p>
+<p>Koha comes with many of the necessary Authority frameworks already installed.</p>
 
-	<ul>
-		<li>Go to the 'Administration' module.</li>
-		<li>Select 'Authority types'</li>
-		<li>Click 'New Authority Framework'</li>
-		<li>Fill in the fields that describe your new authority type<br/>
-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: In the 'Authority field to copy', enter the authority field that should be copied from the authority record to the bibliographic record. e.g., in MARC21, field 100 in the authority record should be copied to field 100 in the bibliographic record</span></li>
-		</ul></li>
-		<li>Click 'Submit'</li>
-		<li>To update the MARC Framework for your new authority type, click 'MARC structure' next to the authority</li>
-		<li>From the following screen you can alter fields, subfields and add additional tags</li>
-		<li>By clicking on the 'edit' link you will be able to alter information related to the field</li>
-		<li>By clicking the 'subfields' link you will be able to alter all of the subfields associated with that field</li>
-		<li>By clicking 'Edit subfields' at the bottom of the screen you can alter the information for each subfield</li>
-		<li>After making your changes, click 'Save Changes' at the top of the screen</li>
-		<li>To delete a subfield, just click the 'delete' link next to the field you'd like to edit</li>
-	</ul><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tmpl
index 0623905..6f81db7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tmpl
@@ -1,9 +1,37 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Biblio framework</h1>
+<h1>MARC Bibliographic Frameworks</h1>
 
-<p>biblio frameworks are used to catalog your biblios.</p>
-	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
-	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
+<p>Think of Frameworks as templates for creating new bibliographic records. Koha comes with some predefined frameworks that can be edited or deleted, and librarians can create their own frameworks for content specific to their libraries.</p>
+
+<p>Do not delete or edit the Default Framework since this will cause problems with your cataloging records - always create a new template based on the Default Framework, or alter the other Frameworks.</p>
+
+<p>After clicking the 'MARC structure' link to the right of each framework you can decide how many fields you want to see on one screen by using the pagination options at the top of the table.</p>
+
+<h2>Add New Framework</h2>
+
+<p>To add a new framework</p>
+
+<ul>
+	<li>Click 'New Framework'
+<ul>
+	<li>Enter a code of 4 or fewer characters</li>
+	<li>Use the Description field to enter a more detailed definition of your framework</li>
+</ul>
+</li>
+	<li>Click 'Submit'</li>
+	<li>Once your Framework is added click 'MARC structure' to the right of it on the list of Frameworks
+<ul>
+	<li>You will be asked to choose a Framework to base your new Framework off of, this will make it easier than starting from scratch</li>
+</ul>
+</li>
+	<li>Once your Framework appears on the screen you can edit or delete each field by following the instructions for editing subfields</li>
+</ul>
+
+<h2>Edit Existing Frameworks</h2>
+
+<p>Clicking 'Edit' to the right of a Framework will only allow you to edit the Description for the Framework</p>
+
+<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>
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tmpl
index d3e8555..2b5a612 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tmpl
@@ -1,28 +1,19 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
 <h1>Library Transfer Limits</h1>
-<p>
-Limit the ability to transfer items between libraries based on the
-library sending, the library receiving, and the item type involved.</p>
-
-<p style="color: #990000">IMPORTANT: These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</p>
-
-<ul>
-	<li>
-	<em>Get there:</em> More &gt; Administration &gt; General System Preferences &gt; Circulation &gt; UseBranchTransferLimits</li>
-</ul>
-<h2>Setting Limits <br />
-</h2>
-<ul>
-	<li>Click 'Library Transfer Limits'
-	</li>
-	<li>Check the boxes for the items that should <em>not</em> be transferable
-	<ul>
-		<li style="background-color: #ffe599">TIP:
-		If you accidentally click all the items that can be transferred, you
-		can click the 'Swap All' button to change your selection</span></li>
-	</ul>
-	</li>
-	<li>To prevent all transfers, click 'Check All'</li>
-	<li>If you need to restart you can click 'Uncheck All'</li>
-</ul>
+
+<p>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the collection code involved.</p>
+
+<p>These rules only go into effect if the preference UseBranchTransferLimits is set to 'enforce'.</p>
+
+<p>Before you begin you will want to choose which library you are setting these limits for.</p>
+
+<p>Transfer limits are set based on the collections codes you have applied via the Authorized Value administration area.</p>
+
+<p>Collection codes will appear as tabs above the checkboxes.</p>
+
+<p>Check the boxes for the libraries that you accept checkins from for the item type you have selected at the top.</p>
+
+<p>In the above example, Centerville library will allow patrons to return items from all libraries except Liberty and Franklin to their branch.</p>
+
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tmpl
index 2735178..de30ed8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tmpl
@@ -1,59 +1,50 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Libraries and Groups</h1>
+<h1>Libraries &amp; Groups</h1>
 
-<ul>
-	<li>Click on 'Libraries and groups'</li>
-	 
-	<ul>
-		<li style="background-color: #ffe599">TIP: The terms 'Library' and 'Branch' are interchangeable in Koha.</li>
-	</ul>
-	
-	<li>You can click the 'Edit' link, next to each library, to make changes.</li>
-</ul>
-<h2>Add a new Group</h2>
-
-<strong>What is Group(s) and why would I want to use it? <br />
-</strong>
-<p>
-A single branch library does not need to utilize the Group(s) feature.
-</p>
-<p>
-Group(s) are used to divide your library system into categories. If, for example, you have
-one main library and several branch libraries, you might set up an &quot;M&quot;
-(Main) group and a &quot;B&quot; (Branch) group, with descriptions &quot;Main
-Library&quot; and &quot;Branch Libraries.&quot; Another example is a library system
-which is divided into regions. You can create the &quot;North Region&quot; group,
-which contains libraries A, B, and C and the &quot;South Region&quot; group, which
-contains libraries D, E, and F.
-</p>
-<p style="background-color: #ffe599">TIP: Start by adding your Groups/Categories (if you have any) before adding Libraries.
-</p>
-<ul>
-	<li>To add a new group click 'New Group'
-	<ul>
-		<li style="color: #990000">IMPORTANT: Right now category type is still in development. </li>
-	</ul>
-	</li>
-	<li>Enter the group information</li>
-</ul>
+<p>When setting up your Koha system you will want to add information for every library that will be sharing your system. This data is used in several areas of Koha.</p>
+
+<p>When visiting this page you are presented with a list of the libraries and groups that have already been added to the system.</p>
+
+<h2>Adding a Library</h2>
+
+<p>To add a new library:</p>
 
-<h2><strong>Add a new Library/Branch</strong> <br />
-</h2>
 <ul>
-	<li>To add a new library or branch click 'New Library'
-	</li>
-	<li>Enter the Library Code
-	<ul>
-		<li style="background-color: #ffe599">TIP: Give each library a unique and easily-remembered code (maximum of four
-		characters). This code will be used in Koha's database to identify each
-		library.</li>
-	</ul>
-	</li>
-</ul>
+	<li>Click 'New Library'</li>
+	<li>Fill in the data requested on the form that follows
 <ul>
-	<li>Enter all other information related to the library</li>
-	<li>Click 'Submit'</li>
-	<li>Your library will now be added to the list
-	</li>
+	<li>Of the fields listed, only 'Library code' and 'Name' are required</li>
+	<li>Be sure to enter a library email address to make sure that notices are sent to and from the right address</li>
+	<li>An IP address is required if you have enabled AutoLocation</li>
+</ul>
+</li>
 </ul>
+
+<h2>Editing/Deleting a Library</h2>
+
+<p>You will be unable to delete any library that has patrons or items attached to it.</p>
+
+<p>Each library will have an 'Edit' link to the right of it. Click this link to edit/alter details associated with the library in question.</p>
+
+<p>You will be unable to edit the 'Library code'</p>
+
+<h2>Adding a group</h2>
+
+<p>To add a Search Domain or Library Property Group click the 'New Group' button at the top of the screen.</p>
+
+<p>Of the fields on the group form, 'Category code' and 'Name' are the only required fields</p>
+
+<h2>Search Domain Groups</h2>
+
+<p>Search Domain Groups allow you to search a group of libraries at the same time instead of searching just one library or all libraries.</p>
+
+<p>To see Search Domain Groups in action visit the staff client advanced search page in your Koha system</p>
+
+<h2>Library Property Groups</h2>
+
+<p>You can assign specific categories to your libraries by adding groups for them.</p>
+
+<p>Properties are then applied to libraries via the add or edit library form.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
index 3acbc24..7fc3f5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
@@ -2,32 +2,79 @@
 
 <h1>Patron Categories</h1>
 
-<p>This is where you define the types of users of your library and how they will be handled.</p>
-
-<h2>Categories, Descriptions and Types</h2>
-<p>Start by assigning a Category Code and a Description to each patron category. Each Category can be one of five types:</p>
-	<ul>
-		<li>Adult Patrons: can be linked as &quot;guarantors&quot; to other patrons who are their dependents.  This is the default patron type.</li>
-		<li>Child Patrons: a patron category that has a &quot;guarantor&quot;.</li>
-		<li>Organizational Patrons: can be used for institutional members, e.g. other libraries that borrow from you, in which case Koha expects slightly different information about the institution.</li>
-		<li>Professional Patrons: can also be associated with a guarantor (usually an organization).</li>
-		<li>Staff Members: A member of the library staff.</li>
-		<li>Statistical Patrons: checking out to this patron type creates a statistical (local use) record but does not actually circulate materials.</li>
-	</ul>
-	
-<h3>Note on Permissions</h3>
-<p>Patrons in any category type may be assigned permissions in the staff interface.  The Staff patron type has additional security features over the other types.</p>
-
-<h2>Enrollment Period (months)</h2>
-<p>Enrollment period is a number indicating the length in months of a patron enrollment. If enrollments never expire, set this to an impossibly high number ( &gt;= 99).</p>
-
-<h2>Upper Age Limit and Age Required</h2>
-<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be &quot;2&quot; and Upper Age Limit would be &quot;18.&quot; If there is no upper age limit, set this value to 999 (the highest allowed).</p>
-
-<h2>Enrollment Fee and Reserve Fee</h2>
-<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with (up to) six decimal places, with no currency notation (e.g. &quot;1.250000&quot; instead of &quot;$1.25&quot;).</p>
-
-<h2>Overdue Notice Required</h2>
-<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
+<p>Patron categories allow you to organize your patrons into different roles, age groups, and patron types.</p>
+
+<p>Patrons are assigned to one of six main categories:</p>
+
+<ul>
+	<li>Adult
+<ul>
+	<li>Most common patron type, usually used for a general 'Patron' category.</li>
+</ul>
+</li>
+	<li>Child
+<ul>
+	<li>Children patrons can have a guardian to be attached to them.</li>
+</ul>
+</li>
+	<li>Staff
+<ul>
+	<li>Patrons within the staff category will have access to the staff client.</li>
+</ul>
+</li>
+	<li>Organizational
+<ul>
+	<li>Organizational patrons are organizations. Organizations can be used as guarantors for Professional patrons.</li>
+</ul>
+</li>
+	<li>Professional
+<ul>
+	<li>Professional patrons can be linked to Organizational patrons</li>
+</ul>
+</li>
+	<li>Statistical
+<ul>
+	<li>This patron type is used strictly for statistical purposes, such as in house use of items.</li>
+</ul>
+</li>
+</ul>
+
+<h2>Adding a patron category</h2>
+
+<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.
+<ul>
+	<li style="color: #990000;">Important: The category code is limited to 10 characters (numbers and letters)</li>
+</ul>
+</li>
+	<li>Enter a plain text version of the category in the 'Description' field.</li>
+	<li>Enrollment period (in months) should be filled in if you have a limited enrollment period for your patrons (eg. Student cards expire after 9 months or until a specific date)
+<ul>
+	<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>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>
+</ul>
+</li>
+	<li>If you want your patron to receive overdue notices, set the 'Overdue notice required' to 'Yes'</li>
+	<li>If you charge patrons for placing holds on items, enter the fee amount in the 'Hold fee' field.
+<ul>
+	<li style="color: #990000;">Important: Only enter numbers and decimals in this field</li>
+</ul>
+</li>
+	<li>In the 'Category type' field choose one of the six main parent categories</li>
+	<li>Finally you can assign advanced messaging preferences by default to a patron category
+<ul>
+	<li style="color: #990000;">Important: Requires that you have EnhancedMessagingPreferences enabled</li>
+	<li style="color: #990000;">Important: These can be changed for individual patrons, this setting is just a default to make it easier to set up messages for an entire category</li>
+</ul>
+</li>
+</ul>
 
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tmpl
index fb4376d..3bed7ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tmpl
@@ -2,7 +2,8 @@
 
 <h1>MARC Bibliographic Framework Test</h1>
 
-<p>Once you have completed the process of setting up your MARC Frameworks and checked your MARC to Koha mapping, this program checks for major errors in your MARC setup.</p>
+<p>This tool checks the MARC structure in your frameworks.</p>
+
+<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>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run the MARC Bibliographic Framework Test after every revision.</p>
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tmpl
index 3f6fb1c..67880b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tmpl
@@ -2,18 +2,20 @@
 
 <h1>Cities and Towns</h1>
 
-<p>This parameter helps you define the cities and towns that your patrons live in.  These will appear as a pull down on the patron add screen to make it easier for entering of consistent data.</p>
-<h2>Add a new city</h2>
-		<ul>
-			<li>		   
-		   Click 'New City'</li>
-			<li>		   
-		   Enter the city or town name and the zipcode</li>
-			<li>		   
-		   Click 'Submit'</li>
-			<li>		   
-		   You can edit/delete your cities and towns from the main 'Cities and towns' page</li>
-			<li>		   
-		   These fields will then appear when adding/editing a patron as a pull down to make it easier to enter data</li>
-		</ul>
-	</div>	<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<p>To standardize patron input you can define cities or towns within your region so that when new patrons are added librarians simply have to select the town from a list instead of having to type the town and zip (or postal) code information.</p>
+
+<h2>Adding a City</h2>
+
+<p>To add a new city, click the 'New City' button at the top of the page and enter the city name, state and zip/postal code.</p>
+
+<p>One you click Submit, your city will be saved and will be listed on the Cities and Towns page.</p>
+
+<p>Cities can be edited or deleted at any time.</p>
+
+<h2>Viewing Cities on Patron Add Form</h2>
+
+<p>If you have defined local cities using the New city form, then when adding or editing a patron record you will see those cities in a pull down menu to make city selection easy.</p>
+
+<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>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tmpl
index 611476c..fa5f914 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tmpl
@@ -1,38 +1,56 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>About Classification Sources</h1>
-
-<p>Define classification sources (i.e., call number schemes) used by your collection. You can also define 'filing rules' used for sorting call numbers.</p>
-	   
-<p><strong>IMPORTANT:</strong> You do not have the option to 'define' a new filing rule. Currently, the filing rules and sorting routines are statically defined with options available in the dropdown menu when creating or editing a 'classification source' or 'filing rule'.</p>
-	   
-<p><strong>TIP:</strong> In the future, this features will be expanded to allow new filing rules to be created (defined) on the fly. In other words, in addition to choosing from a static sorting routine or filing rule, you will be able to actually to define new ones.</p>
-
-<h1>To add a new 'Classification Source'...</h1>
-		<ul>
-			<li>Click 'New Classification Source'</li>
-			<li>Enter a 'Classification source code'</li>
-			<li>Enter a 'Description' for your new classification source</li>
-			<li>Note if the classification source is in use (check the box for 'yes' and leave unchecked for 'no')</li>
-			<li>Choose a 'filing rule' from the dropdown menu to associate with your new classification source</li>
-			<li>Click 'Save'</li>
-		</ul>	   
-<p>IMPORTANT: 'Source in use?' controls whether source is available in item editor. For example, Koha ships with Dewey and LCC rules but a Dewey library may not want catalogers to mistakenly use LCC as an item callnumber type. To accomplish this, check box 'source in use?' only for the Dewey Classification Source and leave 'source in use' for all others unchecked.</p>
-
-<h1>To add a new 'Filing Rule'...</h1>
-		<ul>
-			<li>Click 'New Filing Rules'</li>
-			<li>Enter a 'Filing Rule Code'</li>
-			<li>Enter a 'Description' for your new filing rule</li>
-			<li>Choose a 'filing routine' from the dropdown menu to associate with your new filing rule</li>
-			<li>Click 'Save'</li>
-		</ul>
-		
-<h1>To edit a new 'Classification Source' or 'Filing Rule'...</h1>
-		<ul>
-			<li>Click 'edit' next to the 'classification source' or 'filing rule' you wish to edit</li>
-			<li>Edit</li>
-			<li>Click 'Save'</li>
-		</ul>
+<h1>Classification Sources</h1>
+
+<p>Source of classification or shelving scheme is an Authorized Values category that is mapped to field 942$2 in Koha's MARC Bibliographic frameworks.</p>
+
+<p>Commonly used values of this field are:</p>
+
+<ul>
+	<li>ddc - Dewey Decimal Classification</li>
+	<li>lcc - Library of Congress Classification</li>
+</ul>
+
+<p>If you chose to install classification sources during Koha's installation, you would see other values too:</p>
+
+<ul>
+	<li>ANSCR (sound recordings)</li>
+	<li>SuDOC classification</li>
+	<li>Universal Decimal Classification</li>
+	<li>Other/Generic Classification</li>
+</ul>
+
+<h2>Adding/Editing Classification Sources</h2>
+
+<p>You can add your own source of classification by using the New Classification Source button. To edit use the Edit link.</p>
+
+<p>When creating or editing:</p>
+
+<ul>
+	<li>You will need to enter a code and a description.</li>
+	<li>Check the 'Source in use?' checkbox if you want the value to appear in the drop down list for this category.</li>
+	<li>Select the appropriate filing rule from the drop down list.</li>
+</ul>
+
+<h2>Classification Filing Rules</h2>
+
+<p>Filing rules determine the order in which items are placed on shelves.</p>
+
+<p>Values that are pre-configured in Koha are:</p>
+
+<ul>
+	<li>Dewey</li>
+	<li>LCC</li>
+	<li>Generic</li>
+</ul>
+
+<p>Filing rules are mapped to Classification sources. You can setup new filing rules by using the New Filing Rule button. To edit use the Edit link.</p>
+
+<p>When creating or editing:</p>
+
+<ul>
+	<li>Enter a code and a description</li>
+	<li>Choose an appropriate filing routine - dewey, generic or lcc</li>
+</ul>
 
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tmpl
index 21eca0a..e5c3bdc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tmpl
@@ -1,9 +1,11 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Currencies administration</h1>
+<h1>Currencies and Exchange Rates</h1>
 
-<p>Define the currencies you deal with here.</p>
+<p>If you place orders from more than one country you will want to input currency exchange rates so that your acquisitions module will properly calculate totals.</p>
 
-<p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
+<p style="background-color: #ffe599">Tip: This data is not automatically updated, so be sure to keep it up to date so that your accounting is kept correct.</p>
+
+<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>
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tmpl
index 91cd133..6422e2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tmpl
@@ -2,18 +2,22 @@
 
 <h1>Keyword to MARC Mapping</h1>
 
-<p>This tool will allow you to map MARC fields to a set of predefined keywords. </p>
+<p>This tool will allow you to map MARC fields to a set of predefined keywords.</p>
 
-<p>At this time the only keyword in use is 'subtitle.' </p>
+<p>At this time the only keyword in use is 'subtitle.'</p>
 
-<p>Using this tool you can define what MARC field prints to the detail screen of the bibliographic record using keywords.  The following example will use the subtitle field.</p>
+<p>Using this tool you can define what MARC field prints to the detail screen of the bibliographic record using keywords. The following example will use the subtitle field.</p>
 
-<p>Using the Framework pull down menu, choose the Framework you would like to apply this rule to.  For example, the subtitle for books can be found in the 245$b field.</p>
+<p>Using the Framework pull down menu, choose the Framework you would like to apply this rule to. For example, the subtitle for books can be found in the 245$b field.</p>
 
 <p>However the subtitle for DVDs appears in 245$p</p>
 
 <p>Using this tool you can tell Koha to print the right field as the subtitle when viewing the bibliographic record in the OPAC.</p>
 
+<p>This tool can be used to chain together pieces of the record as well. If you want the series number to show in the title on your search results you simply have to map 490 $v to 'subtitle' along with the 245 $b.</p>
+
+<p style="background-color: #ffe599">Tip: Chain together the fields you want to show after the item title in the order in which you want them to appear.</p>
+
 <p>Future developments will include additional keyword assigned fields.</p>
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tmpl
index f7b289f..8c8eb67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tmpl
@@ -1,36 +1,22 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
 <h1>Item Circulation Alerts</h1>
 
-<p>
-This matrix is to be used to define rules for check-in and checkout
-notifications for combinations of libraries, patron categories, and
-item types
-</p>
+<p>Libraries can decide if they want to have patrons automatically notified of circulation events (check ins and check outs).</p>
+
+<p>These preferences are set based on patron types and item types.</p>
+
+<p style="color: #990000;">Important: These preference can be overwritten by changes in the individual patron's messaging preferences.</p>
+
+<p>To set up circulation alerts:</p>
+
+<ul>
+	<li>Choose your library from the pull down at the top of the screen
 <ul>
-	<li>
-	Click on 'Item Circulation Alerts'&nbsp;</li>
-	<li>You will be presented with the option of choosing a branch or applying rules to all branches ('Default')
-	</li>
-	<li>Clicking on the squares in the matrix will change the color and also the email alert rules
-	</li>
-	<li>To set whether patrons receive alerts for checking books out, click the squares in the 'Check out' matrix
-	<ul>
-		<li style="background-color: #ffe599">TIP: If you have the library select box set to 'Default' the matrix will apply to all libraries.</span></li>
-	</ul>
-	</li>
-	<li>To set whether patrons receive alerts for checking books in, click the squares in the 'Check in' matrix
-	<ul>
-		<li style="background-color: #ffe599">TIP:
-		If you have the library select box set to a specific branch the matrix
-		will apply just to that branch, showing the branch code in the message.</span>
-		</div>
-		</li>
-	</ul>
-	</li>
+	<li>To set preferences for all libraries, keep the menu set to 'Default'</li>
+</ul>
+</li>
+	<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>
-<h3><strong>Can I customize the email sent to my patrons?</strong></h3>
-<p>
-Yes, just go to Tools &gt; Notices and edit the Check In and Check Out notices.
-</p>
 
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl
index 177e505..c47e696 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tmpl
@@ -1,41 +1,60 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Item types management</h1>
-
-<p>You can define as many item types as you want.</p>
-<p>The item types are the &quot;categories&quot; into which your library items fall. For instance, you probably want to have videocassettes in a different category from non-fiction books, and mysteries in a different category from children's picture books. If you already are using a commercial ILS, you almost certainly already have all of your materials divided up into such categories. Now you need to tell Koha what your categories are.</p>
-<p>The itemtype code is limited to four characters. This code is rarely displayed by Koha; instead the description of the type will be what users see.</p>
-<p>&quot;Rental charge&quot; is any amount you might charge to users for borrowing items of a certain type (like videos).</p>
-<p>&quot;Renewals allowed&quot; indicates how many times an items of this type may be renewed.</p>
-<p>Item types are useful for many things, and <strong>very</strong> important in controlling how Koha works :</p>
-	<ul>
-		<li>Patrons can search on item types</li>
-		<li>Issuing rules are set for item types (and for patron types / libraries)</li>
-	</ul>
-<p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
-
-<h3>Adding &amp; Editing New Item Types</h3>
-	<ul>
-		<li>Your system will come with some predefined item types.  From this screen you can edit or delete these items</li>
-		<li>To add a new item type click 'New Item Type'</li>
-		<li>Enter a short code for the 'Item Type'</li>
-		<li>Enter a longer explanation in the 'Description'</li>
-		<li>Feel free to choose an image for each item type (or selected the 'No image' option)</li>
-		<li>The 'Not for loan' option can be used for items that cannot be checked out of the library</li>
-		<li>'Renewals' should include the number of times this item can be renewed</li>
-		<li>If you charge a rental fee for items (such as DVDs) enter that amount in the 'Rental charge' field</li>
-		<li>The summary field is used to edit the way this item displays on the search results page
-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: For electronic resources you might want to enter</span>
-		    <span style="background-color: #ffe599">
-<em>&lt;a href=&quot;[856u]&quot;&gt;open site&lt;/a&gt;</em></span>
-		    <span style="background-color: #ffe599">
-to show the item link on the search results page</span></li>
-		</ul></li>
-		<li>When you're finished click 'Save Changes'</li>
-	</ul>
-<p><strong>Can I have a different type for new releases and older titles?</strong>
-Yes.  Just enter an item type for new items and assign different circulation rules for this item type.
- </p><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<h1>Item Types</h1>
+
+<p>Koha allows you to organize your collection by item types and collection codes.</p>
+
+<p>Item types typically refer to the material type (book, cd, dvd, etc), but can be used in any way that works for your library.</p>
+
+<h2>Adding Item Types</h2>
+
+<p>To add a new item type, simply click the 'New Item Type' button at the top of the Item Types page.</p>
+
+<ul>
+	<li>In the 'Item Type' field, enter a short code for your item type</li>
+	<li>The description is the plain text definition of the item type</li>
+	<li>You can choose to have an image associated with your item type
+<ul>
+	<li>You can choose from a series of image collections</li>
+	<li>You can link to a remote image</li>
+	<li>Or you can just have no image associated with the item type</li>
+	<li style="color: #990000;">Important: To have your item type images appear in the OPAC you need to set noItemTypeImages to 'Show'
+<ul>
+	<li>Get there: More &gt; Administration &gt; Global System Preferences &gt; Admin</li>
+</ul>
+</li>
+</ul>
+</li>
+	<li>For items that do not circulate, check the 'Not for loan' options
+<ul>
+	<li>Items marked 'Not for loan' will appear in the catalog, but cannot be checked out to patrons</li>
+</ul>
+</li>
+	<li>Enter the total number of renewals allowed for the item type in the 'Renewals' box</li>
+	<li>For items that you charge a rental fee for, enter the total fee you charge in the 'Rental charge' field
+<ul>
+	<li style="color: #990000;">Important: Do not enter symbols in this field, only numbers and decimal points (ex. $5.00 should be entered as 5 or 5.00)</li>
+	<li>This will charge the patron on checkout</li>
+</ul>
+</li>
+	<li>When finished, click 'Save Changes'
+<ul>
+	<li>Tip: All fields, with the exception of the 'Item Type' will be editable from the Item Types list</li>
+</ul>
+</li>
+	<li>Your new item type will now appear on the list</li>
+</ul>
+
+<h2>Editing Item Types</h2>
+
+<p>Each item type has an Edit button beside it. To edit an item simply click the 'Edit' link.</p>
+
+<p>You will not be able to edit the code you assigned as the 'Item Type' but you will be able to edit the description for the item.</p>
+
+<h2>Deleting Item Types</h2>
+
+<p>Each item has a Delete button beside it. To delete an item, simply click the 'Delete' link.</p>
+
+<p>You will not be able to delete item types that are being used by items within your system.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tmpl
index 80cf6c7..e661b0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tmpl
@@ -1,15 +1,15 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Koha 2 MARC links</h1>
+<h1>Koha to MARC Mapping</h1>
 
-<p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>
+<p>While Koha stores the entire MARC record, it also stores common fields for easy access in various tables in the database. Koha to MARC Mapping is used to tell Koha where to find these values in the MARC record. In many cases you will not have to change the default values set by in this tool on installation, but it is important to know that the tool is here and can be used at any time.</p>
 
-<p>The pull-down menu lists all the Koha tables that can receive values from the MARC records. The columns from each table are listed below the pull-down menu.</p>
+<p>The Koha to MARC Mapping page offers you the option of choosing from one of three tables in the database to assign values to.</p>
 
-<p>Do not expect to have every Koha table.column mapped to a MARC subfield. Some (such as biblionumber, biblioitemnumber, and itemnumber) are values generated by Koha and will probably be automatically mapped. Others are flags which are set in the course of normal circulation activities and will contain information that is not part of your MARC record.</p>
+<p>After choosing the table you would like to view, click 'OK.' To edit any mapping click on the 'Koha Filed' or the 'Edit' link.</p>
 
-<p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>
+<p>Choose which MARC field you would like to map to this Koha Field and click the 'OK' button. If you would like to clear all mappings, click the 'Click to "Unmap"' button.<p>
 
-<p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
+<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>
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
index 68d09bc..5e3a437 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
@@ -1,57 +1,140 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>MARC tag structure administration</h1>
+<h1>MARC Bibliographic Frameworks Subfields</h1>
 
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p> 
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
+<p>Frameworks are made up of MARC fields and subfields. To make edits to most Frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
 
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p> 
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : whether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : whether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <strong>very important</strong>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can &quot;map&quot; a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on &quot;title&quot;, this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : allows you to select from 19 possible visibility conditions, 17 of which are implemented. They are the following:</li>
-<code><br />
-( ! means 'not visible' or in the case of Collapsed 'not 
-Collapsed')
-<br /><br />
-  -9 =&gt; Future use<br />
-  -8 =&gt;  Flag<br />
-  -7 =&gt;  OPAC !Intranet !Editor  Collapsed<br />
-  -6 =&gt;  OPAC  Intranet !Editor !Collapsed<br />
-  -5 =&gt;  OPAC  Intranet !Editor  Collapsed<br />
-  -4 =&gt;  OPAC !Intranet !Editor !Collapsed<br />
-  -3 =&gt;  OPAC !Intranet  Editor  Collapsed<br />
-  -2 =&gt;  OPAC !Intranet  Editor !Collapsed<br />
-  -1 =&gt;  OPAC  Intranet  Editor  Collapsed<br />
-   0 =&gt;  OPAC  Intranet  Editor !Collapsed<br />
-   1 =&gt; !OPAC  Intranet  Editor  Collapsed<br />
-   2 =&gt; !OPAC !Intranet  Editor !Collapsed<br />
-   3 =&gt; !OPAC !Intranet  Editor  Collapsed<br />
-   4 =&gt; !OPAC  Intranet  Editor !Collapsed<br />
-   5 =&gt; !OPAC !Intranet !Editor  Collapsed<br />
-   6 =&gt; !OPAC  Intranet !Editor !Collapsed<br />
-   7 =&gt; !OPAC  Intranet !Editor  Collapsed<br />
-   8 =&gt; !OPAC !Intranet !Editor !Collapsed<br />
-   9 =&gt; Future use<br />
-</code>
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorized value list of the selected type</li>
-<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can &quot;magically&quot; find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : If you enter a field/subfield here (200b), a link appears after the subfield in the MARC Details view. This view is present only in intranet, not in Opac. If the librarian click on the link, a search&nbsp; is done on the DB for the field/subfield with the same value. Can be used for 2 main topic :
-  	<ul>
-  		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author.</li>
-  		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serials that are with this issn. </li>
- 	</ul>
+<ul>
+	<li>Each field has a tag (which is the MARC tag)
+<ul>
+	<li>The 'Label for lib' is what will show in the staff client if you have advancedMARCeditor set to display labels</li>
+	<li>The 'Label for OPAC' is what will show on the MARC view in the OPAC</li>
+	<li>If you check 'Repeatable' then the field will have a plus sign next to it allowing you to add multiples of that tag</li>
+	<li>If you check 'Mandatory' the record will not be allowed to save unless you have a value assigned to this tag</li>
+	<li>'Authorized value' is where you define an authorized value that your catalogers can choose from a pull down to fill this field in
+To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC Structure' listing</li>
+</ul>
+</li>
+	<li>From the list of subfields you can click 'Delete' to the right of each to delete the subfields</li>
+	<li>To edit the subfields click 'Edit Subfields'</li>
+	<li>For each subfield you can set the following values
+<ul>
+	<li>Text for librarian
+<ul>
+	<li>what appears before the subfield in the librarian interface</li>
+</ul>
+</li>
+	<li>Text for OPAC
+<ul>
+	<li>what appears before the field in the OPAC.</li>
+	<li>If left empty, the text for librarian is used instead</li>
+</ul>
+</li>
+	<li>Repeatable
+<ul>
+	<li>the field will have a plus sign next to it allowing you to add multiples of that tag</li>
+</ul>
+</li>
+	<li>Mandatory
+<ul>
+	<li>the record will not be allowed to save unless you have a value assigned to this tag</li>
+</ul>
+</li>
+	<li>Managed in tab
+<ul>
+	<li>defines the tab where the subfield is shown. All subfields of a given field must be in the same tab or ignored. Ignore means that the subfield is not managed.</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Default value
+<ul>
+	<li>defines what you want to appear in the field by default, this will be editable, but it saves time if you use the same note over and over or the same value in a field often.</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>hidden
+<ul>
+	<li>allows you to select from 19 possible visibility conditions, 17 of which are implemented. They are the following:
+<ul>
+	<li>-9 =&gt; Future use</li>
+	<li>-8 =&gt; Flag</li>
+	<li>-7 =&gt; OPAC !Intranet !Editor Collapsed</li>
+	<li>-6 =&gt; OPAC Intranet !Editor !Collapsed</li>
+	<li>-5 =&gt; OPAC Intranet !Editor Collapsed</li>
+	<li>-4 =&gt; OPAC !Intranet !Editor !Collapsed</li>
+	<li>-3 =&gt; OPAC !Intranet Editor Collapsed</li>
+	<li>-2 =&gt; OPAC !Intranet Editor !Collapsed</li>
+	<li>-1 =&gt; OPAC Intranet Editor Collapsed</li>
+	<li>0 =&gt; OPAC Intranet Editor !Collapsed</li>
+	<li>1 =&gt; !OPAC Intranet Editor Collapsed</li>
+	<li>2 =&gt; !OPAC !Intranet Editor !Collapsed</li>
+	<li>3 =&gt; !OPAC !Intranet Editor Collapsed</li>
+	<li>4 =&gt; !OPAC Intranet Editor !Collapsed</li>
+	<li>5 =&gt; !OPAC !Intranet !Editor Collapsed</li>
+	<li>6 =&gt; !OPAC Intranet !Editor !Collapsed</li>
+	<li>7 =&gt; !OPAC Intranet !Editor Collapsed</li>
+	<li>8 =&gt; !OPAC !Intranet !Editor !Collapsed</li>
+	<li>9 =&gt; Future use URL : if checked, the subfield is an URL, and can be clicked</li>
+</ul>
+</li>
+	<li>( ! means 'not visible' or in the case of Collapsed 'not Collapsed')</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Is a URL
+<ul>
+	<li>if checked, it means that the subfield is a URL and can be clicked</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Link
+<ul>
+	<li>If you enter a field/subfield here (200b), a link appears after the subfield in the MARC Detail view. This view is present only in the staff client, not the OPAC. If the librarian clicks on the link, a search is done on the database for the field/subfield with the same value. This can be used for 2 main topics :
+<ul>
+	<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all bib records with the same author.</li>
+	<li>on a field that is a link (4xx) to reach another bib record. For example, put 011a in 464$x, will find the serials that are with this ISSN.</li>
+</ul>
+</li>
+	<li style="color: #990000;">Important: This value should not change after data has been added to your catalog</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Koha link
+<ul>
+	<li>Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC). So, in this list you can "map" a MARC subfield to its meaning. Koha constantly maintains consistency between a subfield and its meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Authorized value
+<ul>
+	<li>means the value cannot by typed by the librarian, but must be chosen from a pull down generated by the authorized value list</li>
+	<li>In the example above, the 504a field will show the MARC504 Authorized Values when cataloging</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Thesaurus
+<ul>
+	<li>means that the value is not free text, but must be searched in the authority/thesaurus of the selected category</li>
+</ul>
+</li>
+</ul>
+<ul>
+	<li>Plugin
+<ul>
+	<li>means the value is calculated or managed by a plugin. Plugins can do almost anything.</li>
+	<li>For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
+</ul>
+</li>
+</ul>
 </li>
+	<li>To save your changes simply click the 'Save Changes' button at the top of the screen</li>
 </ul>
 
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl
index 5ba040d..506c3c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tmpl
@@ -1,28 +1,24 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>MARC tag structure administration</h1>
+<h1>MARC Bibliographic Frameworks Tags</h1>
 
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
+<p>To add a field to a Framework click the 'New Tag' button at the top of the Framework definition</p>
 
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
+<p>This will open up a blank form for entering MARC field data</p>
+
+<p>Enter the information about your new tag:</p>
 
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
 <ul>
-<li>repeatable : whether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : whether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorized value list of the selected type</li>
-<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : useless for instance</li>
+	<li>The 'Tag' is the MARC field number</li>
+	<li>The 'Label for lib' is the text that will appear in the staff client when in the cataloging module</li>
+	<li>The 'Label for OPAC' is the text that will appear in the OPAC when viewing the MARC version of the record</li>
+	<li>If this field can be repeated, check the 'Repeatable' box</li>
+	<li>If this field is mandatory, check the 'Mandatory' box</li>
+	<li>If you want this field to be a pull down with limited possible answers, choose which 'Authorized value' list you want to use</li>
 </ul>
 
+<p>When you're finished, click 'Save Changes' and you will be presented with your new field</p>
+
+<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>
+
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tmpl
index 693119e..6082e4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tmpl
@@ -1,13 +1,49 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Record Matching Rules</h1>   
-    <p><span style="background-color: #ffe599">
-IMPORTANT: This is an advanced feature and should not be altered without knowing how it will effect data migration.</span></p>
+<h1>Record Matching Rules</h1>
 
-<p>Use this tool to create rules to apply during the data migration process. It will prevent duplicates from coming into the system when importing MARC records. An import rule or matching rule consists of one or more 'match points' and zero or more 'match checks'. Each match point specifies a 'search index' and a MARC 'tag', 'subfield', or 'length' (fixed field position) when a record is imported. For each match point, a string is constructed from the tag specified in the match point and the related index is searched.</p>
+<p>Record matching rules are used when importing MARC records into Koha.</p>
 
-<p>The set of matching records are assigned a score (the value of which is determined by the match point rule). Then, the rest of the match points are considered and the scores of each set of matches is added up. The set of matching records whose total score is over a threshold value defined in the matching rule are candidate matches.</p>
+<p>The rules that you set up here will be referenced with you Stage MARC Records for Import.</p>
 
-<p>Match checks are applied for all candidate matches. Each match check specifies a tag in the incoming record and a tag in the possible matching record. The values must be the same for a match to be considered good (e.g., doing a match check on title, or publication date).</p>
+<p>To create a new matching rule:</p>
+
+<ul>
+	<li>Click 'New Record Matching Rule'
+<ul>
+	<li>Choose a unique name and enter it in the 'Matching rule code' field</li>
+	<li>'Description' can be anything you want to make it clear to you what rule you're picking</li>
+	<li>'Match threshold' - ??</li>
+	<li>Match points are set up to determine what fields to match on</li>
+	<li>'Search index' can be found by looking at the ccl.properties file on your system which tells the zebra indexing what data to search for in the MARC data".</li>
+	<li>'Score' - ??</li>
+	<li>Enter the MARC tag you want to match on in the 'Tag' field</li>
+	<li>Enter the MARC tag subfield you want to match on in the 'Subfields' field</li>
+	<li>'Offset' - ??</li>
+	<li>'Length' - ??</li>
+	<li>Koha only has one 'Normalization rule' that removes extra characters such as commas and semicolons. The value you enter in this field is irrelevant to the normalization process.</li>
+	<li>'Required match checks' - ??</li>
+</ul>
+</li>
+</ul>
+
+<h2>Sample Record Matching Rule: Control Number</h2>
+
+<ul>
+	<li>Match threshold: 100</li>
+	<li>Matchpoints (just the one):</li>
+	<li>Search index: Control-number</li>
+	<li>Score: 101</li>
+	<li>Tag: 001
+<ul>
+	<li>this field is for the control number assigned by the organization creating, using, or distributing the record</li>
+</ul>
+</li>
+	<li>Subfields: a</li>
+	<li>Offset: 0</li>
+	<li>Length: 0</li>
+	<li>Normalization rule: Control-number</li>
+	<li>Required Match checks: none (remove the blank one)</li>
+</ul>
 
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tmpl
index a8d7306..27112e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tmpl
@@ -1,33 +1,59 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Patron attribute types</h1>A patron attribute (or extended patron attribute) is an additional piece of information associated with a patron record.  Each attribute has a type that specifies whether the attribute is repeatable, can serve as a unique identifier, can take a password, and whether it can be used to search for patron records in the staff interface.
-The list of attribute types is controlled by staff with 'superlibrarian' permissions.<br/>
-	<ul>
-		<li>Get there: Patrons &gt; Patron Record &gt; More &gt; Set Permissions</li>
-	</ul>Once an attribute type is defined, values for that attribute can be added to the patron record via the staff interface or the batch patron import.
-Two uses of extended attributes are:
-
-	<ul>
-		<li>defining additional unique identifiers, such as a campus student ID number, a library staff HR number, and so on.  These IDs can be used for searching or matching and overlaying records during a batch import.</li>
-		<li>additional statistical categories.  For example, a library could define an attribute type for tracking the academic major of a student patron. Any number of attributes of this sort could be defined.</li>
-	</ul>The extended attributes feature is completely optional.  If the 'ExtendPatronAttributes' system preference is OFF, customizable patron attributes will not be usable.
-<h2>Add Patron Attribute</h2>
-	<ul>
-		<li>Click 'Patron attribute types'</li>
-		<li>	   
-	   IMPORTANT: You will need to have ExtendedPatronAttributes turned on
-		<ul>
-			<li>Get there: More &gt; Administration &gt; General system preferences &gt; Patrons &gt; ExtendedPatronAttributes</li>
-		</ul></li>
-		<li>To add a new Patron Attribute, click 'New Patron Attribute Type'</li>
-		<li>The 'Patron attribute type code' should be unique and is the only required field
-		<ul>
-			<li>TIP: This field is not editable once it is set</li>
-		</ul></li>
-		<li>Fill in all of the fields you need for your attribute
-		<ul>
-			<li>TIP: The repeatibility and unique_id settings of an attribute type cannot be changed after creation - this is to avoid having to deal with changing constraints if an attribute type is already in use by patron records</li>
-		</ul></li>
-		<li>Click 'Save'</li>
-		<li>TIP: An attribute type cannot be deleted if it is used by any patron records</li>
-	</ul><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<h1>Patron Attribute Types</h1>
+
+<p>Patron attributes can be used to define custom fields to associate with your patron records. In order to enable the use of custom fields you need to set the ExtendedPatronAttributes system preference.</p>
+
+<p>A common use for this field would be for a student ID number or a Driver's license number.</p>
+
+<h2>Adding Patron Attributes</h2>
+
+<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
+<ul>
+	<li>This field is limited to 10 characters (numbers and letters only)</li>
+	<li>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>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>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>
+	<li>Check 'Display in OPAC' to display this attribute on a patron's details page in the OPAC.</li>
+	<li>Check 'Searchable' to make this attribute searchable in the staff patron search.</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>
+	<li>An authorized value list is not enforced during batch patron import.</li>
+</ul>
+</li>
+	<li>Click Save to save your new attribute</li>
+</ul>
+
+<p>Once added your attribute will appear on the list of attributes and also on the patron record add/edit form</p>
+
+<h2>Editing/Deleting Patron Attributes</h2>
+
+<p>Each patron attribute has an edit and a delete link beside it on the list of attributes.</p>
+
+<p>Some fields in the attribute will not be editable once created:</p>
+
+<ul>
+	<li>Patron attribute type code</li>
+	<li>Repeatable</li>
+	<li>Unique identifier</li>
+</ul>
+
+<p>You will be unable to delete an attribute if it's in use.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tmpl
index ab68f16..c2cf717 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tmpl
@@ -1,9 +1,19 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>System preferences administration</h1>
+<h1>System Preferences</h1>
+
+<p>Global system preferences control the way your Koha system works in general. Set these preferences before anything else in Koha.</p>
+
+<p>System preferences can be searched (using any part of the preference name or description) using the search box on the 'Administration' page or the search box at the top of each system preferences page.</p>
+
+<p>When editing preferences a '(modified)' tag will appear next to items you change until you click the 'Save All' button</p>
+
+<p>After saving your preferences you'll get a confirmation message telling you what preferences were saved</p>
+
+<p>Each section of preferences can be sorted alphabetically by clicking the small down arrow to the right of the word 'Preference' in the header column</p>
 
-<p>This page allows you to set the system preferences that control much of the basic behavior of Koha.</p>
 <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>
@@ -21,4 +31,6 @@
 		<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><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+	</ul>
+	
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tmpl
index 582553c..833e01e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tmpl
@@ -1,15 +1,13 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Road Types</h1>
-
-<p>The values defined in this preference will show up in a pull down menu when entering patron information.These values can be used in geographic statistics.</p>
-
-<h2>Add a new road type</h2>
-		<ul>
-			<li>Click 'New Road Type'</li>
-			<li>Enter a value such as Blvd., Avenue, Street or St.</li>
-			<li>Click 'Submit'</li>
-			<li>Your values will appear on the Road Types page</li>
-			<li>Your values will also appear as authorized values when entering or editing a patron</li>
-		</ul>
-	</div>	<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
+<h1>Adding Road Types</h1>
+
+<p>To add a road type, click 'New Road Type' and then enter the road type the way you'd like it displayed.</p>
+
+<p>Once you submit the form, your new road type will be listed on the Road Types page</p>
+
+<h2>Viewing Road Types on Patron Add form</h2>
+
+<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>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl
index 163c4ea..c4473c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl
@@ -2,78 +2,93 @@
 
 <h1>Circulation and Fines Rules</h1>
 
-<p>These rules define how your items are circulated, how/when fines are calculated and how holds are handled. The rules are applied from most specific to less specific, using the first found in this order: </p>
+<p>These rules define how your items are circulated, how/when fines are calculated and how holds are handled.</p>
+
+<p>The rules are applied from most specific to less specific, using the first found in this order:</p>
 
 <ul>
-<li>same library, same patron type, same item type</li>
-<li>same library, same patron type, default item type</li>
-<li>same library, default patron type, same item type</li>
-<li>same library, default patron type, default item type</li>
-<li>default library, same patron type, same item type</li>
-<li>default library, same patron type, default item type</li>
-<li>default library, default patron type, same item type</li>
-<li>default library, default patron type, default item type</li></ul>
+	<li>same library, same patron type, all item types</li>
+	<li>same library, same patron type, alll item types</li>
+	<li>same library, all patron types, same item type</li>
+	<li>same library, all patron types, all item types</li>
+	<li>all libraries, same patron type, same item type</li>
+	<li>all libraries, same patron type, all item types</li>
+	<li>all libraries, all patron types, same item type</li>
+	<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>
 
-<p><span style="background-color: #ffe599">TIP: If you are a single library system, you can leave your library selection to 'default library' or choose your branch name and experience the same results.</span></p>
+<p style="color: #990000;">Important: At the very least you will need to set an default circulation rule. This rule should be set for all item types, all libraries and all patron types. 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 class="section">Default Issuing Rule</h3>
+<h2>Default Circulation Rules</h2>
 
-<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: </p>
- 
-<p><span style="background-color: #ffe599">TIP: If you leave this set to 'Default' it will apply the rules to all libraries</span></p>
+<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>From the matrix you can choose any combination of patron categories and item types to apply the rules to. </p>
+<p>From the matrix you can choose any combination of patron categories and item types to apply the rules to</p>
 
-<ul><li>First choose which patron category you'd like the rule to   be applied to. If you leave this to 'Default' 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 'Default' 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 and item can be checked out to a   patron by entering the number of days in the 'Loan Period'   box.</li>
-<li>'Fine Amount' should have the amount you would like to   charge for overdue items
-<ul><li><span style="color: #ff0000">IMPORTANT: Enter only numbers and decimal points.</span></li></ul></li>
-<li>The 'Fine Grace Period' is the period of time an item can   be overdue before you start charging fines.</li>
-<li>Enter the 'Fine Charging Interval' in days (ex. charge   fines every 1 day, or every 2 days)</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>
-<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></ul>
+<ul>
+	<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 and item can be checked out to a patron by entering the number of days in the 'Loan Period' box.</li>
+	<li>'Fine Amount' should have the amount you would like to charge for overdue items
+<ul>
+	<li>Enter only numbers and decimal points (no currency symbols).</li>
+</ul>
+</li>
+	<li>The 'Fine Grace Period' is the period of time an item can be overdue before you start charging fines.</li>
+	<li>Enter the 'Fine Charging Interval' in days (ex. charge fines every 1 day, or every 2 days)</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>
+	<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>
+</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>
+<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>
 
-<p>To save time you can clone rules from one library to another by choosing the clone option above the rules matrix. </p>
+<p>To save time you can clone rules from one library to another by choosing the clone option above the rules matrix.</p>
 
-<p>After choosing to clone you will be presented with a confirmation message. </p>
+<p>After choosing to clone you will be presented with a confirmation message.</p>
 
-<h3 class="section">Default Checkouts and Hold Policy</h3>
+<h2>Default Checkouts and Hold Policy</h2>
 
-<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>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>
+<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
-<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></ul></li>
-<li>Once your policy is set, you can unset it by clicking the   'Unset' link to the right of the rule</li></ul>
+<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
+<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>
+</ul>
+</li>
+	<li>Once your policy is set, you can unset it by clicking the 'Unset' link to the right of the rule</li>
+</ul>
 
-<h3 class="section">Checkouts Per Patron</h3>
+<h2>Checkouts Per Patron</h2>
 
-<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><span 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.</span></p>
+<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>
 
-<h3 class="section">Item Hold Policies</h3>
+<p>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>
+
+<h2>Item Hold Policies</h2>
+
+<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 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>
+</ul>
 
-<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 policies have the following effects: </p>
+<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>
 
-<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></ul> 
- 
-<p><span style="color: #ff0000">IMPORTANT: Note that if the system preference AllowHoldPolicyOverride set to 'allow', these policies can be overridden by your circulation staff.</span></p>
- 
-<p><span style="color: #ff0000">IMPORTANT: These policies are based on the patron's home branch, not the branch that the reserving staff member is from.</span> </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>
 
-	<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tmpl
index 96ccd8a..e3dd8d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tmpl
@@ -1,14 +1,15 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Stop word administration page</h1>
+<h1>Stop Words</h1>
 
-<p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>
-<h3>Koha with Zebra</h3>
-<p>Zebra handles stopwords internally, and does so effectively and efficiently.  In normal circumstances, there should be no reason for Koha to remove stopwords prior to submitting the search query to Zebra, and in most cases doing so will actually negatively affect relevance ranking and phrase searching without giving any performance benefit.</p>
+<p style="color: #990000">Important: If NoZebra is set to 'Use' this option will not appear on the administration menu</p>
 
-<h3>Koha without Zebra</h3>
-<p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>
+<p>Stop words are words that you want the search system to ignore.</p>
 
-<p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
+<p>Koha comes with a standard list of stop words that can be edited by visiting the Stop Word administration area.</p>
+
+<p>To add a new stop word to the list, click the 'New Stop Word' button and add the word you'd like ignored</p>
+
+<p style="color: #990000">Important: If you change something in this table, ask your administrator to run misc/batchRebuildBiblioTables.pl script.</p>
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tmpl
index cf1625f..c8cd0f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tmpl
@@ -1,15 +1,41 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 
-<h1>Z39.50 servers administration</h1>
+<h1>Z39.50 Servers</h1>
 
-<p>Defines the Z39.50 servers you want Koha to search.</p>
+<p>Koha has a powerful copy cataloging tool. Using Koha you can connect to any Z39.50 target that is publicly available or that you have the log in information to.</p>
 
-<p>Koha comes with one Z39.50 server site defined (the U.S. Library of Congress) for finding catalog records to import directly into your catalog. In this area, you can define other servers for searching.</p>
+<p>Koha comes with a default list of Z39.50 targets set up that you can add to, edit or delete.</p>
 
-<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>
+<p>To find additional targets you use IndexData's IRSpy: <a href="http://irspy.indexdata.com">http://irspy.indexdata.com</a></p>
 
-<p>If you have a login name and password for other Z39.50 servers, Koha will save your user ID and password in addition to the other information it needs to make a connection. (For anonymous servers, leave the userid and password fields blank.) The other fields on the form control whether or not the server is automatically searched when you request a Z39.50 search (put a "1" in the "Checked" field) and the order in which it is checked.</p>
+<h2>Add a Z39.50 Target</h2>
+<ul>
+	<li>From the main Z39.50 page, click 'New Z39.50 Server'
+<ul>
+	<li>Userid and Password are only required for servers that are password protected</li>
+</ul>
+</li>
+</ul>
 
-<p>It is a good idea to be selective in choosing servers. Defining more than five or six checked servers may slow down your Z39.50 search results, even if they are queried all together.</p>
+<h2>Suggested Z39.50 Targets</h2>
+
+<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>
+	<li>HALTON HILLS PUBLIC cat.hhpl.on.ca:210 halton_hills</li>
+	<li>LIBRARY OF CONGRESS z3950.loc.gov:7090 Voyager</li>
+	<li>LONDON PUBLIC LIBRARY catalogue.londonpubliclibrary.ca:210 INNOPAC</li>
+	<li>MANITOBA PUBLIC library.gov.mb.ca:210 horizon</li>
+	<li>MILTON PL cat.mpl.on.ca:210 horizon</li>
+	<li>NATIONAL LIBRARY OF WALES cat.llgc.org.uk:210 default</li>
+	<li>TORONTO PUBLIC symphony.torontopubliclibrary.ca:2200 unicorn</li>
+	<li>TRI-UNI 129.97.129.194:7090 voyager</li>
+	<li>VANCOUVER PUBLIC LIBRARY z3950.vpl.ca:210 Horizon</li>
+</ul>
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
-- 
1.7.2.3



More information about the Koha-patches mailing list