From: Sarven Capadisli Date: Fri, 10 Apr 2009 17:39:56 +0000 (+0000) Subject: Merge branch '0.7.x' into 0.8.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c9c5ec0e4beea45d6257a263e5e0f0d4e6c57025;hp=-c;p=quix0rs-gnu-social.git Merge branch '0.7.x' into 0.8.x --- c9c5ec0e4beea45d6257a263e5e0f0d4e6c57025 diff --combined README index dcd5f6a953,09d9d301c5..29a1e157ad --- a/README +++ b/README @@@ -176,10 -176,6 +176,10 @@@ and the URLs are listed here for your c version may render your Laconica site unable to send or receive XMPP messages. - Facebook library. Used for the Facebook application. +- PEAR Services_oEmbed. Used for some multimedia integration. +- PEAR HTTP_Request is an oEmbed dependency. +- PEAR Validat is an oEmbed dependency.e +- PEAR Net_URL is an oEmbed dependency.2 A design goal of Laconica is that the basic Web functionality should work on even the most restrictive commercial hosting services. @@@ -1129,7 -1125,7 +1129,7 @@@ default: nickname of a user account to service updates or announcements. Users are able to unsub if they want. Default is null; no auto subscribe. welcome: nickname of a user account that sends welcome messages to new - users. Can be the same as 'subscribe' account, although on + users. Can be the same as 'default' account, although on busy servers it may be a good idea to keep that one just for 'urgent' messages. Default is null; no message.