diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
| commit | 3da7921f08ecdda929466921ecc50698f1adf99e (patch) | |
| tree | 0e179e504399e874bfd785d0a95eec44b76d5952 /lib/plugins/acl/lang/en | |
| parent | 6cf2bbfa12b776cf47cb69ae40fb8862f715ad01 (diff) | |
| parent | cc4bb766fdac23358d7b586aa3830b9650eed7a8 (diff) | |
| download | rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.gz rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.bz2 | |
Merge branch 'master' into future
* master: (162 commits)
fixed revision JS for images
upgraded SimplePie to 1.3.1 FS#2708
removed obsolete browser plugin (migrate does it)
adjust spacing to match standard 1.4em grid
added comment on use of whitelist vs blacklist
Updated idfilter() function for IIS
use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
added 'home' class to first link in hierarchical breadcrumbs
reduced required max width to go into tablet mode
re-added linear gradients for firefox
added missing styling for disabled form elements (FS#2705)
fixed acronyms in italics (FS#2684)
improved print styles (includes fixes for FS#2645 and FS#2707)
basic styles improvements
Greek language update
Use list in acl help text, for more structure
Galician language update
touch the config on save, even if no changes were made
unwind the width narrowing commit
put some whitespace between form submit button and fieldset bottom border
...
Conflicts:
lib/plugins/config/admin.php
lib/plugins/config/settings/config.class.php
Diffstat (limited to 'lib/plugins/acl/lang/en')
| -rw-r--r-- | lib/plugins/acl/lang/en/help.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/plugins/acl/lang/en/help.txt b/lib/plugins/acl/lang/en/help.txt index 2b80cc4c7..e865bbb23 100644 --- a/lib/plugins/acl/lang/en/help.txt +++ b/lib/plugins/acl/lang/en/help.txt @@ -1,12 +1,9 @@ === Quick Help: === On this page you can add and remove permissions for namespaces and pages in your wiki. - -The left pane displays all available namespaces and pages. - -The form above allows you to see and modify the permissions of a selected user or group. - -In the table below all currently set access control rules are shown. You can use it to quickly delete or change multiple rules. + * The left pane displays all available namespaces and pages. + * The form above allows you to see and modify the permissions of a selected user or group. + * In the table below all currently set access control rules are shown. You can use it to quickly delete or change multiple rules. Reading the [[doku>acl|official documentation on ACL]] might help you to fully understand how access control works in DokuWiki. |