LibrePlanet 2015
================
+The repository has a master (development) branch and a stable
+(live) branch. To work on it, you'll edit your checkout of the
+master branch until you are satisfied, push it to the master
+branch on the Web server (<http://wiki-dev0.libreplanet.org>),
+make sure it works well and make sure it works well. Then
+you'll copy it over to your checkout of the stable branch,
+then push that to the stable branch on the Web server
+(<http://libreplanet.org>).
+
This is the static HTML site for LibrePlanet 2015. Read on for
instructions on how to setup your development environment.
-----------------
Apache is required in order to replicate the appearance of the website
-on the live and staging servers.
+on the live and staging servers on your machine. If you don't want to
+install Apache, you can still work on the site, you just won't be able
+to see what it looks like until you push to the Web.
### Enable server-side include module