diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2015-06-26 11:07:20 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2015-06-26 11:07:20 +0200 |
| commit | 5ddba4576a304c9e62b028c97ee466d79de12429 (patch) | |
| tree | 03199c579f9302f0ed1e0b47f9c597a7f9bd2fc7 /lib/plugins/usermanager | |
| parent | 5114259bf530b89afbb21bd693b1da3f96016b7f (diff) | |
| parent | 71c46303d9cd8a321e58a7e7255d13f0d5a5c4eb (diff) | |
| download | rpg-5ddba4576a304c9e62b028c97ee466d79de12429.tar.gz rpg-5ddba4576a304c9e62b028c97ee466d79de12429.tar.bz2 | |
Merge branch 'master' into styler
* master: (26 commits)
translation update
translation update
Replace old constructor call by __construct() in dokuwiki_xmlrpc_server
translation update
change two spaces to a space
translation update
translation update
translation update
translation update
Upgrade to jQuery 1.11.3 and jQueryUI 1.11.4 closes #1175
update confToHash() inline documentation for new parameter
translation update
Plugins can send usage data
fixed isBundled() check when remote info is unavailable
avoid accessing nonexistant array key. fixes #1165
translation update
Define the negation character in a constant
Ensure single value negation is not affected by white space differences
Ensure filtering only removes empty string values (not other values which PHP evaluates to false)
translation update
...
Diffstat (limited to 'lib/plugins/usermanager')
| -rw-r--r-- | lib/plugins/usermanager/lang/en/import.txt | 4 |
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. |