Merge branch 'manual18.05.x' into 'master'

[kohadocs.git] / source / systempreferences.rst

diff --git a/source/systempreferences.rst b/source/systempreferences.rst
index 7fc4f7c..d01b6c7 100644 (file)
--- a/source/systempreferences.rst
+++ b/source/systempreferences.rst
@@ -752,7 +752,7 @@ Values:
 Description:
 
 -  This preference allows the system administrator to determine if users
-   will be able to set and see an item type icon
+   will be able to set and see an item type icon in 
    the catalog on both the OPAC and the Staff Client. The images will
    display in both the OPAC and the Staff Client/Intranet. If images of
    item types are disabled, text labels for item types will still appear
@@ -1242,10 +1242,10 @@ Description:
 -  Used when merging authorities.
 
 -  Controls how the indicators of linked authority records affect the
-   corresponding biblio indicators. Currently, the default valueis fine-tuned
+   corresponding biblio indicators. Currently, the default value is fine-tuned
    for MARC21 and copies the authority indicators for UNIMARC.
 
--  For example,a MARC21 field 100 in a biblio record should pick its first
+-  For example, a MARC21 field 100 in a biblio record should pick its first
    indicator from the linked authority record. The second indicator is not
    controlled by the authority. This report supports such MARC conventions.
 
@@ -11616,15 +11616,25 @@ Values:
 
 Description:
 
-When the value of this system preference is set to 'do', Koha will look at the
-patron's circulation history to see if they have checked this item out before.
-An alert will show up on the screen indicating that patron has indeed checked
-this item out.  Staff will be prompted to allow the checkout to occur.
-If the value is set to 'don't', Koha will not check the patron's circulation
-history. When the value is set to 'Unless overridden, do', this will check the
-patron's circulation history even if there are fines, fees, and/or holds on the
-patron's account.  Lastly, if the value is set to 'Unless overridden, don't',
-Koha will not check circulation history regardless of fines, fees, and/or holds.
+-  When the value of this system preference is set to 'do', Koha will look at the
+   patron's circulation history to see if they have checked this item out before.
+   An alert will show up on the screen indicating that patron has indeed checked
+   this item out. Staff will be prompted to allow the checkout to occur.
+
+   |image1390|
+
+-  If the value is set to 'do not', Koha will not check the patron's circulation
+   history.
+
+-  When the value is set to 'Unless overridden, do', this will check the
+   patron's circulation history unless the patron's :ref:`personal setting 
+   <add-a-new-patron>` or the :ref:`patron category setting <adding-a-patron-category>` 
+   specifically say not to.
+   
+-  Lastly, if the value is set to 'Unless overridden, do not',
+   Koha will not check circulation history unless the patron's :ref:`personal 
+   setting <add-a-new-patron>` or the :ref:`patron category setting <adding-a-
+   patron-category>` specifically say to check.
 
      **Note**