switched to using amber, added all the main pages.

1 files changed, 30 insertions, 24 deletions

diff --git a/README.md b/README.md
index 21596eb..ef76154 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,15 @@ Bitmask downloads
 
 This is the Bitmask download website (https://dl.bitmask.net)
 
-It is entirely static, but relies on a bunch of apache tricks for things like language negotiation, server side includes, and pretty directory indexes.
+It is entirely static, but relies on a bunch of apache tricks for things like language negotiation and pretty directory indexes.
+
+The static content files in ./public/ are rendered from the content in ./pages/ using the command `amber rebuild`.
+
+To install amber:
+
+    gem install amber
+
+See https://github.com/elijh/amber for more information.
 
 Requirements
 -----------------------------------------
@@ -32,42 +40,34 @@ The following apache directives are required, on the document root:
     Options +MultiViews
 
     ##
-    ## SERVER SIDE INCLUDES
-    ##
-
-    AddType text/html .shtml
-    AddOutputFilter INCLUDES .shtml
-    Options +Includes
-
-    ##
     ## REWRITES
     ##
 
     Options +FollowSymLinks
     RewriteEngine on
-    LogLevel alert rewrite:trace4
+    #LogLevel alert rewrite:trace4
 
     #
     # Allow /:locale/ prefix path if the document exists
-    # e.g. /de/blah/ ==> /blah/index.de.shtml
+    # e.g. /de/blah/ ==> /blah/index.de.html
     #
 
-    RewriteCond %{DOCUMENT_ROOT}/$2/index.$1.shtml -f
-    RewriteRule ^([a-z]{2})/(.*) /$2/index.$1.shtml [L]
+    RewriteCond %{DOCUMENT_ROOT}/$2/index.$1.html -f
+    RewriteRule ^([a-z]{2})/(.*) /$2/index.$1.html [L]
 
-    RewriteCond %{DOCUMENT_ROOT}/index.$1.shtml -f
-    RewriteRule ^([a-z]{2})$ /index.$1.shtml [L]
+    RewriteCond %{DOCUMENT_ROOT}/index.$1.html -f
+    RewriteRule ^([a-z]{2})$ /index.$1.html [L]
 
     #
     # Fall back to english if the document doesn't exist
-    # e.g. /xx/blah ==> /blah/index.en.shtml
+    # e.g. /xx/blah ==> /blah/index.en.html
     #
 
-    RewriteCond %{DOCUMENT_ROOT}/$2/index.$1.shtml !-f
-    RewriteRule ^([a-z]{2})/(.*) /$2/index.en.shtml [L]
+    RewriteCond %{DOCUMENT_ROOT}/$2/index.$1.html !-f
+    RewriteRule ^([a-z]{2})/(.*) /$2/index.en.html [L]
 
-    RewriteCond %{DOCUMENT_ROOT}/index.$1.shtml !-f
-    RewriteRule ^([a-z]{2})$ /index.en.shtml [L]
+    RewriteCond %{DOCUMENT_ROOT}/index.$1.html !-f
+    RewriteRule ^([a-z]{2})$ /index.en.html [L]
 
     ##
     ## Index Directories
@@ -123,8 +123,14 @@ The following apache directives are required, on the document root:
 Credits
 -----------------------------------------
 
-Stylesheet is adapted from Apaxy, in the public domain.
-https://github.com/AdamWhitcroft/Apaxy
+Dir listing style from Apaxy - https://github.com/AdamWhitcroft/Apaxy
+License: in the public domain.
+
+Icons are from "Faenza Icons" -- http://tiheum.deviantart.com/art/Faenza-Icons-173323228
+License: GNU General Public License.
+
+Stylesheet is from Bootstrap -- http://getbootstrap.com
+License: Apache, version 2 -- https://www.apache.org/licenses/LICENSE-2.0.html
 
-Icons are from "Faenza Icons" Licensed under the GPL.
-http://tiheum.deviantart.com/art/Faenza-Icons-173323228
+The fonts are Font Awesome -- http://fortawesome.github.io
+License: SIL OFL 1.1 -- http://scripts.sil.org/OFL