From d433e462cbceb2591034c2fcd7443bfcc362d5ec Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Wed, 15 Feb 2017 16:28:47 +1300
Subject: [PATCH] Bug 18026 - URL to database columns link in system
 preferences is incorrect (master)
Content-Type: text/plain; charset="utf-8"

Here's a patch for the master branch

 Changes to be committed:
	modified:   koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
	modified:   koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
	modified:   koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
---
 .../prog/en/modules/admin/preferences/acquisitions.pref             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 6 +++---
 .../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index 99d0e03..4e56037 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -9,7 +9,7 @@ Acquisitions:
                   receiving: receiving an order.
                   cataloguing: cataloging the record.
         -
-            - "The following <a href='http://schema.koha-community.org/tables/items.html' target='blank'>database columns</a> should be unique in an item:"
+            - "The following <a href='http://schema.koha-community.org/master/tables/items.html' target='blank'>database columns</a> should be unique in an item:"
             - pref: UniqueItemFields
             - (separated by a space)
         -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 62aaeff..27ae8e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -728,17 +728,17 @@ OPAC:
               class: integer
             - "days."
         -
-            - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
+            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
             - pref: PatronSelfRegistrationBorrowerMandatoryField
               class: multi
             - (separate columns with |)
         -
-            - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
+            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
             - pref: PatronSelfRegistrationBorrowerUnwantedField
               class: multi
             - (separate columns with |)
         -
-            - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
+            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
             - pref: PatronSelfModificationBorrowerUnwantedField
               class: multi
             - (separate columns with |)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index e0e36d8..a38f546 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -24,12 +24,12 @@ Patrons:
                no: "Don't"
          - default the card number field on the patron addition screen to the next available card number (for example, if the largest currently used card number is 26345000012941, then this field will default to 26345000012942).
      -
-         - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
+         - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
          - pref: BorrowerMandatoryField
            class: multi
          - (separate columns with |)
      -
-         - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron entry screen:"
+         - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron entry screen:"
          - pref: BorrowerUnwantedField
            class: multi
          - (separate columns with |)
-- 
2.1.4