# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1290453042 -3600
# Node ID a6c7665d9f67a4d704ec14b9b2f6f7a4ee413d0d
# Parent  c3b461c0b97fc1d0c022fc3acdbdcca065fc062c# Parent  987caba84824a3b7fa7779e6b9fa0e94429c969b
Merge

diff -r 987caba84824 -r a6c7665d9f67 .hgsubstate
diff -r 987caba84824 -r a6c7665d9f67 README
--- a/README	Sun Nov 21 01:26:01 2010 -0600
+++ b/README	Mon Nov 22 20:10:42 2010 +0100
@@ -8,6 +8,17 @@
 * Instead of using Django to serve the site, use Blatter to generate a static version which can then be served by a normal webserver like Apache or nginx.
 * Move all the content into a subrepository so volunteers can just clone that repository if they just want to edit the content.
 
+Repository
+---------
+The repository is split into three subrepositories. The `main` repository contains
+scripts and templates to render the page. The `content` repository contains the
+content of each page and defines the structure of the website. The `rendered`
+repository contains the auto-generated pages.
+
+If you want to help out with patches, you usually just edit hg-website and hg-website-content
+and generate the rendered pages using blatter (or leave that tasks for the
+maintainer). 
+
 Setup
 -----
 
@@ -37,8 +48,8 @@
 
 You can then visit [http://localhost:8008](http://localhost:8008) to view the site.
 
-To render a static version of the site into the `out/` directory:
+To render a static version of the site into the `rendered/` directory:
 
     blatter blat
 
-For more information on using blatter, check the README file at [http://bitbucket.org/sjl/blatter/src/](http://bitbucket.org/sjl/blatter/src/)
\ No newline at end of file
+For more information on using blatter, check the README file at [http://bitbucket.org/sjl/blatter/src/](http://bitbucket.org/sjl/blatter/src/)