fix conflict with Robin's changes on trunk

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index fb210d610749da871711e0dbead7b4c2e7d604cc..228d0b1d08bd36cdaec559ac97d62732eb8daf7d 100644 (file)
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 README
 ------
 
-Laconica 0.6.3
-23 November 2008
+Laconica 0.6.3 ("Gardening at Night")
+24 November 2008
 
 This is the README file for Laconica, the Open Source microblogging
 platform. It includes installation instructions, descriptions of
@@ -99,9 +99,8 @@ This is a minor feature and security improvement version from version
 - Use cached favorites info to avoid excess DB hits for faves.
 - Optionally use Sphinx Search for notice search.
 - Optionally use Sphinx Search for people search.
-
-Because of the CSRF fixes in particular, this upgrade is recommended
-for all Laconica sites.
+- FOAF URL link on profile page.
+- HTML correction for repeated @id attributes in favorites forms.
 
 Prerequisites
 =============
@@ -127,6 +126,7 @@ Your PHP installation must include the following PHP extensions:
 - MySQL. For accessing the database.
 - GD. For scaling down avatar images.
 - mbstring. For handling Unicode (UTF-8) encoded strings.
+- gettext. For multiple languages. Default on many PHP installs.
 
 For some functionality, you will also need the following extensions:
 
@@ -329,6 +329,24 @@ If you have problems with the .htaccess file on versions of Apache
 earlier than 2.2.x, try changing the regular expressions in the
 htaccess.sample file that use "\w" to just use ".".
 
+Sphinx
+------
+
+To use a Sphinx server to search users and notices, you also need
+to install, compile and enable the sphinx pecl extension for php on the
+client side, which itself depends on the sphinx development files.
+"pecl install sphinx" should take care of that. Add "extension=sphinx.so"
+to your php.ini and reload apache to enable it.
+
+You can update your MySQL or Postgresql databases to drop their fulltext
+search indexes, since they're now provided by sphinx.
+
+On the sphinx server side, a script reads the main database and build
+the keyword index. A cron job reads the database and keeps the sphinx
+indexes up to date. scripts/sphinx-cron.sh should be called by cron
+every 5 minutes, for example. scripts/sphinx.sh is an init.d script
+to start and stop the sphinx search daemon.
+
 SMS
 ---
 
@@ -608,22 +626,6 @@ backups of a working Laconica system by backing up the database and
 the Web directory. To backup the database use mysqldump (http://ur1.ca/7xo)
 and to backup the Web directory, try tar.
 
-Sphinx
-------
-
-To use a Sphinx server to search users and notices, you also need
-to install, compile and enable the sphinx pecl extension for php on the
-client side, which itself depends on the sphinx development files.
-"pecl install sphinx" should take care of that. Add "extension=sphinx.so"
-to your php.ini and reload apache to enable it.
-
-You can update your MySQL or Postgresql databases to drop their fulltext
-search indexes, since they're now provided by sphinx.
-
-On the sphinx server side, a script reads the main database and build
-the keyword index. A cron job reads the database and keeps the sphinx
-indexes up to date.
-
 Upgrading
 =========