# Conflicts:
#   .readthedocs.yaml

Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>

Resolve "add the new config file for readthe docs"

See merge request fusiondirectory/user-manual!410

Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>

Resolve "Add the task and mail template fonctionnality to the manual"

See merge request fusiondirectory/user-manual!409

Resolve "[Orchestrator] - Installation and configuration manual"

See merge request fusiondirectory/user-manual!408

Resolve "There is no mention of askme macro"

Closes #225

See merge request fusiondirectory/user-manual!407

Resolve "Add an example for d modifier where we only use the year"

Closes #187

See merge request fusiondirectory/user-manual!406

Merge branch '228-remove-we-recommend-to-use-the-most-recent-php-version-as-we-are-fixed-on-certains-versions' into '1.4'

Resolve "Remove we recommend to use the most recent php version as we are fixed on certains versions"

Closes #228

See merge request fusiondirectory/user-manual!405

Resolve "Remove we recommend to use the most recent php version as we are fixed on certains versions"

Resolve "update the certified distribution matrix"

Closes #194

See merge request fusiondirectory/user-manual!404

Resolve "Correct contact us in the documentation"

See merge request fusiondirectory/user-manual!402

Merge branch '201-bump-php-version-for-centos-to-7-3' into '1.4'

See merge request fusiondirectory/user-manual!401

Merge branch '226-user-manual-missing-instructions-for-inserting-core-schemas-for-fusiondirectory' into '1.4'

Resolve "[user-manual] missing instructions for inserting core schemas for FusionDirectory"

See merge request fusiondirectory/user-manual!400

Merge branch '222-there-is-a-typo-in-the-repository-for-1-4-its-tell-buster-when-it-should-tell-bullseye' into '1.4'

Resolve "There is a typo in the repository for 1.4 its tell buster when it should tell bullseye"

Closes #222

See merge request fusiondirectory/user-manual!396

 fix(repository) There is a typo in the repository for 1.4 its tell buster when it should tell bullseye

Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>

Resolve "[user-manual] - Issue related to the configuration of the zimbra plugin"

Closes #220

See merge request fusiondirectory/user-manual!394

Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>

Resolve "Change --install-schema to --insert-schema"

Closes #218

See merge request fusiondirectory/user-manual!393

Fix command for inserting the schemas

Signed-off-by: Jonathan Swaelens <jonathan.swaelens@fusiondirectory.org>

Resolve "change the install method for fusondirectory 1.4"

Closes #215

See merge request fusiondirectory/user-manual!392

Merge branch '217-user-manual-franceconnect-adds-to-supann-the-new-schema-to-be-installed' into '1.4'

Resolve "[User-manual] - FranceConnect - Adds to supann the new schema to be installed"

Closes #217

See merge request fusiondirectory/user-manual!391

Adds to user manual how to install the new fdFranceConnect schema.

Resolve "change the install method for fusondirectory 1.4"

See merge request fusiondirectory/user-manual!390

Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>

Resolve "[User-Manual] - Release 1.3.1 to 1.4 documentation"

Closes #214

See merge request fusiondirectory/user-manual!389

Resolve "we should add an entry of me nu on the left that show the webservice"

Closes #213

See merge request fusiondirectory/user-manual!388

Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>

Resolve "FusionDirectory should recommand at least 512MB ram"

Closes #212

See merge request fusiondirectory/user-manual!387