Merge remote-tracking branch 'gitlab/master'

diff --cc source/02_administration.rst
index 00dc568,fc4eecf..d133e3d
--- 1/source/02_administration.rst
--- 2/source/02_administration.rst
+++ b/source/02_administration.rst
@@@ -11035,13 -11035,13 +11035,19 @@@ Description
      the database
      structure <http://schema.koha-community.org/tables/borrowers.html>`__
      associated with the borrowers table.
+     
+     **Note**
+     
+     If either :ref:`PatronQuickAddFields` or :ref:`BorrowerMandatoryField`
+     (or both) is set, a button labeled "Quick add new patron" will be displayed
+     in the "Patrons" toolbar.
  
 +    **Note**
 +
 +    If either :ref:`PatronQuickAddFields` or :ref:`BorrowerMandatoryField`
 +    (or both) is set, a button labeled "Quick add new patron" will be displayed
 +    in the "Patrons" toolbar.
 +
  .. _borrowerrelationship-label:
  
  borrowerRelationship
@@@ -11514,7 -11514,7 +11520,6 @@@ and fields specified here. If applicabl
  as well, individual fields in that form will be ignored.
  
      **Note**
- 
 -    
      If either :ref:`PatronQuickAddFields` or :ref:`BorrowerMandatoryField`
      (or both) is set, a button labeled "Quick add new patron" will be displayed
      in the "Patrons" toolbar.
@@@ -13930,7 -13930,7 +13935,6 @@@ top of the Item Types page
            points (ex. $5.00 should be entered as 5 or 5.00)
  
  
--
  -  If you would like a message or alert to appear when items of this
     type are checked in you can enter that in the 'Checkin message' box