From 826d6f462609d74593790328dd9c7b36265615d2 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Sun, 3 Apr 2011 22:41:49 +1200
Subject: [PATCH] Bug 5917 tracking template changes

---
 .../en/includes/checkouts-table-footer.inc    |   2 +-
 .../prog/en/includes/circ-toolbar.inc         |   2 +
 .../intranet-tmpl/prog/en/modules/about.tt    |   1 +
 .../prog/en/modules/admin/biblio_framework.tt | 136 +++++++++
 .../prog/en/modules/catalogue/detail.tt       |  12 +-
 .../prog/en/modules/catalogue/results.tt      |  23 +-
 .../prog/en/modules/circ/circulation.tt       | 106 ++++++-
 .../en/modules/circ/hold-transfer-slip.tt     |   6 +-
 .../prog/en/modules/circ/returns.tt           |   3 +-
 .../prog/en/modules/help/admin/admin-home.tt  |   8 +
 .../en/modules/help/admin/aqbudgetperiods.tt  |  16 +-
 .../prog/en/modules/help/admin/aqbudgets.tt   |  22 +-
 .../prog/en/modules/help/admin/aqplan.tt      |   4 +-
 .../help/admin/auth_subfields_structure.tt    | 161 ++++++++--
 .../modules/help/admin/authorised_values.tt   | 274 +++++++++---------
 .../prog/en/modules/help/admin/authtypes.tt   |  40 +--
 .../en/modules/help/admin/biblio_framework.tt |  36 ++-
 .../help/admin/branch_transfer_limits.tt      |  41 +--
 .../prog/en/modules/help/admin/branches.tt    |  95 +++---
 .../prog/en/modules/help/admin/categorie.tt   | 101 +++++--
 .../prog/en/modules/help/admin/checkmarc.tt   |   5 +-
 .../prog/en/modules/help/admin/cities.tt      |  32 +-
 .../en/modules/help/admin/classsources.tt     |  86 +++---
 .../prog/en/modules/help/admin/currency.tt    |   8 +-
 .../en/modules/help/admin/fieldmapping.tt     |  12 +-
 .../help/admin/item_circulation_alerts.tt     |  44 +--
 .../prog/en/modules/help/admin/itemtypes.tt   |  97 ++++---
 .../en/modules/help/admin/koha2marclinks.tt   |  12 +-
 .../help/admin/marc_subfields_structure.tt    | 181 ++++++++----
 .../en/modules/help/admin/marctagstructure.tt |  34 +--
 .../en/modules/help/admin/matching-rules.tt   |  50 +++-
 .../modules/help/admin/patron-attr-types.tt   |  88 ++++--
 .../prog/en/modules/help/admin/preferences.tt |  18 +-
 .../prog/en/modules/help/admin/roadtype.tt    |  24 +-
 .../prog/en/modules/help/admin/smart-rules.tt | 125 ++++----
 .../prog/en/modules/help/admin/stopwords.tt   |  15 +-
 .../en/modules/help/admin/z3950servers.tt     |  38 ++-
 .../help/authorities/authorities-home.tt      |  12 +-
 .../modules/help/authorities/authorities.tt   |  77 ++---
 .../en/modules/help/circ/branchtransfers.tt   |  38 +--
 .../en/modules/help/circ/circulation-home.tt  |  27 +-
 .../prog/en/modules/help/circ/circulation.tt  |  92 ++++--
 .../prog/en/modules/help/circ/overdue.tt      |  15 +-
 .../en/modules/help/circ/pendingreserves.tt   |  33 ++-
 .../en/modules/help/circ/reserveratios.tt     |   4 +-
 .../prog/en/modules/help/circ/returns.tt      |  59 ++--
 .../modules/help/circ/transferstoreceive.tt   |  21 +-
 .../en/modules/help/circ/view_holdsqueue.tt   |  17 +-
 .../en/modules/help/circ/waitingreserves.tt   |   6 +-
 .../prog/en/modules/help/export/marc.tt       |  34 ++-
 .../modules/help/labels/label-edit-layout.tt  |  30 +-
 .../modules/help/labels/label-edit-profile.tt |  78 ++---
 .../prog/en/modules/help/labels/label-home.tt |  41 ++-
 .../en/modules/help/labels/spinelabel-home.tt |  11 +-
 .../modules/help/offline_circ/process_koc.tt  |  41 +--
 .../modules/help/patroncards/edit-layout.tt   |  30 +-
 .../modules/help/patroncards/edit-profile.tt  |  20 +-
 .../modules/help/patroncards/edit-template.tt |  31 +-
 .../prog/en/modules/help/patroncards/home.tt  |  27 +-
 .../en/modules/help/patroncards/manage.tt     |  22 +-
 .../prog/en/modules/members/moremember.tt     |  92 +++++-
 .../prog/en/modules/suggestion/suggestion.tt  |  33 ++-
 .../prog/en/modules/tools/koha-news.tt        |  19 ++
 .../en/xslt/MARC21slim2intranetDetail.xsl     |  30 +-
 .../en/xslt/UNIMARCslim2intranetDetail.xsl    |   5 +
 .../opac-tmpl/prog/en/includes/masthead.inc   |   2 +-
 .../prog/en/modules/opac-addbybiblionumber.tt |  15 +-
 .../opac-tmpl/prog/en/modules/opac-auth.tt    |   2 +-
 .../opac-tmpl/prog/en/modules/opac-basket.tt  |   4 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tt  |  10 +-
 .../opac-tmpl/prog/en/modules/opac-results.tt |  27 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt |   2 +-
 koha-tt/opac-tmpl/prog/en/modules/sco/help.tt |  13 +-
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt |  25 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl    |  45 ++-
 .../prog/en/xslt/MARC21slim2OPACResults.xsl   |  28 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl   |   5 +
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl  |   5 +
 78 files changed, 2007 insertions(+), 1079 deletions(-)

diff --git a/koha-tt/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tt/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
index 2b6826d593..4cf58c4a0f 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
+++ b/koha-tt/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
@@ -1,6 +1,6 @@
 <tfoot>
 	<tr>
-		<td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td>
+        <td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td>
 		<td>[% totaldue %]</td>
 		<td>[% totalprice %]</td>
 		<td colspan="2">
