Merge branch 'master' into feat/approval

# Conflicts:
#	vendor/vendor.json

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -95,6 +95,11 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
    - If `PROTOCOL` is set to `fcgi`, Gitea will listen for FastCGI requests on TCP socket
      defined by `HTTP_ADDR` and `HTTP_PORT` configuration settings.
 - `UNIX_SOCKET_PERMISSION`: **666**: Permissions for the Unix socket.
+- `LOCAL_ROOT_URL`: **%(PROTOCOL)s://%(HTTP_ADDR)s:%(HTTP_PORT)s/**: Local
+   (DMZ) URL for Gitea workers (such as SSH update) accessing web service. In
+   most cases you do not need to change the default value. Alter it only if
+   your SSH server node is not the same as HTTP node. Do not set this variable
+   if `PROTOCOL` is set to `unix`.
 - `DISABLE_SSH`: **false**: Disable SSH feature when it's not available.
 - `START_SSH_SERVER`: **false**: When enabled, use the built-in SSH server.
 - `SSH_DOMAIN`: **%(DOMAIN)s**: Domain name of this server, used for displayed clone URL.

docs/content/doc/help/seek-help.en-us.md

@@ -1,5 +1,5 @@
 ---
-date: "2017-01-20T15:00:00+08:00"
+date: "2018-05-21T15:00:00+00:00"
 title: "Support Options"
 slug: "seek-help"
 weight: 10
@@ -16,8 +16,7 @@ menu:
 # Support Options
 
 - [Discord](https://discord.gg/NsatcWJ)
-- [#gitea on Freenode](http://webchat.freenode.net?nick=giteachat....&channels=%23gitea&prompt=1)
-- [Matrix](https://matrix.to/#/#gitea-dev:matrix.org)
+- [Discourse Forum](https://discourse.gitea.io/)
 
 ## Bugs