Use pull request #11175 from ncoden/chore/move-docs-to-develop for v6.5.0

9896d58dc chore: move documentation changes to develop Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f6e462feab530c7bee0e667d2d88bf1670800fef..d41473f059490a99f12b8a20ba581d59b21a890f 100644 (file)
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,7 @@
 Before submitting a pull request, make sure it's targeting the right branch:
 
-- For documentation fixes, use `master`.
-- For bug fixes or new features compatible with the next version, use `develop`.
-- For bug fixes incompatible with `develop`, use the support branch of the latest compatible version, which will be formatted `support/6.x`.
+- For the latest version, use `develop`.
+- For bug fixes incompatible with `develop`, use the support branch of the latest compatible and supported version `support/6.x`.
 
 If you're fixing a JavaScript issue, it would help to create a new test case under the folder `test/visual/` that recreates the issue and show's that it's been fixed. Run `npm test` to compile the testing folder.
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 54e8e41c96ac514c70c4010f9fc5b386d01a5347..b2d5de5f7647e9d90fd502f6d0873fc3acd1490a 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,11 +25,11 @@ When you submit a pull request, @mention a few people you’d like to help you r
 ## Git Workflow
 
 Foundation uses a git workflow close to [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/). The workflow relies on three branches:
-- **`master`**: The stable branch. It only contains the latest stable version released. Pull requests for docs improvements can be opened on it.
-- **`develop`**: The developing branch is used to prepare the next minor/major version. It always contains all the new features and bug fixes, and is the most up-to-date version of Foundation. Almost every pull request should be opened on this branch. When a new version is released, it is merged on `master`, a support branch is created, and `develop` now targets the next version.
+- **`master`**: The stable branch. It only contains the latest stable version released. Do NOT open pull requests on it.
+- **`develop`**: The developing branch is used to prepare the next minor/major version. It always contains all the new features and bug fixes, and is the most up-to-date version of Foundation. Almost every pull request should be opened on this branch  (fixes, features, documentation...). When a new version is released, it is merged on `master`, a support branch is created, and `develop` now targets the next version.
 - **`support/*`**: Support branches are used to support the previous versions (i.e. `support/v6.4` for `v6.4.0`) and prepare patches (i.e. `v6.4.1`). When a pull request for a bug fix is merged on `develop` and is compatible with supported versions, its commits must be added on the compatible `support/*` branches too. A patch version can be then released. If a fix is not compatible with `develop`, a pull request can be opened on the latest compatible and supported `support/*` branch.
 
-This git workflow was adopted as of `v6.3`, so `v6.2` and previous versions are not supported.
+This git workflow was fully adopted as of `v6.5`, so `v6.4` and previous versions are not supported.
 
 ## Coding Standards
 

diff --git a/gulp/tasks/docs.js b/gulp/tasks/docs.js
index 7fffa75496cbc206f741ea3b3e52061b7d7675be..dc3592839ff0c3acea8c0aea49d552939eecef9b 100644 (file)
--- a/gulp/tasks/docs.js
+++ b/gulp/tasks/docs.js
@@ -30,7 +30,7 @@ supercollider
     pageRoot: 'docs/pages',
     data: {
       repoName: 'foundation-sites',
-      editBranch: 'master'
+      editBranch: 'develop'
     }
   })
   .searchConfig({