Merge branch '73-rewrote-the-new-branch-feature-page' into '1.4'

Resolve "rewrote the new branch feature page"

Closes #73

See merge request fusiondirectory/dev-manual!123

source/index.rst

@@ -20,6 +20,7 @@ Contents:
    development/index.rst
    marketplace/index.rst
    releasing/index.rst
+   new-version/index.rst
    support/index.rst
    security/index.rst
    contact/contact.rst

source/new-version/index.rst

+creating a new version our softwares
+====================================
+
+How to create a new version of our various softwares
+
+.. toctree::
+   :maxdepth: 2
+
+   new-fusiondirectory.rst
+   new-fusiondirectory-integrator.rst
+   new-fusiondirectory-orchestrator.rst
+   new-fusiondirectory-tools.rst

source/new-version/new-fusiondirectory-integrator.rst

+Creating a new version of FusionDirectory Integrator
+====================================================
+
+-  Create the new milestone
+-  Create the new branchs from master
+
+Create the new milestone
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+-  got to FusionDirectory `milestones`_ and create the new milestone, version is the version number
+
+   -  FusionDirectory Integrator version
+   -  Start date, date of the milestone creation
+   -  Stop date is start date + 3 month
+
+Create a new fixes branch from master
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+We need to create a branch 
+
+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**
+
+
+.. _milestones :  https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones

source/new-version/new-fusiondirectory-orchestrator.rst

+Creating a new version of FusionDirectory Orchestrator
+======================================================
+
+-  Create the new milestone
+-  Create the new branchs from master
+
+Create the new milestone
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+-  got to FusionDirectory `milestones`_ and create the new milestone, version is the version number
+
+   -  FusionDirectory Orchestrator version
+   -  Start date, date of the milestone creation
+   -  Stop date is start date + 3 month
+
+Create a new fixes branch from master
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+We need to create a branch                                                
+
+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**
+
+
+.. _milestones :  https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones

source/new-version/new-fusiondirectory-tools.rst

+Creating a new version of FusionDirectory Tools
+===============================================
+
+-  Create the new milestone
+-  Create the new branchs from master
+
+Create the new milestone
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+-  got to FusionDirectory `milestones`_ and create the new milestone, version is the version number
+
+   -  FusionDirectory Orchestrator version
+   -  Start date, date of the milestone creation
+   -  Stop date is start date + 3 month
+
+Create a new fixes branch from master
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+We need to create a branch
+
+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**
+
+
+.. _milestones :  https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones

source/releasing/new-feature-branch.rst → source/new-version/new-fusiondirectory.rst

-Create the new features branch for FusionDirectory
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Creating a new version of FusionDirectory
+=========================================
 
 -  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 branchs from master
+-  Update include/variables_common.inc
 
 Create the new milestone
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 -  got to FusionDirectory `milestones`_ and create the new milestone
 
--  For FusionDirectory
-
-   -  FusionDirectory 1.3.x
+   -  FusionDirectory version
    -  Start date, date of the milestone creation
    -  Stop date is start date + 3 month
 
 Create a new fixes branch from master
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+We need to create a branch for fusiondirectory and fusiondirectory-plugins
+
 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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -66,6 +34,6 @@ Change the version number in :
 
 .. code:: php
 
-   define ("FD_VERSION", "1.2-fixes");
+   define ("FD_VERSION", "1.3-fixes");
 
 .. _milestones :  https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones

source/releasing/index.rst

@@ -10,4 +10,3 @@ How to create a release of our various softwares
    fusiondirectory-integrator.rst
    fusiondirectory-orchestrator.rst
    fusiondirectory-tools.rst
-   new-feature-branch.rst