Merge pull request #1837 from obfusk/fix-branch-info

hacking-howto: re-word branches info

diff --git a/docs/hacking-howto b/docs/hacking-howto
index e6313f7d6837fd85da3059116fd73e962e9751fe..d6e2b67ebf65dcade1736e60e78c2cb27355f0d5 100644 (file)
--- a/docs/hacking-howto
+++ b/docs/hacking-howto
@@ -982,14 +982,16 @@ could have a look at previous reviews and see what the common mistakes are.
 
 === Which branch to use?
 
-Work on i3 generally happens in two branches: “master” and “next”. Since
-“master” is what people get when they check out the git repository, its
-contents are always stable. That is, it contains the source code of the latest
-release, plus any bugfixes that were applied since that release.
+Work on i3 generally happens in two branches: “master” and “next” (the latter
+being the default branch, the one that people get when they check out the git
+repository).
+
+The contents of “master” are always stable. That is, it contains the source code
+of the latest release, plus any bugfixes that were applied since that release.
 
 New features are only found in the “next” branch. Therefore, if you are working
-on a new feature, use the “next” branch. If you are working on a bugfix, use
-the “next” branch, too, but make sure your code also works on “master”.
+on a new feature, use the “next” branch. If you are working on a bugfix, use the
+“next” branch, too, but make sure your code also works on “master”.
 
 == Thought experiments