1.1 --- a/INSTALL.mkd	Thu Jul 10 01:19:48 2014 +0200
     1.2 +++ b/INSTALL.mkd	Thu Jul 10 02:14:49 2014 +0200
     1.3 @@ -21,6 +21,7 @@
     1.4    * libghc6-parsec3-dev
     1.5    * imagemagick
     1.6    * exim4
     1.7 +  * markdown2 (install with Python's pip)
     1.8  
     1.9  If you're using any other Linux distribution or BSD system, install the
    1.10  necessary software components accordingly.
    1.11 @@ -108,43 +109,7 @@
    1.12      cp -RL framework/* /opt/webmcp/
    1.13  
    1.14  
    1.15 -5. Install RocketWiki LqFb-Edition
    1.16 -----------------------------------
    1.17 -
    1.18 -    # Download and unpack "RocketWiki LqFb-Edition"
    1.19 -    # from http://www.public-software-group.org/pub/projects/rocketwiki/liquid_feedback_edition/
    1.20 -    make
    1.21 -    mkdir /opt/rocketwiki-lqfb
    1.22 -    cp rocketwiki-lqfb rocketwiki-lqfb-compat /opt/rocketwiki-lqfb/
    1.23 -
    1.24 -If you experience problems with multi-byte encoding (UTF-8) later, then apply
    1.25 -the following patch to both `rocketwiki-lqfb.hs` and
    1.26 -`rocketwiki-lqfb-compat.hs` prior compilation:
    1.27 -
    1.28 -    --- rocketwiki-lqfb.hs
    1.29 -    +++ rocketwiki-lqfb.hs
    1.30 -    @@ -1,4 +1,6 @@
    1.31 - 
    1.32 -    +import System.IO (hSetEncoding, stdin, stdout, utf8)
    1.33 -    +
    1.34 -     import Text.ParserCombinators.Parsec
    1.35 -     import Control.Applicative ((<$>), (<*>))
    1.36 -     import Data.List (intercalate)
    1.37 -    @@ -405,7 +407,10 @@
    1.38 -           return htmlEntity
    1.39 -     
    1.40 -     
    1.41 -    -main = interact wikiParse
    1.42 -    +main = do
    1.43 -    +  hSetEncoding stdin utf8
    1.44 -    +  hSetEncoding stdout utf8
    1.45 -    +  interact wikiParse
    1.46 - 
    1.47 -     wikiParse str
    1.48 -       | success parseResult = html
    1.49 -
    1.50 -
    1.51 -6. Install the LiquidFeedback-Frontend
    1.52 +5. Install the LiquidFeedback-Frontend
    1.53  --------------------------------------
    1.54  
    1.55  Unpack source tree into appropriate directory, e.g. `/opt/liquid_feedback_frontend`:
    1.56 @@ -169,14 +134,14 @@
    1.57      make
    1.58  
    1.59  
    1.60 -7. Configure mail system
    1.61 +6. Configure mail system
    1.62  ------------------------
    1.63  
    1.64  It may be necessary to configure your server's mail system, e.g. running
    1.65  `dpkg-reconfigure exim4-config` on a Debian system.
    1.66  
    1.67  
    1.68 -8. Configure the Webserver for LiquidFeedback:
    1.69 +7. Configure the Webserver for LiquidFeedback:
    1.70  ----------------------------------------------
    1.71  
    1.72  A sample configuration for `lighttpd` is given below (assuming `mod_alias` has
    1.73 @@ -220,7 +185,7 @@
    1.74  `/etc/lighttpd/conf-enabled/`.
    1.75  
    1.76  
    1.77 -9. Configure the LiquidFeedback-Frontend:
    1.78 +8. Configure the LiquidFeedback-Frontend:
    1.79  -----------------------------------------
    1.80  
    1.81      cd /opt/liquid_feedback_frontend/config
    1.82 @@ -235,7 +200,7 @@
    1.83      end
    1.84  
    1.85  
    1.86 -10. Setup regular execution of `lf_update` and `lf_update_suggestion_order`
    1.87 +9. Setup regular execution of `lf_update` and `lf_update_suggestion_order`
    1.88  ---------------------------------------------------------------------------
    1.89  
    1.90  The executables `lf_update` and `lf_update_suggestion_order` must be executed
    1.91 @@ -267,7 +232,7 @@
    1.92  And this file should be started automatically at system boot.
    1.93  
    1.94  
    1.95 -11. Setup notification loop in background
    1.96 +10. Setup notification loop in background
    1.97  -----------------------------------------
    1.98  
    1.99  In addition to regular execution of `lf_update` and
   1.100 @@ -279,7 +244,7 @@
   1.101      echo "Event:send_notifications_loop()" | ../webmcp/bin/webmcp_shell myconfig
   1.102  
   1.103  
   1.104 -12. Start the sytem
   1.105 +11. Start the sytem
   1.106  -------------------
   1.107  
   1.108  After `lf_update` has been executed at least once, and the webserver has been