diff --git a/draft/localver.rst b/draft/localver.rst
index ce5674c66..c415260bf 100644
--- a/draft/localver.rst
+++ b/draft/localver.rst
@@ -1,4 +1,4 @@
-.. _localver::
+.. _localver:
 
 Understanding the Local Version Counter
 =======================================
diff --git a/intro/getting-started.rst b/intro/getting-started.rst
index fdbe14b4f..28b7f3f54 100644
--- a/intro/getting-started.rst
+++ b/intro/getting-started.rst
@@ -130,10 +130,10 @@ clicking "Edit" and entering a new value for "Rescan Interval".
 
 --------------
 
-Good luck and have fun! There is more
-`documentation <http://docs.syncthing.net/>`__ and if you run into
-trouble feel free to post a question in the `support
-forum <https://forum.syncthing.net/c/support>`__. If you have
-problems getting devices to connect, first take a look at :ref:`firewall-setup`, then
-look at any error messages in the GUI or on the console and if necessary
-move on to :ref:`debugging`. Don't forget that configuration changes will not be reflected instantly - give Syncthing a little time, especially after a restart.
+Good luck and have fun! There is more `documentation
+<http://docs.syncthing.net/>`__ and if you run into trouble feel free to post
+a question in the `support forum <https://forum.syncthing.net/c/support>`__.
+If you have problems getting devices to connect, first take a look at :ref
+:`firewall-setup`, then look at any error messages in the GUI or on the
+console. Don't forget that configuration changes will not be reflected
+instantly - give Syncthing a little time, especially after a restart.
diff --git a/users/autostart.rst b/users/autostart.rst
index e2fbed02f..4112eb1b7 100644
--- a/users/autostart.rst
+++ b/users/autostart.rst
@@ -229,9 +229,9 @@ log messages (``-e`` lets the pager jump to the very end)::
 
     journalctl -e -u syncthing@myuser.service
     journalctl -e --user-unit=syncthing.service
-    
+
 Permissions
-^^^^^^^^^
+^^^^^^^^^^^
 
 In case you want to override the permissions under which the files and folders are created (especially because Windows does not have a concept of group permissions), you enable the `Ignore Permissions` option in the folder settings, and add the line "UMask=0002" (or any other umask you like) in the [Service] section of the "syncthing@.service" file.
 
diff --git a/users/relaying.rst b/users/relaying.rst
new file mode 100644
index 000000000..b7e3125c7
--- /dev/null
+++ b/users/relaying.rst
@@ -0,0 +1,31 @@
+.. _relaying:
+
+Relaying
+========
+
+Syncthing can bounce traffic via a *relay* when it's not possible to establish
+a direct connection between two devices. There are a number of public relays
+available for this purpose. The advantage is that it makes a connection
+possible where it would otherwise not be; the downside is that the transfer
+rate is much lower than a direct connection would allow. When connected via a
+relay, Syncthing will periodically retry a direct connection.
+
+Relaying is enabled by default.
+
+Security
+--------
+
+The connection between two devices is still end to end encrypted, the relay
+only retransmits the encrypted data much like a router. However, a device must
+register with a relay in order to be reachable over that relay, so the relay
+knows your IP and device ID. In that respect it is similar to a discovery
+server. The relay operator can see the amount of traffic flowing between
+devices.
+
+Configuration
+-------------
+
+Running Your Own Relay
+----------------------
+
+.. versionadded:: 0.12.0