X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/5d065586f4c16c0ec6510dba97b0d5facb859d75..c9610f1e514f31982e2d9e79b5ad9b6037551b68:/README.rst

diff --git a/README.rst b/README.rst
index 831c2f9..f805e77 100644
--- a/README.rst
+++ b/README.rst
@@ -15,16 +15,17 @@ Features
 
   - repositories can be cloned
   - clone url can be displayed
+  - remote pastes can be forked (rel="vcs-git" and gist.github.com)
 - paste editing
 
   - add new files
   - delete existing files
   - replace file with upload
-- OpenID authentication
 - multiple files in one paste
 - syntax highlighting with GeSHi
 - rST and Markdown rendering
 - image upload + display
+- OpenID authentication
 - external tool support
 
   - xmllint
@@ -100,6 +101,7 @@ way to install it.
 If you install it manually be sure to update the
 path from ``data/config.default.php``.
 
+
 ======
 Search
 ======
@@ -110,6 +112,7 @@ It is used to provide search capabilities and the list of recent pastes.
 
 __ http://www.elasticsearch.org/
 
+
 Setup
 =====
 Edit ``config.php``, setting the ``elasticsearch`` property to the HTTP URL
@@ -117,6 +120,7 @@ of the index, e.g. ::
 
   http://localhost:9200/phorkie/
 
+You must use a search namespace with Elasticsearch such as ``phorkie/``.
 Run the index script to import all existing pastes into the index::
 
   php scripts/index.php
@@ -136,6 +140,10 @@ index, run the following command::
 Phorkie will automatically re-index everything when ``setupcheck`` is enabled
 in the configuration file.
 
+You may also manually run the reindexing script with::
+
+  $ php scripts/index.php
+
 
 =====
 HowTo
@@ -165,7 +173,7 @@ Protect your site with OpenID
 You have the option of enabling OpenID authentication to help secure your
 pastes on phorkie.
 Set the ``$GLOBALS['phorkie']['auth']`` values in the
-``data/config.php`` file as desired.  
+``data/config.php`` file as desired.
 
 There are two different types of security you can apply.
 First, you can restrict to one of three ``securityLevels``:
@@ -179,6 +187,21 @@ You will need to add the individual OpenID urls to the
 ``$GLOBALS['phorkie']['auth']['users']`` variable.
 
 
+Get information about paste editors
+===================================
+Phorkie stores the user's OpenID or IP address (when not logged in) when
+a paste is edited.
+It is possible to get this information for each single commit::
+
+    // IP / OpenID for the latest commit
+    $ git notes --ref=identity show
+    127.0.0.1
+
+    // show IP / OpenID for a given commit
+    $ git notes --ref=identity show 29f82a
+    http://cweiske.de/
+
+
 =================
 Technical details
 =================