Update Branch Information

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2013-10-16 00:03:05 +07:00
parent 13752c196a
commit 744610e521
2 changed files with 9 additions and 9 deletions

View file

@ -12,11 +12,11 @@ Currently, there are three branches in the MSB GIT repository:
will come from. Please use this branch for testing only and not for
production environments.
- 1.6: The MSB stable branch for Slackware 14.0.
- 14.0-mate-1.6: The MSB stable branch for Slackware 14.0.
This is the currently supported branch and only receives bug fix updates.
The MSB binary packages for Slackware 14.0 are built from this branch.
You might want to use this branch if you enjoy stable releases.
Once Slackware 14.1 gets declared the next stable release then
Once Slackware 14.1 gets declared as the next stable release then
this branch will be obsoleted and no longer updated.
- 14.1-mate-1.6: The MSB stable branch for Slackware 14.1.
@ -35,7 +35,7 @@ $ git branch
An asterisk will appear in front of the branch you are currently in.
Example output of 'git branch':
1.6
14.0-mate-1.6
14.1-mate-1.6
* master
@ -43,11 +43,11 @@ This output indicates that you are now in the 'master' branch.
To switch to another branch, use 'git checkout <branch_name>'. Example:
$ git checkout 1.6
$ git checkout 14.0-mate-1.6
$ git branch
* 1.6
* 14.0-mate-1.6
14.1-mate-1.6
master
You have now switched from the 'master' branch to the '1.6' branch.
You have now switched from the 'master' branch to the '14.0-mate-1.6' branch.

View file

@ -5,7 +5,7 @@ This project provides SlackBuild scripts to build and install the MATE desktop
environment on Slackware (http://www.mate-desktop.org). Please check the main
project website at http://mateslackbuilds.github.io for screenshots and more
information. There is also a link to some MATE 1.6 binary packages for
Slackware 14.0.
Slackware 14.0 and Slackware 14.1.
Please read GIT_BRANCHES.TXT to make sure you are on the right branch of the
MSB repo before attempting to build from the scripts. After cloning the
@ -13,8 +13,8 @@ initial Git repo, you will be using 'master' branch which will build the
development branch of MATE 1.7. Building from the development branch is not
supported and may or may not work at any given moment. Most users will want
to build from the stable branch which is MATE version 1.6, released on April
2, 2013. Checkout that branch using 'git checkout 1.6' to build from the
stable MSB branch.
2, 2013. Checkout that branch using 'git checkout 14.1-mate-1.6' to build from
the stable MSB branch.
The rest of this README.TXT is specific to building from the 'master' branch.