aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/help_faq.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-10-13 17:21:02 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-10-13 17:21:02 +0200
commit563fb56c4a90329e6430da6766e95741fb4135cd (patch)
treed149c978fe58789383cc374c90c38bdbf447ea2e /phpBB/language/en/help_faq.php
parentbfe621d7b5d1cdd38b87920fa2eba8179903379a (diff)
parent8017469e59141d99aefe97363520f3e06b9b6422 (diff)
downloadforums-563fb56c4a90329e6430da6766e95741fb4135cd.tar
forums-563fb56c4a90329e6430da6766e95741fb4135cd.tar.gz
forums-563fb56c4a90329e6430da6766e95741fb4135cd.tar.bz2
forums-563fb56c4a90329e6430da6766e95741fb4135cd.tar.xz
forums-563fb56c4a90329e6430da6766e95741fb4135cd.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10275] Remove incorrect password information from FAQ
Diffstat (limited to 'phpBB/language/en/help_faq.php')
-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 9e00c290f8..6ca9589913 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?',