summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-04-14 23:03:31 +0000
committerRobin Millette <millette@controlyourself.ca>2009-04-14 23:03:31 +0000
commit533a463879e574f53fb84dd977e9d72a75023451 (patch)
treeac6caa220b15d50664beab5507e1a56b030839f2 /README
parent20394664957a202cc86cc48ee2d115032e82c58a (diff)
parent9f2e2e4b2c1b428a1892c57c7194fbc5ede5b125 (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.