summaryrefslogtreecommitdiff
path: root/lib/plugins/acl
diff options
context:
space:
mode:
authorGuy Brand <gb@unistra.fr>2013-11-18 20:48:03 +0100
committerGuy Brand <gb@unistra.fr>2013-11-18 20:48:03 +0100
commit9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764 (patch)
treed87417a2562e14e40f21012a9e1ede2d159239c5 /lib/plugins/acl
parent0f71b9e8c36a27b7e476b43879f1cf9636a9958e (diff)
parent14b3007921f7b66fc9e3621b861a3c83e7e9093c (diff)
downloadrpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.gz
rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.bz2
Merge branch 'master' into stable
Diffstat (limited to 'lib/plugins/acl')
-rw-r--r--lib/plugins/acl/admin.php2
-rw-r--r--lib/plugins/acl/lang/ar/lang.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index b24981d91..6c7c28ff6 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -345,7 +345,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
}
/**
- * Print infos and editor
+ * Print info and editor
*/
function _html_info(){
global $ID;
diff --git a/lib/plugins/acl/lang/ar/lang.php b/lib/plugins/acl/lang/ar/lang.php
index 7c05b721c..4e44dab5f 100644
--- a/lib/plugins/acl/lang/ar/lang.php
+++ b/lib/plugins/acl/lang/ar/lang.php
@@ -1,8 +1,8 @@
<?php
+
/**
- * Arabic language file
- *
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
* @author Mostafa Hussein <mostafa@gmail.com>
* @author Yaman Hokan <always.smile.yh@hotmail.com>
* @author Usama Akkad <uahello@gmail.com>