Merge pull request #1176 from annando/1409-diaspora-repeated-twitter-cleanup

1409 diaspora repeated twitter cleanup

diff --git a/boot.php b/boot.php
index 31858010d8e74a7e3485f12af6dcf617cb0215e1..20abdde5005401145c1ff6a52518b282a234b21f 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -508,7 +508,7 @@ if(! class_exists('App')) {
                                $argc --;
                        }
 
-                       set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
+                       #set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
 
                        if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
                                $this->query_string = substr($_SERVER['QUERY_STRING'],9);

diff --git a/doc/FAQ.md b/doc/FAQ.md
index 59e5a7adead5279cbe6d4526ad21f1622e7eaeb2..6fa852e0b0544bbb5fbf1dcd3b1cf860dc45347d 100644 (file)
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -40,7 +40,6 @@ Sometimes you get a browser warning about a missing certificate. These warnings
 If you dont have a SSL cert yet, there are three ways to get one: buy one, get a free one (eg. via StartSSL) or create your own (not recommended). [You can find more information about setting up SSL and why it's a bad idea to use self-signed SSL here.](help/SSL) 
 
 Be aware that a browser warning about security issues is something that can make new users feel insecure about the whole friendica project. 
-Because of this, Friendica Red will only accept SSL certs signed by a recognized CA and doesn't connect to servers without these kind of SSL. Despite of the negative aspects of SSL, this is a necessary solution until there is an established alternative for this technique.
 
 Also you can have problems with the connection to diaspora because some pods require a SSL-certificated connection. 
 
@@ -158,8 +157,6 @@ Depending on the features of the client you might encounter some glitches in usa
 
 If you have problems with your Friendica page, you can ask the community at the [Friendica Support Group](https://helpers.pyxis.uberspace.de/profile/helpers). If you can't use your default profile you can either use a test account [test server](http://friendica.com/node/31) respectively an account at a public site [list](http://dir.friendica.com/siteinfo) or you can use the Librelist mailing list. If you want to use the mailing list, please just send a mail to friendica AT librelist DOT com.
 
-If you are using Friendica Red, you will also find help at this forum: [Friendica Red Development](https://myfriendica.net/profile/friendicared).
-
 If you are a theme developer, you will find help at this forum: [Friendica Theme Developers](https://friendica.eu/profile/ftdevs).
 
 Admin
@@ -169,13 +166,13 @@ Admin
 
 **Can I configure multiple domains with the same code instance?**
 
-You can do that. What you can't do is point two different domains at the same database. As long as .htconfig.php exists to keep it from trying to do an install, you can keep the real config in include/$hostname/.htconfig.php All of the cache and lock stuff can be configured per instance.
+This function is not supported anymore starting from Friendica 3.3
 
 <a name="sources"></a>
 
 **Where can I find the source code of friendica, addons and themes?**
 
-You can find the main respository [here](https://github.com/friendica/friendica). There you will always find the current stable version of friendica. The source files of Friendica Red are [here](https://github.com/friendica/red).
+You can find the main respository [here](https://github.com/friendica/friendica). There you will always find the current stable version of friendica.
 
 Addons are listed at [this page](https://github.com/friendica/friendica-addons).