summaryrefslogtreecommitdiff
path: root/lib/plugins/usermanager
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2015-06-15 21:42:11 +0200
committerGerrit Uitslag <klapinklapin@gmail.com>2015-06-15 21:42:11 +0200
commitb9f9f2f569ed22bc570a8f42884938ae58735bb5 (patch)
tree0d4e2984a4336ccaf4ecb3cc0d5aa3bd5be074d6 /lib/plugins/usermanager
parent0c43e7198c135083b88bdad3dd7876a8ff8a2870 (diff)
parentadc91fc60470e25c23d2508ba9781ef0102faa83 (diff)
downloadrpg-b9f9f2f569ed22bc570a8f42884938ae58735bb5.tar.gz
rpg-b9f9f2f569ed22bc570a8f42884938ae58735bb5.tar.bz2
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'lib/plugins/usermanager')
-rw-r--r--lib/plugins/usermanager/lang/en/import.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/usermanager/lang/en/import.txt b/lib/plugins/usermanager/lang/en/import.txt
index 360a0689b..3a1cf999e 100644
--- a/lib/plugins/usermanager/lang/en/import.txt
+++ b/lib/plugins/usermanager/lang/en/import.txt
@@ -2,8 +2,8 @@
Requires a CSV file of users with at least four columns.
The columns must contain, in order: user-id, full name, email address and groups.
-The CSV fields should be separated by commas (,) and strings delimited by quotation marks (%%""%%). Backslash (\) can be used for escaping.
-For an example of a suitable file, try the "Export Users" function above.
+The CSV fields should be separated by commas (,) and strings delimited by quotation marks (%%""%%). Backslash (\) can be used for escaping.
+For an example of a suitable file, try the "Export Users" function above.
Duplicate user-ids will be ignored.
A password will be generated and emailed to each successfully imported user.