summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-04-10 10:48:13 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-04-10 10:48:13 -0400
commita0a6a627e7c8f036588a3e3488fb1c273e3815c4 (patch)
tree55f8b7e1bc390eb1b8515701ace3b30938c03df9 /README
parent08c08d02aa48e492eb40ad3790e4fb05c2b86a91 (diff)
parent6cdc2ff444b8c76a3cdc5b8c6e9e7e7539d9b6cc (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index f18d9c7c1..09d9d301c 100644
--- a/README
+++ b/README
@@ -1125,7 +1125,7 @@ default: nickname of a user account to automatically subscribe new
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.