Address comments, and shorten Android note

Author: marbens-arch

users/faq-parts/troubleshooting.rst

@@ -149,6 +149,8 @@ Syncthing decides which neighbour has the latest state, or if the states conflic
 it initiates the conflict resolution procedure, which in the end results in a consistent
 up-to-date state with all the neighbours.
 
+.. _unknown-suspicious-address:
+
 Why does Syncthing connect to this unknown/suspicious address?
 --------------------------------------------------------------
 

users/tuning.rst

@@ -229,6 +229,8 @@ For restricting sync traffic to only LAN:
     see your device ID and public IP address, but not the synchronized data,
     as that is encrypted.
 
+    .. seealso:: :ref:`unknown-suspicious-address`
+
 - :opt:`natEnabled`
     Set to false to disable opening up UPnP and NAT-PMP port mappings and
     pinholes, and to disable hole punching. This reduces the ability for sync
@@ -242,8 +244,32 @@ For restricting other things to only LAN:
     used by your sync partners to discover your IP address from your device ID.
 
     .. note::
-        Note that on Android, local discovery is known to usually not work, so
-        either global discovery or hardcoding IP addresses is often required.
+        On Android, local discovery is known to usually not work, so either
+        global discovery or hardcoding IP addresses is often required.
+
+- :opt:`urAccepted`
+    Set to -1 to disable usage reporting.
+    When usage reporting is enabled, usage reporting servers can know your
+    public IP address, :opt:`urUniqueID`, and (obviously) the contents of the
+    usage report (which depend on the version you chose).
+
+- :opt:`crashReportingEnabled`
+    Set to false to disable automatic crash reporting. Crash reporting servers
+    can know your public IP address, the version of Syncthing that crashed, and
+    the username and hostname of the machine that Syncthing was built on.
+
+    .. seealso:: :doc:`crashrep`
+
+- :opt:`autoUpgradeIntervalH`
+    Set to 0 to disable automatic upgrades. Syncthing will still automatically
+    contact the Internet to check for upgrades when you open up the Web GUI,
+    so it knows when to show the upgrade button, unless you follow the
+    procedure for :opt:`releasesURL`.
+
+- :opt:`releasesURL`
+    Unset (set to blank) to disable upgrade checks.
+    With upgrade checks disabled, to upgrade Syncthing, you have to manually
+    replace the executable and restart Syncthing.
 
 If it's not obvious, do *not* hardcode non-LAN IP addresses,
 if you want to keep LAN-only.