diff --git a/gui/default/assets/lang/lang-el.json b/gui/default/assets/lang/lang-el.json
index 04c387e8..8e288c45 100644
--- a/gui/default/assets/lang/lang-el.json
+++ b/gui/default/assets/lang/lang-el.json
@@ -86,7 +86,7 @@
"Ignore Patterns": "Πρότυπο για αγνόηση",
"Ignore Permissions": "Αγνόησε τα δικαιώματα",
"Incoming Rate Limit (KiB/s)": "Περιορισμός ταχύτητας λήψης (KiB/s)",
- "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Με μια εσφαλμένη ρύθμιση μπορεί προκαληθεί ζημιά στα περιεχόμενα του φακέλου και το Syncthing μπορεί να σταματήσει να λειτουργεί.",
+ "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": "Διατήρηση εκδόσεων",
diff --git a/gui/default/assets/lang/lang-eu.json b/gui/default/assets/lang/lang-eu.json
index 3ad4c3ef..32ea8a00 100644
--- a/gui/default/assets/lang/lang-eu.json
+++ b/gui/default/assets/lang/lang-eu.json
@@ -9,7 +9,7 @@
"Add Device": "Gaineratu makina",
"Add Folder": "Gaineratu partekatze",
"Add Remote Device": "Gaineratu makinan izan",
- "Add new folder?": "Gaineratu berri partekatze ?",
+ "Add new folder?": "Gaineratu hau partekatze ?",
"Address": "Helbide",
"Addresses": "Helbidek",
"Advanced": "Aditu",
@@ -235,6 +235,6 @@
"files": "fitxategik",
"full documentation": "Dokumentazio osoa",
"items": "Elementuak",
- "{%device%} wants to share folder \"{%folder%}\".": "{{device}} banaketa \"{{folderLabel}}\" gomitatzen zaitu.",
- "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} \"{{folderLabel}}\" ({{folder}}) gomitatzen zaitu."
+ "{%device%} wants to share folder \"{%folder%}\".": "{{device}} banaketa \"{{folder}}\" gomitatzen zaitu.",
+ "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} \"{{folderlabel}}\" ({{folder}}) gomitatzen zaitu."
}
\ No newline at end of file
diff --git a/gui/default/assets/lang/lang-fr-CA.json b/gui/default/assets/lang/lang-fr-CA.json
index 13a5c967..c3462864 100644
--- a/gui/default/assets/lang/lang-fr-CA.json
+++ b/gui/default/assets/lang/lang-fr-CA.json
@@ -9,7 +9,7 @@
"Add Device": "Ajouter l'appareil",
"Add Folder": "Ajouter un partage",
"Add Remote Device": "Ajouter un appareil",
- "Add new folder?": "Ajouter un nouveau partage ?",
+ "Add new folder?": "Ajouter ce partage ?",
"Address": "Adresse",
"Addresses": "Adresses",
"Advanced": "Avancé",
@@ -235,6 +235,6 @@
"files": "fichiers",
"full documentation": "documentation complète",
"items": "éléments",
- "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folderLabel}}\".",
- "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}})."
+ "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folder}}\".",
+ "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderlabel}}\" ({{folder}})."
}
\ No newline at end of file
diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json
index 656eee49..4f7aaa2a 100644
--- a/gui/default/assets/lang/lang-fr.json
+++ b/gui/default/assets/lang/lang-fr.json
@@ -9,7 +9,7 @@
"Add Device": "Ajouter l'appareil",
"Add Folder": "Ajouter un partage",
"Add Remote Device": "Ajouter un appareil",
- "Add new folder?": "Ajouter un nouveau partage ?",
+ "Add new folder?": "Ajouter ce partage ?",
"Address": "Adresse",
"Addresses": "Adresses",
"Advanced": "Avancé",
@@ -235,6 +235,6 @@
"files": "Fichiers",
"full documentation": "documentation complète",
"items": "éléments",
- "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folderLabel}}\".",
- "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}})."
+ "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folder}}\".",
+ "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderlabel}}\" ({{folder}})."
}
\ No newline at end of file
diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1
index bbc68c28..e58a74e3 100644
--- a/man/stdiscosrv.1
+++ b/man/stdiscosrv.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "STDISCOSRV" "1" "November 12, 2016" "v0.14" "Syncthing"
+.TH "STDISCOSRV" "1" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
stdiscosrv \- Syncthing Discovery Server
.
diff --git a/man/strelaysrv.1 b/man/strelaysrv.1
index 3ad940ca..612b8301 100644
--- a/man/strelaysrv.1
+++ b/man/strelaysrv.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "STRELAYSRV" "1" "November 12, 2016" "v0.14" "Syncthing"
+.TH "STRELAYSRV" "1" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
strelaysrv \- Syncthing Relay Server
.
diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7
index 712559ac..1ea52aca 100644
--- a/man/syncthing-bep.7
+++ b/man/syncthing-bep.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-BEP" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-bep \- Block Exchange Protocol v1
.
@@ -290,14 +290,15 @@ message Folder {
}
message Device {
- bytes id = 1;
- string name = 2;
- repeated string addresses = 3;
- Compression compression = 4;
- string cert_name = 5;
- int64 max_sequence = 6;
- bool introducer = 7;
- uint64 index_id = 8;
+ bytes id = 1;
+ string name = 2;
+ repeated string addresses = 3;
+ Compression compression = 4;
+ string cert_name = 5;
+ int64 max_sequence = 6;
+ bool introducer = 7;
+ uint64 index_id = 8;
+ bool skip_introduction_removals = 9;
}
enum Compression {
@@ -373,6 +374,10 @@ introducers.
.sp
The \fBindex id\fP field contains the unique identifier for the current set of
index data. See \fI\%Delta Index Exchange\fP for the usage of this field.
+.sp
+The \fBskip introduction removals\fP field signifies if the remote device has
+opted to ignore introduction removals for the given device. This setting is
+copied across as we are being introduced to a new device.
.SS Index and Index Update
.sp
The Index and Index Update messages define the contents of the senders
diff --git a/man/syncthing-config.5 b/man/syncthing-config.5
index 30e809fd..f1f8e35c 100644
--- a/man/syncthing-config.5
+++ b/man/syncthing-config.5
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-CONFIG" "5" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-config \- Syncthing Configuration
.
@@ -97,6 +97,7 @@ The following shows an example of the default configuration file (IDs will diffe
\-1
false
false
+ false
dynamic
@@ -161,7 +162,7 @@ migration from previous formats.
.nf
.ft C
-
+
1
0
@@ -175,6 +176,7 @@ migration from previous formats.
\-1
false
false
+ false
.ft P
.fi
@@ -225,10 +227,13 @@ The following child elements may exist:
.INDENT 0.0
.TP
.B device
-These must have the \fBid\fP attribute and nothing else. Mentioned devices
-are those that will be sharing the folder in question. Each mentioned
-device must have a separate \fBdevice\fP element later in the file. It is
-customary that the local device ID is included in all repositories.
+These must have the \fBid\fP attribute and can have an \fBintroducedBy\fP attribute,
+identifying the device that introduced us to share this folder with the given device.
+If the original introducer unshares this folder with this device, our device will follow
+and unshare the folder (subject to skipIntroductionRemovals being false on the introducer device).
+All mentioned devices are those that will be sharing the folder in question.
+Each mentioned device must have a separate \fBdevice\fP element later in the file.
+It is 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
@@ -301,6 +306,12 @@ sparse files will not be created.
By default, devices exchange information about blocks available in
transfers that are still in progress. When set to true, such information
is not exchanged for this folder.
+.INDENT 7.0
+.TP
+.B fsync
+Transfer updated (from other devices) files to permanent storage before
+committing the changes to the internal database.
+.UNINDENT
.UNINDENT
.SH DEVICE ELEMENT
.INDENT 0.0
@@ -308,7 +319,7 @@ is not exchanged for this folder.
.sp
.nf
.ft C
-
+
dynamic
@@ -354,6 +365,14 @@ Disable all compression.
.B introducer
Set to true if this device should be trusted as an introducer, i.e. we
should copy their list of devices per folder when connecting.
+.TP
+.B skipIntroductionRemovals
+Set to true if you wish to follow only introductions and not de\-introductions.
+For example, if this is set, we would not remove a device that we were introduced
+to even if the original introducer is no longer listing the remote device as known.
+.TP
+.B introducedBy
+Defines which device has introduced us to this device. Used only for following de\-introductions.
.UNINDENT
.sp
In addition, one or more \fBaddress\fP child elements must be present. Each
diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7
index a1e32459..092286f2 100644
--- a/man/syncthing-device-ids.7
+++ b/man/syncthing-device-ids.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-DEVICE-IDS" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-device-ids \- Understanding Device IDs
.
diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7
index f1e0f4c9..1c9fc31e 100644
--- a/man/syncthing-event-api.7
+++ b/man/syncthing-event-api.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-EVENT-API" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-event-api \- Event API
.
diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7
index ec76833c..89e02623 100644
--- a/man/syncthing-faq.7
+++ b/man/syncthing-faq.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-FAQ" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-faq \- Frequently Asked Questions
.
diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7
index 1938fe33..0f7f25d6 100644
--- a/man/syncthing-globaldisco.7
+++ b/man/syncthing-globaldisco.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-GLOBALDISCO" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-globaldisco \- Global Discovery Protocol v3
.
diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7
index 3f8ffea8..53d84236 100644
--- a/man/syncthing-localdisco.7
+++ b/man/syncthing-localdisco.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-LOCALDISCO" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-localdisco \- Local Discovery Protocol v4
.
diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7
index 6c4a0e2c..abad9b3d 100644
--- a/man/syncthing-networking.7
+++ b/man/syncthing-networking.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-NETWORKING" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-networking \- Firewall Setup
.
diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7
index 2d87ad8d..143286b8 100644
--- a/man/syncthing-relay.7
+++ b/man/syncthing-relay.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-RELAY" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-relay \- Relay Protocol v1
.
diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7
index a88768c0..047eeed9 100644
--- a/man/syncthing-rest-api.7
+++ b/man/syncthing-rest-api.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-REST-API" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-rest-api \- REST API
.
@@ -86,6 +86,7 @@ Returns the current configuration.
"maxConflicts": 10,
"disableSparseFiles": false,
"disableTempIndexes": false,
+ "fsync": false,
"invalid": ""
}
],
diff --git a/man/syncthing-security.7 b/man/syncthing-security.7
index 51bd9fa4..aea40b62 100644
--- a/man/syncthing-security.7
+++ b/man/syncthing-security.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-SECURITY" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-security \- Security Principles
.
diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5
index 9ba501ba..106918dc 100644
--- a/man/syncthing-stignore.5
+++ b/man/syncthing-stignore.5
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-STIGNORE" "5" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-stignore \- Prevent files from being synchronized to other nodes
.
diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7
index 9f1af961..344abf59 100644
--- a/man/syncthing-versioning.7
+++ b/man/syncthing-versioning.7
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING-VERSIONING" "7" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-versioning \- Keep automatic backups of deleted files by other nodes
.
diff --git a/man/syncthing.1 b/man/syncthing.1
index cfd3a2a4..3e8e582d 100644
--- a/man/syncthing.1
+++ b/man/syncthing.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING" "1" "November 12, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING" "1" "November 21, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing \- Syncthing
.