Fixes #3960: Add details in the database maintenance chapter about how archival/deletion works
Merge pull request #85 from Kegeruneku/bug_3960/doc/3960_add_database_maintenance_details

Fixes #3960: Add details in the database maintenance chapter about how a...
Fixes #5729: Add a 'Parameters' section in the documentation
Merge pull request #88 from Kegeruneku/bug_5729/doc/5729_add_parameters_in_doc

Fixes #5729: Add a 'Parameters' section in the documentation
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11