Issue 2127 - Adapt README.md for cms repository

README.md

 # CMS #
 
 We use this CMS for [adblockplus.org](https://github.com/adblockplus/web.adblockplus.org/)
 and related websites. It converts a directory with content data into static
 files. You are free to use it for other projects but please keep in mind that we
 make no stability guarantees whatsoever and might change functionality any time.

[Sebastian Noack, 2015/03/12 09:27:51]

Really worth pointing this out here? Isn't it the same for all of our projects,
and part of the GPL terms anyway?

[Wladimir Palant, 2015/03/12 16:40:01]

No. Most our projects are explicitly developed for a wide audience. This is an
internal product however, it is targeted at our own needs only. It might turn
out useful for somebody else but that's not our development goal.

 
 ## How to use ##
 
 ### Running the test server ###
 
 The test server will convert your content directory on the fly, your changes
 will become visible immediately. To run it you need:
 
 * Python 2.7
 * [Flask](http://flask.pocoo.org/), [Jinja2](http://jinja.pocoo.org/) and
   [Markdown](https://pypi.python.org/pypi/Markdown) modules (can be installed by
   running `easy_install Flask Jinja2 Markdown` from the command line)
 * A current copy of the
   [cms repository](https://github.com/adblockplus/cms/) (can be

[Sebastian Noack, 2015/03/12 09:27:51]

This README goes into the CMS repo, right? So any reasons to list it as a
dependency of itself?

[Wladimir Palant, 2015/03/12 16:40:01]

Because repositories like web.adblockplus.org will link to the README directly.
Typically, people won't start with the cms repository - they will start with
web.adblockplus.org.

   [downloaded as ZIP file](https://github.com/adblockplus/cms/archive/master.zip)
   or cloned via `git clone https://github.com/adblockplus/cms.git`)
 
-Run the following command from the directory of the `cms` repository:

[Sebastian Noack, 2015/03/12 09:27:51]

How about making runserver.py run from everywhere, just like we did for
build.py?

[Wladimir Palant, 2015/03/12 16:40:01]

Done.

-
-    python runserver.py www_directory
-
-Here `www_directory` should be replaced by the path to your content directory.
-This will start a local web server on port 5000, e.g. the page the page
-`pages/example.md` will be accessible under `http://localhost:5000/en/example`.
+Run the `runserver.py` script from your content directory, e.g.:
+
+    python ../cms/runserver.py
+
+Alternatively, the content directory could also be specified as command line
+parameter of `runserver.py`. This will start a local web server on port 5000,
+e.g. the page the page `pages/example.md` will be accessible under
+`http://localhost:5000/en/example`.
 
 Note that the test server is inefficient and shouldn't be run in production.
 There you should generate static files as explained below.
 
 ### Generating the standalone test server ###
 
 The standalone test server is a single binary, without any further dependencies.
 It can be copied to another system and will no longer require Python or any of
 its modules. In order to generate the standalone test server you need all the
 prerequisites required to run the test server and
@@ skipping 188 matching lines @@
 * Additional variables `head` and `body` are defined with the HTML code that
   should be added to the head and content of the page respectively.
 
 By default, `default.tmpl` will be used for all pages. If other templates are
 defined, the pages need to choose them explicitly using the `template` setting.
 
 ### Custom filters ###
 
 The `filters` directory can define custom Jinja2 filters which will be available
 in all Jinja2 templates. The file name defines the filter name, e.g.
-`myfilter.py` will define a file named `myfilter`. This file should also contain

[Sebastian Noack, 2015/03/12 09:27:51]

I suppose you mean "will define a filter name `myfilter`".
                                  ^

[Wladimir Palant, 2015/03/12 16:40:01]

Done.

-a function called `myfilter`, this one will be called when the filter is
+`myfilter.py` will define a filter named `myfilter`. This file should also
+contain a function called `myfilter`, this one will be called when the filter is
 invoked. For more information on Jinja2 filters see
 [official documentation](http://jinja.pocoo.org/docs/dev/api/#writing-filters).