From d8334d1515c22f7a3e1f4632c39ea26c5802dffe Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Wed, 18 Nov 2015 16:29:40 +0100 Subject: [PATCH] `stable` is the new stable branch. --- contributing.md | 4 ++-- doc/installation/manual_installation.md | 8 ++++---- from_the_sources.md | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contributing.md b/contributing.md index cbd463e85..74751060e 100644 --- a/contributing.md +++ b/contributing.md @@ -26,7 +26,7 @@ The best way to propose a change on the documentation or the code is to create a [GitHub pull request](https://help.github.com/articles/using-pull-requests/). > Your pull request should always been against the `next-release` -> branch and not against `master` which is the stable branch! +> branch and not against `stable` which is the stable branch! 1. Create a branch for your work @@ -81,7 +81,7 @@ For all issues: > For now there is also the `fixed in next-release` label which > indicates this issue is resolved in `next-release` and will be -> closed when merged on `master`. +> closed when merged on `stable`. > > This label will no longer be necessary once the branch > reorganization (#69). diff --git a/doc/installation/manual_installation.md b/doc/installation/manual_installation.md index e8cff3dec..5dd26f880 100644 --- a/doc/installation/manual_installation.md +++ b/doc/installation/manual_installation.md @@ -44,11 +44,11 @@ apt-get install build-essential redis-server libpng-dev git python-minimal ## Fetching the Code -You may either download them [here](https://github.com/vatesfr/xo-server/archive/master.zip) and [here](https://github.com/vatesfr/xo-web/archive/master.zip) or use `git` with these repositories from `http://github.com/vatesfr/xo-server` and `http://github.com/vatesfr/xo-web`: +You may either download them [here](https://github.com/vatesfr/xo-server/archive/stable.zip) and [here](https://github.com/vatesfr/xo-web/archive/stable.zip) or use `git` with these repositories from `http://github.com/vatesfr/xo-server` and `http://github.com/vatesfr/xo-web`: ``` -git clone http://github.com/vatesfr/xo-server -git clone http://github.com/vatesfr/xo-web +git clone -b stable http://github.com/vatesfr/xo-server +git clone -b stable http://github.com/vatesfr/xo-web ``` ## Installing dependencies @@ -118,7 +118,7 @@ $ npm install -g forever $ forever start bin/xo-server ``` -- Our stable branch is "master" and the beta branch is "next-release". You can change it if you want to test our latest features (on both XO-Server and XO-Web, do NOT mix them): +- Our stable branch is *stable* and the beta branch is *next-release*. You can change it if you want to test our latest features (on both XO-Server and XO-Web, do NOT mix them): ``` $ git checkout next-release diff --git a/from_the_sources.md b/from_the_sources.md index 272de5ced..8ce17ed28 100644 --- a/from_the_sources.md +++ b/from_the_sources.md @@ -48,11 +48,11 @@ apt-get install build-essential redis-server libpng-dev git python-minimal ## Fetching the Code -You may either download them [here](https://github.com/vatesfr/xo-server/archive/master.zip) and [here](https://github.com/vatesfr/xo-web/archive/master.zip) or use `git` with these repositories from `http://github.com/vatesfr/xo-server` and `http://github.com/vatesfr/xo-web`: +You may either download them [here](https://github.com/vatesfr/xo-server/archive/stable.zip) and [here](https://github.com/vatesfr/xo-web/archive/stable.zip) or use `git` with these repositories from `http://github.com/vatesfr/xo-server` and `http://github.com/vatesfr/xo-web`: ``` -git clone http://github.com/vatesfr/xo-server -git clone http://github.com/vatesfr/xo-web +git clone -b stable http://github.com/vatesfr/xo-server +git clone -b stable http://github.com/vatesfr/xo-web ``` ## Installing dependencies @@ -122,7 +122,7 @@ $ npm install -g forever $ forever start bin/xo-server ``` -- Our stable branch is "master" and the beta branch is "next-release". You can change it if you want to test our latest features (on both XO-Server and XO-Web, do NOT mix them): +- Our stable branch is *stable* and the beta branch is *next-release*. You can change it if you want to test our latest features (on both XO-Server and XO-Web, do NOT mix them): ``` $ git checkout next-release @@ -171,4 +171,4 @@ Don't forget to start redis if you don't reboot now: ``` service redis start -``` \ No newline at end of file +```