prepare readme, news and changelog for 0.4.0

3 files changed, 78 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 3109e7f..e37ed9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-15  Christian Weiske  <cweiske@cweiske.de>
+
+	* Release version 0.4
+
 2013-09-17  Christian Weiske  <cweiske@cweiske.de>
 
 	* Add webhook support
diff --git a/NEWS.rst b/NEWS.rst
index 5202cb1..c3936e8 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -1,3 +1,31 @@
+Version 0.4.0 - 2014-07-15
+--------------------------
+* Fix bug #27: Render .json files
+* Fix bug #31: Forked pastes cannot be remote forked
+* Fix bug #33: Do not index login page
+* Fix bug #41: AGPL link broken
+* Fix bug #43: github gist cloning does not work
+* Fix bug #44: Anchors of files with spaces in their name
+* Fix renaming of binary files
+* Implement request #6: Atom feed for new and updated pastes
+* Implement request #7: Track and display remote forks
+* Implement request #21: Send linkbacks when forking remote pastes
+* Implement request #32: Distribute phorkie as .phar file with all dependencies
+* Implement request #34: Store last OpenID in cookie and pre-fill login form
+* Implement request #35: Store author of a paste
+* Implement request #37: Show user icon in navbar and profile page
+* Implement request #42: Single click remote forking with web+fork: url handler
+* Add autoconfiguration for public git clone urls over http
+* Add baseurl setting to make phorkie run in a subdirectory of a domain
+* Add setupcheck page that checks dependencies and other things
+* Add support for file names with directories in pastes
+* Add support for UTF-8 characters in file names
+* Add support for web hooks
+* Add support for forking HTTP and HTTPS git URLs
+* Extract gist titles
+* Make it possible to install dependencies via composer
+
+
 Version 0.3.1 - 2012-09-27
 --------------------------
 * Check for OpenID package in SetupCheck
diff --git a/README.rst b/README.rst
index 043c438..a755d3a 100644
--- a/README.rst
+++ b/README.rst
@@ -16,6 +16,7 @@ Features
   - repositories can be cloned
   - clone url can be displayed
   - remote pastes can be forked (rel="vcs-git" and gist.github.com)
+  - single click forking of forks on different servers to your own
 - paste editing
 
   - add new files
@@ -37,19 +38,41 @@ Features
 
   - options: quoting, logical and, or, not, partial words
 - webhook support - get notified when pastes are created, edited or deleted
+- atom feed for new and updated pastes
+- notifies remote instances via linkbacks when a paste has been forked
 
 
 ============
 Installation
 ============
+
+.phar
+=====
+Download ``phorkie-0.4.0.phar`` and put it in your web server's document root
+directory.
+
+No further setup needed.
+
+.. note:: Only valid if your webserver is configured to let
+   PHP handle ``.phar`` files.
+
+   Unfortunately, no Linux distribution has this activated by default.
+
+.. warning:: PHP has some bugs in its .phar handling code (e.g. with FPM).
+
+   So currently, the ``.phar`` option is considered experimental.
+
+
+Zip package
+===========
 1. Unzip the phorkie release file::
 
-   $ tar xjvf phorkie-0.3.0.tar.bz2
+   $ tar xjvf phorkie-0.4.0.tar.bz2
 
 2. Create the git directories::
 
-   $ mkdir -p repos/git repos/work
-   $ chmod og+w repos/git repos/work
+   $ mkdir -p www/repos/git www/repos/work
+   $ chmod og+w www/repos/git www/repos/work
 
 3. Install dependencies_
 
@@ -111,6 +134,13 @@ on your machine:
   $ pear install pear2/pear2_services_linkback-alpha
 
 
+You can use composer to install all dependencies automatically::
+
+  $ composer install
+
+Note that the ``.phar`` package already contains all dependencies.
+
+
 ======
 Search
 ======
@@ -160,8 +190,19 @@ HowTo
 
 Make git repositories clonable
 ==============================
-To make git repositories clonable, you need to install ``git-daemon``
-(``git-daemon-run`` package on Debian/Ubuntu).
+
+HTTP
+----
+By default, the pastes are clonable via ``http`` as long as the ``repos/git/``
+directory is within the ``www/`` directory.
+
+No further setup needed.
+
+
+git-daemon
+----------
+You may use ``git-daemon`` to provide public ``git://`` clone urls.
+Install the ``git-daemon-run`` package on Debian/Ubuntu.
 
 Make the repositories available by symlinking the paste repository
 directory (``$GLOBALS['phorkie']['cfg']['repos']`` setting) into
@@ -246,17 +287,6 @@ The event may be ``create``, ``edit`` or ``delete``.
 Technical details
 =================
 
-TODO
-====
-- filters (``xmllint --format``, ``rapper``)
-- document how to keep disk usage low (block size)
-- comments
-- when 2 people edit, merge changes
-- diff changes
-- configurable highlights
-- Atom feed for new pastes
-- Atom feed for paste changes
-
 
 URLs
 ====