talk links

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

diff --git a/2019/README.md b/2019/README.md
index 20082ff938b4706a90d468b76da8355c6e24a71e..2b2b2b1868ad679ee86446fd361dfa22acc3ff11 100644 (file)
--- a/2019/README.md
+++ b/2019/README.md
@@ -4,7 +4,7 @@ Heads up: to edit the Web site, you'll need a basic-to-intermediate understandin
 
 # SECTION 1: DEVELOPMENT WORKFLOW
 
-The actual LIVE site, visible at libreplanet.org/YEAR, is served from the "stable" branch of the git repository using a git hook. There is also a development branch called "master" which we use to preview edits on the Web. The master branch is served to the Web at http://wiki-dev0.libreplanet.org/YEAR and publicly visible, but not linked to.
+The actual LIVE site, visible at libreplanet.org/YEAR, is served from the "stable" branch of the git repository using a git hook. There is also a development branch called "master" which we use to preview edits on the Web. The master branch **used to** be served to the Web at http://wiki-dev0.libreplanet.org/YEAR and publicly visible, but not linked to.
 
 Full workflow to make, test and deploy an edit.
 -----------------
@@ -45,7 +45,7 @@ Here are specific instructions for more complex editing tasks:
 
 The workflow for this is Edit the Brains page with the schedule, then run a script to convert it into HTML and dump it into your checkout of the repo, then push that change up to the Web like any other edit.
 
-See instructions at <https://ricketyspace.net/lpschedule-generator> for installing and running the script. The source files are stored in Brains in markdown but with special tags, so that you can edit them without needing to know this whole process. The jinja2 templates are stored in the the Web site's git repo at assets/templates.
+See instructions at <https://ricketyspace.net/lpschedule-generator> for installing and running the script. The source files are stored in Brains in markdown but with special tags, so that you can edit them without needing to know this whole process.
 
 Please crop all photos of speakers too 100x100 px (200x200 px for keynotes) and then upload them to <http://static.fsf.org/nosvn/libreplanet/speaker-pics/>. Then include their URL in the bios page to embed them.
 
@@ -88,6 +88,10 @@ chmod +x foo.html
 
 Replace `foo.html` with the desired file name.
 
+## Using Markdown
+
+Static pages can be edited using markdown by creating a index.mdwn file in the appropriate subdirectory (e.g. ./fun/index.mdwn) and running 'make wikipages'. Note that the .mdwn files should have the ```<!--#include...``` lines in place, everything else being regular markdown. It is a requirement to have the python-markdown package installed to run 'make wikipages'. To add this functionality to new pages, edit the Makefile. Also note that the index.html in those directories would be generated from the mdwn file and should not be edited directly.
+
 ## Modifying top-right corner
 
 In the `/2019/includes/banner.html` find the `...#top-right-desktop
@@ -125,6 +129,7 @@ the commands below as the root user using `sudo`.
 
 ```
 a2enmod include
+a2enmod rewrite
 ```
 
 If this doesn't work, you may not have Apache installed. Install the
@@ -150,7 +155,7 @@ RewriteEngine on
             SSILegacyExprParser on
             Options +Includes
             XBitHack on
-        </Directory>
+G        </Directory>
         ErrorLog /home/owner/libreplanet-static/logs/error.log
         CustomLog /home/owner/libreplanet-static/access.log combined
 </VirtualHost>
@@ -163,7 +168,6 @@ git repository.
 
 ```
 a2ensite your-virtual-host
-* Do not need to do this -mdb
 ```
 
 Replace `your-virtual-host` with the name of virtual host file you made (in this case, libreplanet).
@@ -172,10 +176,6 @@ Replace `your-virtual-host` with the name of virtual host file you made (in this
 
 ```
 service apache2 restart
-*  /usr/local/bin/user-apache-restart
-
-If you are mdb, do: user-apache-restart
-
 ```
 
 *Edit your hosts file*