Docs and translation update

gui/assets/lang/lang-fi.json

@@ -1,5 +1,5 @@
 {
-    "A negative number of days doesn't make sense.": "A negative number of days doesn't make sense.",
+    "A negative number of days doesn't make sense.": "Negatiivinen määrä päiviä ei ole järjellinen.",
     "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
     "API Key": "API-avain",
     "About": "Tietoja",
@@ -50,7 +50,7 @@
     "Edit Folder": "Muokkaa kansiota",
     "Editing": "Muokkaus",
     "Enable UPnP": "Ota UPnP käyttöön",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Syötä osoitteet pilkuilla erotettuina (\"tcp://ip:portti, tcp://nimi:portti\") tai \"dynamic\" käyttääksesi osoitteen automaattista selvitystä.",
     "Enter ignore patterns, one per line.": "Syötä ohituslausekkeet, yksi riviä kohden.",
     "Error": "Virhe",
     "External File Versioning": "Ulkoinen tiedostoversionti",
@@ -58,10 +58,10 @@
     "File Pull Order": "File Pull Order",
     "File Versioning": "Tiedostoversiointi",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Tiedostojen oikeusbitit jätetään huomiotta etsittäessä muutoksia. Käytä FAT-tiedostojärjestelmissä.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Files are moved to .stversions folder when replaced or deleted by Syncthing.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Kun Syncthing poistaa tai korvaa tiedostoja, ne siirretään .stversions-hakemistoon.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Tiedostot siirretään päivämäärällä merkityiksi versioiksi .stversions-kansioon, kun Syncthing korvaa tai poistaa ne.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Tiedostot on suojattu muilla laitteilla tehdyiltä muutoksilta, mutta tällä laitteella tehdyt muutokset lähetetään muuhun ryhmään.",
-    "Folder": "Folder",
+    "Folder": "Kansio",
     "Folder ID": "Kansion ID",
     "Folder Master": "Hallitsijakansio",
     "Folder Path": "Kansion polku",
@@ -94,7 +94,7 @@
     "Major Upgrade": "Major Upgrade",
     "Maximum Age": "Maksimi-ikä",
     "Metadata Only": "Vain metadata",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Vapaan levytilan vähimmäismäärä",
     "Move to top of queue": "Siirrä jonon alkuun",
     "Multi level wildcard (matches multiple directory levels)": "Monitasoinen jokerimerkki (vaikuttaa useassa kansiotasossa)",
     "Never": "Ei koskaan",
@@ -114,8 +114,8 @@
     "Override Changes": "Ohita muutokset",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Polku kansioon paikallisella tietokoneella. Kansio luodaan, ellei sitä ole olemassa. Tilde-merkkiä (~) voidaan käyttää oikotienä polulle",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Polku jonne versiot tullaan tallentamaan (jätä tyhjäksi oletusvalintaa .stversions varten).",
-    "Pause": "Pause",
+    "Pause": "Keskeytä",
-    "Paused": "Paused",
+    "Paused": "Keskeytetty",
     "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
     "Please wait": "Ole hyvä ja odota",
     "Preview": "Esikatselu",
@@ -124,16 +124,16 @@
     "RAM Utilization": "RAM:n käyttö",
     "Random": "Satunnaien",
     "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relays": "Välityspalvelimet",
-    "Release Notes": "Release Notes",
+    "Release Notes": "Julkaisutiedot",
-    "Remove": "Remove",
+    "Remove": "Poista",
     "Rescan": "Skannaa uudelleen",
     "Rescan All": "Skannaa kaikki uudelleen",
     "Rescan Interval": "Uudelleenskannauksen aikaväli",
     "Restart": "Käynnistä uudelleen",
     "Restart Needed": "Uudelleenkäynnistys tarvitaan",
     "Restarting": "Käynnistetään uudelleen",
-    "Resume": "Resume",
+    "Resume": "Jatka",
     "Reused": "Uudelleenkäytetty",
     "Save": "Tallenna",
     "Scanning": "Skannataan",
@@ -154,11 +154,11 @@
     "Shutdown Complete": "Sammutus valmis",
     "Simple File Versioning": "Yksinkertainen tiedostoversiointi",
     "Single level wildcard (matches within a directory only)": "Yksitasoinen jokerimerkki (vaikuttaa vain kyseisen kansion sisällä)",
-    "Smallest First": "Smallest First",
+    "Smallest First": "Pienin ensin",
     "Source Code": "Lähdekoodi",
     "Staggered File Versioning": "Porrastettu tiedostoversiointi",
     "Start Browser": "Käynnistä selain",
-    "Statistics": "Statistics",
+    "Statistics": "Tilastot",
     "Stopped": "Pysäytetty",
     "Support": "Tuki",
     "Sync Protocol Listen Addresses": "Synkronointiprotokollan kuunteluosoite",
@@ -181,16 +181,16 @@
     "The folder ID must be unique.": "Kansion ID:n tulee olla uniikki.",
     "The folder path cannot be blank.": "Kansion polku ei voi olla tyhjä.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Seuraavat aikavälit ovat käytössä: ensimmäisen tunnin ajalta uusi versio säilytetään joka 30 sekunti, ensimmäisen päivän ajalta uusi versio säilytetään tunneittain ja ensimmäisen 30 päivän aikana uusi versio säilytetään päivittäin. Lopulta uusi versio säilytetään viikoittain, kunnes maksimi-ikä saavutetaan.",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
+    "The following items could not be synchronized.": "Seuraavia nimikkeitä ei voitu synkronoida.",
     "The maximum age must be a number and cannot be blank.": "Maksimi-iän tulee olla numero, eikä se voi olla tyhjä.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maksimiaika versioiden säilytykseen (päivissä, aseta 0 säilyttääksesi versiot ikuisesti).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Vapaan levytilan vähimmäismäärä prosentteina tulee olla positiivinen luku (suljetulta) väliltä 0-100.",
-    "The number of days must be a number and cannot be blank.": "The number of days must be a number and cannot be blank.",
+    "The number of days must be a number and cannot be blank.": "Päivien määrän tulee olla numero, eikä se voi olla tyhjä.",
-    "The number of days to keep files in the trash can. Zero means forever.": "The number of days to keep files in the trash can. Zero means forever.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Montako päivää tiedostoja säilytetään roskakorissa. Nolla (0) = ikuisesti.",
     "The number of old versions to keep, per file.": "Säilytettävien vanhojen versioiden määrä tiedostoa kohden.",
     "The number of versions must be a number and cannot be blank.": "Versioiden määrän rulee olla numero, eikä se voi olla tyhjä.",
     "The path cannot be blank.": "Polku ei voi olla tyhjä.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "Nopeusrajan tulee olla positiivinen luku tai nolla. (0: ei rajaa)",
     "The rescan interval must be a non-negative number of seconds.": "Uudelleenskannauksen aikavälin tulee olla ei-negatiivinen numero sekunteja.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "This is a major version upgrade.",
@@ -204,7 +204,7 @@
     "Upgrade To {%version%}": "Päivitä versioon {{version}}",
     "Upgrading": "Päivitetään",
     "Upload Rate": "Lähetysmäärä",
-    "Uptime": "Uptime",
+    "Uptime": "Päälläoloaika",
     "Use HTTPS for GUI": "Käytä HTTPS:ää GUI:n kanssa",
     "Version": "Versio",
     "Versions Path": "Versioiden polku",

gui/assets/lang/lang-zh-TW.json

@@ -1,6 +1,6 @@
 {
     "A negative number of days doesn't make sense.": "一個負的天數並不合理。",
-    "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
+    "A new major version may not be compatible with previous versions.": "一個新的主要版本可能與以前的版本並不相容。",
     "API Key": "API 金鑰",
     "About": "關於",
     "Actions": "操作",
@@ -10,8 +10,8 @@
     "Add new folder?": "新增資料夾?",
     "Address": "位址",
     "Addresses": "位址",
-    "Advanced": "Advanced",
+    "Advanced": "進階",
-    "Advanced Configuration": "Advanced Configuration",
+    "Advanced Configuration": "進階設定",
     "All Data": "全部資料",
     "Allow Anonymous Usage Reporting?": "允許匿名的使用資訊回報？",
     "Alphabetic": "字母順序",
@@ -19,18 +19,18 @@
     "Anonymous Usage Reporting": "匿名的使用資訊回報",
     "Any devices configured on an introducer device will be added to this device as well.": "任何在引入者裝置所設置的裝置將會一併新增至此裝置",
     "Automatic upgrades": "自動升級",
-    "Be careful!": "Be careful!",
+    "Be careful!": "請小心！",
     "Bugs": "程式錯誤",
     "CPU Utilization": "CPU 使用",
     "Changelog": "更新日誌",
-    "Clean out after": "Clean out after",
+    "Clean out after": "於之後清空",
     "Close": "關閉",
     "Command": "指令",
     "Comment, when used at the start of a line": "註解，當輸入在一行的開頭時",
     "Compression": "壓縮",
     "Connection Error": "連線錯誤",
     "Copied from elsewhere": "從別處複製",
-    "Copied from original": "Copied from original",
+    "Copied from original": "從原來複製",
     "Copyright © 2015 the following Contributors:": "Copyright © 2015 下列貢獻者：",
     "Delete": "刪除",
     "Deleted": "已刪除",
@@ -54,10 +54,10 @@
     "Enter ignore patterns, one per line.": "輸入忽略樣式，每行一種。",
     "Error": "錯誤",
     "External File Versioning": "外部檔案版本控制",
-    "Failed Items": "Failed Items",
+    "Failed Items": "失敗的項目",
     "File Pull Order": "提取檔案的順序",
     "File Versioning": "檔案版本控制",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "File permission bits are ignored when looking for changes. Use on FAT file systems.",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "當改變時，檔案權限位元 File permission bits 會被忽略。用於 FAT 檔案系統上。",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Files are moved to .stversions folder when replaced or deleted by Syncthing.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "其他裝置做的改變不會影響到此裝置的檔案，但在此裝置上的變化將被發送到叢集中的其他部分。",
@@ -80,7 +80,7 @@
     "Ignore Patterns": "忽略樣式",
     "Ignore Permissions": "忽略權限",
     "Incoming Rate Limit (KiB/s)": "連入速率限制 (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "不正確的設定可能會損壞你的資料夾內容，並引致 Syncthing 的不正當運作。",
     "Introducer": "引入者",
     "Inversion of the given condition (i.e. do not exclude)": "反轉給定條件 (即：不要排除)",
     "Keep Versions": "保留歷史版本數",
@@ -90,11 +90,11 @@
     "Later": "稍後",
     "Local Discovery": "本地探索",
     "Local State": "本地狀態",
-    "Local State (Total)": "Local State (Total)",
+    "Local State (Total)": "本地狀態 (總結)",
     "Major Upgrade": "重大更新",
     "Maximum Age": "最長保留時間",
     "Metadata Only": "僅中繼資料",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "最少閒置磁碟空間",
     "Move to top of queue": "移到隊列頂端",
     "Multi level wildcard (matches multiple directory levels)": "多階層萬用字元 (可比對多層資料夾)",
     "Never": "從未",
@@ -114,8 +114,8 @@
     "Override Changes": "置換改變",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "資料夾在本地電腦的路徑。若資料夾不存在則會建立。波浪符號 (~) 可用作下列資料夾的捷徑：",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "儲存歷史版本的路徑 (若為空，則預設使用資料夾中的 .stversions 資料夾)。",
-    "Pause": "Pause",
+    "Pause": "暫停",
-    "Paused": "Paused",
+    "Paused": "暫停",
     "Please consult the release notes before performing a major upgrade.": "執行重大升級前請先參閱版本資訊。",
     "Please wait": "請稍後",
     "Preview": "預覽",
@@ -123,7 +123,7 @@
     "Quick guide to supported patterns": "可支援樣式的快速指南",
     "RAM Utilization": "記憶體使用",
     "Random": "隨機",
-    "Relayed via": "Relayed via",
+    "Relayed via": "中繼於",
     "Relays": "中繼點",
     "Release Notes": "版本資訊",
     "Remove": "移除",
@@ -133,8 +133,8 @@
     "Restart": "重新啟動",
     "Restart Needed": "需要重新啟動",
     "Restarting": "正在重新啟動",
-    "Resume": "Resume",
+    "Resume": "繼續",
-    "Reused": "Reused",
+    "Reused": "重用",
     "Save": "儲存",
     "Scanning": "正在掃描",
     "Select the devices to share this folder with.": "選擇要共享這個資料夾的裝置。",
@@ -181,18 +181,18 @@
     "The folder ID must be unique.": "資料夾識別碼必須為獨一無二的。",
     "The folder path cannot be blank.": "資料夾路徑不能空白。",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "使用下列的間隔：在第一個小時內每 30 秒保留一個版本，在第一天內每小時保留一個版本，在第 30 天內每一天保留一個版本，在達到最長保留時間前每一星期保留一個版本。",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
+    "The following items could not be synchronized.": "以下項目不能被同步。",
     "The maximum age must be a number and cannot be blank.": "最長保留時間必須為一個數字且不得為空。",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "一個版本被保留的最長時間 (單位為天，若設定為 0 則表示永遠保留)。",
     "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
     "The number of days must be a number and cannot be blank.": "天數必須必須為一個數字且不得為空。",
-    "The number of days to keep files in the trash can. Zero means forever.": "The number of days to keep files in the trash can. Zero means forever.",
+    "The number of days to keep files in the trash can. Zero means forever.": "檔案在 trash can 中保留的日子。零表示永遠地保留。",
     "The number of old versions to keep, per file.": "每個檔案要保留的舊版本數量。",
     "The number of versions must be a number and cannot be blank.": "每個檔案要保留的舊版本數量必須是數字且不能為空白。",
     "The path cannot be blank.": "路徑不能空白。",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "限制速率必須為非負的數字 (0: 不設限制)",
     "The rescan interval must be a non-negative number of seconds.": "重新掃描間隔必須為一個非負數的秒數。",
-    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
+    "They are retried automatically and will be synced when the error is resolved.": "解決間題後，將會自動重試和同步。",
     "This is a major version upgrade.": "這是一個主要版本更新。",
     "Trash Can File Versioning": "Trash Can File Versioning",
     "Unknown": "未知",
@@ -209,11 +209,11 @@
     "Version": "版本",
     "Versions Path": "歷史版本路徑",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "當檔案歷史版本的存留時間大於設定的最大值，或是其數量在一段時間內超出允許值時，則會被刪除。",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "當新增一個裝置時，請記住，這個裝置也必須被添加至另一邊。",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "當新增一個裝置時，務必記住，當前的這個裝置也同樣必須被添加至另一邊。",
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "當新增一個資料夾時，請記住，資料夾識別碼是用來將裝置之間的資料夾綁定在一起的。它們有區分大小寫，且必須在所有裝置之間完全相同。",
     "Yes": "是",
     "You must keep at least one version.": "您必須保留至少一個版本。",
-    "days": "days",
+    "days": "日",
     "full documentation": "完整說明文件",
     "items": "個項目",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想要分享資料夾 \"{{folder}}\"。"

man/syncthing-bep.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .

man/syncthing-config.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
@@ -81,33 +81,42 @@ The following shows the default configuration file:
 .sp
 .nf
 .ft C
-<configuration version="10">
+<configuration version="12">
-    <folder id="default" path="/Users/jb/Sync" ro="false" rescanIntervalS="60" ignorePerms="false" autoNormalize="false">
+    <folder id="default" path="/Users/jb/Sync/" ro="false" rescanIntervalS="60" ignorePerms="false" autoNormalize="true">
-        <device id="5SYI2FS\-LW6YAXI\-JJDYETS\-NDBBPIO\-256MWBO\-XDPXWVG\-24QPUM4\-PDW4UQU"></device>
+        <device id="3LT2GA5\-CQI4XJM\-WTZ264P\-MLOGMHL\-MCRLDNT\-MZV4RD3\-KA745CL\-OGAERQZ"></device>
+        <minDiskFreePct>1</minDiskFreePct>
         <versioning></versioning>
         <copiers>0</copiers>
         <pullers>0</pullers>
         <hashers>0</hashers>
         <order>random</order>
+        <ignoreDelete>false</ignoreDelete>
+        <scanProgressIntervalS>0</scanProgressIntervalS>
+        <pullerSleepS>0</pullerSleepS>
+        <pullerPauseS>0</pullerPauseS>
+        <maxConflicts>0</maxConflicts>
     </folder>
-    <device id="5SYI2FS\-LW6YAXI\-JJDYETS\-NDBBPIO\-256MWBO\-XDPXWVG\-24QPUM4\-PDW4UQU" name="syno" compression="metadata" introducer="false">
+    <device id="3LT2GA5\-CQI4XJM\-WTZ264P\-MLOGMHL\-MCRLDNT\-MZV4RD3\-KA745CL\-OGAERQZ" name="syno" compression="metadata" introducer="false">
         <address>dynamic</address>
     </device>
     <gui enabled="true" tls="false">
-        <address>127.0.0.1:8384</address>
+        <address>127.0.0.1:52620</address>
-        <apikey>l7jSbCqPD95JYZ0g8vi4ZLAMg3ulnN1b</apikey>
+        <apikey>k1dnz1Dd0rzTBjjFFh7CXPnrF12C49B1</apikey>
     </gui>
     <options>
-        <listenAddress>0.0.0.0:56847</listenAddress>
+        <listenAddress>tcp://0.0.0.0:22000</listenAddress>
-        <globalAnnounceServer>udp4://announce.syncthing.net:22026</globalAnnounceServer>
+        <globalAnnounceServer>default</globalAnnounceServer>
-        <globalAnnounceServer>udp6://announce\-v6.syncthing.net:22026</globalAnnounceServer>
         <globalAnnounceEnabled>true</globalAnnounceEnabled>
         <localAnnounceEnabled>true</localAnnounceEnabled>
-        <localAnnouncePort>21025</localAnnouncePort>
+        <localAnnouncePort>21027</localAnnouncePort>
-        <localAnnounceMCAddr>[ff32::5222]:21026</localAnnounceMCAddr>
+        <localAnnounceMCAddr>[ff12::8384]:21027</localAnnounceMCAddr>
+        <relayServer>dynamic+https://relays.syncthing.net/endpoint</relayServer>
         <maxSendKbps>0</maxSendKbps>
         <maxRecvKbps>0</maxRecvKbps>
         <reconnectionIntervalS>60</reconnectionIntervalS>
+        <relaysEnabled>true</relaysEnabled>
+        <relayReconnectIntervalM>10</relayReconnectIntervalM>
+        <relayWithoutGlobalAnn>false</relayWithoutGlobalAnn>
         <startBrowser>true</startBrowser>
         <upnpEnabled>true</upnpEnabled>
         <upnpLeaseMinutes>60</upnpLeaseMinutes>
@@ -115,6 +124,9 @@ The following shows the default configuration file:
         <upnpTimeoutSeconds>10</upnpTimeoutSeconds>
         <urAccepted>0</urAccepted>
         <urUniqueID></urUniqueID>
+        <urURL>https://data.syncthing.net/newdata</urURL>
+        <urPostInsecurely>false</urPostInsecurely>
+        <urInitialDelayS>1800</urInitialDelayS>
         <restartOnWakeup>true</restartOnWakeup>
         <autoUpgradeIntervalH>12</autoUpgradeIntervalH>
         <keepTemporariesH>24</keepTemporariesH>
@@ -123,6 +135,8 @@ The following shows the default configuration file:
         <symlinksEnabled>true</symlinksEnabled>
         <limitBandwidthInLan>false</limitBandwidthInLan>
         <databaseBlockCacheMiB>0</databaseBlockCacheMiB>
+        <minHomeDiskFreePct>1</minHomeDiskFreePct>
+        <releasesURL>https://api.github.com/repos/syncthing/syncthing/releases?per_page=30</releasesURL>
     </options>
 </configuration>
 .ft P
@@ -144,13 +158,19 @@ migration from previous formats.
 .sp
 .nf
 .ft C
-<folder id="default" path="/Users/jb/Sync" ro="false" rescanIntervalS="60" ignorePerms="false" autoNormalize="false">
+<folder id="default" path="/Users/jb/Sync/" ro="false" rescanIntervalS="60" ignorePerms="false" autoNormalize="true">
-    <device id="5SYI2FS\-LW6YAXI\-JJDYETS\-NDBBPIO\-256MWBO\-XDPXWVG\-24QPUM4\-PDW4UQU"></device>
+    <device id="3LT2GA5\-CQI4XJM\-WTZ264P\-MLOGMHL\-MCRLDNT\-MZV4RD3\-KA745CL\-OGAERQZ"></device>
+    <minDiskFreePct>1</minDiskFreePct>
     <versioning></versioning>
     <copiers>0</copiers>
     <pullers>0</pullers>
     <hashers>0</hashers>
     <order>random</order>
+    <ignoreDelete>false</ignoreDelete>
+    <scanProgressIntervalS>0</scanProgressIntervalS>
+    <pullerSleepS>0</pullerSleepS>
+    <pullerPauseS>0</pullerPauseS>
+    <maxConflicts>0</maxConflicts>
 </folder>
 .ft P
 .fi
@@ -194,6 +214,11 @@ customary that the local device ID is included in all repositories.
 Syncthing will currently add this automatically if it is not present in
 the configuration file.
 .TP
+.B minDiskFreePct
+The percentage of space that should be available on the disk this folder
+resides. The folder will be stopped when the percentage of free space goes
+below the threshold. Set to zero to disable.
+.TP
 .B versioning
 Specifies a versioning configuration.
 .UNINDENT
@@ -231,6 +256,23 @@ Pull files ordered by file size; smallest and largest first respectively.
 Pull files ordered by modification time; oldest and newest first
 respectively.
 .UNINDENT
+.TP
+.B ignoreDelete
+When set to true, this device will pretend not to see instructions to
+delete files from other devices.
+.TP
+.B scanProgressIntervalS
+The interval with which scan progress information is sent to the GUI. Zero
+means the default value (two seconds).
+.TP
+.B pullerSleepS, pullerPauseS
+Tweaks for rate limiting the puller. Don\(aqt change these unless you know
+what you\(aqre doing.
+.TP
+.B maxConflicts
+The maximum number of conflict copies to keep around for any given file.
+The default, \-1, means an unlimited number. Setting this to zero disables
+conflict copies altogether.
 .UNINDENT
 .SH DEVICE ELEMENT
 .INDENT 0.0
@@ -370,16 +412,19 @@ If set, this is the API key that enables usage of the REST interface.
 .nf
 .ft C
 <options>
-    <listenAddress>0.0.0.0:56847</listenAddress>
+    <listenAddress>tcp://0.0.0.0:22000</listenAddress>
-    <globalAnnounceServer>udp4://announce.syncthing.net:22026</globalAnnounceServer>
+    <globalAnnounceServer>default</globalAnnounceServer>
-    <globalAnnounceServer>udp6://announce\-v6.syncthing.net:22026</globalAnnounceServer>
     <globalAnnounceEnabled>true</globalAnnounceEnabled>
     <localAnnounceEnabled>true</localAnnounceEnabled>
-    <localAnnouncePort>21025</localAnnouncePort>
+    <localAnnouncePort>21027</localAnnouncePort>
-    <localAnnounceMCAddr>[ff32::5222]:21026</localAnnounceMCAddr>
+    <localAnnounceMCAddr>[ff12::8384]:21027</localAnnounceMCAddr>
+    <relayServer>dynamic+https://relays.syncthing.net/endpoint</relayServer>
     <maxSendKbps>0</maxSendKbps>
     <maxRecvKbps>0</maxRecvKbps>
     <reconnectionIntervalS>60</reconnectionIntervalS>
+    <relaysEnabled>true</relaysEnabled>
+    <relayReconnectIntervalM>10</relayReconnectIntervalM>
+    <relayWithoutGlobalAnn>false</relayWithoutGlobalAnn>
     <startBrowser>true</startBrowser>
     <upnpEnabled>true</upnpEnabled>
     <upnpLeaseMinutes>60</upnpLeaseMinutes>
@@ -387,6 +432,9 @@ If set, this is the API key that enables usage of the REST interface.
     <upnpTimeoutSeconds>10</upnpTimeoutSeconds>
     <urAccepted>0</urAccepted>
     <urUniqueID></urUniqueID>
+    <urURL>https://data.syncthing.net/newdata</urURL>
+    <urPostInsecurely>false</urPostInsecurely>
+    <urInitialDelayS>1800</urInitialDelayS>
     <restartOnWakeup>true</restartOnWakeup>
     <autoUpgradeIntervalH>12</autoUpgradeIntervalH>
     <keepTemporariesH>24</keepTemporariesH>
@@ -395,8 +443,8 @@ If set, this is the API key that enables usage of the REST interface.
     <symlinksEnabled>true</symlinksEnabled>
     <limitBandwidthInLan>false</limitBandwidthInLan>
     <databaseBlockCacheMiB>0</databaseBlockCacheMiB>
-    <pingTimeoutS>60</pingTimeoutS>
+    <minHomeDiskFreePct>1</minHomeDiskFreePct>
-    <pingIdleTimeS>120</pingIdleTimeS>
+    <releasesURL>https://api.github.com/repos/syncthing/syncthing/releases?per_page=30</releasesURL>
 </options>
 .ft P
 .fi
@@ -408,12 +456,18 @@ The \fBoptions\fP element contains all other global configuration options.
 .TP
 .B listenAddress
 The listen address for incoming sync connections. See the \fBaddress\fP
-element under the \fI\%GUI Element\fP for allowed syntax.
+element under the \fI\%GUI Element\fP for allowed syntax, with the addition
+that the address must have a protocol scheme prefix. Currently \fBtcp://\fP
+is the only supported protocol scheme.
 .TP
 .B globalAnnounceServer
-A URI to a global announce (discovery) server. Allowed protocol prefixes
+A URI to a global announce (discovery) server, or the word \fBdefault\fP to
-are \fBudp4://\fP (UDP over IPv4), \fBudp6://\fP (UDP over IPv6) and
+include the default servers. Any number of globalAnnounceServer elements
-\fBudp://\fP (UDP over any available protocol).
+may be present. The syntax for non\-default entries is that of a HTTP or
+HTTPS URL. A number of options may be added as query options to the URL:
+\fBinsecure\fP to prevent certificate validation (required for HTTP URLs)
+and \fBid=<device ID>\fP to perform certificate pinning. The device ID to
+use is printed by the discovery server on startup.
 .TP
 .B globalAnnounceEnabled
 Whether to announce this device to the global announce (discovery) server,
@@ -429,6 +483,12 @@ The port on which to listen and send IPv4 broadcast announcements to.
 .B localAnnounceMCAddr
 The group address and port to join and send IPv6 multicast announcements on.
 .TP
+.B relayServer
+Lists one or more relay servers, on the format \fBrelay://hostname:port\fP\&.
+Alternatively, a relay list can be loaded over https by using an URL like
+\fBdynamic+https://somehost/path\fP\&. The default loads the list of relays
+from the relay pool server, \fBrelays.syncthing.net\fP\&.
+.TP
 .B maxSendKbps
 Outgoing data rate limit, in kibibits per second.
 .TP
@@ -439,6 +499,17 @@ Incoming data rate limits, in kibibits per second.
 The number of seconds to wait between each attempt to connect to currently
 unconnected devices.
 .TP
+.B relaysEnabled
+When true, relays will be connected to and potentially used for device to device connections.
+.TP
+.B relayReconnectIntervalM
+Sets the interval, in minutes, between relay reconnect attempts.
+.TP
+.B relayWithoutGlobalAnn
+When set to true, relay connections will be attempted even when global
+discovery is disabled. This is useful only in the case where devices are
+known to be connected to the same relays. The default is \fBfalse\fP\&.
+.TP
 .B startBrowser
 Whether to attempt to start a browser to show the GUI when Syncthing starts.
 .TP
@@ -465,6 +536,17 @@ version of usage reporting has been accepted.
 The unique ID sent together with the usage report. Generated when usage
 reporting is enabled.
 .TP
+.B urURL
+The URL to post usage report data to, when enabled.
+.TP
+.B urPostInsecurely
+When true, the UR URL can be http instead of https, or have a self signed
+certificate. The default is \fBfalse\fP\&.
+.TP
+.B urInitialDelayS
+The time to wait from startup to the first usage report being sent. Allows
+the system to stabilize before reporting statistics.
+.TP
 .B restartOnWakeup
 Whether to perform a restart of Syncthing when it is detected that we are
 waking from sleep mode (i.e. a folded up laptop).
@@ -508,6 +590,13 @@ slow response time (slow connection/cpu) and large index exchanges
 .TP
 .B pingIdleTimeS
 ping interval in seconds. Don\(aqt change it unless you feel it\(aqs necessary.
+.TP
+.B minHomeDiskFreePct
+The percentage of space that should be available on the partition holding
+the configuration and index.
+.TP
+.B releasesURL
+The URL from which release information is loaded, for automatic upgrades.
 .UNINDENT
 .SH AUTHOR
 The Syncthing Authors

man/syncthing-device-ids.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .

man/syncthing-event-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .

man/syncthing-faq.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .

man/syncthing-globaldisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .
@@ -67,15 +67,7 @@ certificate was presented, status \fB403\fP (Forbidden) is returned. If the
 posted data doesn\(aqt conform to the expected format, \fB400\fP (Bad Request) is
 returned.
 .sp
-In successfull responses, the server may return a 
+In successfull responses, the server may return a \fBReannounce\-After\fP header
-.nf
-\(ga\(ga
-.fi
-Reannounce\-After"
-.nf
-\(ga\(ga
-.fi
-header
 containing the number of seconds after which the client should perform a new
 announcement.
 .sp

man/syncthing-localdisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v3
 .
@@ -165,6 +165,9 @@ struct Relay {
 .UNINDENT
 .UNINDENT
 .sp
+In the \fBAnnounce\fP  structure  field \fBMagic\fP is used to ensure
+a correct datagram was received and MUST be equal to \fB0x9D79BC40\fP\&.
+.sp
 The first Device structure contains information about the sending
 device. The following zero or more Extra devices contain information
 about other devices known to the sending device.

man/syncthing-networking.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .
@@ -55,18 +55,20 @@ The external forwarded port and the internal destination port has to be the same
 Communication in Syncthing works both ways. Therefore if you set up port
 forwards for one device, other devices will be able to connect to it even when
 they are behind a NAT network or firewall.
+.sp
+In the absence of port forwarding, relaying may work well enough to get
+devices connected and synced, but will perform poorly in comparison to a
+direct connection.
 .SH LOCAL FIREWALL
 .sp
 If your PC has a local firewall, you will need to open the following ports for
-incoming traffic:
+incoming and outgoing traffic:
 .INDENT 0.0
 .IP \(bu 2
 Port \fB22000/TCP\fP (or the actual listening port if you have changed
 the \fISync Protocol Listen Address\fP setting.)
 .IP \(bu 2
-Port \fB21025/UDP\fP (for discovery broadcasts on IPv4)
+Port \fB21027/UDP\fP (for discovery broadcasts on IPv4 and multicasts on IPv6)
-.IP \(bu 2
-Port \fB21026/UDP\fP (for discovery multicasts on IPv6)
 .UNINDENT
 .SH REMOTE WEB GUI
 .sp

man/syncthing-rest-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .
@@ -112,6 +112,65 @@ with the connection/peer.
 .fi
 .UNINDENT
 .UNINDENT
+.SS GET /rest/system/debug
+.sp
+New in version 0.12.0.
+
+.sp
+Returns the set of debug facilities and which of them are currently enabled.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+{
+  "enabled": [
+    "beacon"
+  ],
+  "facilities": {
+    "beacon": "Multicast and broadcast discovery",
+    "config": "Configuration loading and saving",
+    "connections": "Connection handling",
+    "db": "The database layer",
+    "dialer": "Dialing connections",
+    "discover": "Remote device discovery",
+    "events": "Event generation and logging",
+    "http": "REST API",
+    "main": "Main package",
+    "model": "The root hub",
+    "protocol": "The BEP protocol",
+    "relay": "Relay connection handling",
+    "scanner": "File change detection and hashing",
+    "stats": "Persistent device and folder statistics",
+    "sync": "Mutexes",
+    "upgrade": "Binary upgrades",
+    "upnp": "UPnP discovery and port mapping",
+    "versioner": "File versioning"
+  }
+}
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SS POST /rest/system/debug
+.sp
+New in version 0.12.0.
+
+.sp
+Enables or disables debugging for specified facilities. Give one or both of
+\fBenable\fP and \fBdisable\fP query parameters, with comma separated facility
+names. To disable debugging of the beacon and discovery packages, and enable it
+for config and db:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ curl \-H X\-API\-Key:abc123 \-X POST \(aqhttp://localhost:8385/rest/system/debug?disable=beacon,discovery&enable=config,db\(aq
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
 .SS GET /rest/system/discovery
 .sp
 Returns the contents of the local discovery cache.
@@ -150,6 +209,13 @@ curl \-X POST \-\-header "X\-API\-Key: TcE28kVPdtJ8COws1JdM0b2nodj77WeQ" http://
 Post with empty to body to remove all recent errors.
 .SS GET /rest/system/error
 .sp
+\fBNOTE:\fP
+.INDENT 0.0
+.INDENT 3.5
+Return format changed in 0.12.0.
+.UNINDENT
+.UNINDENT
+.sp
 Returns the list of recent errors.
 .INDENT 0.0
 .INDENT 3.5
@@ -159,8 +225,8 @@ Returns the list of recent errors.
 {
   "errors": [
     {
-      "time": "2014\-09\-18T12:59:26.549953186+02:00",
+      "when": "2014\-09\-18T12:59:26.549953186+02:00",
-      "error": "This is an error string"
+      "message": "This is an error string"
     }
   ]
 }
@@ -172,6 +238,29 @@ Returns the list of recent errors.
 .sp
 Post with an error message in the body (plain text) to register a new
 error. The new error will be displayed on any active GUI clients.
+.SS GET /rest/system/log
+.sp
+New in version 0.12.0.
+
+.sp
+Returns the list of recent log entries.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+{
+  "messages": [
+    {
+      "when": "2014\-09\-18T12:59:26.549953186+02:00",
+      "message": "This is a log entry"
+    }
+  ]
+}
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
 .SS GET /rest/system/ping
 .sp
 Returns a \fB{"ping": "pong"}\fP object.

man/syncthing-security.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .

man/syncthing-stignore.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .

man/syncthing-versioning.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TODO" "7" "October 20, 2015" "v0.11" "Syncthing"
+.TH "TODO" "7" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 Todo \- Keep automatic backups of deleted files by other nodes
 .

man/syncthing.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "October 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING" "1" "November 04, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .