From 8b563fc04ee5ab6adc8370bdaf7f8a5b50f14f95 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Wed, 4 May 2016 11:40:13 +0200
Subject: [PATCH] Fix lighttpd documentation

---
 docs/en/user/installation.rst | 21 ++++++++++-----------
 docs/fr/user/installation.rst | 21 ++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 3872ad3a..d22f8549 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -192,20 +192,20 @@ After reloading or restarting nginx, you should now be able to access wallabag a
 
     When you want to import large file into wallabag, you need to add this line in your nginx configuration ``client_max_body_size XM; # allows file uploads up to X megabytes``.
 
-Configuration on LigHTTPd
+Configuration on lighttpd
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Edit your ``lighttpd.conf`` file and paste this configuration into it:
+Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe for wallabag (edit your ``lighttpd.conf`` file and paste this configuration into it):
 
 ::
 
     server.modules = (
-    "mod_fastcgi",
-    "mod_access",
-    "mod_alias",
-    "mod_compress",
-    "mod_redirect",
-    "mod_rewrite",
+        "mod_fastcgi",
+        "mod_access",
+        "mod_alias",
+        "mod_compress",
+        "mod_redirect",
+        "mod_rewrite",
     )
     server.document-root = "/var/www/wallabag/web"
     server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
@@ -226,9 +226,8 @@ Edit your ``lighttpd.conf`` file and paste this configuration into it:
     dir-listing.activate = "disable"
 
     url.rewrite-if-not-file = (
-    "^/([^?])(?:\?(.))?" => "/app.php?$1&$2",
-    "^/([^?]*)" => "/app.php?=$1",
-    "^/wiki$" => "/app.php",
+        "^/([^?])(?:\?(.))?" => "/app.php?$1&$2",
+        "^/([^?]*)" => "/app.php?=$1",
     )
 
 Rights access to the folders of the project
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 9039d608..8f2ae25d 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -189,20 +189,20 @@ Après que vous ayez rechargé/redémarré Nginx, vous devriez pouvoir avoir acc
 
     Si vous voulez importer un fichier important dans wallabag, vous devez ajouter cette ligne dans votre configuration nginx ``client_max_body_size XM; # allows file uploads up to X megabytes``.
 
-Configuration avec LigHTTPd
+Configuration avec lighttpd
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Éditez votre fichier ``lighttpd.conf`` collez-y cette configuration :
+En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wallabag``, voici un fichier de configuration pour wallabag (éditez votre fichier ``lighttpd.conf`` collez-y cette configuration) :
 
 ::
 
     server.modules = (
-    "mod_fastcgi",
-    "mod_access",
-    "mod_alias",
-    "mod_compress",
-    "mod_redirect",
-    "mod_rewrite",
+        "mod_fastcgi",
+        "mod_access",
+        "mod_alias",
+        "mod_compress",
+        "mod_redirect",
+        "mod_rewrite",
     )
     server.document-root = "/var/www/wallabag/web"
     server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
@@ -223,9 +223,8 @@ Configuration avec LigHTTPd
     dir-listing.activate = "disable"
 
     url.rewrite-if-not-file = (
-    "^/([^?])(?:\?(.))?" => "/app.php?$1&$2",
-    "^/([^?]*)" => "/app.php?=$1",
-    "^/wiki$" => "/app.php",
+        "^/([^?])(?:\?(.))?" => "/app.php?$1&$2",
+        "^/([^?]*)" => "/app.php?=$1",
     )
 
 Droits d'accès aux dossiers du projet
-- 
2.41.0