Merge branch 'master' of ../trunk

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index 6c73a327ac77d5bedf9bf74ab9d730b33e63f38e..a0758e5ee0c0dafdd419f1d18acf8af1d9dd8783 100644 (file)
--- a/README
+++ b/README
@@ -117,6 +117,10 @@ This is a minor feature and security improvement version from version
 - Code cleanup: checkboxes have proper <label> elements
 - Code cleanup: consolidated various notice-listing code in one place
 - Better support for unsubscribing from a remote user
+- Stump of experimental Facebook application (not ready for use! code
+  review only!)
+- Stump of experimental user account deletion (not ready for use! code
+  review only!)
 
 Prerequisites
 =============
@@ -663,7 +667,7 @@ Upgrading
 =========
 
 If you've been using Laconica 0.6, 0.5 or lower, or if you've been
-tracking the "darcs" version of the software, you will probably want
+tracking the "git" version of the software, you will probably want
 to upgrade and keep your existing data. There is no automated upgrade
 procedure in Laconica 0.6.4. Try these step-by-step instructions; read
 to the end first before trying them.
@@ -813,6 +817,10 @@ private: If set to 'true', anonymous users will be redirected to the
          authentication will require it. Note that this does not turn
          off registration; use 'closed' or 'inviteonly' for the
          behaviour you want.
+notice: A plain string that will appear on every page. A good place
+       to put introductory information about your service, or info about
+       upgrades and outages, or other community info. Any HTML will
+        be escaped.
 
 db
 --
@@ -1064,7 +1072,7 @@ The primary output for Laconica is syslog, unless you configured a
 separate logfile. This is probably the first place to look if you're
 getting weird behaviour from Laconica.
 
-If you're tracking the unstable version of Laconica in the darcs
+If you're tracking the unstable version of Laconica in the git
 repository (see below), and you get a compilation error ("unexpected
 T_STRING") in the browser, check to see that you don't have any
 conflicts in your code.
@@ -1099,12 +1107,12 @@ Unstable version
 ================
 
 If you're adventurous or impatient, you may want to install the
-development version of Laconica. To get it, use the darcs version
-control tool (http://darcs.net/) like so:
+development version of Laconica. To get it, use the git version
+control tool (http://git-scm.com/) like so:
 
-       darcs get http://laconi.ca/darcs/ mublog
+       git clone http://laconi.ca/software/laconica.git
 
-To keep it up-to-date, use 'darcs pull'. Watch for conflicts!
+To keep it up-to-date, use 'git pull'. Watch for conflicts!
 
 Further information
 ===================