aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-10-13 17:20:52 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-10-13 17:20:52 +0200
commit8017469e59141d99aefe97363520f3e06b9b6422 (patch)
treea00d15741618caf3f474f2ecc750a8de7a776419
parent57d157a72394f80a509e669585977d639aea4778 (diff)
parentee91656968aa362aa702821de2e0c0cb0457cc0f (diff)
downloadforums-8017469e59141d99aefe97363520f3e06b9b6422.tar
forums-8017469e59141d99aefe97363520f3e06b9b6422.tar.gz
forums-8017469e59141d99aefe97363520f3e06b9b6422.tar.bz2
forums-8017469e59141d99aefe97363520f3e06b9b6422.tar.xz
forums-8017469e59141d99aefe97363520f3e06b9b6422.zip
Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympus
* igorw/ticket/10275: [ticket/10275] Remove incorrect password information from FAQ
-rw-r--r--phpBB/language/en/help_faq.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 3b7dc02d3f..b915a3da19 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -60,7 +60,7 @@ $help = array(
),
array(
0 => 'I registered in the past but cannot login any more?!',
- 1 => 'Attempt to locate the e-mail sent to you when you first registered, check your username and password and try again. It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.'
+ 1 => 'It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.'
),
array(
0 => 'What is COPPA?',