Merge branch 'patch-9' into 'master'

Replace librarycontact.png

See merge request koha-community/koha-manual!222

diff --git a/source/administration.rst b/source/administration.rst
index d23a4d2..f9e4353 100644 (file)
--- a/source/administration.rst
+++ b/source/administration.rst
@@ -56,8 +56,7 @@ To add a new library:
 -  Next you can enter basic contact info about the branch
 
    |image125|
-   .. screenshot is missing the OPAC info box
-
+ 
    -  The address and contact fields can be used to make notices custom
       for each library
 
@@ -108,9 +107,11 @@ To add a new library:
 
    -  If this library has a specific `MARC organization code <http://www.loc.gov/marc/organizations/orgshome.html>`_, you can enter it   here. If left blank, the code entered in the :ref:`MARCOrgCode` preference will be used for this library.
 
-   -  Finally, if you have any notes you can put them here. These will
+   -  If you have any notes you can put them here. These will
       not show in the OPAC
-
+     
+   -  Finally, you can choose whether the library will display as an available pickup location for holds
+   
     **Note**
 
     Of the fields listed, only 'Library code' and 'Name' are required

diff --git a/source/images.rst b/source/images.rst
index 336472c..8497c15 100644 (file)
--- a/source/images.rst
+++ b/source/images.rst
@@ -1372,8 +1372,8 @@
 .. |image1383| image:: images/tools/stockrotation/sr_manage_stages.png
 .. |image1384| image:: images/tools/stockrotation/sr_manage_items.png
 .. |image1385| image:: images/tools/stockrotation/sr_catalog_view.png
-.. |image1386| image:: images/illrequests/illformpickerstaff.png
-.. |image1387| image:: images/illrequests/createILLstaff1.png
+.. |image1386| image:: images/illrequests/ILLformpickerstaff.png
+.. |image1387| image:: images/illrequests/CreateILLstaff1.png
 .. |image1388| image:: images/illrequests/createILLstaff2.png
 .. |image1389| image:: images/illrequests/confirmrequeststaff.png
 .. |image1390| image:: images/circ/prevcheckout.png

diff --git a/source/images/ILLrequests/Confirmrequeststaff.png b/source/images/ILLrequests/Confirmrequeststaff.png
deleted file mode 100644 (file)
index 7ba9eda..0000000
Binary files a/source/images/ILLrequests/Confirmrequeststaff.png and /dev/null differ

diff --git a/source/images/ILLrequests/CreateILLstaff1.png b/source/images/ILLrequests/CreateILLstaff1.png
deleted file mode 100644 (file)
index a34863c..0000000
Binary files a/source/images/ILLrequests/CreateILLstaff1.png and /dev/null differ

diff --git a/source/images/ILLrequests/CreateILLstaff2.png b/source/images/ILLrequests/CreateILLstaff2.png
deleted file mode 100644 (file)
index 6c28f81..0000000
Binary files a/source/images/ILLrequests/CreateILLstaff2.png and /dev/null differ

diff --git a/source/images/ILLrequests/ILLformpickerstaff.png b/source/images/ILLrequests/ILLformpickerstaff.png
deleted file mode 100644 (file)
index 7c3a59b..0000000
Binary files a/source/images/ILLrequests/ILLformpickerstaff.png and /dev/null differ

diff --git a/source/images/opac/ILLform.png b/source/images/opac/ILLform.png
index cad5a1e..225f6b6 100644 (file)
Binary files a/source/images/opac/ILLform.png and b/source/images/opac/ILLform.png differ

diff --git a/source/images/opac/ILLformpicker.png b/source/images/opac/ILLformpicker.png
index cd9cded..5ce1bd0 100644 (file)
Binary files a/source/images/opac/ILLformpicker.png and b/source/images/opac/ILLformpicker.png differ