~ chicken-core (chicken-5) e59d9cabebc43bc0e93ce6856d6768eb83ff753e

commit e59d9cabebc43bc0e93ce6856d6768eb83ff753e
Merge: ce208785 8c769c55
Author:     Moritz Heidkamp <moritz.heidkamp@bevuta.com>
AuthorDate: Sat Jun 6 17:44:13 2015 +0200
Commit:     Moritz Heidkamp <moritz.heidkamp@bevuta.com>
CommitDate: Sat Jun 6 17:44:13 2015 +0200

    Merge remote-tracking branch 'origin/master' into prerelease

diff --cc buildversion
index b617d997,1f1ac7c2..5b341fd7
--- a/buildversion
+++ b/buildversion
@@@ -1,1 -1,1 +1,1 @@@
- 4.9.0
 -4.9.1
++4.9.1
diff --cc manual/faq
index e53fdf37,6310ef2e..6ed43c29
--- a/manual/faq
+++ b/manual/faq
@@@ -720,9 -719,9 +719,9 @@@ Compile the program that uses the modul
  
  ==== Why is my program which uses regular expressions so slow?
  
- The regular expression engine has recently be replaced by [[http://wiki.call-cc.org/users/alex shinn|alex shinn]]'s excellent
 -The regular expression engine has recently been replaced by [[/users/alex shinn|alex shinn]]'s excellent
++The regular expression engine has recently been replaced by [[http://wiki.call-cc.org/users/alex shinn|alex shinn]]'s excellent
  {{irregex}} library, which is fully implemented in Scheme. Precompiling regular
- expressions to internal form is somewhat slower than with the old PCRE-based
+ expressions to internal forms is somewhat slower than with the old PCRE-based
  regex engine. It is advisable to use {{irregex}} to precompile regular expressions
  outside of time-critical loops and use them where performance matters.
  
@@@ -777,8 -776,11 +776,11 @@@ and wrap calls to {{set-finalizer!}} i
  
  ==== Does CSI support history and autocompletion?
  
- CSI doesn't support it natively but it can be activated with one of the [[http://wiki.call-cc.org/egg/readline|readline]], [[http://wiki.call-cc.org/egg/linenoise|linenoise]] or [[http://wiki.call-cc.org/egg/parley|parley]] eggs. Out of these three, the parley egg is recommended.
- After installing parley, add the following to your {{~/.csirc}} or equivalent file:
+ CSI doesn't support it natively but it can be activated with one of the
 -[[/egg/readline|readline]], [[/egg/linenoise|linenoise]] or
 -[[/egg/parley|parley]] eggs. Out of these three, the parley egg is
++[[http://wiki.call-cc.org/egg/readline|readline]], [[http://wiki.call-cc.org/egg/linenoise|linenoise]] or
++[[http://wiki.call-cc.org/egg/parley|parley]] eggs. Out of these three, the parley egg is
+ recommended. After installing parley, add the following to your
+ {{~/.csirc}} or equivalent file:
  
  <enscript highlight=scheme>
  (use parley)