diff options
author | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:16:58 -0400 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:16:58 -0400 |
commit | 0ef95a7009f48960a317f406f4d9e95c58b34d6f (patch) | |
tree | 8b7864a2e10a8a046fc591865df3254f2ffa3798 /phpBB/docs/FAQ.html | |
parent | 1783134217830223edfe9bde616e424c4974b6af (diff) | |
parent | 034155531446acd13b497cd25fa7528ce7cdf9c6 (diff) | |
download | forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.gz forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.bz2 forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.xz forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
Diffstat (limited to 'phpBB/docs/FAQ.html')
-rw-r--r-- | phpBB/docs/FAQ.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index ebc5d06189..a76b6be72a 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -82,7 +82,7 @@ <p>There are people, companies (unrelated to your hosting provider), etc. that will install your forum, either for free or for a payment. We do not recommend you make use of these offers. Unless the service is provided by your hosting company you will have to divulge passwords and other sensitive details. If you did not know how to use an ATM would you give a passer-by your bank card and PIN and ask them to show you what to do? No, probably not! The same applies to your hosting account details!</p> -<p>We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at <a href="http://www.phpbb.com/">www.phpbb.com</a> and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.</p> +<p>We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at <a href="https://www.phpbb.com/">www.phpbb.com</a> and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.</p> </div> @@ -143,7 +143,7 @@ I want to sue you because i think you host an illegal board!</h2> <div class="content"> -<p>This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP <code>mail()</code> function or directly via SMTP. Some hosting providers limit the <code>mail()</code> function to prevent its use in spamming, others may rename it or limit its functionality. If the <code>mail()</code> function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see <a href="http://www.phpbb.com/">www.phpbb.com</a> for additional help on this matter.</p> +<p>This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP <code>mail()</code> function or directly via SMTP. Some hosting providers limit the <code>mail()</code> function to prevent its use in spamming, others may rename it or limit its functionality. If the <code>mail()</code> function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see <a href="https://www.phpbb.com/">www.phpbb.com</a> for additional help on this matter.</p> <p>If you do require SMTP services please do not ask (on our forums or elsewhere) for someone to provide you with one. Open relays are now things of the past thanks to the unthinking spammers out there. Therefore you are unlikely to find someone willing to offer you (free) services.</p> @@ -243,7 +243,7 @@ I want to sue you because i think you host an illegal board!</h2> <div class="content"> -<p>Please read the paragraph about permissions in our extensive <a href="http://www.phpbb.com/support/documentation/3.0/">online documentation</a>.</p> +<p>Please read the paragraph about permissions in our extensive <a href="https://www.phpbb.com/support/documentation/3.0/">online documentation</a>.</p> </div> @@ -299,11 +299,11 @@ I want to sue you because i think you host an illegal board!</h2> <div class="content"> -<p>Please read our <a href="http://www.phpbb.com/support/documentation/3.0/">extensive user documentation</a> first, it may just explain what you want to know.</p> +<p>Please read our <a href="https://www.phpbb.com/support/documentation/3.0/">extensive user documentation</a> first, it may just explain what you want to know.</p> <p>Feel free to search our community forum for the information you require. <strong>PLEASE DO NOT</strong> post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:</p> -<p><a href="http://www.phpbb.com">www.phpbb.com</a></p> +<p><a href="https://www.phpbb.com">www.phpbb.com</a></p> </div> @@ -321,7 +321,7 @@ I want to sue you because i think you host an illegal board!</h2> <div class="content"> - <p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p> + <p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="https://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p> </div> |