Merge branch 'pr/96'

* pr/96: Add note about running syncthing instance on discovery server
2015-12-18 15:32:32 +01:00
parent 008e5a0ac0 c7795aa858
commit 203ff4a7b1
1 changed files with 6 additions and 0 deletions
@@ -26,6 +26,12 @@ to select a different location.
 Configuring
 -----------

+.. note::
+   If you are running an instance of syncthing on the discovery server,
+   you must either add that instance to other nodes using a static 
+   address or bind the discovery server and syncthing instances to
+   different IP addresses.
+
 Running discosrv with non-default settings requires passing the
 respective parameters to discosrv on every start. ``discosrv -help``
 gives you all the tweakables with their defaults: