From d4688c12955d9ed3db1eb10f3b5d669fc5a635e1 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Tue, 26 Aug 2014 11:31:34 -0400 Subject: [PATCH] Adding more detail to the readme file for newbs. --- 2015/README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/2015/README.md b/2015/README.md index ec1728d9..12c5ee80 100644 --- a/2015/README.md +++ b/2015/README.md @@ -1,6 +1,15 @@ 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 (), +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 +(). + This is the static HTML site for LibrePlanet 2015. Read on for instructions on how to setup your development environment. @@ -8,7 +17,9 @@ Setting Up Apache ----------------- 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 -- 2.25.1