diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000000000000000000000000000000000..99ab470ea3861b10ce3e1871680bb6b188a3164e
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,7 @@
+# These are supported funding model platforms
+
+ko_fi: fusiondirectory
+liberapay: fusiondirectory
+open_collective: fusiondirectory
+community_bridge: fusiondirectory
+github: fusiondirectory
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a220e5c55e7b23759e9eb29be7829d379bf4fe81..a49a85d0c45b013b57861fc113547be46f19ff37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,10 @@
-# Specify docker image
-image: debian:stretch
-
-# Define variable to disable SSL verification of GIT
-variables:
- GIT_SSL_NO_VERIFY: "true"
-
-# Execute before every job
-# Install libperl-critic-perl, php-codesniffer, git and php
-before_script:
- - apt-get update -qq
- - apt-get install -y -qq python-sphinx python-sphinx-rtd-theme make
-
-# Generate perlcritic rapport
+# Generate sphinx rapport
create_sphinx_rapport:
+ image: registry.fusiondirectory.org/fusiondirectory/fd/sphinx-cli:buster
only:
- branches
- tags
script:
- - make html
+ - make SPHINXOPTS='-n -W' html
diff --git a/Changelog.md b/Changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..ab3c012a2826269aabf59cd514000acc52179ca3
--- /dev/null
+++ b/Changelog.md
@@ -0,0 +1,51 @@
+## %"FusionDirectory 1.3.1" - 2023-06-23
+
+### Added
+
+#### dev-manual
+- dev-manual#1 adding release policies
+- dev-manual#2 adding license
+- dev-manual#4 Adding more documentation
+- dev-manual#5 adding code of conduct
+- dev-manual#6 adding an contributing section to the manual
+- dev-manual#15 Add translate Fusiondirectory section
+- dev-manual#19 Add schema number for sinaps config schema
+- dev-manual#20 add schema number for supann extension
+- dev-manual#21 reservation of a OID number for the schema of fusiondirectory-plugins-seafile and fusiondirectory-plugins-libreroaming
+- dev-manual#30 Guidelines for better contributions
+- dev-manual#31 code of conduct
+- dev-manual#44 add the release workflow of our various software to the the manual
+- dev-manual#45 new subsection in ldap schema "FusionDirectory attribute finder"
+- dev-manual#49 add support / security / contact us like in the user manual
+- dev-manual#51 add what is fusiondirectory / prerequisite /certified distribution
+
+### Changed
+
+#### dev-manual
+- dev-manual#3 reorganising logically the documentation
+- dev-manual#7 latest version of contributing.md
+- dev-manual#18 move how_to_contribute page from the wiki to developper documentation
+- dev-manual#17 move how_to_contribute page from the wiki to developper documentation
+- dev-manual#25 rewrite the FusionDirectory Life Cycle page
+- dev-manual#29 rewrite distribution and php support
+- dev-manual#32 Update the contribute part of the Contributing to FusionDirectory
+- dev-manual#37 change the old pictures showing fusiondirectory 1.0.8 in the manual
+- dev-manual#47 correct the fusiondirectory cycle that is at 6 month when is should be 12 month
+- dev-manual#48 move all fusiondirectory dev manual into a fusiondirectory subidrectory
+
+### Removed
+
+#### dev-manual
+- dev-manual#50 remove centos 8 from te supported distribution
+
+### Fixed
+
+#### dev-manual
+- dev-manual#13 Correct the exemple about php codesniffer
+- dev-manual#9 Coding standard examples should match the coding standards
+- dev-manual#10 The code sniffer command is wrong
+- dev-manual#28 change the url in 1.3 for the webservice documentation
+- dev-manual#52 replace freenode by libera
+- dev-manual#66 clarify the php version supported for FusionDirectory 1.3.x
+- dev-manual#67 update the certified distribution matrix
+
diff --git a/source/_static/images/attributes/base.png b/source/_static/images/attributes/base.png
index 70db6836cbaa38e52ab555b67a6a03a1e4194f6f..ddcc8d275f4b342eeb7d894f127de503aef8bcc7 100644
Binary files a/source/_static/images/attributes/base.png and b/source/_static/images/attributes/base.png differ
diff --git a/source/_static/images/attributes/boolean-false.png b/source/_static/images/attributes/boolean-false.png
index 0603b3f6e5f59428809a1006d741d0e421fa5156..143b52354ab3297ec0a5083086bbdecad7e5f7d2 100644
Binary files a/source/_static/images/attributes/boolean-false.png and b/source/_static/images/attributes/boolean-false.png differ
diff --git a/source/_static/images/attributes/boolean-true.png b/source/_static/images/attributes/boolean-true.png
index 7bb7a67983035986aba7e429a599c329d5a0241e..5b6a835b6d0f3d64d746c7113d11ae5ab5531eb7 100644
Binary files a/source/_static/images/attributes/boolean-true.png and b/source/_static/images/attributes/boolean-true.png differ
diff --git a/source/_static/images/attributes/composite.png b/source/_static/images/attributes/composite.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3a5457c617ca1253f9cc703b6b712d80f47034a
Binary files /dev/null and b/source/_static/images/attributes/composite.png differ
diff --git a/source/_static/images/attributes/date1.png b/source/_static/images/attributes/date1.png
index 2491fb24333f763db3dee2f9a16e6ed3f27cce36..0108da2679a0189741f3b622ba08f649ed8bef98 100644
Binary files a/source/_static/images/attributes/date1.png and b/source/_static/images/attributes/date1.png differ
diff --git a/source/_static/images/attributes/int.png b/source/_static/images/attributes/int.png
index ea04028efbee5d7c269b5e26560ab4290539db71..64c841ed33d3390889ade286a972196234f6e6b2 100644
Binary files a/source/_static/images/attributes/int.png and b/source/_static/images/attributes/int.png differ
diff --git a/source/_static/images/attributes/password.png b/source/_static/images/attributes/password.png
index e467028e5e531bcef9332020fd5a6a7b927edc2e..478dd55af7c62a8aed384f65f884e46387632fb4 100644
Binary files a/source/_static/images/attributes/password.png and b/source/_static/images/attributes/password.png differ
diff --git a/source/_static/images/attributes/select.png b/source/_static/images/attributes/select.png
index 2947e4bac0a67fc64821d1b26b845b4da15a7d34..ff01ceaabd00cdb055daf5a175e6bf23a0da2f32 100644
Binary files a/source/_static/images/attributes/select.png and b/source/_static/images/attributes/select.png differ
diff --git a/source/_static/images/attributes/set.png b/source/_static/images/attributes/set.png
index 4f248233755526a8a8edce935c0e51589cb37715..56f71ee17cd578b8694f058fce28ac047de8e484 100644
Binary files a/source/_static/images/attributes/set.png and b/source/_static/images/attributes/set.png differ
diff --git a/source/_static/images/attributes/string.png b/source/_static/images/attributes/string.png
index a10d33a2c4720b4878fa3cae23964ac609787462..2cd3cd935871447bac5fce3daaa8e8d266ed5243 100644
Binary files a/source/_static/images/attributes/string.png and b/source/_static/images/attributes/string.png differ
diff --git a/source/_static/images/attributes/users1.png b/source/_static/images/attributes/users1.png
index c5c57a7f4851eb2a025cd5cf401264245e99b550..c80f20e3284050d05acf707af17860f87b0ef4a5 100644
Binary files a/source/_static/images/attributes/users1.png and b/source/_static/images/attributes/users1.png differ
diff --git a/source/_static/images/attributes/users2.png b/source/_static/images/attributes/users2.png
index 54804764ee82dcae0c2724af177a35812c0ebea4..b6d64a79d03730c397b0c84a109dcb20a319e77e 100644
Binary files a/source/_static/images/attributes/users2.png and b/source/_static/images/attributes/users2.png differ
diff --git a/source/_static/images/attributes/users3.png b/source/_static/images/attributes/users3.png
index fc98888348ff482e1377d8a92f4a25a7d9c37697..f6262a67e4299da6f8a2425dd378f621781ad4bd 100644
Binary files a/source/_static/images/attributes/users3.png and b/source/_static/images/attributes/users3.png differ
diff --git a/source/_static/images/demoplugin.png b/source/_static/images/demoplugin.png
index 7e21ccdc62b742288c974a843c9cc612a6b73344..889f3dc6f66c1d7839ccc70609251ff250dd4203 100644
Binary files a/source/_static/images/demoplugin.png and b/source/_static/images/demoplugin.png differ
diff --git a/source/code-of-conduct.rst b/source/code-of-conduct.rst
new file mode 100644
index 0000000000000000000000000000000000000000..b80639920a135e817ae134bd5e806efcad400b54
--- /dev/null
+++ b/source/code-of-conduct.rst
@@ -0,0 +1,85 @@
+.. _code-of-conduct-label:
+
+Code of Conduct
+===============
+
+Our Pledge
+----------
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our
+project and our community a harassment-free experience for everyone,
+regardless of age, body size, disability, ethnicity, gender identity and
+expression, level of experience, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+Our Standards
+-------------
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual
+ attention or advances
+- Trolling, insulting/derogatory comments, and personal or political
+ attacks
+- Public or private harassment
+- Publishing others’ private information, such as a physical or
+ electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+Our Responsibilities
+--------------------
+
+Project maintainers are responsible for clarifying the standards of
+acceptable behavior and are expected to take appropriate and fair
+corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct, or to ban
+temporarily or permanently any contributor for other behaviors that they
+deem inappropriate, threatening, offensive, or harmful.
+
+Scope
+-----
+
+This Code of Conduct applies both within project spaces and in public
+spaces when an individual is representing the project or its community.
+Examples of representing a project or community include using an
+official project e-mail address, posting via an official social media
+account, or acting as an appointed representative at an online or
+offline event. Representation of a project may be further defined and
+clarified by project maintainers.
+
+Enforcement
+-----------
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may
+be reported by contacting the project team at coc@fusiondirectory.org.
+All complaints will be reviewed and investigated and will result in a
+response that is deemed necessary and appropriate to the circumstances.
+The project team is obligated to maintain confidentiality with regard to
+the reporter of an incident. Further details of specific enforcement
+policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in
+good faith may face temporary or permanent repercussions as determined
+by other members of the project’s leadership.
+
+Attribution
+-----------
+
+This Code of Conduct is adapted from the `Contributor
+Covenant <https://www.contributor-covenant.org>`__, version 1.4,
+available at
+`https://www.contributor-covenant.org/version/1/4 <https://www.contributor-covenant.org/version/1/4/>`__
diff --git a/source/conf.py b/source/conf.py
index 952ce98a2cdf71cec3f2891b981f3880ee37107b..10201cd432af3b9c797a2345533a2122b94b223b 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -59,9 +59,9 @@ author = u'Benoit Mortier Côme Chilliet'
# built documents.
#
# The short X.Y version.
-version = u'1.2'
+version = u'1.3'
# The full version, including alpha/beta/rc tags.
-release = u'1.2'
+release = u'1.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/source/contact/contact.rst b/source/contact/contact.rst
new file mode 100644
index 0000000000000000000000000000000000000000..98d1dccb9a52411fdb8e9e2b476a28ff680f21bd
--- /dev/null
+++ b/source/contact/contact.rst
@@ -0,0 +1,13 @@
+
+Contact Us
+==========
+
+We are also contactable on:
+
+* Mailing list: `<https://lists.fusiondirectory.org/wws/lists>`__
+* IRC: #fusiondirectory on irc.libera.chat `<irc://irc.libera.chat/fusiondirectory>`__
+
+Follow Us
+
+* On twitter: https://twitter.com/fusiondirectory
+* On linkedin: https://www.linkedin.com/company/fusiondirectory
diff --git a/source/contribute/guidelines.rst b/source/contribute/guidelines.rst
deleted file mode 100644
index 8bfb92aeff001b1abbbce2b966488c5540204a44..0000000000000000000000000000000000000000
--- a/source/contribute/guidelines.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Guidelines for better contributions
-===================================
-
-There is a complete set of guidelines that you should read
-
-`Contributing to FusionDirectory <https://gitlab.fusiondirectory.org/fusiondirectory/fd/blob/1.3-dev/CONTRIBUTING.md>`_
-
-
diff --git a/source/contribute/index.rst b/source/contribute/index.rst
deleted file mode 100644
index 112aeab145ec3c65a94ad8614a019ca058924e5f..0000000000000000000000000000000000000000
--- a/source/contribute/index.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Contributing to FusionDirectory
-===============================
-
-How to contribute to FusionDirectory
-
-.. toctree::
- :maxdepth: 2
-
- register
- guidelines
-
diff --git a/source/contribute/register.rst b/source/contribute/register.rst
deleted file mode 100644
index 139abfc9f9e87408d56a5d08232533202081463b..0000000000000000000000000000000000000000
--- a/source/contribute/register.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Registering a FusionDirectory Account
-=====================================
-
-To create a FusionDirectory project Account you must go to
-`FusionDirectory Sign UP <https://register.fusiondirectory.org>`_
diff --git a/source/development/index.rst b/source/development/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e1e5277c14a670c45f23b5cab08662d02cac2360
--- /dev/null
+++ b/source/development/index.rst
@@ -0,0 +1,9 @@
+Development Worflows
+====================
+
+We follow a specific workflow to label our tickets during their life cycle
+
+.. toctree::
+ :maxdepth: 2
+
+ workflow-tickets.rst
diff --git a/source/development/workflow-tickets.rst b/source/development/workflow-tickets.rst
new file mode 100644
index 0000000000000000000000000000000000000000..669a83c1e16278e35b77cd2c9a1dd0d27fd68838
--- /dev/null
+++ b/source/development/workflow-tickets.rst
@@ -0,0 +1,103 @@
+New ticket opened
+=================
+
+First the label of the dolibarr project should be added to it.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The dolibarr label are made like this : **PJYYYY**-project number
+
+We have some basic project number that should always be used by default if there is no customer project.
+
+- FusionDirectory / Automated Testing / FusionDirectory demo :
+ **PJ1802-0188**
+
+- Argonaut : **PJ1802-0190**
+
+- Packaging Debian / Redhat / Centos / Ubuntu : **PJ1802-0189**
+
+- Gitlab-ci changes : **PJ1802-0188**
+
+- User-manual : **PJ2003-0342**
+
+- Dev Manual : **PJ2003-0343**
+
+.. warning::
+
+ if the label doesnt exist it need to be created at the group level
+ for exemple : `Group Label`_
+
+Second the component where the bug/enhancement is to be made should be specified
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Example : fusiondirectory-core or plugin-xxx
+
+.. warning::
+
+ It could be several component
+
+Third if this is a customer under contract the level of support should be added also
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Example : basic, intermediate, expert, premium
+
+Ticket as been treated
+======================
+
+you need to input you time into the ticket with **/spend** with a choice of xxmin, xxhours, xxdays
+
+.. warning::
+
+ Very important as it allow to caculate the time spend on this feature or fix
+
+if some code has been commited and need to be tested
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- The **to be tested** label should be added
+
+if some more info is needed to act on the report
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- The **need info** label should be added, don’t hesitate to ping the
+ user reporting the bug with **@(useranme)** to ask him to check it out
+
+If the change need to be cherry-picked in a -fixes version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- The **fixes** label is added, when the cherry-pick as been merged we
+ remove the **fixes** and add the **fixes-merged** label
+
+if the change need a change in packaging
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- The **packaging** label is added and a corresponding ticket is open
+ in the corresponding distribution projects
+
+ - `Debian Packaging`_
+ - `Centos Packaging`_
+ - `Ubuntu Packaging`_
+
+
+- The packaging ticket are linked back with the code fix ticket
+
+Ticket need to be closed
+========================
+
+- Remove the **to be tested** label, and add one of the changelog label
+ to specify what has been done.
+
+ - Added
+ - Changed
+ - Deprecated
+ - Fixed
+ - Removed
+ - Security
+
+Those label are used to generate a changelog when we release a new
+version of the software, and also used when we want to search in which
+version something has been changed and what the type of change it was
+
+
+.. _Debian Packaging : https://gitlab.fusiondirectory.org/debian
+.. _Centos Packaging : https://gitlab.fusiondirectory.org/centos
+.. _Ubuntu Packaging : https://gitlab.fusiondirectory.org/ubuntu
+.. _Group Label : https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/labels
diff --git a/source/api/api.rst b/source/fusiondirectory/api/api.rst
similarity index 66%
rename from source/api/api.rst
rename to source/fusiondirectory/api/api.rst
index 880a9da116128abc400e31f33b75f68b72870547..51a0be72d5f71db68f5deb725d3e4f87d7e82af8 100644
--- a/source/api/api.rst
+++ b/source/fusiondirectory/api/api.rst
@@ -3,4 +3,4 @@ FusionDirectory API
FusionDirectory API is called simplePlugin and is documented automatically at each build.
-`FusionDirectory API <http://api.fusiondirectory.org/index.html>`_
+`FusionDirectory API <https://stable-api.fusiondirectory.org/>`_
diff --git a/source/api/index.rst b/source/fusiondirectory/api/index.rst
similarity index 100%
rename from source/api/index.rst
rename to source/fusiondirectory/api/index.rst
diff --git a/source/api/webservice.rst b/source/fusiondirectory/api/webservice.rst
similarity index 78%
rename from source/api/webservice.rst
rename to source/fusiondirectory/api/webservice.rst
index 2c76c2a2b333355bdc6f38e45220f27005717be1..bdaccb1b83ad0de2fc74c9d295efe875eb4efa57 100644
--- a/source/api/webservice.rst
+++ b/source/fusiondirectory/api/webservice.rst
@@ -1,14 +1,21 @@
Fusiondirectory WebService
==========================
-FusionDirectory WebService plugin exposes a JSONRPC webservice you can use if you want to access LDAP content through FusionDirectory system.
-This way, you ensure that things like foreign keys are kept consistent, and you have a nicer API than the low-level LDAP one.
+FusionDirectory WebService plugin exposes a JSON RPC webservice that you can use if you want to access LDAP content through FusionDirectory system.
+This way, you ensure that your ldap objects are kept consistent, your are able to use the system templates and have restrictions applied by acls.
-It is a standard JSONRPC server served on HTTPS protocol.
+On top of that you have a nicer API than the low-level LDAP one.
-Note that you can allow HTTP in plugin configuration, but please avoid doing so except for testing purposes.
+The `JSON RPC webservice methods are detailed here <https://api.fusiondirectory.org/classfdRPCService.html#details>`_.
-The `webservice methods are detailed here <http://api.fusiondirectory.org/classfdRPCService.html#details>`_.
+.. warning::
+
+ This API is deprecated in favour of the REST API coming in FusionDirectory 1.4.
+ So i will not evolve apart from eventual bugfixes
+
+.. warning::
+
+ Note that you can allow HTTP in plugin configuration, but please avoid doing this except for testing purposes.
Basically you first need to call **login** to get a session ticket you’ll use in the other method calls you make.
If you have several LDAP configured you might call **listLdaps** first to list them and specify which one to use as first parameter of **login** (otherwise just pass NULL as first parameter).
@@ -16,7 +23,6 @@ If you have several LDAP configured you might call **listLdaps** first to list t
Then you can use **ls** to list objects of a given type (list types with **listTypes** first if needed).
**getfields** method will give you the fields of a given type (and tab) and **setfields** will allow you to change the value of these fields.
-
.. code-block:: php
<?php
@@ -84,4 +90,3 @@ Then you can use **ls** to list objects of a given type (list types with **listT
} catch (jsonRPCClient_NetworkErrorException $e) {
die($e->getMessage());
}
-
diff --git a/source/coding/codingstandards.rst b/source/fusiondirectory/coding/codingstandards.rst
similarity index 99%
rename from source/coding/codingstandards.rst
rename to source/fusiondirectory/coding/codingstandards.rst
index cc97acdaeedc2a161611a054c9a17f40919c1cf3..0d4c0ce7fa8830107edbe12454dc1757688db635 100644
--- a/source/coding/codingstandards.rst
+++ b/source/fusiondirectory/coding/codingstandards.rst
@@ -1,3 +1,5 @@
+.. _coding-style-label:
+
Coding Style
============
@@ -277,6 +279,8 @@ Files Format
* UTF-8, LF - not CR LF
+.. _checking-standard-label:
+
Checking standards
------------------
diff --git a/source/coding/copyright.rst b/source/fusiondirectory/coding/copyright.rst
similarity index 100%
rename from source/coding/copyright.rst
rename to source/fusiondirectory/coding/copyright.rst
diff --git a/source/coding/index.rst b/source/fusiondirectory/coding/index.rst
similarity index 100%
rename from source/coding/index.rst
rename to source/fusiondirectory/coding/index.rst
diff --git a/source/coding/sourcecode.rst b/source/fusiondirectory/coding/sourcecode.rst
similarity index 100%
rename from source/coding/sourcecode.rst
rename to source/fusiondirectory/coding/sourcecode.rst
diff --git a/source/fusiondirectory/contribute/guidelines.rst b/source/fusiondirectory/contribute/guidelines.rst
new file mode 100644
index 0000000000000000000000000000000000000000..adab59d782eea1ed456a5380890ef1e24062fe3a
--- /dev/null
+++ b/source/fusiondirectory/contribute/guidelines.rst
@@ -0,0 +1,310 @@
+Guidelines for better contributions
+===================================
+
+#. `Welcome <#Welcome>`__
+#. `Code of Conduct <#code-of-conduct>`__
+#. `I just have a question! <#i-just-have-a-question>`__
+#. `How Can I Contribute? <#how-can-i-contribute>`__
+
+ - `Translate FusionDirectory in your
+ language <#translate-fusiondirectory>`__
+ - `Register for a FusionDirectory project account <#register-for-a-fusiondirectory-project-account>`__
+ - `Finding Wonderful Bugs <#finding-wonderful-bugs>`__
+ - `Any Feedback To Enhance Our
+ Apps <#any-feedback-to-enhance-our-apps>`__
+ - `Your Awesome And Mighty Codes
+ Contributions <#your-awesome-and-mighty-codes-contributions>`__
+
+#. `Coding with style <#coding-with-style>`__
+
+ - `Git Commit Messages <#git-commit-messages>`__
+ - `PHP Style Guide <#php-style-guide>`__
+
+#. `Licensing <#licensing>`__
+
+--------------
+
+Welcome
+-------
+
+ «Here's a list of our guidelines, If you want to share a best
+ practice, or think one of these guidelines should be removed, feel
+ free to share it with us.»
+
+🎉 First off, thanks for taking the time to contribute!
+
+Now, sit comfortably at the fireplace, grab your glasses and immerse
+yourself in our documentation.
+
+Code Of Conduct
+---------------
+
+All projects and everyone participating in it is governed by
+FusionDirectory :ref:`code-of-conduct-label`.
+
+By participating, you are expected to uphold this code. Please read this
+before.
+
+I just have a question!
+-----------------------
+
+.. note::
+
+ Please don't file an issue to ask a question. You'll get
+ faster results by using the resource below.
+
+We have an various channel of communications
+
+- `#fusiondirectory, the irc channel of FusionDirectory on
+ Libera.chat <https://web.libera.chat/>`__, channel #fusiondirectory
+- `FusionDirectory Users mailing
+ list <https://lists.fusiondirectory.org/wws/info/users>`__
+- `FusionDirectory dev mailing
+ list <https://lists.fusiondirectory.org/wws/info/developpers>`__
+
+How Can I Contribute?
+---------------------
+
+So, you've developed a new cool feature? Fixed an annoying bug? Found a
+mistake? Want to help translate FusionDirectory in your own language.
+We'd be happy to hear from you! ðŸ‘
+
+Translate FusionDirectory
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We are using
+`Transifex <https://www.transifex.com/fusiondirectory/>`__
+to translate FusionDirectory.
+
+- Create a transifex account
+- Ask to be added to the language group you want to translate
+- Start translating
+
+Register for a FusionDirectory project account
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To create a FusionDirectory project Account you must go to
+
+- `FusionDirectory Sign UP <https://register.fusiondirectory.org>`__
+
+Put FusionDirectory in debug mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Go into FusionDirectory configuration
+- Activate the displaying of PHP errors, and the TRACE debug level
+
+Finding Wonderful Bugs
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. note::
+
+ This section guides you through submitting a bug report. Following
+ these guidelines helps maintainers and the community understand your
+ report, reproduce the behavior, and find related reports.
+
+When you are creating a bug report, please include as many details as
+possible. Fill out the **Bugs** template to create issues, the
+information it asks for helps us resolve issues faster.
+
+Explain the problem and include additional details to help maintainers
+reproduce the problem:
+
+- **Use a clear and descriptive title** for the issue to identify the
+ problem.
+- **Describe the exact steps which reproduce the problem** in as many
+ details as possible. For example, start by explaining wich brower and
+ it's version. When listing steps, don't just say what you did, but
+ explain how you did it. For example, if you moved the cursor to the
+ end of an input, explain if you used the mouse, or a keyboard.
+- **Describe the behavior** you observed after following the steps and
+ point out what exactly is the problem with that behavior.
+- **Explain which behavior** you expected to see instead and why.
+- **Include screenshots and animated GIFs** which show you following
+ the described steps and clearly demonstrate the problem. You can use
+ `this tool <http://www.cockos.com/licecap/>`__ to record GIFs on
+ macOS and Windows, and `this tool <https://github.com/colinkeenan/silentcast>`__ on Linux.
+
+- **Include the PHP errors and trace** collected at the debug step
+ above
+- **If the problem is linked to a specific LDAP entry** attach its LDAP
+ dump.
+
+Fill in a report on :
+
+- `FusionDirectory <https://gitlab.fusiondirectory.org/fusiondirectory/fd/issues>`__
+ for the core program
+- `FusionDirectory
+ Plugins <https://gitlab.fusiondirectory.org/fusiondirectory/fd-plugins/issues>`__
+ for plugins.
+
+Any Feedback To Enhance FusionDirectory
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note::
+
+ This section guides you through submitting an enhancement suggestion,
+ including completely new features and minor improvements to existing
+ functionality. Following these guidelines helps maintainers and the
+ community understand your suggestion and find related suggestions.
+
+When you are creating a enhancement report, please include as many
+details as possible. Fill out the **Enhancement** template to create
+thoses issues, the information it asks for helps us resolve issues
+faster.
+
+- `FusionDirectory <https://gitlab.fusiondirectory.org/fusiondirectory/fd/issues>`__
+ for the core program
+- `FusionDirectory
+ Plugins <https://gitlab.fusiondirectory.org/fusiondirectory/fd-plugins/issues>`__
+ for plugins.
+
+- **Use a clear and descriptive title** for the issue to identify the
+ suggestion.
+- **Provide a step-by-step description of the suggested enhancement**
+ in as many details as possible.
+- **Describe the current behavior** and **explain which behavior you
+ expected to see instead** and why.
+- **Include screenshots and animated GIFs** which help you demonstrate
+ the steps which the suggestion is related to. You can use `this
+ tool <http://www.cockos.com/licecap/>`__ to record GIFs on macOS and
+ Windows, and `this
+ tool <https://github.com/colinkeenan/silentcast>`__ on Linux.
+- **Explain why this enhancement would be useful** to most
+ FusionDirectory users.
+
+Your awesome And Mighty Codes Contributions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note::
+
+ This section guides you through submitting an enhancement suggestion,
+ including completely new features and minor improvements to existing
+ functionality. Following these guidelines helps maintainers and the
+ community understand your suggestion and find related suggestions.
+
+When you are contributing a new fonctionnality or plugin, please include
+as many details as possible.
+
+Fill out the **Contribution** template to create thoses issues, the
+information it asks for helps us resolve issues faster.
+
+- `FusionDirectory <https://gitlab.fusiondirectory.org/fusiondirectory/fd/issues>`__
+ for the core program
+- `FusionDirectory
+ Plugins <https://gitlab.fusiondirectory.org/fusiondirectory/fd-plugins/issues>`__
+ for plugins.
+
+- **Use a clear and descriptive title** for the issue to identify your
+ contribution
+- **Provide a step-by-step description of the contribution** in as many
+ details as possible.
+- **Include screenshots and animated GIFs** which help you demonstrate
+ what this contribution is about. You can use `this
+ tool <http://www.cockos.com/licecap/>`__ to record GIFs on macOS and
+ Windows, and `this
+ tool <https://github.com/colinkeenan/silentcast>`__ or `this
+ tool <https://github.com/GNOME/byzanz>`__ on Linux.
+- **Explain why this contribution would be useful** to most
+ FusionDirectory users.
+- **Follow the** :ref:`coding-style-label`.
+- **Use our**
+ `PHP CodeSniffer <http://pear.php.net/package/PHP_CodeSniffer>`_
+ rules to check code compliance :ref:`checking-standard-label`.
+
+Coding with style
+-----------------
+
+Git Commit Messages
+~~~~~~~~~~~~~~~~~~~
+
+.. note::
+
+ Having a good guideline for creating commits and sticking to it makes
+ working with Git and collaborating with others a lot easier.
+
+Here are some rules of thumb :
+
+- Use the present tense ("Add feature" not "Added feature")
+- If you have a body, separate the subject from the body with a newline
+- Limit the subject line to 72 characters
+- Do not end the subject line with a period
+- Use imperative
+ `mood <https://en.wikipedia.org/wiki/Imperative_mood#English>`__ in
+ the subject line
+- If the subject is not clear enough, use the body to explain what and
+ why as opposed to how
+- Consider starting the commit message with an applicable emoji, when
+ you feel it's an important commit :
+
+.. code-block:: shell
+
+ :tada: When first / initial commit
+ :sparkles: When introducing new features
+ :ambulance: When fixing a bug
+ :handshake: When merging files
+ :tractor: When you changing file structure or refactoring
+ :books: When writing docs
+ :gem: When new Release
+ :lipstick: For cosmetics purposes
+
+Commit Message Format
+^^^^^^^^^^^^^^^^^^^^^
+
+Each commit message consists of a **header**, a **body** and a
+**footer**. The header has a special format that includes a **type**, a
+**scope** and a **subject**:
+
+::
+
+ <emoji> <type>(<scope>): <subject>
+ <BLANK LINE>
+ <body>
+ <BLANK LINE>
+ <footer>
+
+The **header** is mandatory and the **scope** of the header is optional.
+
+Where type can be :
+
+- **feat**: A new feature
+- **fix**: A bug fix
+- **core**: Code for the Core
+- **docs**: Documenting the code or writing new documentation
+- **style**: Cosmetics purpose
+- **test**: Adding missing or correcting tests
+
+Examples:
+
+::
+
+ :sparkles: feat(supann): Make supannRefId multivaluated
+
+ supannRefId on Structure object is too small and mono valued
+
+ close #5685
+
+PHP style Guide
+~~~~~~~~~~~~~~~
+
+To be sure to respect our guidelines, read :ref:`coding-style-label`.
+
+Licensing
+---------
+
+For all new projects and most of older one we use **GPL2+ License**. You
+can find it here :ref:`license-label`.
+
+Make sure to use resources that we have the rights to use. Copyrighted
+images and videos may cause legal problems.
+
+--------------
+
+This document is strongly inspired by the following resources:
+`ovh-ux-guidelines <https://github.com/ovh-ux/ovh-ux-guidelines>`__,
+`project-guidelines <https://github.com/wearehive/project-guidelines>`__,
+`Atom
+Guidelines <https://github.com/atom/atom/blob/master/CONTRIBUTING.md#reporting-bugs>`__,
+`Angularjs
+guidelines <https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md>`__.
+
+With love â¤ï¸
diff --git a/source/fusiondirectory/distribution/certified-distribution.rst b/source/fusiondirectory/distribution/certified-distribution.rst
new file mode 100644
index 0000000000000000000000000000000000000000..41f181fbe54e7ecfe65415f892a2cd74fff9e254
--- /dev/null
+++ b/source/fusiondirectory/distribution/certified-distribution.rst
@@ -0,0 +1,22 @@
+
+Certified distributions
+=======================
+
+We certify FusionDirectory with all the most common distributions, here is a table which summarizes the level of support by distribution and version.
+
+ * FusionDirectory 1.3.1 need = PHP 7.3
+
+================= ========================
+DISTRIBUTION FusionDirectory 1.3.1
+================= ========================
+Debian Buster supported
+Debian Bullseye not supported
+----------------- ------------------------
+Ubuntu 18.04 LTS supported ²
+Ubuntu 20.04 LTS not supported
+----------------- ------------------------
+Centos 7 supported
+Centos 8 not supported
+================= ========================
+
+² Need the ppa repository from the official maintainer of Debian/Ubuntu packages
diff --git a/source/fusiondirectory/index.rst b/source/fusiondirectory/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..abf56a863a6a4599376965242c32d0653ba0f24b
--- /dev/null
+++ b/source/fusiondirectory/index.rst
@@ -0,0 +1,26 @@
+FusionDirectory
+===============
+
+.. image:: /_static/images/fd_logo.png
+ :alt: FusionDirectory
+ :align: center
+
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ whatis/fusiondirectory.rst
+ prerequisite/prerequisite.rst
+ distribution/certified-distribution.rst
+ contribute/guidelines.rst
+ coding/index
+ pluginsystem/index
+ api/index
+ schemas/index
+ themes/index
+ translate/translation.rst
+ release/index
+ license/license.rst
+
diff --git a/source/license/license.rst b/source/fusiondirectory/license/license.rst
similarity index 94%
rename from source/license/license.rst
rename to source/fusiondirectory/license/license.rst
index a1a98488d922a0472152f34efb51577b0c98f854..de7c3920917a13334bdc36d490e8b582ef6b3b8e 100644
--- a/source/license/license.rst
+++ b/source/fusiondirectory/license/license.rst
@@ -1,3 +1,5 @@
+.. _license-label:
+
License
=======
diff --git a/source/pluginsystem/attributes.rst b/source/fusiondirectory/pluginsystem/attributes.rst
similarity index 98%
rename from source/pluginsystem/attributes.rst
rename to source/fusiondirectory/pluginsystem/attributes.rst
index 53751b5ea7e2a064d7927e2952ddf8258f9d7150..5cf1843804fd6025eec9017f4f828e41d1eb561c 100644
--- a/source/pluginsystem/attributes.rst
+++ b/source/fusiondirectory/pluginsystem/attributes.rst
@@ -109,6 +109,9 @@ CompositeAttribute
Allow to handle several UI attributes which are stored as only one LDAP field.
For instance let's say you store an FTP connection URL in an LDAP field as "ftp://user:password@host:port" but you want to display 4 inputs for the 4 parts.
+
+.. image:: /_static/images/attributes/composite.png
+
That would look like :
.. code-block:: php
diff --git a/source/pluginsystem/configbackend.rst b/source/fusiondirectory/pluginsystem/configbackend.rst
similarity index 100%
rename from source/pluginsystem/configbackend.rst
rename to source/fusiondirectory/pluginsystem/configbackend.rst
diff --git a/source/pluginsystem/folders.rst b/source/fusiondirectory/pluginsystem/folders.rst
similarity index 100%
rename from source/pluginsystem/folders.rst
rename to source/fusiondirectory/pluginsystem/folders.rst
diff --git a/source/pluginsystem/further.rst b/source/fusiondirectory/pluginsystem/further.rst
similarity index 100%
rename from source/pluginsystem/further.rst
rename to source/fusiondirectory/pluginsystem/further.rst
diff --git a/source/pluginsystem/index.rst b/source/fusiondirectory/pluginsystem/index.rst
similarity index 100%
rename from source/pluginsystem/index.rst
rename to source/fusiondirectory/pluginsystem/index.rst
diff --git a/source/pluginsystem/menusections.rst b/source/fusiondirectory/pluginsystem/menusections.rst
similarity index 100%
rename from source/pluginsystem/menusections.rst
rename to source/fusiondirectory/pluginsystem/menusections.rst
diff --git a/source/pluginsystem/plinfo.rst b/source/fusiondirectory/pluginsystem/plinfo.rst
similarity index 100%
rename from source/pluginsystem/plinfo.rst
rename to source/fusiondirectory/pluginsystem/plinfo.rst
diff --git a/source/pluginsystem/start.rst b/source/fusiondirectory/pluginsystem/start.rst
similarity index 100%
rename from source/pluginsystem/start.rst
rename to source/fusiondirectory/pluginsystem/start.rst
diff --git a/source/fusiondirectory/prerequisite/prerequisite.rst b/source/fusiondirectory/prerequisite/prerequisite.rst
new file mode 100644
index 0000000000000000000000000000000000000000..a5dc3137aef9750efde63bf4c68a759899933701
--- /dev/null
+++ b/source/fusiondirectory/prerequisite/prerequisite.rst
@@ -0,0 +1,89 @@
+Prerequisites
+=============
+
+FusionDirectory is a Web application that will need:
+
+* a webserver;
+* PHP;
+* an ldap server;
+* perl
+
+Web server
+----------
+
+FusionDirectory requires a web server that supports PHP, like:
+
+* `Apache 2 (or more recent) <http://httpd.apache.org>`_;
+* `Nginx <http://nginx.org/>`_;
+* `Microsoft IIS <https://www.iis.net>`_.
+
+PHP
+---
+
+As of 1.3.1 release, FusionDirectory will requires `PHP <http://php.net>`_ **7.3**
+
+.. note::
+
+ We recommand to use the most recent stable PHP release for better performances.
+
+Mandatory extensions
+^^^^^^^^^^^^^^^^^^^^
+
+Following PHP extensions are required for the app to work properly:
+
+* ``cas``: for CAS authentication;
+* ``curl``: to communicate with different types of servers and protocols
+* ``filter``: to filters a variable with a specified filter;
+* ``fpdf``: to export data in pdf format;
+* ``gd``: to generate images;
+* ``iconv`` : for the samba integration;
+* ``imagick`` : to handle images;
+* ``imap``: to handle imap servers management;
+* ``json``: to get support for JSON data format;
+* ``mbstring``: to manage multi bytes characters;
+* ``ldap``: to connect and query the ldap server;
+* ``openssl``: secured communications and generation of secure tokens;
+* ``session``: to get user sessions support;
+* ``simplexml``;
+* ``xml``.
+
+Optional extensions
+^^^^^^^^^^^^^^^^^^^
+
+.. note::
+
+ Even if those extensions are not mandatory, we advise you to install them anyways.
+
+Following PHP extensions are required for some extra features of FusionDirectory :
+
+* ``gettext`` : for an internationalized interface.
+* ``mhash`` : to make use of SSHA encryption
+* ``sha1`` : to make use of SSHA encryption
+* ``zlib``: to handle snapshots;
+
+
+Configuration
+^^^^^^^^^^^^^
+
+PHP configuration file (``php.ini``) must be adapted to reflect following variables:
+
+.. code-block:: ini
+
+ expose_php = Off;
+ implicit_flush = Off;
+ memory_limit = 128M ; // max memory limit
+ max_execution_time = 30 ; // not mandatory but adviced
+ session.auto_start = off ;
+
+LDAP server
+-----------
+
+For FusionDirectory to work you need an ldap server.
+
+Servers know to work are :
+
+* `OpenLDAP`_
+* `389DS`_
+
+.. _OpenLDAP : https://www.openldap.org/
+.. _389DS : https://directory.fedoraproject.org/
diff --git a/source/fusiondirectory/release/esr.rst b/source/fusiondirectory/release/esr.rst
new file mode 100644
index 0000000000000000000000000000000000000000..79ad296e952bf1d9baf9ed215b1b47cebf9bda75
--- /dev/null
+++ b/source/fusiondirectory/release/esr.rst
@@ -0,0 +1,7 @@
+FusionDirectory Life Cycle
+==========================
+
+A maintained version is a **major** version for which we release **minor** bug fix releases and communicate about security vulnerabilities.
+
+Our general support policy is to maintain major releases until **12 months** after the next major version is released to give some time for upgrading.
+
diff --git a/source/release/index.rst b/source/fusiondirectory/release/index.rst
similarity index 100%
rename from source/release/index.rst
rename to source/fusiondirectory/release/index.rst
diff --git a/source/release/releasepolicy.rst b/source/fusiondirectory/release/releasepolicy.rst
similarity index 100%
rename from source/release/releasepolicy.rst
rename to source/fusiondirectory/release/releasepolicy.rst
diff --git a/source/schemas/iana.rst b/source/fusiondirectory/schemas/iana.rst
similarity index 100%
rename from source/schemas/iana.rst
rename to source/fusiondirectory/schemas/iana.rst
diff --git a/source/schemas/index.rst b/source/fusiondirectory/schemas/index.rst
similarity index 93%
rename from source/schemas/index.rst
rename to source/fusiondirectory/schemas/index.rst
index 3ba98405027fc1f6dba83e55c85022bf105f7a18..115b0bf03f7c437e00db78450c25daeb657d6148 100644
--- a/source/schemas/index.rst
+++ b/source/fusiondirectory/schemas/index.rst
@@ -9,4 +9,5 @@ If your plugin needs a new schema or stores data in config back-end, the followi
schemaname
numberrules
namerules
+ schemaweb
iana
diff --git a/source/schemas/namerules.rst b/source/fusiondirectory/schemas/namerules.rst
similarity index 100%
rename from source/schemas/namerules.rst
rename to source/fusiondirectory/schemas/namerules.rst
diff --git a/source/schemas/numberrules.rst b/source/fusiondirectory/schemas/numberrules.rst
similarity index 100%
rename from source/schemas/numberrules.rst
rename to source/fusiondirectory/schemas/numberrules.rst
diff --git a/source/schemas/schemaname.rst b/source/fusiondirectory/schemas/schemaname.rst
similarity index 100%
rename from source/schemas/schemaname.rst
rename to source/fusiondirectory/schemas/schemaname.rst
diff --git a/source/fusiondirectory/schemas/schemaweb.rst b/source/fusiondirectory/schemas/schemaweb.rst
new file mode 100644
index 0000000000000000000000000000000000000000..3350900408575468185119687ff4d8f5c64616f5
--- /dev/null
+++ b/source/fusiondirectory/schemas/schemaweb.rst
@@ -0,0 +1,13 @@
+FusionDirectory attribute & Objectclass finder
+==============================================
+
+To be able to find at wich version an attribute / objectclass has been added / deprecated or removed we wrote a web application that allow you to search based on various criteria.
+
+Those criteria are :
+
+ * Attributes
+ * ObjectClass
+ * Release
+ * Schemas
+
+The application is available on `Schema <https://schemas.fusiondirectory.org/>`_
diff --git a/source/themes/index.rst b/source/fusiondirectory/themes/index.rst
similarity index 100%
rename from source/themes/index.rst
rename to source/fusiondirectory/themes/index.rst
diff --git a/source/themes/themes.rst b/source/fusiondirectory/themes/themes.rst
similarity index 100%
rename from source/themes/themes.rst
rename to source/fusiondirectory/themes/themes.rst
diff --git a/source/translate/translation.rst b/source/fusiondirectory/translate/translation.rst
similarity index 69%
rename from source/translate/translation.rst
rename to source/fusiondirectory/translate/translation.rst
index b40854e4df2559a3a214091c14f0ff8a18d2eb43..c53346e40b1b445a3b06a39efc413893f57a6dcb 100644
--- a/source/translate/translation.rst
+++ b/source/fusiondirectory/translate/translation.rst
@@ -1,7 +1,7 @@
-Translate FusionDirectory
-=========================
+Translation
+===========
-We are using `Transifex <https://www.transifex.com/fusiondirectory/FusionDirectory-1x/>`_
+We are using `Transifex <https://www.transifex.com/fusiondirectory/>`_
* Create a transifex account
* Ask to be added to the language group you want to translate
diff --git a/source/fusiondirectory/whatis/fusiondirectory.rst b/source/fusiondirectory/whatis/fusiondirectory.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e65ee2c4d416ec54d0d964dcb50e12fae9e471fc
--- /dev/null
+++ b/source/fusiondirectory/whatis/fusiondirectory.rst
@@ -0,0 +1,83 @@
+What is FusionDirectory ?
+=========================
+
+`FusionDirectory <https://www.fusiondirectory.org/>`__ provides a
+solution to daily management of data stored in an LDAP directory.
+Becoming the cornerstone of the information system, the corporate
+directory becomes more complex offering more data and managing more
+infrastructure services.
+
+This interface is simple and can be used to delegate fully or partly the
+data management to non-specialists.
+
+Features
+^^^^^^^^
+
+- Users, groups, mail, ssh, personal management.
+- Supann norm Management.
+- `PARTAGE`_ mail integration
+- Systems management : dhcp, dns, sudo, all kind of systems.
+- System deployment management : `FAI`_, `OPSI`_
+- Complex Roles Management.
+- Access to multiple LDAP trees.
+- FusionDirectory Triggers
+
+Acls and roles
+^^^^^^^^^^^^^^
+
+- ACLs are only used by FusionDirectory and not the underlying ldap server.
+- ACLs can be assigned to roles.
+
+ - Global administrator : Can do everything.
+ - Local administrator : Can manage users and groups and also a branch.
+ - Human resources : Can create users from template to optimize the arrival of new people.
+ - User : Will only be able to change his data permitted by an administrator
+
+
+FusionDirectory Triggers
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+FusionDirectory incorporates a series of triggers that can launch a specific action based on a task
+FusionDirectory must run.
+
+These triggers are associated with a content type (LDAP user, group, server, password, service
+and the triggering action (create, edit, delete, change password … )
+
+For example, when creating a user, a script generation form can be executed automatically
+with information from the LDAP server.
+
+This can be useful for generating badges with photo, a form of access to the canteen or sending an email
+to warn other services of the actual arrival of the person.
+
+This system is also convenient when we want to deploy the account of that person on an application that
+does not support LDAP.
+
+Another example is when a user leaves, you must:
+
+* archive and delete his mailbox
+* archive and remove its network space
+* delete him from third party applications not connected to LDAP.
+
+
+All of this can be easily done by shell scripts (at least in UNIX environment) and run automatically after
+the suppression of the person by the administrator in FusionDirectory
+
+The interaction with non-LDAP applications
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+FusionDirectory stores information of a service or a server on an LDAP
+server. How about when this service does not have the opportunity to
+interact with LDAP?
+
+This question can be solved by creating:
+
+- LDAP schema suitable for application to the LDAP server
+- A plugin for its management in FusionDirectory with the simple plugin
+ `API`_
+- An `Argonaut`_ module for the client installed on the server
+
+.. _FAI : https://fai-project.org/
+.. _OPSI : https://www.opsi.org/
+.. _PARTAGE : https://partage.renater.fr/
+.. _Argonaut : https://www.argonaut-project.org/
+.. _API : https://fusiondirectory-developer-documentation.readthedocs.io/en/1.4/api/index.html
diff --git a/source/index.rst b/source/index.rst
index b6a90ed63cdcffa3df907204be40814e4a9eab4e..3b79f6151fa892b3ab8a71f13924e6a78cc79c48 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -16,17 +16,13 @@ Contents:
.. toctree::
:maxdepth: 2
- contribute/index
- coding/index
- pluginsystem/index
- api/index
- schemas/index
- themes/index
- translate/index
- release/index
- support/index
- license/index
+ fusiondirectory/index.rst
+ development/index.rst
+ releasing/index.rst
+ support/index.rst
+ security/index.rst
+ contact/contact.rst
+ code-of-conduct.rst
.. include:: globals.rst
-
diff --git a/source/license/index.rst b/source/license/index.rst
deleted file mode 100644
index 09e91ff59f69986f84cbd9da391f4ae93ac7592a..0000000000000000000000000000000000000000
--- a/source/license/index.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-License
-=======
-
-.. toctree::
- :maxdepth: 2
-
- license
diff --git a/source/release/esr.rst b/source/release/esr.rst
deleted file mode 100644
index 6c580b765e3ca83a82e6f1aa6c9ef6beb4d6ac1b..0000000000000000000000000000000000000000
--- a/source/release/esr.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-FusionDirectory Life Cycle
-==========================
-
-A maintained version is a **major** version for which we release **minor** bug fix releases and communicate about security vulnerabilities.
-
-Our general support policy is to maintain major releases until **3 months** after the next major version is released to give some time for upgrading.
-
-We also provide a more conservative life-cycle through **ESR** versions.
-
-The **ESR** tag is given to a major release once it has been thoroughly tested and proven reliable on real production systems.
-
-**ESR** versions are maintained until **6 months** after the next **ESR** version is announced, allowing less frequent major upgrades,
-and a larger time-frame for switching between them.
diff --git a/source/releasing/argonaut-source.rst b/source/releasing/argonaut-source.rst
new file mode 100644
index 0000000000000000000000000000000000000000..d8dfb8a8e9db4692ec3f2f474ac1a78710dc4c60
--- /dev/null
+++ b/source/releasing/argonaut-source.rst
@@ -0,0 +1,87 @@
+How to release a Argonaut Version
+==================================
+
+- Update AUTHORS.md file
+- Updates the Changelog.md
+- Regenerate the manpages with the new version
+- Merge the branch into master
+
+All those operations have to be made onto the 1.x-fixes branch each one
+of them inside a ticket with the label ~release and with a **MR**
+
+Update the AUTHORS file
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Add the authors of all the patchs we received to the AUTHORS file
+
+::
+
+ * Markus Amersdorfer <der.plusch@subnet.at>
+ Wiki setup, Testing, hints, proposals
+
+Updates the Changelog.md
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+To update the Changelog.md you must first run the following command, at the end you have to put the milestone you want a changelog for
+
+.. code:: shell
+
+ gitlab_changelog.py --config-file ~/.python-gitlab.cfg --gitlab fd --project "fusiondirectory/argonaut" "Argonaut 1.3.1"
+
+Update the user documentation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+open an issue ins the `user manual issues`_ to update the release notes for
+the supported version, label this issue ~release and with the correct
+milestone
+
+The content should got into **source/argonaut/update/supported**
+
+the file should be named like in this example current version to new version
+
+
+1.3-to-1.3.1.rst
+
+Update the UPGRADE documentation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Update UPGRADE.md with a new section for the new version corresponding
+to what you have put into `user manual supported`_ after updating the documentation
+for the release
+
+you can run for example
+
+.. code:: shell
+
+ pandoc --from rst --to markdown -o 1.3-to-1.3.1.md 1.3-to-1.3.1.rst
+
+directly in the user-manual source to generate the content to copy/paste at the end of UPGRADE.MD
+
+Update manpages
+^^^^^^^^^^^^^^^
+
+Regenerate the manpages with the new version, use the
+**update-manpages.sh** from the dev-tools
+
+.. code:: shell
+
+ update-manpages.sh fusiondirectory 1.2.3
+
+Merge the fixes branch into master
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Only a gitlab master account user can do the merge on the master branch
+
+Tag the release
+^^^^^^^^^^^^^^^
+
+After merging the release we need to tag the release. go to `Argonaut tags`_
+
+- Paste the Changelog.md corresponding to the release we just made
+- Upload the fusiondirectory-xxx.tar.gz and
+ fusiondirectory-plugins-xxx.tar.gz to the tag
+
+.. _user manual issues: https://gitlab.fusiondirectory.org/fusiondirectory/user-manual/-/issues
+.. _user manual supported : https://fusiondirectory-user-manual.readthedocs.io/en/latest/fusiondirectory/update/supported/index.html
+.. _Argonaut tags : https://gitlab.fusiondirectory.org/fusiondirectory/argonaut/-/tags
+.. _schema history : https://gitlab.fusiondirectory.org/fusiondirectory/schema-history/pipelines
diff --git a/source/releasing/fusiondirectory-source.rst b/source/releasing/fusiondirectory-source.rst
new file mode 100644
index 0000000000000000000000000000000000000000..c5772a1d7cd73971bb4b0fd6ae7071a5a9b1461b
--- /dev/null
+++ b/source/releasing/fusiondirectory-source.rst
@@ -0,0 +1,126 @@
+How to release a FusionDirectory Version
+========================================
+
+- Updates the locales
+- Increment FusionDirectory version
+- Update the AUTHORS.md file
+- Updates the Changelog.md in fusiondirectory and
+ fusiondirectory-plugins
+- Write the upgrade documentation
+- Update the UPGRADE.md
+- Regenerate the manpages with the new version
+- Merge the branch into master for fusiondirectory and fusiondirectory
+ plugins
+
+All those operations have to be made onto the 1.x-fixes branch each one
+of them inside a ticket with the label ~release and with a **MR**
+
+Updates the locales
+^^^^^^^^^^^^^^^^^^^
+
+Update the locales from transifex in fusiondirectory and
+fusiondirectory-plugins
+
+.. code:: shell
+
+ tx pull -a -f
+
+Increment FusionDirectory version
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+open **include/variables_common.inc**
+
+Change the version number in :
+
+.. code:: php
+
+ define ("FD_VERSION", "1.2.x");
+
+Update the AUTHORS file
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Add the authors of all the patchs we received to the AUTHORS file
+
+::
+
+ * Markus Amersdorfer <der.plusch@subnet.at>
+ Wiki setup, Testing, hints, proposals
+
+Updates the Changelog.md
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+To update the Changelog.md you must first run the following command, at the end you have to put the milestone you want a changelog for
+
+.. code:: shell
+
+ gitlab_changelog.py --config-file ~/.python-gitlab.cfg --gitlab fd --project "fusiondirectory/fd" --project "fusiondirectory/fd-plugins" "FusionDirectory 1.3.1"
+
+Update the user documentation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+open an issue ins the `user manual issues`_ to update the release notes for
+the supported version, label this issue ~release and with the correct
+milestone
+
+The content should got into **source/fusiondirectory/update/supported**
+
+the file should be named like in this example current version to new version
+
+
+1.3-to-1.3.1.rst
+
+Update the UPGRADE documentation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Update UPGRADE.md with a new section for the new version corresponding
+to what you have put into `user manual supported`_ after updating the documentation
+for the release
+
+you can run for example
+
+.. code:: shell
+
+ pandoc --from rst --to markdown -o 1.3-to-1.3.1.md 1.3-to-1.3.1.rst
+
+directly in the user-manual source to generate the content to copy/paste at the end of UPGRADE.MD
+
+Update manpages
+^^^^^^^^^^^^^^^
+
+Regenerate the manpages with the new version, use the
+**update-manpages.sh** from the dev-tools
+
+.. code:: shell
+
+ update-manpages.sh fusiondirectory 1.2.3
+
+this as to be done for fusiondirectory
+
+Merge the fixes branch into master
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Only a gitlab master account user can do the merge on the master branch
+
+Tag the release
+^^^^^^^^^^^^^^^
+
+After merging the release we need to tag the release. go to `FusionDirectory tags`_ and `FusionDirectory Plugin tags`_
+
+- Paste the Changelog.md corresponding to the release we just made
+- Upload the fusiondirectory-xxx.tar.gz and
+ fusiondirectory-plugins-xxx.tar.gz to the tag
+
+Run the ci for the schema-history website
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Once the tags for a release are created in both fusiondirectory and
+fusiondirectory-plugins, the CI of schema-history project needs to run
+to update the schema website.
+
+The CI is at `schema history`_
+
+.. _user manual issues: https://gitlab.fusiondirectory.org/fusiondirectory/user-manual/-/issues
+.. _user manual supported : https://fusiondirectory-user-manual.readthedocs.io/en/latest/fusiondirectory/update/supported/index.html
+.. _FusionDirectory tags : https://gitlab.fusiondirectory.org/fusiondirectory/fd/tags
+.. _FusionDirectory Plugin tags : https://gitlab.fusiondirectory.org/fusiondirectory/fd-plugins/tags
+.. _schema history : https://gitlab.fusiondirectory.org/fusiondirectory/schema-history/pipelines
diff --git a/source/releasing/index.rst b/source/releasing/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..c2e5d9a0a36be8267624c55f1eaaa79db52f54c6
--- /dev/null
+++ b/source/releasing/index.rst
@@ -0,0 +1,11 @@
+Releasing our softwares
+========================
+
+How to create a release of our various softwares
+
+.. toctree::
+ :maxdepth: 2
+
+ fusiondirectory-source.rst
+ argonaut-source.rst
+ new-feature-branch.rst
diff --git a/source/releasing/new-feature-branch.rst b/source/releasing/new-feature-branch.rst
new file mode 100644
index 0000000000000000000000000000000000000000..1a4b7b2d4e1181fcc99ab216aa24b36f5847b2d6
--- /dev/null
+++ b/source/releasing/new-feature-branch.rst
@@ -0,0 +1,82 @@
+Create the new features branch for FusionDirectory and Argonaut
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Create the new milestone
+- Create the new features branch from master
+- Remove branch that we just merged
+- Merge Changelog.md, AUTHORS.md, UPGRADE.md into fusiondirectory developement
+ version
+- Merge Changelog.md into fusiondirectory-plugins -dev version
+- Update include/variables_common.inc, only if you create a new feature branch for FusionDirectory
+
+Create the new milestone
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+- got to FusionDirectory `milestones`_ and create the new milestone
+
+- For FusionDirectory
+
+ - FusionDirectory 1.3.x
+ - Start date, date of the milestone creation
+ - Stop date is start date + 3 month
+
+- For Argonaut
+
+ - Argonaut 1.3.x
+ - Start date, date of the milestone creation
+ - Stop date is start date + 3 month
+
+Create a new fixes branch from master
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The branch should be named with the version of the release followed by **-fixes**.
+
+ex: **1.3** is released the feature branch is **1.3-fixes**
+
+Remove the branch we just merged
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+Merge Changelog.md, Authors.md, UPGRADE.md into into the developement branch
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This operation have inside a ticket with the label ~release and with a
+**MR**
+
+Changelog.md, AUTHORS.md, UPGRADE.md have to be merged into the developement branch
+after a release to ensure that the merge from the -dev to master will be easy.
+
+* Create a new merge request from the developement branch
+
+* Push into the developpement branch the needed files
+
+.. code:: bash
+
+ git checkout 1.2.1-fixes -- AUTHORS.md
+
+.. code:: bash
+
+ git checkout 1.2.1-fixes -- Changelog.md
+
+.. code:: bash
+
+ git checkout 1.2.1-fixes -- UPGRADE.md
+
+Increment FusionDirectory version
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Only if you create a new feature branch for FusionDirectory
+
+open include/variables_common.inc
+
+Change the version number in :
+
+.. code:: php
+
+ define ("FD_VERSION", "1.2-fixes");
+
+.. _milestones : https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones
+.. _user manual issues: https://gitlab.fusiondirectory.org/fusiondirectory/user-manual/-/issues
+.. _user manual supported : https://fusiondirectory-user-manual.readthedocs.io/en/latest/fusiondirectory/update/supported/index.html
+.. _Argonaut tags : https://gitlab.fusiondirectory.org/fusiondirectory/argonaut/-/tags
+.. _schema history : https://gitlab.fusiondirectory.org/fusiondirectory/schema-history/pipelines
diff --git a/source/security/gpg.rst b/source/security/gpg.rst
new file mode 100644
index 0000000000000000000000000000000000000000..dbf9255b112ff789f5b80d3529c9243783299093
--- /dev/null
+++ b/source/security/gpg.rst
@@ -0,0 +1,27 @@
+Digital signature
+-----------------
+
+Our official packages for Debian and Centos/RHEL are signed with the official gpg
+key of the project.
+
+Official gpg key
+^^^^^^^^^^^^^^^^
+
+.. code-block:: shell
+
+ pub rsa4096/0xD744D55EACDA69FF 2017-07-02 [SC] [expire : 2022-07-01]
+ A94DE63F2EDB5F0DC0785EBBD744D55EACDA69FF
+ uid [ totale ] FusionDirectory Project Signing Key <contact@fusiondirectory.org>
+
+Our official development packages for Debian and Centos/RHEL are signed with the official development gpg
+key of the project.
+
+Development gpg key
+^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: shell
+
+ pub rsa2048/0xADD3A1B88B29AE4A 2014-02-25 [SC]
+ 8ABF887BF6254D6F57B82069ADD3A1B88B29AE4A
+ uid [ totale] FusionDirectory Packagers <fusiondirectory-packages@lists.fusiondirectory.org>
+
diff --git a/source/security/index.rst b/source/security/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..cbeaf63015db821b61b932a8d8b3a0a7b2b71139
--- /dev/null
+++ b/source/security/index.rst
@@ -0,0 +1,11 @@
+Security
+========
+
+
+
+.. toctree::
+ :maxdepth: 2
+
+ gpg
+ security-issues
+
diff --git a/source/security/security-issues.rst b/source/security/security-issues.rst
new file mode 100644
index 0000000000000000000000000000000000000000..0f852161d82cf820a3ec5c864bbd3f1675c9f4da
--- /dev/null
+++ b/source/security/security-issues.rst
@@ -0,0 +1,10 @@
+Security issues
+---------------
+
+If you find a security issue inside FusionDirectory you can report it to directly to |security|.
+
+you can sign your message with the public key from
+
+**Benoit Mortier** **0xEF2FF1E48638EAD1**
+
+.. |security| replace:: security team security@fusiondirectory.org
diff --git a/source/support/community.rst b/source/support/community.rst
new file mode 100644
index 0000000000000000000000000000000000000000..c279c5037b739b184122058d4fb4af3aa8224fbd
--- /dev/null
+++ b/source/support/community.rst
@@ -0,0 +1,7 @@
+Community support
+=================
+
+For any question regarding FusionDirectory support (installation, configuration, usage, etc…), the preferred way to get some support is through the `mailing list`_ or `irc`_.
+
+.. _irc : irc://irc.libera.chat/fusiondirectory
+.. _mailing list : https://lists.fusiondirectory.org/wws/info/users
diff --git a/source/support/index.rst b/source/support/index.rst
index 2c7231c42b7febb48cf0351f5b118747a254168f..90cbd10702109774da36ef1dbbdfd6c461e4ced7 100644
--- a/source/support/index.rst
+++ b/source/support/index.rst
@@ -1,7 +1,11 @@
-Distribution and PHP support
-============================
+Support
+=======
+
+FusionDirectory Support Options
.. toctree::
:maxdepth: 2
- osandphp
+ professional
+ community
+
diff --git a/source/support/osandphp.rst b/source/support/osandphp.rst
deleted file mode 100644
index b4180d063b99d99513de15d39a585207da3b0052..0000000000000000000000000000000000000000
--- a/source/support/osandphp.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-Distribution and PHP support Policy
-===================================
-
-Distribution OSes have different interpretations of what a 'supported version' is, here are the OS and PHP versions FusionDirectory support.
-
-Server OSes
------------
-
- * Debian: stable and oldstable
- * Ubuntu: the two latest LTS releases
- * Enterprise Linux (RHEL, CentOS, ...): two latest major releases
-
-
-PHP versions
-============
-
-The version of PHP depend on the FusionDirectory version.
-
-Fusiondirectory need at least PHP 5.4.
-
- * Fusiondirectory 1.2.3 need PHP 5.4
- * Fusiondirectory 1.3 need PHP 5.6
- * Fusiondirectory 1.4 need PHP 7.0
-
diff --git a/source/support/professional.rst b/source/support/professional.rst
new file mode 100644
index 0000000000000000000000000000000000000000..714baa2c6656e1729cf16de93841f8e4a195d300
--- /dev/null
+++ b/source/support/professional.rst
@@ -0,0 +1,31 @@
+Professional paid support
+=========================
+
+`FusionDirectory`_ helps you keep FusionDirectory running smoothly
+
+Why choose FusionDirectory ?
+
+* You are the publishers of FusionDirectory.
+* We have over 16 years experience in the support of LDAP directories and applications directory management.
+* We support and maintains OpenLDAP architectures for various entities from small to very big on a daily basis
+* We maintain and develop the `PHP LDAP`_ module
+
+You are sure to get :
+
+* Answers to your questions about FusionDirectory by phone, email or web,
+* Packages containing bug fixes between two stable versions
+* Assistance for the development of FusionDirectory modules tailored to your needs,
+* Assistance on the update of FusionDirectory
+* A technician on site if the situation requires.
+
+Support Options :
+
+* Get `support for your FusionDirectory`_ instance
+* Get `training for your daily use`_ of FusionDirectory
+* Get `support on specialized plugins`_ of FusionDirectory
+
+.. _FusionDirectory : https://www.fusiondirectory.org/
+.. _support for your FusionDirectory : https://www.fusiondirectory.org/en/our-support-offers/
+.. _training for your daily use : https://www.fusiondirectory.org/en/training/
+.. _support on specialized plugins : https://www.fusiondirectory.org/en/support-specialized-plugins/
+.. _PHP LDAP : https://www.php.net/manual/en/book.ldap.php
diff --git a/source/translate/index.rst b/source/translate/index.rst
deleted file mode 100644
index 854fcc8a03cb842e767294a08956bc645a29bea1..0000000000000000000000000000000000000000
--- a/source/translate/index.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Translate
-=========
-
-.. toctree::
- :maxdepth: 2
-
- translation