Fix nginx config

[phorkie.git] / README.rst

diff --git a/README.rst b/README.rst
index eb86a1ae95063ab15e4aeafedacbe424fceaa4a4..6916a357f8453c9a8579c2c764c27a546ea8a078 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -50,7 +50,7 @@ Installation
 
 .phar
 =====
-Download ``phorkie-0.5.0.phar`` and put it in your web server's document root
+Download ``phorkie-0.6.1.phar`` and put it in your web server's document root
 directory.
 
 No further setup needed.
@@ -69,7 +69,7 @@ Zip package
 ===========
 1. Unzip the phorkie release file::
 
-   $ tar xjvf phorkie-0.5.0.tar.bz2
+   $ tar xjvf phorkie-0.6.1.tar.bz2
 
 2. Create the git directories::
 
@@ -366,9 +366,9 @@ If you use nginx, place the following lines into your ``server`` block:
     rewrite ^/([0-9]+)/delete/confirm$ /delete.php?id=$1&confirm=1;
     rewrite ^/([0-9]+)/doap$ /doap.php?id=$1;
     rewrite ^/([0-9]+)/edit$ /edit.php?id=$1;
-    rewrite ^/([0-9]+)/edit/(.+)$ edit.php?id=$1&file=$2
+    rewrite ^/([0-9]+)/edit/(.+)$ /edit.php?id=$1&file=$2;
     rewrite ^/([0-9]+)/embed$ /embed.php?id=$1;
-    rewrite ^/([0-9]+)/embed/(.+)$ embed.php?id=$1&file=$2
+    rewrite ^/([0-9]+)/embed/(.+)$ /embed.php?id=$1&file=$2;
     rewrite ^/([0-9]+)/fork$ /fork.php?id=$1;
     rewrite ^/([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2;
     rewrite ^/([0-9]+)/rev/(.+)$ /revision.php?id=$1&rev=$2;
@@ -430,3 +430,25 @@ Lighttpd rewrites
         "^/setup$" => "/setup.php",
         "^/user$" => "/user.php"
     )
+
+
+===========
+Development
+===========
+
+Releasing a new version
+=======================
+
+#. Update ``ChangeLog``, ``NEWS.rst``, ``build.xml`` and ``README.rst``.
+#. Update local dependencies::
+
+    $ phing collectdeps
+#. Build ``.tar.bz2`` and ``.phar`` release files with::
+
+    $ phing zip
+    $ phing phar
+#. Test.
+#. Tag the release in git
+#. Upload release to sourceforge::
+
+    $ phing deploy-sf