aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhruv <dhruv.goel92@gmail.com>2013-09-15 11:18:01 +0530
committerDhruv <dhruv.goel92@gmail.com>2013-09-15 11:18:01 +0530
commit6ce5a72c55a9dcb47488f6baeee6750cf387d70e (patch)
tree197891bb054be2c682fa193d81546d6e88f71bc1
parent939174eac8c93f53193b5fb7101c5c4228e39825 (diff)
parent30a26f23a4f9a206ee251e13520b04a6f8db68c7 (diff)
downloadforums-6ce5a72c55a9dcb47488f6baeee6750cf387d70e.tar
forums-6ce5a72c55a9dcb47488f6baeee6750cf387d70e.tar.gz
forums-6ce5a72c55a9dcb47488f6baeee6750cf387d70e.tar.bz2
forums-6ce5a72c55a9dcb47488f6baeee6750cf387d70e.tar.xz
forums-6ce5a72c55a9dcb47488f6baeee6750cf387d70e.zip
Merge remote-tracking branch 'Prosk8er/ticket/11844' into develop
# By Prosk8er # Via Prosk8er * Prosk8er/ticket/11844: [ticket/11844] update acp/authentication language var
-rw-r--r--phpBB/language/en/acp/board.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 6eabe99d80..f786374ba6 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -392,7 +392,7 @@ $lang = array_merge($lang, array(
// Auth settings
$lang = array_merge($lang, array(
- 'ACP_AUTH_SETTINGS_EXPLAIN' => 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
+ 'ACP_AUTH_SETTINGS_EXPLAIN' => 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default four plug-ins are provided: DB, LDAP, Apache, and OAuth. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
'AUTH_METHOD' => 'Select an authentication method',