OStatus enabled by default, only disabled for private siteprofile

[quix0rs-gnu-social.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 0fa6634810d90c8372f915d6c5dd3a22495d9d2a..64f4a817ccb4194023aff8b92a049a708ccde42a 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -310,59 +310,6 @@ that if your mail server is on a different computer from your email
 server, you'll need to have a full installation of StatusNet, a working
 config.php, and access to the StatusNet database from the mail server.
 
-XMPP
-----
-
-XMPP (eXtended Message and Presence Protocol, <http://xmpp.org/>) is the
-instant-messenger protocol that drives Jabber and GTalk IM. You can
-distribute messages via XMPP using the system below; however, you
-need to run the XMPP incoming daemon to allow incoming messages as
-well.
-
-1. You may want to strongly consider setting up your own XMPP server.
-   Ejabberd, OpenFire, and JabberD are all Open Source servers.
-   Jabber, Inc. provides a high-performance commercial server.
-
-2. You must register a Jabber ID (JID) with your new server. It helps
-   to choose a name like "update@example.com" or "notice" or something
-   similar.  Alternately, your "update JID" can be registered on a
-   publicly-available XMPP service, like jabber.org or GTalk.
-
-   StatusNet will not register the JID with your chosen XMPP server;
-   you need to do this manually, with an XMPP client like Gajim,
-   Telepathy, or Pidgin.im.
-
-3. Configure your site's XMPP variables, as described below in the
-   configuration section.
-
-On a default installation, your site can broadcast messages using
-XMPP. Users won't be able to post messages using XMPP unless you've
-got the XMPP daemon running.  See 'Queues and daemons' below for how
-to set that up. Also, once you have a sizable number of users, sending
-a lot of SMS, OStatus, and XMPP messages whenever someone posts a message
-can really slow down your site; it may cause posting to timeout.
-
-NOTE: stream_select(), a crucial function for network programming, is
-broken on PHP 5.2.x less than 5.2.6 on amd64-based servers. We don't
-work around this bug in StatusNet; current recommendation is to move
-off of amd64 to another server.
-
-Public feed
------------
-
-You can send *all* messages from your social networking site to a
-third-party service using XMPP. This can be useful for providing
-search, indexing, bridging, or other cool services.
-
-To configure a downstream site to receive your public stream, add
-their "JID" (Jabber ID) to your config.php as follows:
-
-    $config['xmpp']['public'][] = 'downstream@example.net';
-
-(Don't miss those square brackets at the end.) Note that your XMPP
-broadcasting must be configured as mentioned above. Although you can
-send out messages at "Web time", high-volume sites should strongly
-consider setting up queues and daemons.
 
 Queues and daemons
 ------------------
@@ -382,17 +329,19 @@ This plugin is enabled by default. It tries its best to do background
 job during regular HTTP requests, like API or HTML pages calls.
 
 Since queueing system is enabled by default, notices to be broadcasted
-will be stored, by default, into DB (table queue_items).
+will be stored, by default, into DB (table queue_item).
 
-Each time it casn, OpportunisticQM will try to handle some of them.
+Each time it can, OpportunisticQM will try to handle some of them.
 
-This is a good solution wether you:
+This is a good solution whether you:
 
 * have no access to command line (shared hosting)
-* do not want to deal with long-running PHP process
-* run a low trffic GnuSocial instance
+* do not want to deal with long-running PHP processes
+* run a low traffic GNU social instance
 
-In other case, you really should consider using queuedaemon.
+In other case, you really should consider enabling the queuedaemon for
+performance reasons. Background daemons are necessary anyway if you wish
+to use the Instant Messaging features such as communicating via XMPP.
 
 ### queuedaemon