Fixes #3907: Add a note about the Rudder V2 API in the documentation
Merge pull request #17 from Kegeruneku/bug_3907/dev/3907_document_api_v2

Fixes #3907: Add a note about the Rudder V2 API in the documentation
10_install_server/00_install_intro.txt: Add advice on partitioning
Merge pull request #19 from coredumb/ust3932/implementation/advice_separate_partitions_2.4

10_install_server/00_install_intro.txt: Add advice on partitioning
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Fixes #3941 - Explain how configure yum repositories to add Rudder and its GPG key
Merge pull request #20 from nperron/bug_3941/doc/explain_how_configure_yum_to_accept_gpgkeys

Fixes #3941 - Explain how configure yum repositories to add Rudder and its GPG key
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	10_install_server/13_install_root_server_centos_rhel.txt
	11_install_agent/20_install_agent_centos_rhel.txt
	12_upgrade/20_upgrade_centos_rhel.txt
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	10_install_server/13_install_root_server_centos_rhel.txt
	11_install_agent/20_install_agent_centos_rhel.txt
	12_upgrade/20_upgrade_centos_rhel.txt
Fixes #3949: Update LDAP authentication procedure
Merge pull request #21 from fanf/bug_3949/Update_ldap_authentication_documentation

Fixes #3949: Update LDAP authentication procedure
Revert "Fixes #3949: Update LDAP authentication procedure"

This reverts commit 880fc6485c29489b3cc8a8eb82ed00fab8bfa385.
Fixes #3943 - Fix display of Chapters in Advanced usage
Fixes #3949: document LDAP authentication mixed with rudder-users.xml defined authorization
Merge pull request #25 from fanf/bug_3949/Update_ldap_authentication_documentation

Fixes #3949: document LDAP authentication mixed with rudder-users.xml defined authorization
Merge pull request #22 from nperron/bug_3943/doc/fix_chapters

Fixes #3943 - Fix display of Chapters in Advanced usage
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Fixes #3956: Some titles were hidden or partially hidden