diff --git a/koha-tt/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tt/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index 301a862ed8..1377aa56c6 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tt/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -99,6 +99,7 @@ function update_child() {
 	    new YAHOO.widget.Button("addnote");
         [% IF ( StaffMember ) %][% IF ( CAN_user_staffaccess ) %] new YAHOO.widget.Button("changepassword");  [% END %]
             [% ELSE %] new YAHOO.widget.Button("changepassword"); [% END %]
+	    new YAHOO.widget.Button("duplicate");
 	    new YAHOO.widget.Button("printslip");
 		new YAHOO.widget.Button("printpage");
 	    new YAHOO.widget.Button("renewpatron");
@@ -138,6 +139,7 @@ function update_child() {
 [% IF ( StaffMember ) %][% IF ( CAN_user_staffaccess ) %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li>[% END %]
           [% ELSE %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li>[% END %]	
 	  [% END %]
+	<li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
 	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print Page</a></li>
 	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print Slip</a></li>
 	<li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/about.tt b/koha-tt/intranet-tmpl/prog/en/modules/about.tt
index 3f8f404b26..84eb9a1905 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/about.tt
@@ -191,6 +191,7 @@
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
                 <li>Liz Rea</li>
                 <li>Allen Reinmeyer</li>
+                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
                 <li>Savitra Sirohi</li>
                 <li>Pawel Skuza (Polish for 1.2)</li>
                 <li>Southeastern University</li>
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tt/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
index ddac1c5f13..6d1de22c7e 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -48,6 +48,79 @@ $(document).ready(function() {
 });
 //]]>
 </script>
+<script type="text/javascript">
+/* Import/Export from/to spreadsheet */
+
+    var importing = false;
+
+    $(document).ready(function() {
+        $("body").css("cursor", "auto");
+        $('.import_export_options').hide();
+        $('a.import_export_fw').click(function() {
+            if (!importing) {
+                $('.import_export_options').hide();
+                $(this).next().show('slide');
+            }
+            return false;
+        });
+        $('.import_export_close').click(function() {
+            if (!importing) {
+                $('.import_export_options').fadeOut('fast');
+                $("body").css("cursor", "auto");
+            }
+        });
+        $('.input_import').val("");
+
+        var matches = new RegExp("\\?error_import_export=(.+)$").exec(window.location.search);
+        if (matches && matches.length > 1) {
+            alert("Error importing the framework " + decodeURIComponent(matches[1]));
+        }
+    });
+    
+    $(function() {
+        $('input.input_import').change( function() {
+            var filename = $(this).val();
+            if ( ! /(?:\.csv|\.sql|\.ods|\.xml)$/.test(filename)) {
+                $(this).css("background-color","yellow");
+                alert('Please select an ods or xml file');
+                $(this).val("");
+                $(this).css("background-color","white");
+            }
+        });
+        $('form.form_export').submit(function() {
+            $('.import_export_options').hide();
+            return true;
+        });
+        $('form.form_import').submit(function() {
+            var id = $(this).attr('id');
+            var obj = $('#' + id + ' input:file');
+            if (/(?:\.csv|\.sql|\.ods|\.xml)$/.test(obj.val())) {
+                if (confirm('Do you really want to import the framework fields/subfields (will overwrite current configuration, for safety reasons please make before an export to have a backup file)?')) {
+                    var frameworkcode = $('#' + id + ' input:hidden[name=frameworkcode]').val();
+                    $('#importing_' + frameworkcode).find("span").html("Importing <strong>" + frameworkcode + "</strong> from <i>" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "</i>");
+                    if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) {
+                        var timestamp = new Date().getTime();
+                        $('#importing_' + frameworkcode).find("img").attr('src', '/intranet-tmpl/prog/img/loading.gif' + '?' +timestamp);
+                    }
+                    $('#importing_' + frameworkcode).css('display', 'block');
+                    if (navigator.userAgent.toLowerCase().indexOf('firefox') == -1) $("body").css("cursor", "progress");
+                    importing = true;
+                    return true;
+                } else
+                    return false;
+            }
+            obj.css("background-color","yellow");
+            alert('Please select an spreadsheet (csv, ods, xml) or sql file');
+            obj.val("");
+            obj.css("background-color","white");
+            return false;
+        });
+    });
+    
+    
+
+</script>
+
 </head>
 <body>
 [% INCLUDE 'header.inc' %]
@@ -115,6 +188,8 @@ $(document).ready(function() {
         <th>&nbsp;</th>
         <th>Edit</th>
         <th>Delete</th>
+        <th title="Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods) or SQL file">Export</th>
+        <th title="Import framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file">Import</th>
     </tr>
     <tr>
         <td>&nbsp;</td>
@@ -122,6 +197,36 @@ $(document).ready(function() {
         <td><a href="marctagstructure.pl?frameworkcode=[% frameworkcode %]">MARC structure</a></td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
+        <td><div class="import_export"><a class="import_export_fw" href="#" title="Export [% frameworkcode %] framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods) or SQL file">Export</a>
+            <div class="import_export_options">
+                <form action="import_export_framework.pl" name="form_[% frameworkcode %]" method="get" target="_blank"  class="form_export">
+                    <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
+                    <ul>
+                        <li class="li_close_import_export"><span class="import_export_close" title="Close popup">Close</span></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="csv" id="type_export_[% frameworkcode %]" checked="checked" /><label for="type_export_[% frameworkcode %]" title="Export to CSV Spreadsheet">Export to CSV Spreadsheet</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="excel" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]" title="Export to Excel as xml format, compatible with OpenOffice/LibreOffice as well">Export to Excel with xml format</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="ods" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]">Export to OpenDocument Spreadsheet format</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="sql" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]" title="Export to SQL">Export to SQL</label></li>
+                        <li><input type="submit" class="export_ok" href="#" value="Export" title="Export to a spreadsheet" /></li>
+                    </ul>
+                </form>
+            </div>
+            </div>
+        </td>
+        <td><div class="import_export"><a href="#" class="import_export_fw" title="Import [% frameworkcode %] framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file">Import</a>
+            <div class="import_export_options">
+                <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_[% frameworkcode %]" id="form_i_[% frameworkcode %]" method="post" enctype="multipart/form-data" class="form_import">
+                    <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
+                    <input type="hidden" name="action" value="import" />
+                    <ul>
+                        <li class="li_close_import_export"><span class="import_export_close" title="Close popup">Close</span></li>
+                        <li><label for="file_import_[% frameworkcode %]" title="Import from a spreadsheet, formats available: ods, xml (formatted from excel)">Spreadsheet file</label><input type="file" name="file_import_[% frameworkcode %]" id="file_import_[% frameworkcode %]" class="input_import" value="" autocomplete="off" /></li>
+                        <li><input type="submit" class="import_ok" value="Import" title="Import from a spreadsheet" /><div id="importing_[% frameworkcode %]" style="display:none" class="importing"><img src="/intranet-tmpl/prog/img/loading.gif" /><span class="importing_msg"></span></div></li>
+                    </ul>
+                </form>
+            </div>
+            </div>
+        </td>
     </tr>
     <!-- note highlight assignment appears backwards because we already have a normal row for Default -->
     [% FOREACH loo IN loop %]
@@ -133,6 +238,37 @@ $(document).ready(function() {
             <td><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode %]" >MARC structure</a></td>
             <td><a href="[% loo.script_name %]?op=add_form&amp;frameworkcode=[% loo.frameworkcode |html %]">Edit</a></td>
             <td><a href="[% loo.script_name %]?op=delete_confirm&amp;frameworkcode=[% loo.frameworkcode |html %]">Delete</a></td>
+            <td>
+            <div class="import_export"><a class="import_export_fw" href="#" title="Export [% loo.frameworkcode %] framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods) or SQL file">Export</a>
+                <div class="import_export_options">
+                    <form action="import_export_framework.pl" name="form_[% loo.frameworkcode %]" method="get" target="_blank" class="form_export">
+                        <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
+                        <ul>
+                            <li class="li_close_import_export"><span class="import_export_close" title="Close popup">Close</span></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="type_export_[% loo.frameworkcode %]" checked="checked" /><label for="type_export_[% loo.frameworkcode %]" title="Export to CSV Spreadsheet">Export to CSV Spreadsheet</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]" title="Export to Excel as xml format, compatible with OpenOffice/LibreOffice as well">Export to Excel as xml format</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]">Export to OpenDocument Spreadsheet format</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="sql" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]" title="Export to SQL">Export to SQL</label></li>
+                            <li><input type="submit" class="export_ok" href="#" value="Export" title="Export to a spreadsheet" /></li>
+                        </ul>
+                    </form>
+                </div>
+                </div>
+            </td>
+            <td><div class="import_export"><a class="import_export_fw" href="#" title="Import [% loo.frameworkcode %] framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file">Import</a>
+            <div class="import_export_options">
+                <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_[% loo.frameworkcode %]" id="form_i_[% loo.frameworkcode %]" method="post" enctype="multipart/form-data" class="form_import">
+                    <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
+                    <input type="hidden" name="action" value="import" />
+                    <ul>
+                        <li class="li_close_import_export"><span class="import_export_close" title="Close popup">Close</span></li>
+                        <li><label for="file_import_[% loo.frameworkcode %]" title="Import from a spreadsheet, formats available: ods, xml (formatted from excel)">Spreadsheet file</label><input type="file" name="file_import_[% loo.frameworkcode %]" id="file_import_[% loo.frameworkcode %]" class="input_import" value="" autocomplete="off" /></li>
+                        <li><input type="submit" class="import_ok" value="Import" title="Import from a spreadsheet" /><div id="importing_[% loo.frameworkcode %]" style="display:none" class="importing"><img src="/intranet-tmpl/prog/img/loading.gif" /><span class="importing_msg"></span></div></li>
+                    </ul>
+                </form>
+            </div>
+            </div>
+        </td>
         </tr>
     [% END %]
 </table>
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 7d0e8f94f3..9c9ed0b38a 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -248,8 +248,8 @@ function verify_images() {
                           [% END %]
                         [% END %]</td>
                     [% END %]
-                    <td class="location">[% UNLESS ( itemloo.singlebranchmode ) %][% itemloo.branchname %] [% END %]<span class="shelvingloc">[% itemloo.location %]</span> </td>
-                    <td class="homebranch">[% itemloo.homebranch %]
+                    <td class="location">[% UNLESS ( itemloo.singlebranchmode ) %][% itemloo.branchname %] [% END %]</td>
+                    <td class="homebranch">[% itemloo.homebranch %]<span class="shelvingloc">[% itemloo.location %]</span> </td>
 		    [% IF ( itemloo.itemdata_ccode ) %]<td>[% itemloo.ccode %]</td>[% END %]
                     <td class="itemcallnumber">[% IF ( itemloo.itemcallnumber ) %] [% itemloo.itemcallnumber %][% END %]</td>
                     <td class="status">
@@ -378,7 +378,13 @@ function verify_images() {
 		</table>
                 [% END %]
 [% ELSE %]
-    <p>No physical items for this record</p>
+    [% IF ( ALTERNATEHOLDINGS ) %]
+    [% FOREACH ALTERNATEHOLDING IN ALTERNATEHOLDINGS %]
+        <div id="alternateholdings"><span class="holdings_label">Holdings:</span> [% ALTERNATEHOLDING.holding %]</div>
+    [% END %]
+    [% ELSE %]
+    <div id="noitems">No physical items for this record</div>
+    [% END %]
 [% END %]
     </div>
     
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
index fa989ceeaf..ad7be6ba17 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -430,7 +430,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                             </td>
                             <td>
                                 <p>[% SEARCH_RESULT.result_number %].
-                                [% biblionumber = SEARCH_RESULT.biblionumber %]
+				[% biblionumber = SEARCH_RESULT.biblionumber %]
                                 [% INCLUDE 'biblio-default-view.inc' %]
                                             <b>[% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title |html %][% ELSE %]No title[% END %]</b>
                                             </a>
@@ -464,12 +464,12 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                             &nbsp;
                                         [% END %]
                                         Description:
-                                        [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place %] [% END %]
-                                        [% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode %][% END %] [% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear %] [% ELSIF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate %][% END %]
-										[% IF ( SEARCH_RESULT.edition ) %]Edition: [% SEARCH_RESULT.edition %][% END %]
-                                        [% IF ( SEARCH_RESULT.pages ) %]: [% SEARCH_RESULT.pages %][% END %]
-                                        [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %] [% IF ( SEARCH_RESULT.normalized_isbn ) %]ISBN: [% SEARCH_RESULT.normalized_isbn %][% END %]
-                                        [% SEARCH_RESULT.description %]
+                                        <span class="results_imprint">[% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place %] [% END %]
+                                        [% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode %][% END %] [% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear %] [% ELSIF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate %][% END %]</span>
+										[% IF ( SEARCH_RESULT.edition ) %]<span class="results_edition">Edition: [% SEARCH_RESULT.edition %]</span>[% END %]
+                                        <span class="results_physicaldesc">[% IF ( SEARCH_RESULT.pages ) %]: [% SEARCH_RESULT.pages %][% END %]
+                                        [% IF ( SEARCH_RESULT.size ) %] ; [% SEARCH_RESULT.size %][% END %]</span> [% IF ( SEARCH_RESULT.normalized_isbn ) %]<span class="results_isbn">ISBN: [% SEARCH_RESULT.normalized_isbn %]</span>[% END %]
+                                        <span class="results_itemtype">[% SEARCH_RESULT.description %]</span>
                                         [% IF ( SEARCH_RESULT.timestamp ) %] <i>(modified on [% SEARCH_RESULT.timestamp %])</i>[% END %]
                                         [% IF ( SEARCH_RESULT.cn_class ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% SEARCH_RESULT.cn_class |url %]">[% SEARCH_RESULT.cn_class %]</a>][% END %]
                                     </p>
@@ -555,7 +555,16 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                                     [% END %]</ul>
                                     [% END %]
                                     [% ELSE %]
+                                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS ) %]
+                                    <strong id="altholdings_heading">Other holdings:</strong>
+                                    <ul>
+                                    [% FOREACH ALTERNATEHOLDING IN SEARCH_RESULT.ALTERNATEHOLDINGS %]
+                                    <li id="alternateholdings">[% ALTERNATEHOLDING.holding %]</li>
+                                    [% END %]
+                                    </li>
+                                    [% ELSE %]
                                     <span class="unavailable">No items</span>
+                                    [% END %]
                                     [% END %] <!-- /items count -->
                                     </div></td>
 
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 280bf04cef..c93212fbc4 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -24,9 +24,19 @@ if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path
 		dateFormat: 'uk',[% END %]
 		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
 		});
+		$("#relissuest").tablesorter({[% IF ( dateformat_metric ) %]
+		dateFormat: 'uk',[% END %]
+		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
+		});
+
+		//FIXME: Sorting does not work when there are previous checkouts only
+		// (It works fine when there are only checkouts of the day, or both previous and today checkouts)
 		$("#issuest").bind("sortEnd",function() {
         	$("#previous").parents("tr").remove();  // 'previous checkouts' header chokes table sorter
 	    });
+		$("#relissuest").bind("sortEnd",function() {
+		    $("#relprevious").parents("tr").remove();  // 'previous checkouts' header chokes table sorter
+		});
 		$("#holdst").tablesorter({[% IF ( dateformat_metric ) %]
 		dateFormat: 'uk',[% END %]
 			sortList: [[0,0]],
@@ -62,6 +72,25 @@ var allcheckboxes = $(".checkboxed");
 		$(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;
 	});
 
+    $("#relrenew_all").click(function(){
+        $(allcheckboxes).checkCheckboxes(":input[name*=items]");
+        $(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]");
+    });
+    $("#relCheckAllitems").click(function(){
+        $(allcheckboxes).checkCheckboxes(":input[name*=items]");
+        $(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;
+    });
+    $("#relCheckNoitems").click(function(){
+        $(allcheckboxes).unCheckCheckboxes(":input[name*=items]"); return false;
+    });
+    $("#relCheckAllreturns").click(function(){
+        $(allcheckboxes).checkCheckboxes(":input[name*=barcodes]");
+        $(allcheckboxes).unCheckCheckboxes(":input[name*=items]"); return false;
+    });
+    $("#relCheckNoreturns").click(function(){
+        $(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;
+    });
+
     [% IF ( CAN_user_circulate_override_renewals ) %]
     [% IF ( AllowRenewalLimitOverride ) %]
     $( '#override_limit' ).click( function () {
@@ -615,6 +644,9 @@ No patron matched <span class="ex">[% message %]</span>
     [% ELSE %]
             <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
     [% END %]</li>
+[% IF ( displayrelissues ) %]
+<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives Issues</a></li>
+[% END %]
 <li>[% IF ( countreserv ) %]
             <a href="/cgi-bin/koha/circ/circulation.pl#reserves">[% countreserv %] Hold(s)</a>
     [% ELSE %]
@@ -659,6 +691,7 @@ No patron matched <span class="ex">[% message %]</span>
         <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
         <td>[% UNLESS ( todayissue.noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
         <td>[% todayissue.checkoutdate %]</td>
+        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %]
         <td>[% todayissue.itemcallnumber %]</td>
             <td>[% todayissue.charge %]</td>
             <td>[% todayissue.replacementprice %]</td>
@@ -726,6 +759,7 @@ No patron matched <span class="ex">[% message %]</span>
             [% previssue.itemtype %]
         </td>
         <td>[% previssue.displaydate %]</td>
+        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.borrowername %]</td>[% END %]
         <td>[% previssue.itemcallnumber %]</td>
         <td>[% previssue.charge %]</td>
         <td>[% previssue.replacementprice %]</td>
@@ -787,11 +821,81 @@ No patron matched <span class="ex">[% message %]</span>
         <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
         </fieldset>
     [% END %]
-</form>
 [% ELSE %]
 <p>Patron has nothing checked out.</p>
 [% END %]
+
+</div>
+
+
+[% IF ( displayrelissues ) %]
+<div id="relissues">
+<h2>Relatives issues</h2>
+    <table id="relissuest">
+    <thead>
+    <tr>
+        <th scope="col">Due date</th>
+        <th scope="col">Title</th>
+        <th scope="col">Item Type</th>
+        <th scope="col">Branch</th>
+        <th scope="col">Checked out on</th> 
+        <th scope="col">Charge</th>
+	<th scope="col">Borrower</th>
+        <th scope="col">Material</th>
+    </tr>
+    </thead>
+[% IF ( relissues ) %]	<tbody>
+
+    [% FOREACH relissue IN relissues %]
+    [% IF ( loop.odd ) %]
+    <tr>
+    [% ELSE %]
+    <tr class="highlight">
+    [% END %]
+        [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
+            [% relissue.dd %]</td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
+        <td>[% UNLESS ( relissue.noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
+	<td>[% relissue.branchdisplay %]
+        [% IF ( relissue.itemcallnumber ) %]([% relissue.itemcallnumber %])[% END %]</td>
+        <td>[% relissue.displaydate %]</td>
+            <td>[% relissue.charge %]</td>
+            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.borrowername %]</a></td>
+            <td>[% relissue.materials %]</td>
+    </tr>
+    [% END %] <!-- /loop todayissues -->
+    <!-- /if todayissues -->[% END %]
+[% IF ( relprevissues ) %]
+<tr><th class="{sorter: false}" colspan="10"><a name="relprevious" id="relprevious"></a>Previous checkouts</th></tr>
+    [% FOREACH relprevissue IN relprevissues %]
+    [% IF ( loop.odd ) %]
+        <tr>
+    [% ELSE %]
+        <tr class="highlight">
+    [% END %]
+        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
+        [% relprevissue.dd %]
+        </td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
+        <td>
+            [% relprevissue.itemtype %]
+        </td>
+	<td>[% relprevissue.branchdisplay %]
+        [% IF ( relprevissue.itemcallnumber ) %]([% relprevissue.itemcallnumber %])[% END %]</td>
+        <td>[% relprevissue.displaydate %]</td>
+	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.borrowername %]</td>[% END %]
+        <td>[% relprevissue.charge %]</td>
+	<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.borrowername %]</a></td>
+        <td>[% relprevissue.materials %]</td>
+    </tr>
+    <!-- /loop previssues -->[% END %]
+<!--/if previssues -->[% END %]
+      </tbody>
+    </table>
+</form>
+
 </div>
+[% END %]<!-- end displayrelissues --> 
 
 
 <div id="reserves">
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt b/koha-tt/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
index a269b392d3..44e4e5b1fe 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
@@ -2,12 +2,14 @@
 <title>Koha -- Circulation: Transfers</title>
 [% INCLUDE 'doc-head-close-receipt.inc' %]
 <script language="javascript">
+function printandclose()
+{
 window.print();
 window.close();
+}
 </script>
 </head>
-<body onload="window.print();">
-<div id="main">
+<body onload="printandclose();"><div id="main">
 
 [% FOREACH reservedat IN reservedata %]
 
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tt/intranet-tmpl/prog/en/modules/circ/returns.tt
index 3c7e91dd37..c80a89f934 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -388,7 +388,7 @@ function Dopop(link) {
 [% IF ( riloop ) %]
     <h2>Checked-In items</h2>
     <table>
-	<tr><th>Due Date</th><th>Title</th>	<th>Author</th>	<th>Barcode</th><th>Type</th>	<th>Patron</th><th>Note</th></tr>
+	<tr><th>Due Date</th><th>Title</th>	<th>Author</th>	<th>Barcode</th><th>Call Number</th><th>Type</th>	<th>Patron</th><th>Note</th></tr>
 
         [% FOREACH riloo IN riloop %]
             <tr>
@@ -404,6 +404,7 @@ function Dopop(link) {
                     [% riloo.itemtitle |html %]</a></td>
 			<td>[% riloo.itemauthor %]</td>
             <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&amp;itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
+            <td>[% riloo.itemcallnumber %]</td>
             <td>[% riloo.itemtype %] [% riloo.ccode %]</td>
 			<td>[% IF ( riloo.duedate ) %]
                 <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.borrowernumber %]">
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
index 7a0a23ffd1..fd8e2bdec4 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
@@ -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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
index f8cf352864..6eae39d691 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
@@ -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-tt/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
index 75146b127d..fb938148cf 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
@@ -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-tt/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
index 7594cd165b..278cfed6c6 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
@@ -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-tt/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
index 4d9d368fdf..cf6b639c24 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
@@ -1,37 +1,142 @@
 [% INCLUDE '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</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>
+
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
index 7b94a5bd36..6da96c4e46 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
@@ -1,141 +1,149 @@
 [% INCLUDE '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>
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
index 09efcdcc59..c17c772b9c 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
@@ -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>[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
index 036acb74fb..26cd5c8a05 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
@@ -1,9 +1,37 @@
 [% INCLUDE '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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
index e19de60b3b..7cc9fe52ad 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
@@ -1,28 +1,19 @@
 [% INCLUDE '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>
+
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/branches.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/branches.tt
index 4a77a0e5f1..62d09e01c7 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/branches.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/branches.tt
@@ -1,59 +1,50 @@
 [% INCLUDE '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>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/categorie.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
index dbe2e051e7..97e3cbe469 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
@@ -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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
index 8e9d106ee9..54cd87898f 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
@@ -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>
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/cities.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/cities.tt
index f20709b4d1..fdb27ac02a 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/cities.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/cities.tt
@@ -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>	[% INCLUDE '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>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/classsources.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
index c1680aadc7..f7e8bbdefd 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
@@ -1,38 +1,56 @@
 [% INCLUDE '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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/currency.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/currency.tt
index afe8495fa3..b6d9d19279 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/currency.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/currency.tt
@@ -1,9 +1,11 @@
 [% INCLUDE '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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
index f0e25cab95..6c4a3b095b 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
@@ -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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
index 4d81bf8540..fd324a42e9 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
@@ -1,36 +1,22 @@
 [% INCLUDE '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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
index be9ab7746a..bb68cb664e 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
@@ -1,41 +1,60 @@
 [% INCLUDE '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>[% INCLUDE '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>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
index 4e2caa7fc6..deaced4b4a 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
@@ -1,15 +1,15 @@
 [% INCLUDE '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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
index 5250c7c794..d693eb8235 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
@@ -1,57 +1,140 @@
 [% INCLUDE '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</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>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
index fd0bd46a79..f4a250cb39 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
@@ -1,28 +1,24 @@
 [% INCLUDE '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>
+
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
index db8cb8197f..10d0a6d5b9 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
@@ -1,13 +1,49 @@
 [% INCLUDE '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>
 
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+<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' - The total number of 'points' a biblio must earn to be considered a 'match'</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' - The number of 'points' a match on this field is worth.  If the sum of each score is greater than the match threshold, the incoming record is a match to the existing record</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' - For use with control fields, 001-009</li>
+	<li>'Length' - For use with control fields, 001-009</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>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
index 542c141cd7..e304b69678 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
@@ -1,33 +1,59 @@
 [% INCLUDE '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>[% INCLUDE '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>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/preferences.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
index 691d5c7e76..09df1fe9e3 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
@@ -1,9 +1,19 @@
 [% INCLUDE '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>[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+	</ul>
+	
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
index 03be746558..9793051537 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
@@ -1,15 +1,13 @@
 [% INCLUDE '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>	[% INCLUDE '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>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
index 38c1164eab..3b4361279e 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
@@ -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>
 
-	[% INCLUDE 'help-bottom.inc' %]
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
index b63fa69593..7fa1807574 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
@@ -1,14 +1,15 @@
 [% INCLUDE '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>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
index 87ab3201d5..1d5d284948 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
@@ -1,15 +1,41 @@
 [% INCLUDE '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>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
index 7a4274841d..0b081f539a 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
@@ -1,7 +1,15 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Authorities Help</h1><h2>What is a MARC Authority Record?</h2>
+<h1>Authorities</h1>
 
-<p>A MARC Authority Record are used to ensure consitency across catalog records by providing a way to define the standard form of names for:</p><ul><li>People (Authors, Editors, Publishers, Illustrators etc)</li><li>Titles</li><li>Subjects</li><li>Organizations (Companies, Academic Instituites etc)</li></ul>For more information about Authority Records with MARC 21 see the tutorial on the <a href="http://www.loc.gov/marc/uma/index.html">Library of Congress website</a>
+<p>Authority records are a way of controlling fields in your MARC records. Using authority records will provide you with control over subject headings, personal names and places.</p>
+
+<h2>Searching Authorities</h2>
+
+<p>From the authorities page you can search for existing terms and the bibliographic records they are attached to.</p>
+
+<p>From the results you will see the authority record, how many bibliographic records it is attached to, and a delete link (if there are not bibliographic records attached).</p>
+
+<p>Clicking on the authority record summary will open the full record and the option to edit the record.</p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
index d1bc207d63..e52ac84dd6 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
@@ -1,62 +1,19 @@
-[% INCLUDE 'help-top.inc' %]   
-   <h1>Adding an Authority Record</h1>   
-   
-  <p> <span style="background-color: #ffe599">IMPORTANT: To add authority records in bulk, contact your system administrator and tell them that they can use this script:   
-   <span class="ex">misc/migration_tools/bulkauthimport.pl</span></span></p>
-	<ul>
-		<li>Click 'New Authority'</li>
-		<li>Choose the type of authority record you would like to add to your system
-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-Tip: To alter this list you need to make changes to your system parameters</span>
-			<ul>
-				<li>
-			    <em>Get there:</em>Home &gt; Administration			   
-			   &gt; MARC Authorities framework</li>
-			</ul></li>
-		</ul></li>
-		<li>Continue with cataloging your authorities</li>
-	</ul>
-   <h2>Altering Authorities Records</h2>
-	<ul>
-		<li>Search for the Authority</li>
-		<li>Click on the summary for the record you want to edit</li>
-		<li>Click 'Edit' at the top left</li>
-	</ul>   
-   <h2>Adding Authorities to a record</h2>
-   <p>There are three ways to add authorities to a record:</p>
-	<ul>
-		<li>query authority file when adding/editing a record (during cataloging)</li>
-		<li>enable Koha to auto-detect authority records when a record is saved</li>
-		<li>library maintains its own authority records based on the dataset</li>
-	</ul>
-	<p>Here are details on these options:</p>
-	<h3>Query authority file when adding/editing a record (during cataloging)</h3>
-	
-<p>The Bibliographic editor allows queries to the authority file at the add/edit stage of a record, so that cataloging staff can create the links between a bibliographic and authority record when they are cataloging.</p>
-<p>If you wish to provide access to authority records for a given subfield -- MARC 21's 700a subfield, for instance, to make sure an author's name is available in an added entry in its approved form -- you will need to create a subfield &quot;9&quot; for that tag (e.g. tag 700, subfield 9).&nbsp; This is done by adding the subfield via the 'Authority types' administration module.</p>
-	<ul>
-		<li><em>Get there:</em> More &gt; Administration &gt; Authority types
-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: Make sure this subfield is managed in the same tab as the other managed subfields for this tag, and then click the &quot;hidden&quot; checkbox so it will not be displayed with the rest of the record</span>.</li>
-		</ul></li>
-	</ul>
-<p>Koha uses subfield 9 to store the link between a bibliographic record and an authority record.</p>
-
-<p>When the catalogers are adding a record, they will see three dots (...) after the textbox of the 700a subfield (or any field you have chosen to add a subfield 9 to). Clicking on these dots will open a pop-up window allowing the cataloger to search your authority records for a standardized version of the author's name. If the desired name is found in your authority records, it can be automatically copied into the 700a subfield. (If the desired name is not found, the cataloger can enter the name manually.)</p>
-
-<h3>Auto-detection of authority records when a record is saved</h3>
-
-<p>Alternatively, the library can opt into the auto-detection of authority records when a record is saved.&nbsp; This is done by turning the 'BiblioAddsAuthorities' system preference on.</p>
-	<ul>
-		<li><em>Get there:</em> More &gt; Administration &gt; Global preferences &gt; Authorities &gt; BiblioAddsAuthorities</li>
-	</ul>
-
-<h3>Library-maintained authority records</h3>
-
-<p>A third option allows libraries to maintain their own authority records based on the dataset; many libraries prefer not to enable that option because it creates 'ghost' authority records in the system. It's up to the library (or group) which options to enable, or disable.</p>
+[% INCLUDE 'help-top.inc' %]
+
+<h2>Adding Authorities</h2>
+
+<p>To add a new authority record, choose the authority type from the 'New Authority' button.</p>
+
+<p>The form that appears will allow you to enter all of the necessary details regarding your authority record.</p>
+
+<p>To expand collapsed values simply click on the title and the subfields will appear.</p>
+
+<h2>Editing Authorities</h2>
+
+<p>Authorities can be edited by clicking on the authority summary from the search results and then clicking the 'Edit' button above the record.</p>
+
+<p>Once you've made the necessary edits, simply click 'Save' and all of the records that use this authority record will be updated.</p>
+
+<p>To delete an authority record you first must make sure it's not linked to any bibliographic records. If it is not used by any bibliographic records a 'Delete' link will appear to the right of the record on the search results and as a button that appears after clicking on the summary of the authority record.</p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
index 91053ab70d..b05e86a745 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
@@ -1,24 +1,24 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Circulation Transfers</h1>
+<h1>Transfers</h1>
 
-<p>   
-   This tool allows temporary reassignment of an item to another branch.</p>
-	<ul>
-		<li>	   
-	   Click 'Transfer' on the Circulation menu</li>
-		<li>	   
-	   Choose the library you want to transfer the book to from the pull down</li>
-		<li>	   
-	   Scan to type the barcode for the book you want to transfer into the barcode field
-		<ul>
-			<li>		   
-		   If you try to transfer and item the library it's already at you will be presented with a message to the right of the transfer form telling you that the item is already at the library</li>
-		</ul></li>
-		<li>	   
-	   You will be presented with a confirmation of transfer requests below the transfer form after hitting 'Submit'</li>
-		<li>	   
-	   When looking at the item record, the 'Home Library' will still remain, but the 'Current Location' has changed</li>
-	</ul>
+<p>If you work in a multi-branch system you can transfer items from one library to another by using the Transfer tool. To transfer an item</p>
+
+<ul>
+	<li>Click 'Transfer' on the Circulation page
+<ul>
+	<li>Enter the library you would like to transfer the item to</li>
+	<li>Scan or type the barcode on the item you would like to transfer</li>
+</ul>
+</li>
+	<li>Click 'Submit'</li>
+	<li>The item will now say that it is in transit</li>
+	<li>When the item arrives at the other branch the librarian must check the item in to acknowledge that it is no longer in transit</li>
+	<li>The item will not be permanently moved to the new library
+<ul>
+	<li>The item shows the same 'Home Library' but has updated the 'Current Location' to note where it resides at this time</li>
+</ul>
+</li>
+</ul>
 	
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
index 9f61749bc3..2bae339d19 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
@@ -1,18 +1,23 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Circulation Help</h1>
-<h2>What can I do in Circulation?</h2>
+<h1>Circulation</h1>
 
-<p>Circulation is where items are check out and in to patrons. Some libraries use different nomeclature for these functions.</p>
-<p>Koha uses the following terms:</p>
-<ul>
-<li><strong>Check Out </strong>= issue an item to a patron</li>
-<li><strong>Check In</strong> = return an item from a patron</li>
-<li><strong>Transfer</strong> = used to change the holding branch of an item</li>
-<li><strong>Holds</strong> = items that patrons have placed a request on (called &quot;reserves&quot; in some libraries - not to be confused with &quot;Course Reserves&quot; used in academimc libraries)</li>
-<li><strong>Fast Cataloging</strong> = used for quick cataloging of a small record done at the time of circulation</li>
-</ul><br />
+<p>Circulation functions can be accessed in several different ways. On the main page of the staff client there are some quick links in the center of the page to check items out, in or transfer them. For a complete listing of Circulation functions you can visit the Circulation page which is linked from the top left of every page or from the center of the main page.</p>
+
+<p>Before circulating your collection you will want to set your Global System Preferences, Basic Parameters and Patrons & Circulation Rules.</p>
+
+<p>While in Circulation you can jump between the tabs on the quick search box at the top of the screen by using the following hot keys:</p>
 
+<ul>
+	<li>jump to the catalog search with Alt+Q</li>
+	<li>jump to the checkout with Alt+U
+<ul>
+	<li>this will not work for Mac user</li>
+</ul>
+</li>
+	<li>jump to the checkin with Alt+R</li>
+</ul>
 
+<p style="background-color: #ffe599">Tip: Mac users use the OPTION button in place of ALT</p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/circulation.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
index 085af4404c..a818f86162 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
@@ -1,46 +1,94 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Check Out (Issues)</h1>
+<h1>Checking Out (Issuing)</h1>
 
-<p>To check an item out to a patron, first search for that patron using one of the many options.</p>
+<p>To begin the checkout process you must enter the patron barcode or part of their name. The checkout option appears in three main places:</p>
+
+<ul>
+	<li>Check out option on main staff client</li>
+	<li>Check out option on the patron record</li>
+	<li>Check out option on the quick search bar</li>
+</ul>
+
+<h2>Checking Items Out</h2>
+
+<p>To check an item out to a patron, first search for that patron using one of the many options listed above.</p>
 
 <p>At the top of the Check Out screen is a box for you to type or scan the item's barcode into.</p>
+
 <ul>
-<li style="color: #990000">IMPORTANT: Many modern barcode scanners will send a 'return' to the browser, making it so that the 'Check Out' button is automatically clicked</li>
+	<li>Many modern barcode scanners will send a 'return' to the browser, making it so that the 'Check Out' button is automatically clicked</li>
 </ul>
+
 <p>Below the box for the barcode there may be options for you to override the default due date for the item.</p>
+
+<ul>
+	<li>This option will only appear if you have set the SpecifyDueDate system preference to allow staff to override the due date</li>
+</ul>
+
+<p>At the bottom of the page there is a summary of the patron's current checked out items along with the due date, items checked out today will appear at the top.</p>
+
 <ul>
-<li>This option will only appear if you have set the SpecifyDueDate system preference to allow staff to override the due date</li>
+	<li>This screen will show whether an item is renewable and if not, why not.</li>
+	<li>To override the renewal limits you can set the AllowRenewalLimitOverride system preference to allow overrides and a checkbox will appear below the list of checkouts that reads 'Override Renewal Limit'</li>
+	<li>Checking that box will add checkboxes in the renew column above where before the item was not renewable.</li>
 </ul>
-<p>At the bottom of the page there is a summary of the patron's current checked out items along with the due date and the list of items the patron has on hold</p>
-<p>Once you have checked out all of the items for the patron you can print them a receipt by clicking the Print buton at the top of the screen and choosing 'Print Slip'</p>
+
+<p>Also at the bottom of the page is the list of items the patron has on hold</p>
+
+<p>Once you have checked out all of the items for the patron you can print them a receipt by clicking the Print button at the top of the screen and choosing 'Print Slip' or 'Quick Slip'.</p>
+
+<p>If you choose 'Print Slip' it will print all of the items the patron has checked out, including those they checked out at an earlier date. Choosing 'Quick Slip' will print only the items that were checked out today.</p>
+
 <p>If there are notes on the patron record these will appear to the right of the checkout box</p>
+
 <p>If the patron has a hold waiting at the library that too will appear to the right of the check out box making it easy for the circulation librarian to see that there is another item to give the patron</p>
 
-<h2>Check Out Warnings</h2>
+<h2>Check Out Messages</h2>
+
 <p>There are times when Koha will prevent the librarian from being able to check out items to a patron. When this happens a warning will appear notifying the librarian of why the patron cannot check items out.</p>
+
+<ul>
+	<li>Patron owes too much in fines
 <ul>
-<li>Patron owes too much in fines
-<ul><li>You can set the amount at which patron checkouts are blocked with the noissuescharge system preference</li></ul>
+	<li>You can set the amount at which patron checkouts are blocked with the noissuescharge system preference</li>
+</ul>
 </li>
-<li>Patron has been barred from the library
-<ul><li>This can be set by the librarian editing a patron record and adding a flag or by the Overdue/Notice Status Triggers</li></ul>
+	<li>Patron has been barred from the library
+<ul>
+	<li>This can be set by the librarian editing a patron record and adding a flag or by the Overdue/Notice Status Triggers</li>
+</ul>
 </li>
-<li>Patron needs to confirm their address
-<ul><li>This can be set by the librarian editing a patron record and adding a flag</li></ul>
+	<li>Patron needs to confirm their address
+<ul>
+	<li>This can be set by the librarian editing a patron record and adding a flag</li>
+</ul>
 </li>
-<li>Patron has lost their library card
-<ul><li>This can be set by the librarian editing a patron record and adding a flag</li></ul>
+	<li>Patrons has lost their library card
+<ul>
+	<li>This can be set by the librarian editing a patron record and adding a flag</li>
+</ul>
 </li>
 </ul>
 
-<h2>Circulation Messages</h2>
-<p>Circulation messages are short messages that librarians can leave for their patrons or their colleagues that will appear at the time of circulation.</p>
-<p>Circulation messages are set up as Authorized Values. To add or edit Circulation Messages you want to work with the BOR_NOTES value.</p>
-<p>To add a message, visit the patron's record.  When on the patron's check out tab you will see a link to 'Add a new message' to the right of the check out box.</p>
-<p>When you click 'Add a new message' you will be asked to choose if the message is for the librarians or the patron and the message you would like to leave.</p>
-<p>Circulation messages meant for the staff will appear on the patron's checkout screen.</p>
-<p>Circulation messages meant for the patron will appear when they log into the OPAC.</p>
+<h2>Check Out Warnings</h2>
+
+<p>Sometimes checkouts will trigger warning messages that will appear in a yellow box above the check out field. These warnings need to be acknowledged before you will be able to continue checking items out.</p>
 
+<ul>
+	<li>Patron has outstanding fines</li>
+	<li>Item on hold for someone else</li>
+	<li>Item should be on the hold shelf waiting for someone else</li>
+	<li>Item already checked out to this patron</li>
+	<li>Item checked out to another patron</li>
+	<li>Item not for loan</li>
+	<li>Patron has too many things checked out</li>
+	<li>Item cannot be renewed
+<ul>
+	<li>This can be overridden with the AllowRenewalLimitOverride system preference</li>
+</ul>
+</li>
+	<li>Barcode not found</li>
+</ul>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/overdue.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
index d45996f753..a65a2fb112 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
@@ -2,8 +2,13 @@
 
 <h1>Overdues</h1>
 
-<p>This page will show you all items that are overdue as of today.<br/><br/>This report offers a couple options for handing overdues:</p>
-		<ul>
-			<li>You can click the [email] link next to the patron's name to send an email notification about the overdue item</li>
-			<li>You can export this data as a CSV file by clicking 'Download file of all overdues'</li>
-		</ul>
+<p>This report will list all items that are overdue at your library.</p>
+
+<p>The report can be filtered using the menu options found on the left of the report.</p>
+
+<p style="color: #990000">Important: For libraries with a large patron base, this report may take a significant amount of time to run.</p>
+<ul>
+	<li style="background-color: #ffe599">Tip: Large libraries can choose to filter the report before it runs by setting the FilterBeforeOverdueReport system preference to 'Require'.</li>
+</ul>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
index e19bbb921c..09cc0e1f20 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
@@ -1,17 +1,26 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Pending Holds Help</h1>
+<h1>Holds to Pull</h1>
 
-<h2>What is a &quot;Pending Hold&quot;?</h2>
- 
-<p>A Pending Hold is a Hold that has been placed by a Patron that has not been &quot;Filled&quot;. Where Filled means that the item is now ready for the Patron to pick up.</p>
-<p>This report indicates all the items that have Holds on them that are currently held on the library shelves or stack.</p>
+<p>This report will show you all of the items that have holds on them that are available at the library for pulling.</p>
+
+<p>This report will be generated based on a few system preferences:</p>
+
+<ul>
+	<li>StaticHoldsQueueWeight
+<ul>
+	<li>Allows the library to specify a list of library location codes -- if used alone, it will rank the list statically, selecting the top-ranking available location to be added to the picklist.</li>
+</ul>
+</li>
+	<li>RandomizeHoldsQueueWeight
+<ul>
+	<li>If 'RandomizeHoldsQueueWeight' and 'StaticHoldsQueueWeight' are set, the list of library codes in the 'StaticHoldsQueueWeight' system preference are randomized rather than statically ranked. If RandomizeHoldsQueueWeight alone is set, the list of all available library codes is used to randomize the weight.</li>
+</ul>
+</li>
+</ul>
+
+<p>If neither 'RandomizeHoldsQueueWeight' or 'StaticHoldsQueueWeight' is set, the holds queue is statically ranked according to how they are pulled out of the system database.</p>
+
+<p>You can limit the results you see by using the Refine box on the left side of the page</p>
 
-<h2>How does an Hold come off this list?</h2>
-<p>Locate the Item on the shelf and then in Circulation, scan or enter the barcode of the item to Check In the item. The item has now been &quot;seen&quot; by Koha and the status has changed. The item will now appear on the &quot;Holds Awaiting Pickup&quot; report.</p>
-<p style="background-color: #ffe599">   TIP: This report is only applicable if the ReserveNeedReturn system preference is on.</p>
-	<ul>
-		<li><em>Get there:</em> More &gt; Administration &gt; General Preferences &gt; Circulation</li>
-	</ul>
-	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
index 93e282b552..12edd81838 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Hold ratios</h1>
+<h1>Hold Ratios</h1>
 
-<p>This will show you the number of items you have to order for your library to meet your library's hold per item ratio. By default it will be set to the library needing 3 items per hold that has been placed. The report will tell you how many additional items need to be purchased to meet this quota.</p>
+<p>Hold ratios help with collection development. Using this report you will be able to see how many of your patrons have holds on items and whether you should buy more. By default it will be set to the library needing 3 items per hold that has been placed. The report will tell you how many additional items need to be purchased to meet this quota.</p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/returns.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/returns.tt
index 57ea934399..bc9b2392ce 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/returns.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/returns.tt
@@ -1,31 +1,56 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Circulation Check In (Returns)</h1>
+<h1>Checking in (Returning)</h1>
+
+<p>Checking in items can be performed from various different locations</p>
+
+<ul>
+	<li>The check in link on main staff client&nbsp;</li>
+	<li>The check in option on the quick search bar on the Circulation page&nbsp;</li>
+	<li>The check in link on the patron's checkout summary (and on the checkout summary page)</li>
+</ul>
+
+<h2>Checking Items In</h2>
 
 <p>To check an item in scan the barcode for the item into the box provided. A summary of all items checked in will appear below the checkin box</p>
+
 <p>If you are checking items in that were put in the dropbox while the library was closed you can check the 'Dropbox mode' box before scanning items. This will effectively roll back the returned date to the last date the library was open.</p>
+
 <ul>
-<li>This requires that you have your closings added to the Holidays & Calendar Tool</li>
+	<li>This requires that you have your closings added to the Holidays &amp; Calendar Tool</li>
 </ul>
+
 <p>You can also choose to forgive all overdue charges for items you are checking in by checking the 'Forgive overdue charges' box before scanning items.</p>
 
-<h2>Check In Warnings</h2>
+<h2>Check In Messages</h2>
+
 <p>There are several messages that can appear when checking items in:</p>
+
+<ul>
+	<li>If you are checking an item in at a library other than the home branch, a message will appear asking you to transfer the book to the home library
+<ul>
+	<li>After this item is checked in the status of the item will be changed in the catalog to 'in transit'&nbsp;</li>
+	<li>To mark an item as back at the home branch, check the item in at the home branch
 <ul>
-<li>If you are checking an item in at a library other than the home branch, a message will appear asking you to transfer the book to the home library
-<ul><li>After this item is checked in the status of the item will be changed in the catalog to 'in transit'</li>
-<li>To mark an item as back at the home branch, check the item in at the home branch
-<ul><li>A message will appear tell you that the item is not checked out, but the status will now say available in the catalog. This step is necessary to mark items as receieved by the home branch.</li></ul></li>
-</li></ul>
-<li>If you're checking an item in that has a hold on it, you will be prompted to confirm the hold</li>
-<ul><li>Clicking the Confirm hold button will mark the item as waiting for pickup from the library</li>
-<li>Clicking the Print Slip and Confirm button will mark the item as waiting for pickup at the library and present the library with a receipt to print and place on the book with the patron's information</li>
-<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li></ul>
+	<li>A message will appear tell you that the item is not checked out, but the status will now say available in the catalog. This step is necessary to mark items as received by the home branch.</li>
+</ul>
 </li>
-<li>If you're checking in an item that has a hold on it at another branch you will be prompted to confirm and transfer the item
-<ul><li>Clicking the Confirm hold and Transfer button will mark the item as in transit to the library where the hold was placed</li>
-<li>Clicking the Print Slip, Transfer and Confirm button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information</li>
-<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li></ul></li></ul>
-
+</ul>
+</li>
+	<li>If you're checking an item in that has a hold on it, you will be prompted to confirm the hold
+<ul>
+	<li>Clicking the Confirm hold button will mark the item as waiting for pickup from the library&nbsp;</li>
+	<li>Clicking the Print Slip and Confirm button will mark the item as waiting for pickup at the library and present the library with a receipt to print and place on the book with the patron's information</li>
+	<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
+</ul>
+</li>
+	<li>If you're checking in an item that has a hold on it at another branch you will be prompted to confirm and transfer the item
+<ul>
+	<li>Clicking the Confirm hold and Transfer button will mark the item as in transit to the library where the hold was placed&nbsp;</li>
+	<li>Clicking the Print Slip, Transfer and Confirm button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information</li>
+	<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
+</ul>
+</li>
+</ul>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
index 6112134223..d84793bede 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
@@ -1,14 +1,11 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Transfers To Receive Help</h1>
-
-<p>This report depends on the system preference 'TransfersMaxDaysWarning'. If items are not transferred by the number of days defined in this preference a warning will be issued via the 'check this transfer' link.</p>
-	<ul>
-		<li><em>Get there:</em> More &gt; Administration &gt; General Preferences &gt; Circulation &gt; TransfersMaxDaysWarning</li>
-	</ul>
-	
-<h2>What is a Transfer To Receive?</h2>
-<p>This report shows all the items from other libraries/branches that are in transit to your branch. The status of all these items is marked as &quot;In Transit&quot;</p>
-
-<h2>How do I process a Transfer To Receive?</h2>
-<p>Once the item has physically arrived in your branch, click &quot;Receive Item&quot;. This will change the status of the item from &quot;In Transit&quot; to &quot;Waiting&quot;. The item will now show on the &quot;Holds Awaiting Pick Up&quot; report.</p>
+<h1>Transfers To Receive</h1>
+
+<p>This report will list all of the items that Koha thinks are in transit to your library.</p>
+
+<p>If your transfers are late in arriving at your library you will see a message stating how late your items are.</p>
+
+<p style="color: #990000">Important: An item is considered late based on the number of days you have entered in the TransfersMaxDaysWarning system preference.</p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
index 9755529157..ee59ef9a5e 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
@@ -2,17 +2,6 @@
 
 <h1>Holds Queue</h1>
 
-<p>This report lists the next hold waiting (one per biblio) depending on how system preferences are set</p>
-		<ul>
-			<li>StaticHoldsQueueWeight<br/>Allows the library to specify a list of library location codes -- if used alone, it will rank the list statically, selecting the top-ranking available location to be added to the picklist.</li>
-			<li>RandomizeHoldsQueueWeight<br/>If 'RandomizeHoldsQueueWeight' and 'StaticHoldsQueueWeight' are set, the list of library codes in the 'StaticHoldsQueueWeight' system preference are randomized rather than statically ranked. If RandomizeHoldsQueueWeight alone is set, the list of all available library codes is used to randomize the weight.</li>
-		</ul><br/>If neither 'RandomizeHoldsQueueWeight' or 'StaticHoldsQueueWeight' is set, the holds queue is statically ranked according to how they are pulled out of the system database.<br/>
-		<ul>
-			<li><em>Get there: </em>More &gt; Administration &gt; General Preferences &gt; Circulation</li>
-		</ul>
-<p><strong>For optimum display and ease of picking items for holds</strong>, a superlibrarian will want to configure Keyword to
-MARC Mappings linking the keyword "subtitle" to 245$b, 245$p, 245$n, and 245$h.</p> 
-		<ul>
-			<li><em>Get there: </em>More &gt; Administration &gt; Keyword to MARC mapping, and add entries for those four fields.</li>
-		</ul>
-[% INCLUDE 'help-bottom.inc' %]
+<p>This report will show you all of the holds at your library. To generate this report, you must have the Build Holds Queue cron job running.</p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
index 98647c2be6..d80497e027 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
@@ -1,5 +1,7 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Holds awaiting pickup</h1>
+<h1>Holds Awaiting Pickup</h1>
 
-<p>List the holds that are ready &amp; await for the patron to take them at the library</p>
\ No newline at end of file
+<p>This report will show all of the holds that are waiting for patrons to pick them up.</p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/export/marc.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/export/marc.tt
index 5f0150ebbf..87da107aae 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/export/marc.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/export/marc.tt
@@ -2,10 +2,36 @@
 
 <h1>MARC Export</h1>
 
-<p>This is a tool to export your bibliographic records in standard MARC communications format (ISO 2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
+<p>Koha comes with a tool that will allow you to export your bibliographic and/or holdings data in bulk. This can be used to send your records to fellow libraries, organizations or services; or simply for backup purposes.</p>
 
-<p>You are asked to provide a starting bibliographic record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
-
-<p>Records are downloaded to the workstation that requests the export and are saved in a file called "marc.pl."</p>
+<ul>
+	<li>Fill in the form in order to limit your export to a specific range (all fields are optional)
+<ul>
+	<li>Choose to limit your export by any one or more of the following options
+<ul>
+	<li>Limit to a bib number range</li>
+	<li>Limit to a specific item type</li>
+	<li>Limit to a specific library</li>
+	<li>Limit to a call number range</li>
+	<li>Limit to an acquisition date range</li>
+</ul>
+</li>
+	<li>Next choose what to skip when exporting
+<ul>
+	<li>By default items will be exported, if you would like to only export bibliographic data, check the 'Don't export items' box</li>
+	<li>To limit your export only to items from the library you're logged in as (if you leave the 'Library' field set to 'All') or to the library you selected above check the 'Remove non-local items' box</li>
+	<li>You can also choose what fields you don't want to export. This can be handy if you're sharing your data, you can remove all local fields before sending your data to another library</li>
+</ul>
+</li>
+	<li>Finally choose the file type and file name
+<ul>
+	<li>Choose to export your data in marc or marcxml format</li>
+	<li>Choose the name you want your file to save as</li>
+</ul>
+</li>
+	<li>Click 'Export'</li>
+</ul>
+</li>
+</ul>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
index 5e5c6bd1fe..44d7fd5b42 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
@@ -1,23 +1,15 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Label Layouts</h1>
+<h1>Layouts</h1>
 
-<h3>Bibliographic Data to Print</h3>
-<p>This section determines what data will appear on the labels(s).  Choose one of the following two methods of entry:</p>
-<ul>
-<li>Choose Order of Text Fields to Print</li>
-  Any of the data fields listed may be included in the label by selecting a numeric value from the dropdown selections.  These values determine the order in which the data will print (one data field per line).
-<li>List Fields</li>
-  <dl>Enter a comma-separated list of fields to include on the label.  You may select :
-    <dt>any 'koha field'</dt>
-    <dd>These include any of the data fields that may be mapped to your MARC frameworks.  See <em>Home › Administration › MARC Links</em>  for valid kohafields. </dd>
-    <dt>MARC fields</dt>
-    <dd>Specify MARC subfields as a 4-character tag-subfield string, e.g. 254a </dd>
-    <dt>Concatenation of koha & MARC fields<dt>
-    <dd>Enclose a whitespace-separated list of fields to concatenate on one line in double quotes.  e.g. "099a 099b" or "itemcallnumber copynumber"</dd>
-    <dt>Static text strings</dt>
-    <dd>May be entered in single-quotes, e.g. 'My Short-Name_of_Library'</dd>
-  </dl>
-</ul>
+<p>A layout is used to define the fields you want to appear on your labels.</p>
 
-[% INCLUDE 'help-bottom.inc' %]
+<h2>Add a Layout</h2>
+
+<p>To add a new layout, you want to click on the 'Layouts' button at the top of your page and choose 'New Layout'</p>
+
+<p>Using the form that appears you can create a profile to fix any problems with your template.</p>
+
+<p>After saving, your layouts will appear on the 'Manage Layouts' page.</p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
index 23e2835f13..ddf4d8167a 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
@@ -1,49 +1,33 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Label Profiles</h1>
-
-<h2>What is a &quot;Printer Profile&quot;?</h2>
-
-<p>A printer profile is where you setup adjustments for label offset and creep (also known as printer calibration).</p>
-<p>Depending upon the printer you use and even the tray within the printer you use, the text on labels may be offset so that it does not appear correctly on the labels.
-Even once the offset (usually measured from the upper left-hand corner) is correct, the text may appear to "creep" -print correctly on some labels, but slowly move off of other labels.
-A printer profile will allow you to provide a per printer per tray per label template correction for these symptoms.</p>
-
-<h2>How do I setup a Printer Profile?</h2>
-
-<h3>Creating a Printer Profile</h3>
-<p>
-<ol>
-<li>First note: You can only create Printer Profiles for existing label templates.</li>
-<li>Provide a printername and a tray name for your Profile. Note: You can only have a single instance of printername-trayname per label template.</li>
-<li>Then select a label template from the pull-down list of templates.</li>
-<li>Next set the horizontal and vertical offset. Be sure to use numbers which correspond to the units you specify at the bottom of the form. Negative values are permitted.</li>
-<li>Last set the horizontal and vertical creep. Be sure to use numbers which correspond to the units you specify at the bottom of the form. Negative values are permitted.</li>
-<li>Click on the 'Save' button at the bottom of the form to save your new profile.</li>
-</ol>
-</p>
-
-<h3>Applying a Printer Profile</h3>
-<p>
-<ol>
-<li>After creating a Printer Profile, it must be applied to a particular label template. Note: You can only apply one Printer Profile to a given label template at a time.</li>
-<li>Edit the label template you want to apply a profile to.</li>
-<li>On the edit form and in the left-hand column, you will see a "Printer Profile:" field.</li>
-<li>If one or more Printer Profiles are defined for this label template, you will see a pull-down control allowing you to select from a list of available Printer Profiles for that label template.</li>
-<li>Select the profile you want to be applied to the label template at this time. Remember: Only one Printer Profile can be applied at any given time.</li>
-<li>If the "Printer Profile:" field reads "None Defined" this indicates that you will need to create at least one Printer Profile for this label template in order to apply a Printer Profile to this label template.</li>
-</ol>
-</p>
-
-<h3>Tips to Remember When Adjusting a Printer Profile</h3>
-<p>
-<ol>
-<li><b>All</b> of these factor in to image position and creep. Keep this in mind when making adjustments.</li>
-<li>Adjust margins until both top and left margins are correct.</li>
-<li>Then adjust the label height and width to correct label creep across and down page.</li>
-<li>Negative offset units cause overall image movement up and to the left. Positive offset units cause overall image movement down and to the right.</li>
-<li>Negative creep units cause shrinkage of the overall image. Positive creep units cause enlarging of the overall image.</li>
-</ol>
-</p>
-
-[% INCLUDE 'help-bottom.inc' %]
+<h1>Profiles</h1>
+
+<p>A profile is a set of "adjustments" applied to a given template just prior to printing which compensates for anomalies unique and peculiar to a given printer (to which the profile is assigned). This means if you set a template up and then print a sample set of data and find that the items are not all aligned the same on each label, you need to set up a profile for each printer to make up for the differences in printing styles, such as the shifting of text to the left, right, top or bottom.</p>
+
+<p>If your labels are printing just the way you want, you will not need a profile.</p>
+
+<h2>Add a Profile</h2>
+
+<p>To add a new profile, you want to click on the 'Profiles' button at the top of your page and choose 'New Profile'</p>
+
+<p>Using the form that appears you can create a profile to fix any problems with your template.</p>
+
+<ul>
+	<li>The Printer Name and Paper Bin do not have to match your printer exactly, they are for your reference so you can remember what printer you have set the profile for. So if you want to use the Printer model number in printer name or you can call it 'the printer on my desk'</li>
+	<li>Template will be filled in once you have chosen which template to apply the profile to on the template edit form</li>
+	<li>The Units pull down is used to define what measurement scale you're going to be using for your profile.&nbsp;</li>
+	<li>Offset describes what happens when the entire image is off center either vertically or horizontally and creep describes a condition where the distance between the labels changes across the page or up and down the page
+<ul>
+	<li>For these values, negative numbers move the error up and to the left and positive numbers move the error down and to the right</li>
+	<li>Example: the text is .25" from the left edge of the first label, .28" from the left edge of the second label and .31" from the left edge of the third label. This means the horizontal creep should be set to .03" to make up for this difference.</li>
+</ul>
+</li>
+</ul>
+
+<p>After saving, your profiles will appear on the 'Manage Profiles' page.</p>
+
+<p>Once you have saved your new profile, you can return to the list of templates and choose to edit the template that this profile is for.</p>
+
+
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-home.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
index 310b1f4fba..ad7407ee41 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
@@ -1,19 +1,44 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Label Printing</h1>
+<h1>Label Creator</h1>
 
-<h2>How do I print Labels using this feature?</h2>
+<p>The Label Creator allow you to use layouts and templates which you design to print a nearly unlimited variety of labels including barcodes. Here are some of the features of the Label Creator module:</p>
 
-<p>The sequence of steps is:</p><ol><li>Define a Layout</li><li>Define a Layout Template</li><li>Merge a Layout and Layout Template via the Label Batch&nbsp;</li></ol><h2>What is a &quot;Layout&quot;?</h2>
+<ul>
+	<li>Customize label layouts</li>
+	<li>Design custom label templates for printed labels</li>
+	<li>Build and manage batches of labels</li>
+	<li>Export single or multiple batches</li>
+	<li>Export single or multiple labels from within a batch</li>
+	<li>Export label data in one of three formats:
+<ul>
+	<li>PDF - Readable by any standard PDF reader, making labels printable directly on a printer&nbsp;</li>
+	<li>CSV - Export label data after your chosen layout is applied allowing labels to be imported in to a variety of applications</li>
+	<li>XML - Included as an alternate export format</li>
+</ul>
+</li>
+</ul>
 
-<p>A layout is where you define what will print on the label. For example for a spine label you may choose the Classification Number. </p>
+<p>At the top of each screen within the Label Creator, you will see a toolbar allowing quick access to relevant functions. The menu to the left of each screen also allows easy access to the different sections of the Label Creator. The breadcrumb trail near the top of each screen will give specific indication as to where you are within the Label Creator module and allow quick navigation to previously traversed sections. And finally, you can find more detailed information on each section of the Label Creator by clicking the online help link at the upper left-hand corner of every page.</p>
 
-<h2>What is a &quot;Layout Template&quot;?</h2>
+<p>The developers of the Label Creator module hope you will find this an extremely useful tool in the course of your cataloging work. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.</p>
 
-<p>A layout template is the dimensions of the sheet you are using. You will need to either acquire the dimensions from the label supplier, or measure them accurately.</p><p>Layout Templates will need to be defined for each type of Label sheet or page you wish to print to.  </p>
+<h2>Templates</h2>
 
-<h2>What is a &quot;Label Batch&quot;?</h2>
+<p>A template is based on the label/card stock you are using. This might be Avery 5160 for address labels, Gaylord 47-284 for spine labels or Avery 28371 for your patron cards, just to give a couple of examples. These labels will include all of the information you will need for setting up a Koha, this information may be on the packaging, and if not it can usually be found on the vendor's website.</p>
 
-<p>A label batch is where you take your Layout, Layout Template and merge with the items you wish to create the labels for.</p><p>Once the merge has been completed,  a PDF will be generated that can be used to print the labels.</p> 
+<h2>Profiles</h2>
+
+<p>A profile is a set of "adjustments" applied to a given template just prior to printing which compensates for anomalies unique and peculiar to a given printer (to which the profile is assigned). This means if you set a template up and then print a sample set of data and find that the items are not all aligned the same on each label, you need to set up a profile for each printer to make up for the differences in printing styles, such as the shifting of text to the left, right, top or bottom.</p>
+
+<p>If your labels are printing just the way you want, you will not need a profile.</p>
+
+<h2>Layouts</h2>
+
+<p>A layout is used to define the fields you want to appear on your labels.</p>
+
+<h2>Batches</h2>
+
+<p>Batches are made up of the barcodes you would like to print. Once in this tool you can search for the item records you would like to print out labels for.</p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
index b3f85ece09..5449f67f8b 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
@@ -2,10 +2,13 @@
 
 <h1>Quick Spine Label Creator</h1>
 
-<p>This tool allows you to enter a barcode to generate a printable spine label</p>
+<p style="background-color: #ffe599">Tip: This tool does not use the label layouts or templates, it simply prints a spine label in the first spot on the label sheet.</p>
+
+<ul>
+	<li>Define the fields you want to print on the spine label in the SpineLabelFormat system preference</li>
+	<li>Format your label printing by editing spinelabel.css found in koha-tmpl/intranet-tmpl/prog/en/css/</li>
+</ul>
 
 <p>To use this tool you simply need the barcode for the book you'd like to print the spine label for.</p>
 
-<ul><li>Define the fields you want to print on the spine label in the SpineLabelFormat system preference</li>
-<ul><li>Get there: More > Administration > Global System Preferences > Cataloging > SpineLabelFormat</li></ul>
-<li>Format your label printing by editing spinelabel.css found in koha-tmpl/intranet-tmpl/prog/en/css/</li></ul> 	[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
index c2f1e6b0a9..d16d0cce59 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
@@ -1,42 +1,13 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Offline Circ File Uploader</h1>
+<h1>Offline Circulation File (.koc) Uploader</h1>
 
+<p>The offline circulation tool for Windows will generate a KOC file that you can upload into Koha once your system comes back up.</p>
 
-<p>
-The Offline Circulation tool can be used should your library lose Internet access.&nbsp; Learn more about the tool here: <a href="http://kylehall.info/index.php/projects/koha-tools/koha-offline-circulation/">http://kylehall.info/index.php/projects/koha-tools/koha-offline-circulation/</a> 
-</p>
-<p>
-Once you regain access to your Koha database you can upload the data you collected in the Offline tool.
-</p>
-<ol>
-	<li>Go to Circulation</li>
-	<li>Click on the &ldquo;Offline Circulation File (.koc) Uploader&quot; option. </li>
-	<li>
-	In the pop up window, specify the file you wish to upload and click the &ldquo;Upload file&rdquo; button. <br />
-	</div>
-	</li>
-	<li>
-	When the upload process is complete that status bar will say 100%<br />
-	</li>
-	<li>
-	Click the &ldquo;Process offline circulation file&rdquo; button to process the data. 
-	<ul>
-		<li style="color: #990000">IMPORTANT: If any of the barcodes are invalid there will be an empty set of parentheses.</span>
-		</li>
-	</ul>
-	</li>
-</ol>
-<h2>Questions</h2>
-<h3><strong>Why do I want to keep a copy of my offline circ file?</strong></h3>
-<p>
-Once
-a file has been uploaded the data remains in the file. The library may
-want to keep a copy of the file in another directory, or change the
-file extension frm .koc to .txt.&nbsp; The utility only looks at files with
-a .koc extenison. If this isn't done, staff may accidentally add new
-data to an old file.
-</p>
+<p>Browse your computer for the *.koc file</p>
 
+<p>Once the file is uploaded, click the process the file</p>
+
+<p>When this is complete you'll see the summary of actions from when you were offline (including any errors).</p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
index 7a07c9cb94..40993caedc 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
@@ -4,25 +4,31 @@
 
 <p>A layout defines the text and images that will be printed on to the card and where it will appear.</p>
 
-<h3>Add a Layout</h3>
+<h2>Add a Layout</h2>
 
 <p>To add a new layout, you want to click on the 'Layouts' button at the top of your page and choose 'New Layout'</p>
 
 <p>Using the form that appears you can create a profile to fix any problems with your template.</p>
 
 <ul>
-<li>The name you assign to the layout is for your benefit, name it something that will be easy to identify at a later date</li>
-<li>The Units pull down is used to define what measurement scale you're going to be using for your layout.</li>
-<li>Next note if this layout is for the front or the back of the patron card</li>
-<ul><li>You will need a layout for both the front and back of your card if you have 2-sided library cards</li></ul>
-<li>You have the option of adding up to 3 lines of text to your card. Your text can be static text of your choosing and/or fields from the patron record. If you want to print fields from the patron record you want to put the field names in brackets like so - &lt;firstname&gt;</li>
-<li>For each line of text, you can choose your font, font size and the location of the text on the card using the lower X and Y coordinates</li>
-<li>In order to show the barcode and the patron card number you will need to check the 'Print Card Number as Barcode' option. This will turn the patron card number into a barcode. If you want the number to print in human readable format you will need to check the 'Print Card Number as Text Under Barcode' option.</li>
-<li>Finally you can choose up to two images to print on the card.</li>
-<ul><li>One can be the patron image which you can resize to meet your needs.</li>
-<li>The other image can be something like a library logo or symbol that you uploaded using the 'Manage Images' module of the Patron Card Creator Tool.</li></ul></ul>
+	<li>The name you assign to the layout is for your benefit, name it something that will be easy to identify at a later date</li>
+	<li>The Units pull down is used to define what measurement scale you're going to be using for your layout.&nbsp;</li>
+	<li>Next note if this layout is for the front or the back of the patron card
+<ul>
+	<li>You will need a layout for both the front and back of your card if you have 2-sided library cards</li>
+</ul>
+</li>
+	<li>You have the option of adding up to 3 lines of text to your card. Your text can be static text of your choosing and/or fields from the patron record. If you want to print fields from the patron record you want to put the field names in brackets like so - &lt;firstname&gt;</li>
+	<li>For each line of text, you can choose your font, font size and the location of the text on the card using the lower X and Y coordinates</li>
+	<li>In order to show the barcode and the patron card number you will need to check the 'Print Card Number as Barcode' option. This will turn the patron card number into a barcode. If you want the number to print in human readable format you will need to check the 'Print Card Number as Text Under Barcode' option.</li>
+	<li>Finally you can choose up to two images to print on the card.
+<ul>
+	<li>One can be the patron image which you can resize to meet your needs.</li>
+	<li>The other image can be something like a library logo or symbol that you uploaded using the 'Manage Images' module of the Patron Card Creator Tool.</li>
+</ul>
+</li>
+</ul>
 
 <p>After saving, your layouts will appear on the 'Manage Layouts' page.</p>
 
-
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
index 4962e94c50..933b755762 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
@@ -2,23 +2,27 @@
 
 <h1>Profiles</h1>
 
-<p>A profile is a set of “adjustments” applied to a given template  just prior to printing which compensates for anomalies unique and peculiar to a given printer (to which the profile is assigned). This means if you set a template up and then print a sample set of data and find that the items are not all aligned the same on each label, you need to set up a profile for each printer to make up for the differences in printing styles, such as the shifting of text to the left, right, top or bottom.</p>
+<p>A profile is a set of "adjustments" applied to a given template just prior to printing which compensates for anomalies unique and peculiar to a given printer (to which the profile is assigned). This means if you set a template up and then print a sample set of data and find that the items are not all aligned the same on each card, you need to set up a profile for each printer to make up for the differences in printing styles, such as the shifting of text to the left, right, top or bottom.</p>
 
 <p>If your cards are printing just the way you want, you will not need a profile.</p>
 
-<h3>Add a Profile</h3>
+<h2>Add a Profile</h2>
 
 <p>To add a new profile, you want to click on the 'Profiles' button at the top of your page and choose 'New Profile'</p>
 
 <p>Using the form that appears you can create a profile to fix any problems with your template.</p>
 
 <ul>
-<li>The Printer Name and Paper Bin do not have to match your printer exactly, they are for your reference so you can remember what printer you have set the profile for. So if you want to use the Printer model number in printer name or you can call it 'the printer on my desk'</li>
-<li>Template will be filled in once you have chosen which template to apply the profile to on the template edit form</li>
-<li>The Units pull down is used to define what measurement scale you're going to be using for your profile.</li>
-<li>Offset describes what happens when the entire image is off center either vertically or horzontally and creep describes a condition where the distance between the labels changes across the page or up and down the page</li>
-<ul><li>For these values, negative numbers move the error up and to the left and positive numbers move the error down and to the right</li>
-<li>Example: the text is .25” from the left edge of the first label, .28” from the left edge of the second label and .31” from the left edge of the third label. This means the horizontal creep should be set to .03" to make up for this difference.</li></ul></ul>
+	<li>The Printer Name and Paper Bin do not have to match your printer exactly, they are for your reference so you can remember what printer you have set the profile for. So if you want to use the Printer model number in printer name or you can call it 'the printer on my desk'</li>
+	<li>Template will be filled in once you have chosen which template to apply the profile to on the template edit form</li>
+	<li>The Units pull down is used to define what measurement scale you're going to be using for your profile.</li>
+	<li>Offset describes what happens when the entire image is off center either vertically or horizontally and creep describes a condition where the distance between the labels changes across the page or up and down the page
+<ul>
+	<li>For these values, negative numbers move the error up and to the left and positive numbers move the error down and to the right</li>
+	<li>Example: the text is .25" from the left edge of the first label, .28" from the left edge of the second label and .31" from the left edge of the third label. This means the horizontal creep should be set to .03" to make up for this difference.</li>
+</ul>
+</li>
+</ul>
 
 <p>After saving, your profiles will appear on the 'Manage Profiles' page.</p>
 
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
index dbead11f5e..0ef025e16e 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
@@ -4,22 +4,25 @@
 
 <p>A template is the label/card stock you are using. This might be Avery 5160 for address labels, Gaylord 47-284 for spine labels or Avery 28371 for your patron cards, just to give a couple of examples. These labels will include all of the information you will need for setting up a Koha, this information may be on the packaging, and if not it can usually be found on the vendor's website.</p>
 
-<h3>Add a Template</h3>
+<h2>Add a Template</h2>
 
 <p>To add a new template, you want to click on the 'Templates' button at the top of your page and choose 'New Template'</p>
+
 <p>Using the form that appears you can define the template for your sheet of labels or cards.</p>
 
 <ul>
-<li>Template ID will be automatically generated after saving your template, this is simply a system generated unique id</li>
-<li>Template Code should be something you can use to identify your template on a list of templates</li>
-<li>You can use the Template Description to add additional information about the template</li>
-<li>The Units pull down is used to define what measurement scale you're going to be using for the template. This should probably match the unit of measurement used on the template description provided by the product vendor.</li>
-<li>The measurements can be found on the vendor product packaging or website.</li>
-<li>A profile is a set of “adjustments” applied to a given template just prior to printing which compensates for anomalies unique and peculiar to a given printer (to which the profile is assigned).
-<ul><li>Before picking a profile try printing some sample cards so that you can easily define a profile that is right for your printer/template combination.</li>
-<li>After finding any anomalies in the printed document, create a profile and assign it to the template.</li></ul></li></ul>
-
-<p>After saving, your templates will appear on the 'Manage Templates' page.</p>
-
-[% INCLUDE 'help-bottom.inc' %]
-
+	<li>Template ID will be automatically generated after saving your template, this is simply a system generated unique id</li>
+	<li>Template Code should be something you can use to identify your template on a list of templates</li>
+	<li>You can use the Template Description to add additional information about the template</li>
+	<li>The Units pull down is used to define what measurement scale you're going to be using for the template. This should probably match the unit of measurement used on the template description provided by the product vendor.</li>
+	<li>The measurements can be found on the vendor product packaging or website.</li>
+	<li>A profile is a set of "adjustments" applied to a given template just prior to printing which compensates for anomalies unique and peculiar to a given printer (to which the profile is assigned).
+<ul>
+	<li>Before picking a profile try printing some sample cards so that you can easily define a profile that is right for your printer/template combination.</li>
+	<li>After finding any anomalies in the printed document, create a profile and assign it to the template.
+After saving, your templates will appear on the 'Manage Templates' page.</li>
+</ul>
+</li>
+</ul>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/home.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
index 79f217c918..3cabee2395 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
@@ -1,17 +1,20 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Home</h1>
+<h1>Patron Card Creator</h1>
 
 <p>The Patron Card Creator allow you to use layouts and templates which you design to print a nearly unlimited variety of patron cards including barcodes. Here are some of the features of the Patron Card Creator module:</p>
- <ul>
-     <li>Customize patron card layouts</li>
-     <li>Design custom card templates for printed patron cards</li>
-     <li>Build and manage batches of patron cards</li>
-     <li>Export single or multiple batches</li>
-     <li>Export single or multiple patron cards from within a batch</li>
-     <li>Export card data as a PDF readable by any standard PDF reader, making patron cards printable directly on a printer</li>
- </ul>
- <p>At the top of each screen within the Patron Card Creator, you will see a toolbar allowing quick access to relevant functions. The menu to the left of each screen also allows easy access to the different sections of the Patron Card Creator. The breadcrumb trail near the top of each screen will give specific indication as to where you are within the Patron Card Creator module and allow quick navigation to previously traversed sections. And finally, you can find more detailed information on each section of the Patron Card Creator by clicking the online help link at the upper left-hand corner of every page.</p>
- <p>The developers of the Patron Card Creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via <a href="http://bugs.koha-community.org/">Koha Project Bugzilla</a>.</p>
 
-[% INCLUDE 'help-bottom.inc' %]
+<ul>
+	<li>Customize patron card layouts</li>
+	<li>Design custom card templates for printed patron cards</li>
+	<li>Build and manage batches of patron cards</li>
+	<li>Export single or multiple batches</li>
+	<li>Export single or multiple patron cards from within a batch</li>
+	<li>Export card data as a PDF readable by any standard PDF reader, making patron cards printable directly on a printer</li>
+</ul>
+
+<p>At the top of each screen within the Patron Card Creator, you will see a toolbar allowing quick access to relevant functions. The menu to the left of each screen also allows easy access to the different sections of the Patron Card Creator. The breadcrumb trail near the top of each screen will give specific indication as to where you are within the Patron Card Creator module and allow quick navigation to previously traversed sections. And finally, you can find more detailed information on each section of the Patron Card Creator by clicking the online help link at the upper left-hand corner of every page.</p>
+
+<p>The developers of the Patron Card Creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.</p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
index 62493fe138..0629270030 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
@@ -1,29 +1,19 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Templates</h1>
-
-<p>A template is the label/card stock you are using. This might be Avery 5160 for address labels, Gaylord 47-284 for spine labels or Avery 28371 for your patron cards, just to give a couple of examples. These labels will include all of the information you will need for setting up a Koha, this information may be on the packaging, and if not it can usually be found on the vendor's website.</p>
-
-<h1>Profiles</h1>
-
-<p>A profile is a set of “adjustments” applied to a given template just prior to printing which compensates for anomalies unique and peculiar to a given printer (to which the profile is assigned). This means if you set a template up and then print a sample set of data and find that the items are not all aligned the same on each label, you need to set up a profile for each printer to make up for the differences in printing styles, such as the shifting of text to the left, right, top or bottom.</p>
-
-<p>If your cards are printing just the way you want, you will not need a profile.</p>
-
 <h1>Layouts</h1>
 
 <p>A layout defines the text and images that will be printed on to the card and where it will appear.</p>
 
-<h1>Batches</h1>
+<h1>Profiles</h1>
 
-<p>A batch is a collection of patrons for whom you want to generate cards.</p>
+<p>A profile is a set of "adjustments" applied to a given template just prior to printing which compensates for anomalies unique and peculiar to a given printer (to which the profile is assigned). This means if you set a template up and then print a sample set of data and find that the items are not all aligned the same on each card, you need to set up a profile for each printer to make up for the differences in printing styles, such as the shifting of text to the left, right, top or bottom.</p>
 
-<h1>Manage Images</h1>
+<h1>Templates</h1>
 
-<p>Images uploaded using this tool will appear on the menu when creating patron card layouts. You are limited in how many images you can upload (not counting patron images) by the ImageLimit  system preference.</p>
+<p>A template is the label/card stock you are using. This might be Avery 5160 for address labels, Gaylord 47-284 for spine labels or Avery 28371 for your patron cards, just to give a couple of examples. These labels will include all of the information you will need for setting up a Koha, this information may be on the packaging, and if not it can usually be found on the vendor's website.</p>
 
-<p style="color: #990000">IMPORTANT: Images must be under 500k in size.</p>
+<h2>Batches</h2>
 
-<p style="background-color: #ffe599">TIP: Pictures uploaded with this tool should be at least 300dpi which is the minimum quality for a printable image.</p>
+<p>A batch is a collection of patrons for whom you want to generate cards.</p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt
index c036638ab7..a75a25cc81 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -17,7 +17,11 @@ $(document).ready(function() {
 	$.tablesorter.defaults.widgets = ['zebra'];
 	$("#issuest").tablesorter({[% IF ( dateformat_metric ) %]
 		dateFormat: 'uk',[% END %]
-		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
+        headers: { 1: { sorter: 'articles' }}
+	}); 
+	$("#relissuest").tablesorter({[% IF ( dateformat_metric ) %]
+		dateFormat: 'uk',[% END %]
+		headers: { 1: { sorter: 'articles' }}
 	}); 
 	$("#holdst").tablesorter({[% IF ( dateformat_metric ) %]
 		dateFormat: 'uk',[% END %]
@@ -42,6 +46,13 @@ $(document).ready(function() {
 	$("#CheckAllreturns").click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=barcodes]"); $(".checkboxed").unCheckCheckboxes(":input[name*=items]"); return false; });
     $("#CheckNoreturns" ).click(function(){ $(".checkboxed").unCheckCheckboxes(":input[name*=barcodes]"); return false; });
 
+    $("#relrenew_all"      ).click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=items]"   ); $(".checkboxed").unCheckCheckboxes(":input[name*=barcodes]"); });
+    $("#relCheckAllitems"  ).click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=items]"   ); $(".checkboxed").unCheckCheckboxes(":input[name*=barcodes]"); return false; });
+    $("#relCheckNoitems"   ).click(function(){ $(".checkboxed").unCheckCheckboxes(":input[name*=items]"); return false; });
+    $("#relCheckAllreturns").click(function(){ $(".checkboxed").checkCheckboxes(":input[name*=barcodes]"); $(".checkboxed").unCheckCheckboxes(":input[name*=items]"); return false; });
+    $("#relCheckNoreturns" ).click(function(){ $(".checkboxed").unCheckCheckboxes(":input[name*=barcodes]"); return false; });
+
+
     [% IF ( CAN_user_circulate_override_renewals ) %]
     [% IF ( AllowRenewalLimitOverride ) %]
     $( '#override_limit' ).click( function () {
@@ -382,6 +393,9 @@ function validate1(date) {
 <div id="finesholdsissues" class="toptabs">
 	<ul>
 		<li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issuecount %] Checkout(s)</a></li>
+    [% IF ( relissuecount ) %]
+        <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives issues</a></li>
+    [% END %]
 		<li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
 		<li>[% IF ( countreserv ) %]
             <a href="/cgi-bin/koha/members/moremember.pl#onhold">[% countreserv %] Hold(s)</a>
@@ -398,11 +412,11 @@ function validate1(date) {
     [% END %]
 </div>
 
-<div id="checkedout">
-    [% IF ( issueloop ) %]
     <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post" class="checkboxed">
     <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
 	<input type="hidden" name="branch" value="[% branch %]" />
+<div id="checkedout">
+    [% IF ( issueloop ) %]
     <table id="issuest">
     <thead>
 		<tr>
@@ -410,7 +424,7 @@ function validate1(date) {
             <th scope="col">Title</th>
             <th scope="col">Item Type</th>
             <th scope="col">Checked out on</th> 
-        <th scope="col">Call no</th>
+            <th scope="col">Call no</th>
             <th scope="col">Charge</th>
             <th scope="col">Price</th>
             <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
@@ -494,8 +508,62 @@ function validate1(date) {
         <input type="submit" name="renew_checked" value="Renew or Return checked items" />
         <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
         </fieldset>
-    </form>[% ELSE %]<p>Patron has nothing checked out.</p>[% END %]
+    [% ELSE %]<p>Patron has nothing checked out.</p>
+[% END %]
+</div>
+
+
+[% IF ( relissuecount ) %]
+<div id="relissues">
+	<h2>Relatives issues</h2>
+ <table id="relissuest">
+    <thead>
+	<tr>
+            <th scope="col">Due date</th>
+            <th scope="col">Title</th>
+            <th scope="col">Collection</th>
+            <th scope="col">Stock number</th>
+            <th scope="col">Barcode</th>
+            <th scope="col">Item Type</th>
+            <th scope="col">Checked out on</th> 
+            <th scope="col">Borrower</th>
+	    <th scope="col">Call no</th>
+            <th scope="col">Charge</th>
+            <th scope="col">Price</th>
+        </tr>
+    </thead>
+       <tbody>
+       [% FOREACH relissueloo IN relissueloop %]
+
+          [% IF ( relissueloo.overdue ) %]
+          <tr class="problem">
+          [% ELSE %]
+          <tr>
+          [% END %]
+		  <td[% IF ( relissueloo.red ) %] class="od"[% END %]>[% relissueloo.date_due %]
+                [% IF ( relissueloo.itemlost ) %]
+                                        <span class="lost">[% relissueloo.itemlost %]</span>
+                    [% END %]
+                [% IF ( relissueloo.damaged ) %]
+                                        <span class="dmg">[% relissueloo.itemdamaged %]</span>
+                [% END %]
+</td>
+            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissueloo.biblionumber %]"><strong>[% relissueloo.title |html %]</strong></a>[% IF ( relissueloo.author ) %], by [% relissueloo.author %][% END %] [% IF ( relissueloo.publishercode ) %]; [% relissueloo.publishercode %] [% END %] [% IF ( relissueloo.publicationyear ) %], [% relissueloo.publicationyear %][% END %]</td>
+            <td>[% relissueloo.collection %]</td>
+            <td>[% relissueloo.stocknumber %]</td>
+            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
+<td>[% UNLESS ( relissueloo.noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
+            <td>[% relissueloo.issuedate %]</td>
+	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %]</a></td>
+	    <td>[% relissueloo.itemcallnumber %]</td>
+            <td>[% relissueloo.charge %]</td>
+            <td>[% relissueloo.replacementprice %]</td>
+        </tr>
+  [% END %]
+        </tbody>
+       </table>
 	</div>
+[% END %]
 	
 <div id="onhold">
 [% IF ( reservloop ) %]
@@ -543,12 +611,14 @@ function validate1(date) {
         </tr>
 		[% END %]</tbody>
     </table>
-        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset>
-    </form>
-    [% ELSE %]
-    <p>Patron has nothing on hold.</p>
-    [% END %]
-    </div>
+
+        <fieldset class="action">
+        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
+        <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
+        </fieldset>
+    [% ELSE %]<p>Patron has nothing checked out.</p>[% END %]
+	</div>
+
 </div>
 [% END %] <!-- unknowuser -->
 
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tt/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index ad31532922..e725ecb0cb 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -78,7 +78,7 @@ $(document).ready(function() {
 </script>
 <style type="text/css">
 h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; }
-.overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; }
+.overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("/intranet-tmpl/prog/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; }
 </style>
 [% END %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
@@ -124,10 +124,11 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
     </fieldset>
     <fieldset class="rows"> <legend>Suggestion management</legend>
        <ol>
-            [% IF ( suggestionid ) %]<li><label for="status">Status:</label><select id="status" name="status"><option value="">No Status</option>
-                [% FOREACH status_loo IN status_loop %]
-                    [% IF ( status_loo.selected ) %]<option value="[% status_loo.code %]" selected="selected">[% status_loo.desc %]</option>[% ELSE %]<option value="[% status_loo.code %]">[% status_loo.desc %]</option>[% END %]
-                [% END %]
+            [% IF ( suggestionid ) %]<li><label for="status">Status:</label><select id="STATUS" name="STATUS"><option value="">No Status</option>
+                <option value="ASKED"[% IF ( statusselected_ASKED ) %] selected="selected"[% END %]>Asked</option>
+                <option value="ACCEPTED"[% IF ( statusselected_ACCEPTED ) %] selected="selected"[% END %]>Accepted</option>
+                <option value="CHECKED"[% IF ( statusselected_CHECKED ) %] selected="selected"[% END %]>Checked</option>
+                <option value="REJECTED"[% IF ( statusselected_REJECTED ) %] selected="selected"[% END %]>Rejected</option>
             </select></li>[% END %]
         <li><table>
             <thead><tr><th>&nbsp;</th><th>Date</th><th>By</th></tr></thead>
@@ -178,8 +179,8 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
                 </li><li><label for="total">Total</label>
 			<input type="text" readonly="readonly" id="total" name="total" size="10" value="[% total %]"/>
                 </li></ol>
-    </fieldset>
-    <fieldset class="action"><input type="hidden" name="op" value="[% op %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="suggestion.pl?suggestionid=[% suggestionid %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
+    </fieldset><input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby %][% ELSE %]noone[% END %]"/>
+    <fieldset class="action"><input type="hidden" name="op" value="[% op %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby %]#suggestions[% ELSE %]suggestion.pl?suggestionid=[% suggestionid %][% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
     </fieldset>
     </form>
 [% END %]
@@ -233,7 +234,7 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
                     <br />
                     [% IF ( suggestions_loo.copyrightdate ) %]&copy; [% suggestions_loo.copyrightdate %] [% END %]
                         [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc %]</i> [% END %]
-                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %];[% suggestions_loo.collectiontitle %] [% END %][% IF ( suggestions_loo.itemtype ) %];[% suggestions_loo.itemtype %] [% END %]<br />[% IF ( suggestions_loo.note ) %][% suggestions_loo.note %][% END %]
+                        [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% suggestions_loo.itemtype %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note %]</span>[% END %]
                 </td>
                 <td>
                     [% IF ( suggestions_loo.emailsuggestedby ) %]<a href="mailto:[% suggestions_loo.emailsuggestedby %]">[% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF ( suggestions_loo.emailsuggestedby ) %]</a>[% END %]
@@ -250,7 +251,7 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
                     [% suggestions_loo.budget_name %]
                 </td>
                 <td>
-                    [% IF ( suggestions_loo.ASKED ) %]Requested[% END %] [% IF ( suggestions_loo.ACCEPTED ) %]Accepted[% END %] [% IF ( suggestions_loo.ORDERED ) %]Ordered[% END %] [% IF ( suggestions_loo.REJECTED ) %]Rejected[% END %] [% IF ( suggestions_loo.CHECKED ) %]Checked[% END %] [% IF ( suggestions_loo.reason ) %]<br />([% suggestions_loo.reason %])[% END %]
+                    [% IF ( suggestions_loo.ASKED ) %]Asked[% END %] [% IF ( suggestions_loo.ACCEPTED ) %]Accepted[% END %] [% IF ( suggestions_loo.ORDERED ) %]Ordered[% END %] [% IF ( suggestions_loo.REJECTED ) %]Rejected[% END %] [% IF ( suggestions_loo.CHECKED ) %]Checked[% END %] [% IF ( suggestions_loo.reason ) %]<br />([% suggestions_loo.reason %])[% END %]
                 </td>
         </tr>
         [% END %]</tbody>
@@ -259,9 +260,10 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
         <div id="status[% suggestion.suggestiontype %]">
 	<label for="STATUS[% suggestion.suggestiontype %]">Mark selected as: </label><select name="STATUS" id="STATUS[% suggestion.suggestiontype %]">
 	<option value=""> -- Choose a status --</option>
-	<option value="ACCEPTED">Accepted</option>
-	<option value="CHECKED">Checked</option>
-	<option value="REJECTED">Rejected</option>
+	<option value="ASKED"[% IF ( suggestion.statusselected_ASKED ) %] selected="selected"[% END %]>Asked</option>
+	<option value="ACCEPTED"[% IF ( suggestion.statusselected_ACCEPTED ) %] selected="selected"[% END %]>Accepted</option>
+	<option value="CHECKED"[% IF ( suggestion.statusselected_CHECKED ) %] selected="selected"[% END %]>Checked</option>
+	<option value="REJECTED"[% IF ( suggestion.statusselected_REJECTED ) %] selected="selected"[% END %]>Rejected</option>
 	</select>
     <label for="reason[% suggestion.suggestiontype %]">with this reason:</label>                 <select id="reason[% suggestion.suggestiontype %]" name="reason[% suggestion.suggestiontype %]">
                     <option value=""> -- Choose a reason -- </option>
@@ -313,8 +315,11 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
                     <li><label for="collectiontitle"> Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle %]" /></li><li><input type="submit" value="Go" /></li></ol>
                 </fieldset>
 				 <fieldset class="brief"><h4 class="collapse"><a href="#">Suggestion information</a></h4>
-                    <ol><li><label for="status"> Status:</label><select name="status" id="status"><option value="">Any</option>
-[% FOREACH status_loo IN status_loop %][% IF ( status_loo.selected ) %]<option value="[% status_loo.code %]" selected="selected">[% status_loo.desc %]</option>[% ELSE %]<option value="[% status_loo.code %]">[% status_loo.desc %]</option>[% END %][% END %]
+                    <ol><li><label for="status"> Status:</label><select name="STATUS" id="STATUS"><option value="">Any</option>
+                    	<option value="ASKED"[% IF ( statusselected_ASKED ) %] selected="selected"[% END %]>Asked</option>
+						<option value="ACCEPTED"[% IF ( statusselected_ACCEPTED ) %] selected="selected"[% END %]>Accepted</option>
+						<option value="CHECKED"[% IF ( statusselected_CHECKED ) %] selected="selected"[% END %]>Checked</option>
+						<option value="REJECTED"[% IF ( statusselected_REJECTED ) %] selected="selected"[% END %]>Rejected</option>
                                                           </select></li>
                     <li><label for="suggestedby"> Suggested By:</label><select id="suggestedby" name="suggestedby"><option value="">Any</option>
 [% FOREACH suggestedby_loo IN suggestedby_loop %][% IF ( suggestedby_loo.selected ) %]<option value="[% suggestedby_loo.code %]" selected="selected">[% suggestedby_loo.desc %]</option>[% ELSE %]<option value="[% suggestedby_loo.code %]">[% suggestedby_loo.desc %]</option>[% END %][% END %]
diff --git a/koha-tt/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tt/intranet-tmpl/prog/en/modules/tools/koha-news.tt
index 9a79643a8c..7705e4440a 100644
--- a/koha-tt/intranet-tmpl/prog/en/modules/tools/koha-news.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/tools/koha-news.tt
@@ -13,6 +13,25 @@ $(document).ready(function() {
 }); 
 //]]>
 </script>
+<script language="javascript" type="text/javascript" src="[% themelang %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+    mode : "textareas",
+        theme : "advanced",
+    plugins : "table,save,advhr,advlink,iespell,searchreplace,print,contextmenu",
+        theme_advanced_disable : "underline,strikethrough,styleselect,image",
+    theme_advanced_buttons1_add_before : "savecommaseparator",
+    theme_advanced_buttons2_add_before: "cut,copy,paste,separator,search,replace,separator",
+    theme_advanced_buttons3_add_before : "tablecontrolscommaseparator",
+    theme_advanced_buttons3_add : "iespell,advhr,separator,print",
+    theme_advanced_toolbar_location : "top",
+    theme_advanced_toolbar_align : "left",
+    theme_advanced_path_location : "bottom",
+    plugin_insertdate_dateFormat : "%Y-%m-%d",
+    plugin_insertdate_timeFormat : "%H:%M:%S",
+    apply_source_formatting : true
+});
+</script>
 </head>
 <body>
 [% INCLUDE 'header.inc' %]
diff --git a/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 7f1f7b6bc5..09b0735ca8 100644
--- a/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tt/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -16,13 +16,14 @@
         <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
         <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
 
-        <xsl:variable name="UseControlNumber" select="1"/>
+    <xsl:variable name="UseControlNumber" select="marc:sysprefs/marc:syspref[@name='UseControlNumber']"/>
         <xsl:variable name="urlLinkText" select="marc:sysprefs/marc:syspref[@name='urlLinkText']"/>
         <xsl:variable name="OPACBaseurl" select="marc:sysprefs/marc:syspref[@name='OPACBaseurl']"/>
         <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>
         <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
         <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
 
+        <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
         <xsl:variable name="leader" select="marc:leader"/>
         <xsl:variable name="leader6" select="substring($leader,7,1)"/>
         <xsl:variable name="leader7" select="substring($leader,8,1)"/>
@@ -215,6 +216,23 @@
         </span>
         </xsl:if>
 
+        <!-- Analytics -->
+        <xsl:if test="$leader7='s'">
+        <span class="results_summary"><span class="label">Analytics: </span>
+            <a>
+            <xsl:choose>
+            <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
+                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=rcn:<xsl:value-of select="marc:controlfield[@tag=001]"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Host-item:<xsl:value-of select="translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', '')"/></xsl:attribute>
+            </xsl:otherwise>
+            </xsl:choose>
+            <xsl:text>Show analytics</xsl:text>
+            </a>
+        </span>
+        </xsl:if>
+
         <!-- Volumes of sets and traced series -->
         <xsl:if test="$materialTypeCode='ST' or substring($controlField008,22,1)='m'">
         <span class="results_summary"><span class="label">Volumes: </span>
@@ -457,8 +475,12 @@
         <xsl:if test="marc:datafield[@tag=856]">
         <span class="results_summary"><span class="label">Online Resources: </span>
         <xsl:for-each select="marc:datafield[@tag=856]">
+                                   <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
                                    <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
                                     <xsl:choose>
+                                    <xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+                                    </xsl:when>
                                     <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
                                         <xsl:call-template name="subfieldSelect">
                                         <xsl:with-param name="codes">y3z</xsl:with-param>
@@ -538,13 +560,15 @@
             <xsl:choose>
                 <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
                     <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
-                        <xsl:value-of select="translate($f773, '()', '')"/><xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>
+                        <xsl:value-of select="translate($f773, '()', '')"/>
                     </a>
+                    <xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>
                 </xsl:when>
                 <xsl:otherwise>
                     <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Title:<xsl:value-of select="translate($f773, '()', '')"/></xsl:attribute>
-                        <xsl:value-of select="$f773"/><xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>
+                        <xsl:value-of select="$f773"/>
                     </a>
+                    <xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>
                 </xsl:otherwise>
             </xsl:choose>
         </span>
diff --git a/koha-tt/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tt/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
index bb542bcd72..fcfe65c62e 100644
--- a/koha-tt/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tt/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -15,6 +15,7 @@
 </xsl:template>
 
 <xsl:template match="marc:record">
+  <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
   <xsl:variable name="leader" select="marc:leader"/>
   <xsl:variable name="leader6" select="substring($leader,7,1)"/>
   <xsl:variable name="leader7" select="substring($leader,8,1)"/>
@@ -356,11 +357,15 @@
     <li>
       <strong>Online Resources: </strong>
       <xsl:for-each select="marc:datafield[@tag=856]">
+        <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
         <a>
           <xsl:attribute name="href">
             <xsl:value-of select="marc:subfield[@code='u']"/>
           </xsl:attribute>
           <xsl:choose>
+            <xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+              <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+            </xsl:when>
             <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
               <xsl:call-template name="subfieldSelect">
                 <xsl:with-param name="codes">y3z</xsl:with-param>
diff --git a/koha-tt/opac-tmpl/prog/en/includes/masthead.inc b/koha-tt/opac-tmpl/prog/en/includes/masthead.inc
index fa26e47d37..bac07414a5 100644
--- a/koha-tt/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tt/opac-tmpl/prog/en/includes/masthead.inc
@@ -159,7 +159,7 @@
 		[% END %]
 		[% IF ( bartotal ) %]
 			<ul class="second-of-type">
-            <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">View all [% bartotal %] of your lists</a></li>
+            <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">View all [% bartotal %] of your private lists</a></li>
 			</ul>
 		[% END %]
 		<ul class="second-of-type">
diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
index 9782355322..dab4fdab9c 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
@@ -22,10 +22,21 @@
         	</li>
         [% END %]
 		</ul>
-		[% IF ( CGIvirtualshelves ) %]
+		[% IF ( existingshelves ) %]
 			<form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="post">
     		<fieldset class="rows"><legend>Select a List</legend>
-			<ol><li>    <label for="shelfnumber">Add to list:</label> [% CGIvirtualshelves %]</li></ol>
+			<ol><li>    <label for="shelfnumber">Add to list:</label> <select name="shelfnumber" id="shelfnumber">
+				[% IF ( privatevirtualshelves ) %]<optgroup label="Private Lists">
+					[% FOREACH privatevirtualshelve IN privatevirtualshelves %]
+					<option value="[% privatevirtualshelve.shelfnumber %]">[% privatevirtualshelve.shelfname %]</option>
+					[% END %]
+				</optgroup>[% END %]
+				[% IF ( publicvirtualshelves ) %]<optgroup label="Public Lists">
+					[% FOREACH publicvirtualshelve IN publicvirtualshelves %]
+					<option value="[% publicvirtualshelve.shelfnumber %]">[% publicvirtualshelve.shelfname %]</option>
+					[% END %]
+				</optgroup>[% END %]
+			</select></li></ol>
  			[% FOREACH biblio IN biblios %] <input type="hidden" name="biblionumber" value="[% biblio.biblionumber %]" />[% END %]
     		<input type="hidden" name="modifyshelfcontents" value="1" /></fieldset>
     		<fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a></fieldset>
diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-auth.tt
index ad69f46adb..dfa7ed90a8 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-auth.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-auth.tt
@@ -72,7 +72,7 @@
 </ol></fieldset>
 
 <input type="submit" value="Log In" class="submit" />
-<div>  <h5>Don't have a password yet?</h5><p> If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
+<div id="nologininstructions">  <h5>Don't have a password yet?</h5><p> If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
 <h5>Don't have a library card?</h5><p> If you don't have a library card, stop by your local library to sign up.  </p></div>
 </form>
 
diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-basket.tt
index 3ed1297815..3ba5dc4f04 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-basket.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-basket.tt
@@ -293,7 +293,7 @@ function tagAdded() {
             <th scope="row">Location(s)</th>
             <td>[% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %]<ul>[% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
                             <li>
-                                <strong>[% ITEM_RESULT.branchname %]</strong>[% IF ( ITEM_RESULT.location ) %], [% ITEM_RESULT.location %][% END %]
+                                <strong>[% ITEM_RESULT.homebranch %]</strong>[% IF ( ITEM_RESULT.location_opac ) %], [% ITEM_RESULT.location_opac %][% END %]
                                 [% IF ( ITEM_RESULT.itemcallnumber ) %]
                                     ([% ITEM_RESULT.itemcallnumber %])
                                 [% END %]
@@ -367,7 +367,7 @@ function tagAdded() {
 	    </td>
                 <td>[% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %]<ul>[% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
                     <li>
-                        [% ITEM_RESULT.branchname %][% IF ( ITEM_RESULT.location ) %], [% ITEM_RESULT.location %][% END %]
+                        [% ITEM_RESULT.homebranch %][% IF ( ITEM_RESULT.location_opac ) %], [% ITEM_RESULT.location_opac %][% END %]
                         [% IF ( ITEM_RESULT.itemcallnumber ) %]
                             ([% ITEM_RESULT.itemcallnumber %])
                         [% END %]
diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt
index 1d1c13e53d..8588af98aa 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -418,7 +418,13 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 	</table>
     [% END %]
 [% ELSE %]
-<p>No physical items for this record</p>
+    [% IF ( ALTERNATEHOLDINGS ) %]
+    [% FOREACH ALTERNATEHOLDING IN ALTERNATEHOLDINGS %]
+        <div id="alternateholdings"><span class="holdings_label">Holdings:</span> [% ALTERNATEHOLDING.holding %]</div>
+    [% END %]
+    [% ELSE %]
+    <div id="noitems">No physical items for this record</div>
+    [% END %]
 [% END %]
 
 [% IF ( OpenOPACShelfBrowser ) %]
@@ -668,12 +674,14 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         </p></div>
             [% ELSE %]
             <div class="commentline">
+            [% IF ( review.ShowReviewer ) %]
             <h5>
                 Comment by
                 [% review.title %]
                 [% review.firstname %]
                 [% review.surname %]
             </h5>
+            [% END %]
             <small>[% review.datereviewed %]</small>
         <p>
           [% review.review |0 %]
diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt
index e29de6f5d0..2079848a63 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt
@@ -105,9 +105,11 @@ $(document).ready(function(){
 	[% END %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %][% IF ( addbarshelves ) %]
 	param1 += "<optgroup label=\""+_("Your Lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
 	param1 += "<option id=\"s[% addbarshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addbarshelvesloo.shelfname |html %]<\/option>";[% END %]
+    [% IF ( bartotal ) %]param1 += "<option value=\"morelists\">[ "+_("More lists")+" ]<\/option>";[% END %]
 	param1 += "<\/optgroup>";[% END %]
-	[% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public Lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %][% END %]
-	param1 +="<\/optgroup><option value=\"newlist\">[ "+_("New List")+" ]<\/option>"
+	[% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public Lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>";[% END %][% END %]
+	param1 += "<\/optgroup>";
+    param1 += "<option value=\"newlist\">[ "+_("New List")+" ]<\/option>";
 	[% END %]
 	[% END %]
 	param1 += "<\/select> <input type=\"submit\" class=\"submit\" value=\""+_("Save")+"\" />";
@@ -153,7 +155,7 @@ $(document).ready(function(){
     [% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %]$("#tagsel_span").html("<input id=\"tagsel_tag\" class=\"submit\" type=\"submit\" value=\"Tag\"/>");[% END %][% END %]
 
 	function cartList(){
-			if($("#addto").find("option:selected").attr("value") == "addtolist"){
+		if($("#addto").find("option:selected").attr("value") == "addtolist"){
 			var shelfnumber = $("#addto").find("option:selected").attr("id").replace("s","");
 			if (vShelfAdd()) {
 			Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?selectedshelf='+shelfnumber+'&' + vShelfAdd());
@@ -164,6 +166,11 @@ $(document).ready(function(){
 			Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd());
 			}[% ELSE %] alert('You must be logged in to create or add to Lists'); [% END %]
 			return false;
+        } else if($("#addto").find("option:selected").attr("value") == "morelists"){
+            [% IF ( loggedinusername ) %]if (vShelfAdd()) {
+            Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?' + vShelfAdd());
+            }[% ELSE %] alert('You must be logged in to create or add to Lists'); [% END %]
+            return false;
 		}
 		if($("#addto").find("option:selected").attr("value") == "addtocart" || $("#addto").attr("class") == "addtocart"){
 			addMultiple();
@@ -394,8 +401,10 @@ $(document).ready(function(){
                 [% END %]
 
 				<td>
-                [% IF ( SEARCH_RESULT.coins ) %]
-                    <!-- COinS / Openurl --><span class="Z3988" title="[% SEARCH_RESULT.coins %]"></span>
+                [% IF ( SEARCH_RESULT.COinSinOPACResults ) %]
+                    [% IF ( SEARCH_RESULT.coins ) %]
+                        <!-- COinS / Openurl --><span class="Z3988" title="[% SEARCH_RESULT.coins %]"></span>
+                    [% END %]
                 [% END %]
 
 				[% IF ( SEARCH_RESULT.OPACXSLTResultsDisplay ) %]
@@ -446,7 +455,13 @@ $(document).ready(function(){
                     [% END %]
                     </span>
                     [% ELSE %]
-                    <span class="unavailable">No items available:</span>
+                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS ) %]
+                    [% FOREACH ALTERNATEHOLDING IN SEARCH_RESULT.ALTERNATEHOLDINGS %]
+                        &nbsp;<span id="alternateholdings">[% ALTERNATEHOLDING.holding %]</span>,
+                    [% END %]
+                    [% ELSE %]
+                        <span class="unavailable">No items available:</span>
+                    [% END %]
                     [% END %]
                     <span class="unavailable">
                     [% IF ( SEARCH_RESULT.onloancount ) %] Checked out ([% SEARCH_RESULT.onloancount %]), [% END %]
diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt
index ebc5e71f33..0e68220c2b 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -271,7 +271,7 @@ $(function() {
                         [% IF ( itemsloo.size ) %] [% itemsloo.size %][% END %]
                 </span>
                 <span class="results_summary"><span class="label">Holdings:</span>[% IF ( itemsloo.ITEM_RESULTS ) %][% FOREACH ITEM_RESULT IN itemsloo.ITEM_RESULTS %]
-          [% ITEM_RESULT.branchname %][% IF ( ITEM_RESULT.location ) %], [% ITEM_RESULT.location %][% END %]
+          [% ITEM_RESULT.homebranch %][% IF ( ITEM_RESULT.location_opac ) %], [% ITEM_RESULT.location_opac %][% END %]
           [% IF ( ITEM_RESULT.itemcallnumber ) %]
         ([% ITEM_RESULT.itemcallnumber %])[% IF ( loop.last ) %].[% ELSE %],[% END %]
           [% END %]
diff --git a/koha-tt/opac-tmpl/prog/en/modules/sco/help.tt b/koha-tt/opac-tmpl/prog/en/modules/sco/help.tt
index b9c91c50b7..ba52fcd282 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/sco/help.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/sco/help.tt
@@ -12,12 +12,19 @@
 
 <h1>Self Checkout Help</h1>
 
+[% IF ( SelfCheckHelpMessage ) %]
+<div id="selfcheckhelpmessage">
+[% SelfCheckHelpMessage %]
+</div>
+[% END %]
+
 <p>If this is your first time using the self checkout system, or if the system
 is not behaving as expected, you may want to refer to this guide to get
 yourself started.</p>
 
-<h3>Step One: Enter your user id</h3>
-<p>Enter your User ID, and click the submit button (or press the enter key).</p>
+<h3>Step One: Enter your user id[% IF ( SelfCheckoutByLogin ) %] and password[% END %]</h3>
+<p>Enter your User ID[% IF ( SelfCheckoutByLogin ) %] and password[% END %], and click the 
+submit button (or press the enter key).</p>
 
 <h3>Step Two: Scan the barcode for each item, one at a time</h3>
 <p>Scan each item and wait for the page to reload before scanning the next item.
@@ -25,6 +32,8 @@ The checked-out item should appear in your checkouts list.
 The Submit button only needs to be clicked if you enter the barcode manually.</p>
 
 <h3>Step Three: Click the 'Finish' button</h3>
+<p>If you do not click the 'Finish' button, your session will automatically expire in
+[% SelfCheckTimeout %] seconds.</p>
 
     <div class="button">
         <a href="javascript:history.go(-1)">Return to the Self-Checkout</a>
diff --git a/koha-tt/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tt/opac-tmpl/prog/en/modules/sco/sco-main.tt
index 7c867852f4..678fe59830 100644
--- a/koha-tt/opac-tmpl/prog/en/modules/sco/sco-main.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/sco/sco-main.tt
@@ -7,7 +7,7 @@
 <script type="text/javascript">//<![CDATA[
 function sco_init(valid_session) {
     if (valid_session == 1) {
-        setTimeout("location.href='/cgi-bin/koha/sco/sco-main.pl?op=logout';",120000); // TODO: syspref for timeout
+        setTimeout("location.href='/cgi-bin/koha/sco/sco-main.pl?op=logout';",[% SelfCheckTimeout %]); 
     }
 }
 function dofocus() {    // named function req'd for body onload event by some FF and IE7 security models
@@ -110,15 +110,17 @@ $(document).ready(function() {
 <input type="hidden" name="op" value="login" />
 <input type="hidden" name="patronid" value="[% patronid %]" />
 [% IF ( returnitem ) %]
+[% IF ( AllowSelfCheckReturns ) %]
 <input type="hidden" name="barcode" value="[% barcode %]" />
 <input type="button" name="returnbook" value="Return this item" class="return" onclick="this.form.op.value='returnbook';this.form.submit();"  />
 [% END %]
+[% END %]
 <input type="submit" name= "confirm" value="Return to Account Summary" class="back focus" />
 </form>
 [% END %]
 [% IF ( confirm ) %]<!-- We need to confirm the issue.. -->
 <div class="dialog alert"><h3>Please confirm the checkout:</h3>
-<p>[% IF ( confirm_renew_issue ) %]This item is already checked out to you.  Return it?[% END %]</p>
+<p>[% IF ( confirm_renew_issue ) %]This item is already checked out to you.[% END %]</p>
 
 <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" method="post">
 <input type="hidden" name="op" value="checkout" />
@@ -126,8 +128,10 @@ $(document).ready(function() {
 <input type="hidden" name="barcode" value="[% barcode %]" />
 <input type="hidden" name="confirmed" value="" />
 [% IF ( renew ) %]
+[% IF ( AllowSelfCheckReturns ) %]
 <input type="button" value="Return Item" name="confirm" class="return" onclick="this.form.op.value='returnbook';this.form.submit();"  />
 [% END %]
+[% END %]
 <input type="button" value="Renew Item" [% UNLESS ( renew ) %] name="confirm"[% END %] class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />
 <input type="button" value="Cancel" class="cancel" onclick="this.form.op.value='';this.form.submit();return true;"  />
 </form>
@@ -175,7 +179,7 @@ Sorry, This Self-Checkout Station has lost authentication.  Please contact the a
 	[% IF ( validuser ) %]
 	<div id="newcheckout" class="sco_entry">
 	<form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit="return checkout_confirm('[% patronid %]');">
-	<fieldset><legend> Check out or return an item: </legend>
+	<fieldset><legend> Check out[% IF ( AllowSelfCheckReturns ) %], return[% END %] or renew an item: </legend>
 	<label for="barcode">Scan a new item or enter its barcode:</label>
 	<input id="barcode" name="barcode" size="20" class="focus" />
 	<input type="hidden" name="op" value="checkout" />
@@ -209,7 +213,11 @@ Sorry, This Self-Checkout Station has lost authentication.  Please contact the a
     <input type="hidden" name="barcode" value="[% ISSUE.barcode %]" />
     <input type="hidden" name="confirmed" value=""  />
         [% IF ( ISSUE.norenew ) %]
-        <input type="button" value="Return Item" name="confirm" class="return" onclick="this.form.op.value='returnbook';this.form.submit();"  />
+          [% IF ( ISSUE.AllowSelfCheckReturns ) %]
+          <input type="button" value="Return Item" name="confirm" class="return" onclick="this.form.op.value='returnbook';this.form.submit();"  />
+          [% ELSE %]
+          <span>No renewals allowed</span>
+          [% END %]
         [% ELSE %]
         <input type="button" value="Renew Item" [% UNLESS ( ISSUE.renew ) %] name="confirm"[% END %] class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />
         [% END %]
@@ -227,8 +235,17 @@ Sorry, This Self-Checkout Station has lost authentication.  Please contact the a
 	[% ELSE %]<!-- not validuser -->
 	<div class="sco_entry" >
 	<form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="mainform" method="post">
+       [% IF ( authbylogin ) %]
+	<fieldset class="checkout">
+       <legend>Please login with your username and password</legend>
+       <label for="patronlogin">Username:</label>
+	<input type="text" id="patronlogin" class="focus" size="20" name="patronlogin" />
+       <label for="patronpw">Password:</label>
+	<input type="password" id="patronpw" size="20" name="patronpw" />
+       [% ELSE %]
 	<fieldset class="checkout"><label for="patronid">Please enter your card number:</label> 
 	<input type="text" id="patronid" class="focus" size="20" name="patronid" />
+	[% END %]
 
  	[% FOREACH INPUT IN INPUTS %]<input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]">[% END %]
 	<input type="hidden" name="op" value="login" />
diff --git a/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index b47500ac7c..c0a56c39de 100644
--- a/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -17,7 +17,7 @@
         <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
         <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
 
-    <xsl:variable name="UseControlNumber" select="1"/>
+    <xsl:variable name="UseControlNumber" select="marc:sysprefs/marc:syspref[@name='UseControlNumber']"/>
     <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
     <xsl:variable name="OPACurlOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACurlOpenInNewWindow']"/>
     <xsl:variable name="urlLinkText" select="marc:sysprefs/marc:syspref[@name='urlLinkText']"/>
@@ -26,6 +26,7 @@
     <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable>
     <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
     <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
+    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
         <xsl:variable name="leader" select="marc:leader"/>
         <xsl:variable name="leader6" select="substring($leader,7,1)"/>
         <xsl:variable name="leader7" select="substring($leader,8,1)"/>
@@ -271,6 +272,23 @@
         </xsl:if>
         </span>
         </xsl:if>
+        
+        <!-- Analytics -->
+        <xsl:if test="$leader7='s'">
+        <span class="results_summary"><span class="label">Analytics: </span>
+            <a>
+            <xsl:choose>
+            <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
+                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="marc:controlfield[@tag=001]"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Host-item:<xsl:value-of select="translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', '')"/></xsl:attribute>
+            </xsl:otherwise>
+            </xsl:choose>
+            <xsl:text>Show analytics</xsl:text>
+            </a>
+        </span>
+        </xsl:if>
 
         <!-- Volumes of sets and traced series -->
         <xsl:if test="$materialTypeCode='ST' or substring($controlField008,22,1)='m'">
@@ -511,29 +529,30 @@
             </span>
         </xsl:if>
 
+<!-- Image processing code added here, takes precedence over text links including y3z text   -->
         <xsl:if test="marc:datafield[@tag=856]">
         <span class="results_summary"><span class="label">Online Resources: </span>
         <xsl:for-each select="marc:datafield[@tag=856]">
+            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
             <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
             <xsl:if test="$OPACurlOpenInNewWindow='1'">
                 <xsl:attribute name="target">_blank</xsl:attribute>
             </xsl:if>
             <xsl:choose>
+            <xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+                <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+            </xsl:when>                                    
             <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
                 <xsl:call-template name="subfieldSelect">
                     <xsl:with-param name="codes">y3z</xsl:with-param>
                 </xsl:call-template>
             </xsl:when>
-            <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
-                <xsl:choose>
-                <xsl:when test="$urlLinkText!=''">
-                    <xsl:value-of select="$urlLinkText"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:text>Click here to access online</xsl:text>
-                </xsl:otherwise>
-                </xsl:choose>
+            <xsl:when test="$urlLinkText!=''">
+                <xsl:value-of select="$urlLinkText"/>
             </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>Click here to access online</xsl:text>
+            </xsl:otherwise>
             </xsl:choose>
             </a>
             <xsl:choose>
@@ -650,13 +669,15 @@
             <xsl:choose>
                 <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
                     <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
-                        <xsl:value-of select="translate($f773, '()', '')"/><xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>
+                        <xsl:value-of select="translate($f773, '()', '')"/>
                     </a>
+                    <xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>
                 </xsl:when>
                 <xsl:otherwise>
                     <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Title:<xsl:value-of select="translate($f773, '()', '')"/></xsl:attribute>
-                        <xsl:value-of select="$f773"/><xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>
+                        <xsl:value-of select="$f773"/>
                     </a>
+                    <xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>
                 </xsl:otherwise>
             </xsl:choose>
         </span>
diff --git a/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 429562c5bd..50ce9e4eb9 100644
--- a/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tt/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -23,6 +23,10 @@
     <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
     <xsl:variable name="OPACurlOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACurlOpenInNewWindow']"/>
     <xsl:variable name="urlLinkText" select="marc:sysprefs/marc:syspref[@name='urlLinkText']"/>
+    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
+    <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
+    <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
+    <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
         <xsl:variable name="leader" select="marc:leader"/>
         <xsl:variable name="leader6" select="substring($leader,7,1)"/>
         <xsl:variable name="leader7" select="substring($leader,8,1)"/>
@@ -904,9 +908,13 @@
          <span class="results_summary">
 			   <span class="label">Online Access: </span>
                             <xsl:for-each select="marc:datafield[@tag=856]">
+                            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
                             <xsl:if test="$OPACurlOpenInNewWindow='0'">
                                    <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
                                     <xsl:choose>
+                                     <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+                                    </xsl:when>
                                     <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
                                         <xsl:call-template name="subfieldSelect">                        
                                         <xsl:with-param name="codes">y3z</xsl:with-param>                    
@@ -928,6 +936,9 @@
                             <xsl:if test="$OPACurlOpenInNewWindow='1'">
                                    <a target='_blank'><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
                                     <xsl:choose>
+                                    <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and ($SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+                                    </xsl:when>
                                     <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
                                         <xsl:call-template name="subfieldSelect">                        
                                         <xsl:with-param name="codes">y3z</xsl:with-param>                    
@@ -953,10 +964,23 @@
                             </xsl:for-each>
                             </span>
                         </xsl:if>
-                        <span class="results_summary">
+                        <span class="results_summary" id="availability">
                         <span class="label">Availability: </span>
                         <xsl:choose>
-				   <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">No copies available
+				   <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
+                        <xsl:choose>
+                            <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
+                            <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
+                            <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
+                                <xsl:call-template select="marc:datafield[@tag=$AlternateHoldingsField]" name="subfieldSelect">
+                                    <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
+                                    <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
+                                </xsl:call-template>
+                            </xsl:for-each>
+                            (<xsl:value-of select="$AlternateHoldingsCount"/>)
+                            </xsl:when>
+                            <xsl:otherwise>No copies available</xsl:otherwise>
+                        </xsl:choose>
 				   </xsl:when>
                    <xsl:when test="count(key('item-by-status', 'available'))>0">
                    <span class="available">
diff --git a/koha-tt/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tt/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index e4e5f671c3..2832b6b27b 100644
--- a/koha-tt/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tt/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -15,6 +15,7 @@
 </xsl:template>
 
 <xsl:template match="marc:record">
+  <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
   <xsl:variable name="leader" select="marc:leader"/>
   <xsl:variable name="leader6" select="substring($leader,7,1)"/>
   <xsl:variable name="leader7" select="substring($leader,8,1)"/>
@@ -351,11 +352,15 @@
     <span class="results_summary">
       <span class="label">Online Resources: </span>
       <xsl:for-each select="marc:datafield[@tag=856]">
+        <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
         <a>
           <xsl:attribute name="href">
             <xsl:value-of select="marc:subfield[@code='u']"/>
           </xsl:attribute>
           <xsl:choose>
+            <xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+              <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+            </xsl:when>
             <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
               <xsl:call-template name="subfieldSelect">
                 <xsl:with-param name="codes">y3z</xsl:with-param>
diff --git a/koha-tt/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tt/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
index cfb88232cb..831724ce01 100644
--- a/koha-tt/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tt/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -18,6 +18,7 @@
 </xsl:template>
 
 <xsl:template match="marc:record">
+  <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
   <xsl:variable name="leader" select="marc:leader"/>
   <xsl:variable name="leader6" select="substring($leader,7,1)"/>
   <xsl:variable name="leader7" select="substring($leader,8,1)"/>
@@ -76,6 +77,7 @@
     <xsl:choose>
       <xsl:when test="marc:datafield[@tag=856]">
         <xsl:for-each select="marc:datafield[@tag=856]">
+        <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
           <xsl:choose>
             <xsl:when test="@ind2=0">
               <a>
@@ -83,6 +85,9 @@
                   <xsl:value-of select="marc:subfield[@code='u']"/>
                 </xsl:attribute>
                 <xsl:choose>
+                  <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
+                     <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
+                  </xsl:when>
                   <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
                     <xsl:call-template name="subfieldSelect">                        
                       <xsl:with-param name="codes">y3z</xsl:with-param>                    
-- 
2.39.5