Merge branch 'master' into develop

- Updated new develop version label
- Incremented database build number

doc/Home.md

@@ -34,6 +34,7 @@ Friendica Documentation and Resources
 * [Using SSL with Friendica](help/SSL)
 * [Config values that can only be set in .htconfig.php](help/htconfig)
 * [Improve Performance](help/Improve-Performance)
+* [Administration Tools](help/tools)
 
 **Developer Manual**
 

doc/Tags-and-Mentions.md

@@ -23,16 +23,19 @@ You can tag a person on a different network or one that is **not in your social
 
 Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts.
 Friendica blocks incoming “mentions” from people with no relationship to you.
-The exception is an ongiong conversation started from a contact of both you and the 3rd person or a conversation in a forum where you are a member of.
+The exception is an ongoing conversation started from a contact of both you and the 3rd person or a conversation in a forum where you are a member of.
 This is a spam prevention measure.
 
 Remote mentions are delivered using the OStatus protocol.
-This protocol is used by Friendica and GNU Social and several other systems, but is not currently implemented in Diaspora. 
+This protocol is used by Friendica and GNU Social and several other systems like Mastodon, but is not currently implemented in Diaspora. 
 As the OStatus protocol allows this Friendica user can be @-mentioned by users from platforms using this protocol in conversations if the "Enable OStatus support" is activated on the Friendica node.
 These @-mentions wont be blocked, even if there is no relationship between the sender and the receiver of the message.
 
 Friendica makes no distinction between people and forums for the purpose of tagging.
-(Some other networks use !forum to indicate a forum.)
+You can use @-mentions for forums like for other accounts to tag the forum.
+If you want to post something exclusively to a forum (e.g. the support forum) please use the bang-notation instead of  the @tag.
+So !helpers will be an exclusive posting to the support forum if you are connected with the forum.
+If you select a forum from the ACL a !-mention will be added automatically to your posting.
 
 If you sort your contacts into groups, you cannot @-mention these groups.
 But you can select the group in the access control when creating a new posting, to allow (or disallow) a certain group of people to see the posting.
@@ -40,11 +43,14 @@ See [Groups and Privacy](help/Groups-and-Privacy) for more details about groupin
 
 **Topical Tags**
 
-Topical tags are indicated by preceding the tag name with the  # character. This will create a link in the post to a generalised site search for the term provided. For example, #cars will provide a search link for all posts mentioning 'cars' on your site. Topical tags are generally a minimum of three characters in length.  Shorter search terms are not likely to yield any search results, although this depends on the database configuration. The same rules apply as with names that spaces within tags are represented by the underscore character. It is therefore not possible to create a tag whose target contains an underscore.
+Topical tags are indicated by preceding the tag name with the  # character.
+This will create a link in the post to a generalised site search for the term provided.
+For example, #cars will provide a search link for all posts mentioning 'cars' on your site.
+Topical tags are generally a minimum of three characters in length.
+Shorter search terms are not likely to yield any search results, although this depends on the database configuration.
+The same rules apply as with names that spaces within tags are represented by the underscore character.
+It is therefore not possible to create a tag whose target contains an underscore.
 
-Topical tags are also not linked if they are purely numeric, e.g. #1. If you wish to use a numerica hashtag, please add some descriptive text such as #2012-elections. 
- 
-
-
- 
+Topical tags are also not linked if they are purely numeric, e.g. #1.
+If you wish to use a numerica hashtag, please add some descriptive text such as #2012-elections. 
 

doc/de/Home.md

@@ -36,6 +36,7 @@ Friendica - Dokumentation und Ressourcen
 * [Betreibe deine Seite mit einem SSL-Zertifikat](help/SSL)
 * [Konfigurationswerte, die nur in der .htconfig.php gesetzt werden können](help/htconfig) (EN)
 * [Performance verbessern](help/Improve-Performance)
+* [Administration Werkzeuge](help/tools) (EN)
 
 **Dokumentation für Entwickler**
 

doc/tools.md

@@ -0,0 +1,76 @@
+Admin Tools
+===========
+
+* [Home](help)
+
+Friendica Tools
+---------------
+
+Friendica has a build in command console you can find in the *bin* directory.
+The console provides the following commands:
+
+* config:                 Edit site config
+* createdoxygen:          Generate Doxygen headers
+* dbstructure:            Do database updates
+* docbloxerrorchecker:    Check the file tree for DocBlox errors
+* extract:                Generate translation string file for the Friendica project (deprecated)
+* globalcommunityblock:   Block remote profile from interacting with this node
+* globalcommunitysilence: Silence remote profile from global community page
+* archivecontact:         Archive a contact when you know that it isn't existing anymore
+* help:                   Show help about a command, e.g (bin/console help config)
+* autoinstall:            Starts automatic installation of friendica based on values from htconfig.php
+* maintenance:            Set maintenance mode for this node
+* newpassword:            Set a new password for a given user
+* php2po:                 Generate a messages.po file from a strings.php file
+* po2php:                 Generate a strings.php file from a messages.po file
+* typo:                   Checks for parse errors in Friendica files
+
+Please consult *bin/console help* on the command line interface of your server for details about the commands.
+
+3rd Party Tools
+---------------
+
+In addition to the tools Friendica includes, some 3rd party tools can make your admin days easier.
+
+### Fail2ban
+
+Fail2ban is an intrusion prevention framework ([see Wikipedia](https://en.wikipedia.org/wiki/Fail2ban)) that you can use to forbid access to a server under certain conditions, e.g. 3 failed attempts to log in, for a certain amount of time.
+
+The following configuration was [provided](https://forum.friendi.ca/display/174591b4135ae40c1ad7e93897572454) by Steffen K9 using Debian.
+You need to adjust the *logpath* in the *jail.local* file and the *bantime* (value is in seconds).
+
+In */etc/fail2ban/jail.local* create a section for Friendica:
+
+	[friendica]
+	enabled = true
+	findtime = 300
+	bantime  = 900
+	filter = friendica
+	port = http,https
+	logpath = /var/log/friend.log
+	logencoding = utf-8
+
+And create a filter definition in */etc/fail2ban/filter.d/friendica.conf*:
+
+	[Definition]
+	failregex = ^.*Login\.php.*failed login attempt.*from IP <HOST>.*$
+	ignoreregex =
+
+Additionally you have to define the number of failed logins before the ban should be activated.
+This is done either in the global configuration or for each jail separately.
+You should inform your users about the number of failed login attempts you grant them.
+Otherwise you'll get many reports about the server not functioning if the number is too low.
+
+### Log rotation
+
+If you have activated the logs in Friendica, be aware that they can grow to a significant size.
+To keep them in control you should add them to the automatic [log rotation](https://en.wikipedia.org/wiki/Log_rotation), e.g. using the *logrotate* command.
+
+In */etc/logrotate.d/* add a file called *friendica* that contains the configuration.
+The following will compress */var/log/friendica* (assuming this is the location of the log file) on a daily basis and keep 2 days of back-log.
+
+	/var/log/friendica.log {
+		compress
+		daily
+		rotate 2
+	}