summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-04-10 17:39:56 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-04-10 17:39:56 +0000
commitc9c5ec0e4beea45d6257a263e5e0f0d4e6c57025 (patch)
treeb6aef09e676fa97e32bdf742d119c8564b4feb98 /README
parentdcee7f2f6230be385972af4abc9ea8653bf42668 (diff)
parentfba02499327aa18083b590cf38ee6e144be06a6f (diff)
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index dcd5f6a95..29a1e157a 100644
--- a/README
+++ b/README
@@ -1129,7 +1129,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.