Adding Women's Dinner and fixing Party listing.

[libreplanet-static.git] / 2015 / README.md

diff --git a/2015/README.md b/2015/README.md
index f5796a0b87f9bfdbda9d17fbee743a695b90bede..2a87fed56d82e67b05833472159b975e15bf08fc 100644 (file)
--- a/2015/README.md
+++ b/2015/README.md
@@ -1,25 +1,29 @@
 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.
 
+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>).
+
 Setting Up Apache
 -----------------
 
 Apache is required in order to replicate the appearance of the website
-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.
+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 remote.
+
+Modifying Apache's configuration files and running its executables
+typically requires root access.  So, you will most likely need to run
+the commands below as the root user using `sudo`.
 
 ### Enable server-side include module
 
@@ -97,16 +101,24 @@ Creating a New Page
 Add the following to your new page (it should remain commented out, as that is the syntax for SSI):
 
 ```
-<!--#include virtual="/2015/header.html"-->
-<!--#include virtual="/2015/footer.html"-->
+<!--#include virtual="/server/2015/header.html"-->
+<!--#include virtual="/server/2015/banner.html"-->
+<!--#include virtual="/server/2015/sidebar.html"-->
+<!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/close.html"-->
 ```
 
-This will include the header and footer, saving you from duplicating
-HTML.
+This will include the header, banner, sidebar, footer and closing tags
+saving you from duplicating HTML.
+
+If JS is needed for a page, then create a file, containing the JS
+includes, in `/server/2015/` & use SSI to include it in the page.
+
+Use `/server/2015/boilerplate.html` to start a new page.
 
 ### Add Your Markup
 
-Add HTML markup in-between the header and footer includes.
+Add HTML markup in-between the sidebar and footer includes.
 
 ### Enable SSI
 
@@ -127,7 +139,7 @@ Deploying to Staging/Live Servers
 
 A system of git hooks automates deployment to the staging and live
 servers.  When you push to the `master` branch, the site is deployed
-to <http://wiki-dev0.libreplanet.org>.  When you push to the
+to <http://wiki-dev0.libreplanet.org/2015>.  When you push to the
 `stable` branch, the site is deployed to <http://libreplanet.org>.
 
 When you're happy with the state of the master branch and want to