Merge https://github.com/Koha-Community/kohadocs

diff --cc en/source/18_miscellaneous.rst
index 2fb7377,92c3987..6d07980
--- 1/en/source/18_miscellaneous.rst
--- 2/en/source/18_miscellaneous.rst
+++ b/en/source/18_miscellaneous.rst
@@@ -2362,8 -2362,8 +2362,8 @@@ SIP2 communications consist of request
  
  The self checkout machines are ‘dumb’ and so they send requests to the Koha server which runs logic which determines a particular outcome which is sent as a response message back to the client self checkout machine, and this is then conveyed to the user.
  
--.. warning:: Security notice regarding using SIP2 service
-                                To ensure that your SIP2 traffic is secure as it passes over the internet you need to make sure that you are using a VPN or   stunnel.
 -                               To ensure that your SIP2 traffic is secure as it passes over the internet you need to make sure that you are using a VPN or   stunnel.
++.. warning:: Security notice regarding using SIP2 service:
++           To ensure that your SIP2 traffic is secure as it passes over the internet you need to make sure that you are using a VPN or   stunnel.
  
  Setting up SIP2
  ----------------------
@@@ -2405,7 -2405,7 +2405,7 @@@ The account(s) you define in the SIPcon
  
                                The reason we want SIP2 users to only have circulate permissions rather than superlibrarian permissions is to reduce the access SIP2 users have to confidential patron data in case the system was compromised.
  
-                               If the ACS or the SC were compromised then having all SIP2 users only having circulation permissions means that an intruder               would only be able to access patron data via the terminal rather than the web interface as well (which would be available with           superlibrarian permissions). So it is simply a matter of protecting your users.
 -                              If the ACS or the SC were compromised then having all SIP2 users only having circulation permissions means that an intruder               would only be able to access patron data via the terminal rather than the web interface as well (which would be available with           superlibrarian permissions). So it is simply a matter of protecting your users.
++                              If the ACS or the SC were compromised then having all SIP2 users only having circulation permissions means that an intruder would only be able to access patron data via the terminal rather than the web interface as well (which would be available with superlibrarian permissions). So it is simply a matter of protecting your users.
  
  |image1119|
  

diff --cc en/source/images.rst
index c37dce7,7970da1..2cf1a71
--- 1/en/source/images.rst
--- 2/en/source/images.rst
+++ b/en/source/images.rst
@@@ -1150,30 -1150,3 +1150,29 @@@
  .. |image1149| image:: images/appendix-services/sipcommand27.png
  .. |image1150| image:: images/appendix-services/sipcommand28.png
  .. |image1151| image:: images/appendix-services/sipcommand29.png
- 
 +.. |image1152| image:: images/installer/installer_login.png
 +.. |image1153| image:: images/installer/create_library_screen_1.png
 +.. |image1154| image:: images/installer/create_library_screen_1_example.png
 +.. |image1155| image:: images/installer/create_patron_categories_1.png
 +.. |image1156| image:: images/installer/create_patron_category_1_example.png
 +.. |image1157| image:: images/installer/create_patron_1.png
 +.. |image1158| image:: images/installer/create_patron_1_example.png
 +.. |image1159| image:: images/installer/create_item_type_1.png
 +.. |image1160| image:: images/installer/create_item_type_1_example.png
 +.. |image1161| image:: images/installer/create_circulation_rule_1.png
 +.. |image1162| image:: images/installer/onboarding_tool_complete.png
 +.. |image1163| image:: images/installer/login.png
 +.. |image1164| image:: images/installer/login_example.png
 +.. |image1165| image:: images/installer/staff_interface.png
 +.. |image1166| image:: images/installer/installer_start_screen.png
 +.. |image1167| image:: images/installer/perl_modules_installed.png
 +.. |image1168| image:: images/installer/database_settings.png
 +.. |image1169| image:: images/installer/connection_established.png
 +.. |image1170| image:: images/installer/ready_for_data.png
 +.. |image1171| image:: images/installer/database_tables_created.png
 +.. |image1172| image:: images/installer/install_basic_configurations.png
 +.. |image1173| image:: images/installer/select_basic_configurations.png
 +.. |image1174| image:: images/installer/marc21_basic_setup.png
 +.. |image1175| image:: images/installer/unimarc_basic_setup.png
 +.. |image1176| image:: images/installer/data_added_1.png
 +.. |image1177| image:: images/installer/redirect.png

diff --cc en/source/index.rst
Simple merge