Merge branch 'rel_1_6' of git.evergreen-ils.org:Evergreen-DocBook

Merge branch 'rel_1_6' of git.evergreen-ils.org:Evergreen-DocBook

Conflicts:
	1.6/integration/intro.xml
	1.6/stafftasks/intro.xml
	admin/AdminMisc.xml
	admin/Upgrading-Evergreen_1.6.xml
	admin/actiontriggers.xml
	admin/admin-booking.xml
	admin/admin-lsa.xml
	admin/admin-receipt.xml
	admin/admin-survey.xml
	admin/localization.xml
	admin/migratingdata_1.6.xml
	admin/serveradministration.xml
	admin/serversideinstallation.xml
	admin/sip.xml
	admin/staffclientinstallation.xml
	admin/troubleshooting.xml
	admin/z3950.xml
	appendices/about_this_documentation.xml
	appendices/bookindex.xml
	appendices/glossary.xml
	appendices/installchecklist.xml
	appendices/permissions.xml
	appendices/schema.xml
	appendices/schema1.6.1.2.xml
	appendices/schema1.6.1.6.xml
	development/OpenSRF_intro.xml
	development/customize_opac.xml
	development/customizingstaffclient.xml
	development/datamodelsandaccess.xml
	development/development_intro.xml
	development/directoriesandFiles.xml
	development/installchecklist.xml
	development/introduction_to_sql.xml
	development/json.xml
	development/supercat.xml
	integration/intro.xml
	intro/intro_intro.xml
	intro/releasenotes.xml
	media/add_holdings-1.png
	media/add_holdings-2.png
	media/add_holdings-3.png
	media/add_holdings-4.png
	media/add_holdings-5.png
	media/bills-1.png
	media/bills-10.png
	media/bills-11.png
	media/bills-12.png
	media/bills-13.png
	media/bills-14.png
	media/bills-15.png
	media/bills-16.png
	media/bills-17.png
	media/bills-18.png
	media/bills-19.png
	media/bills-2.png
	media/bills-20.png
	media/bills-3.png
	media/bills-4.png
	media/bills-5.png
	media/bills-6.png
	media/bills-7.png
	media/bills-8.png
	media/bills-9.png
	media/catalogue-10.png
	media/catalogue-11.png
	media/catalogue-3.png
	media/catalogue-4.png
	media/catalogue-5.png
	media/catalogue-6.png
	media/catalogue-7.png
	media/catalogue-8.png
	media/catalogue-9.png
	media/circulation-1.png
	media/circulation-10.png
	media/circulation-11.png
	media/circulation-12.png
	media/circulation-13.png
	media/circulation-14.png
	media/circulation-15.png
	media/circulation-16.png
	media/circulation-17.png
	media/circulation-18.png
	media/circulation-19.png
	media/circulation-2.png
	media/circulation-20.png
	media/circulation-21.png
	media/circulation-22.png
	media/circulation-23.png
	media/circulation-24.png
	media/circulation-25.png
	media/circulation-26.png
	media/circulation-27.png
	media/circulation-28.png
	media/circulation-29.png
	media/circulation-3.png
	media/circulation-30.png
	media/circulation-31.png
	media/circulation-32.png
	media/circulation-33.png
	media/circulation-34.png
	media/circulation-35.png
	media/circulation-36.png
	media/circulation-4.png
	media/circulation-5.png
	media/circulation-6.png
	media/circulation-7.png
	media/circulation-8.png
	media/circulation-9.png
	media/hold-1.png
	media/hold-10.png
	media/hold-11.png
	media/hold-12.png
	media/hold-14.png
	media/hold-15.png
	media/hold-16.png
	media/hold-17.png
	media/hold-18.png
	media/hold-19.png
	media/hold-2.png
	media/hold-20.png
	media/hold-21.png
	media/hold-22.png
	media/hold-23.png
	media/hold-24.png
	media/hold-25.png
	media/hold-26.png
	media/hold-27.png
	media/hold-28.png
	media/hold-29.png
	media/hold-4.png
	media/hold-5.png
	media/hold-6.png
	media/hold-7.png
	media/hold-8.png
	media/hold-9.png
	media/k_book_record.png
	media/lsa-1.png
	media/lsa-10.jpg
	media/lsa-11.jpg
	media/lsa-12.jpg
	media/lsa-14.jpg
	media/lsa-16.jpg
	media/lsa-17.jpg
	media/lsa-18.jpg
	media/lsa-2.jpg
	media/lsa-22.png
	media/lsa-23.jpg
	media/lsa-25.jpg
	media/lsa-26.jpg
	media/lsa-27.jpg
	media/lsa-28.jpg
	media/lsa-32.jpg
	media/lsa-33.jpg
	media/lsa-4.jpg
	media/lsa-5.jpg
	media/lsa-7.jpg
	media/lsa-8.jpg
	media/lsa-closed-mountain-1.png
	media/lsa-closed-mountain-2.png
	media/lsa-group-0.png
	media/lsa-group-1.png
	media/lsa-group-1a.png
	media/lsa-group-2.png
	media/lsa-group-3.png
	media/lsa-group-4.png
	media/lsa-group-5.png
	media/lsa-group-6.png
	media/myaccount-bookbags.png
	media/myaccount-itemrenew.png
	media/myaccount-itemscheckedout.png
	media/myaccount-itemsonhold.png
	media/myaccount-login-arrow.png
	media/myaccount-login-info.png
	media/myaccount-login.png
	media/myaccount-loginpasswordupdate.png
	media/myaccount-summary.png
	media/offline-1.png
	media/offline-10.png
	media/offline-11.png
	media/offline-12.png
	media/offline-13.png
	media/offline-14.png
	media/offline-15.png
	media/offline-16.png
	media/offline-17.png
	media/offline-18.png
	media/offline-19.png
	media/offline-2.png
	media/offline-20.png
	media/offline-21.png
	media/offline-22.png
	media/offline-23.png
	media/offline-24.png
	media/offline-25.png
	media/offline-26.png
	media/offline-27.png
	media/offline-28.png
	media/offline-29.png
	media/offline-3.png
	media/offline-30.png
	media/offline-31.png
	media/offline-32.png
	media/offline-33.png
	media/offline-34.png
	media/offline-35.png
	media/offline-36.png
	media/offline-4.png
	media/offline-5.png
	media/offline-6.png
	media/offline-7.png
	media/offline-8.png
	media/offline-9.png
	media/passwordresetmessage.png
	media/patron-1.png
	media/patron-10.png
	media/patron-11.png
	media/patron-12.png
	media/patron-13.png
	media/patron-14.png
	media/patron-15.png
	media/patron-16.png
	media/patron-17.png
	media/patron-18.png
	media/patron-19.png
	media/patron-2.png
	media/patron-20.png
	media/patron-21.png
	media/patron-22.png
	media/patron-23.png
	media/patron-24.png
	media/patron-25.png
	media/patron-26.png
	media/patron-27.png
	media/patron-28.png
	media/patron-29.png
	media/patron-3.png
	media/patron-30.png
	media/patron-31.png
	media/patron-32.png
	media/patron-3a.png
	media/patron-4.png
	media/patron-5.png
	media/patron-6.png
	media/patron-7.png
	media/patron-8.png
	media/patron-9.png
	media/patron-record-status-1.png
	media/patron-record-status-dark-grey.png
	media/patron-record-status-green.png
	media/patron-record-status-light-grey.png
	media/patron-record-status-orange.png
	media/patron-record-status-purple.png
	media/patron-record-status-red.png
	media/patron-record-status-yellow.png
	media/profile-5.png
	media/profile-6.png
	media/profile-7.png
	media/receipt-10.jpg
	media/receipt-11.jpg
	media/receipt-12.jpg
	media/receipt-13.jpg
	media/receipt-14.jpg
	media/receipt-15.jpg
	media/receipt-16.png
	media/receipt-17.jpg
	media/receipt-18.jpg
	media/receipt-19.jpg
	media/receipt-2.jpg
	media/receipt-20.jpg
	media/receipt-21.jpg
	media/receipt-22.jpg
	media/receipt-23.jpg
	media/receipt-24.jpg
	media/receipt-3.jpg
	media/receipt-4.jpg
	media/receipt-5.jpg
	media/receipt-6.jpg
	media/receipt-7.jpg
	media/receipt-8.jpg
	media/receipt-9.jpg
	media/server-3.png
	media/server-4.png
	media/server-5.png
	media/server-6.png
	media/serversideinstallation-staffclient-running-1.png
	media/serversideinstallation-staffclient-running-2.png
	media/serversideinstallation-staffclient-running-3.png
	media/serversideinstallation-staffclient-running-4.png
	media/serversideinstallation-testing-1.png
	media/serversideinstallation-testing-2.png
	media/serversideinstallation-virtual-vbox-install-1.png
	media/serversideinstallation-virtual-vbox-install-2.png
	media/serversideinstallation-virtual-vbox-install-3.png
	media/serversideinstallation-virtual-vbox-install-4.png
	media/serversideinstallation-virtual-vbox-install-5.png
	media/serversideinstallation-virtual-vm-install-1.png
	media/serversideinstallation-virtual-vm-install-10.png
	media/serversideinstallation-virtual-vm-install-11.png
	media/serversideinstallation-virtual-vm-install-12.png
	media/serversideinstallation-virtual-vm-install-13.png
	media/serversideinstallation-virtual-vm-install-14.png
	media/serversideinstallation-virtual-vm-install-15.png
	media/serversideinstallation-virtual-vm-install-16.png
	media/serversideinstallation-virtual-vm-install-17.png
	media/serversideinstallation-virtual-vm-install-18.png
	media/serversideinstallation-virtual-vm-install-19.png
	media/serversideinstallation-virtual-vm-install-2.png
	media/serversideinstallation-virtual-vm-install-20.png
	media/serversideinstallation-virtual-vm-install-21.png
	media/serversideinstallation-virtual-vm-install-3.png
	media/serversideinstallation-virtual-vm-install-4.png
	media/serversideinstallation-virtual-vm-install-5.png
	media/serversideinstallation-virtual-vm-install-6.png
	media/serversideinstallation-virtual-vm-install-7.png
	media/serversideinstallation-virtual-vm-install-8.png
	media/serversideinstallation-virtual-vm-install-9.png
	media/staffclient-1.png
	media/staffclient-2.png
	media/staffclient-3.png
	media/staffclient-4.png
	media/staffclient-5.png
	media/staffclient-6.png
	media/staffclient-6a.png
	media/staffclient-6b.png
	media/staffclient-6c.png
	media/staffclient-6d.png
	media/staffclient-7.png
	media/staffclient-7a.png
	media/staffclient-8.png
	media/staffclient-9.png
	media/staffclientinstallation-proxy-putty-1.png
	media/staffclientinstallation-proxy-socks-1.png
	media/staffclientinstallation-proxy-socks-2.png
	media/staffclientinstallation-staffclient-1.png
	media/staffclientinstallation-staffclient-2.png
	media/staffclientinstallation-staffclient-3.png
	media/staffclientinstallation-staffclient-4.png
	media/staffclientinstallation-staffclient-workstationnames-1.png
	media/staffclientinstallation-staffclient-workstationnames-2.png
	media/staffclientinstallation-staffclient-workstationnames-3.png
	media/staffclientinstallation-tabbed-1.png
	media/survey-1.png
	media/survey-10.png
	media/survey-2.png
	media/survey-3.png
	media/survey-4.png
	media/survey-5.png
	media/survey-6.png
	media/survey-7.png
	media/survey-8.png
	media/survey-9.png
	media/transit-1.png
	media/transit-10.png
	media/transit-2.png
	media/transit-3.png
	media/transit-4a.png
	media/transit-5.png
	media/transit-6.png
	media/transit-7.png
	media/transit-8.png
	media/transit-9.png
	opac/advancedsearch.xml
	opac/basicsearch.xml
	opac/myaccount.xml
	opac/search_URL.xml
	opac/searchmethodology.xml
	opac/searchresults.xml
	opac/searchtips.xml
	opac/simpleselfcheck.xml
	reports/report-add-data-source.xml
	reports/report.diffs
	root.xml
	stafftasks/booking.xml
	stafftasks/cataloging.xml
	stafftasks/circulation.xml
	stafftasks/intro.xml
	stafftasks/staffclient.xml