X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/5dc661ad3c4c6886dd95dd00c63f93107e09cd68..04e78a7eb3d992ff8af4b472144c339dca956911:/README.rst

diff --git a/README.rst b/README.rst
index ca94cf2..1a96ad1 100644
--- a/README.rst
+++ b/README.rst
@@ -133,39 +133,14 @@ It requires the following programs to be installed
 on your machine:
 
 - Git v1.7.5 or later
-- PHP v5.3.0 or later
+- PHP v8.0.0 or later
 
-  - optionally the ``mbstring`` extension
-- PEAR v1.9.2 or later
+  - with the ``mbstring`` extension
+- A dozen of libraries
 
-::
-
-  $ pear install versioncontrol_git-alpha
-  $ pear install services_libravatar-alpha
-  $ pear install http_request2
-  $ pear install pager
-  $ pear install date_humandiff-alpha
-  $ pear install openid-alpha
-
-  $ pear channel-discover pear.twig-project.org
-  $ pear install twig/Twig
-
-  $ pear channel-discover pear.geshi.org
-  $ pear install geshi/geshi
-
-  $ pear channel-discover zustellzentrum.cweiske.de
-  $ pear install zz/mime_type_plaindetect-alpha
-
-  $ pear channel-discover pear.michelf.ca
-  $ pear install michelf/Markdown
-
-  $ pear channel-discover pear2.php.net
-  $ pear install pear2/pear2_services_linkback-alpha
-
-
-You can use composer to install all dependencies automatically::
+Use composer to install all dependencies::
 
-  $ composer install
+  $ composer install --no-dev
 
 Note that the ``.phar`` package already contains all dependencies.
 
@@ -401,7 +376,7 @@ If you use nginx, place the following lines into your ``server`` block:
     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;
-    rewrite ^/([0-9]+)/rev-raw/(.+)/(.+)$ /raw.php?id=$1&rev=$2&file=$3;
+    rewrite ^/([0-9]+)/rev-raw/([^/]+)/(.+)$ /raw.php?id=$1&rev=$2&file=$3;
     rewrite ^/([0-9]+)/tool/([^/]+)/(.+)$ /tool.php?id=$1&tool=$2&file=$3;
 
     rewrite ^/fork-remote$ /fork-remote.php;
@@ -439,7 +414,7 @@ Lighttpd rewrites
         "^/([0-9]+)/fork$" => "/fork.php?id=$1",
         "^/([0-9]+)/raw/(.+)$" => "/raw.php?id=$1&file=$2",
         "^/([0-9]+)/rev/(.+)$" => "/revision.php?id=$1&rev=$2",
-        "^/([0-9]+)/rev-raw/(.+)/(.+)$" => "/raw.php?id=$1&rev=$2&file=$3",
+        "^/([0-9]+)/rev-raw/([^/]+)/(.+)$" => "/raw.php?id=$1&rev=$2&file=$3",
         "^/([0-9]+)/tool/([^/]+)/(.+)$" => "/tool.php?id=$1&tool=$2&file=$3",
 
         "^/fork-remote$" => "/fork-remote.php",