summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Borg <jakob@kastelo.net>2016-11-29 11:56:02 +0100
committerJakob Borg <jakob@kastelo.net>2016-11-29 11:56:02 +0100
commit9da422f1c5df52b987cc39d989ad8866ea925a0d (patch)
tree1b7eff2cde13b77e894ab049e67e60c2f108dd66
parentab1739ba34f899b5c1ee709e9e7ab61ac94b4747 (diff)
downloadsyncthing-9da422f1c5df52b987cc39d989ad8866ea925a0d.tar.gz
syncthing-9da422f1c5df52b987cc39d989ad8866ea925a0d.zip
gui, man: Update docs & translationsv0.14.13
-rw-r--r--gui/default/assets/lang/lang-el.json2
-rw-r--r--gui/default/assets/lang/lang-eu.json2
-rw-r--r--gui/default/assets/lang/lang-fr-CA.json2
-rw-r--r--gui/default/assets/lang/lang-fr.json2
-rw-r--r--gui/default/assets/lang/lang-pl.json6
-rw-r--r--man/stdiscosrv.110
-rw-r--r--man/strelaysrv.12
-rw-r--r--man/syncthing-bep.72
-rw-r--r--man/syncthing-config.54
-rw-r--r--man/syncthing-device-ids.72
-rw-r--r--man/syncthing-event-api.74
-rw-r--r--man/syncthing-faq.736
-rw-r--r--man/syncthing-globaldisco.72
-rw-r--r--man/syncthing-localdisco.72
-rw-r--r--man/syncthing-networking.72
-rw-r--r--man/syncthing-relay.76
-rw-r--r--man/syncthing-rest-api.72
-rw-r--r--man/syncthing-security.78
-rw-r--r--man/syncthing-stignore.518
-rw-r--r--man/syncthing-versioning.72
-rw-r--r--man/syncthing.12
21 files changed, 59 insertions, 59 deletions
diff --git a/gui/default/assets/lang/lang-el.json b/gui/default/assets/lang/lang-el.json
index 8e288c458..eadb30333 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 32ea8a007..933cab969 100644
--- a/gui/default/assets/lang/lang-eu.json
+++ b/gui/default/assets/lang/lang-eu.json
@@ -50,7 +50,7 @@
"Documentation": "Dokumentazio",
"Download Rate": "Deskargatze emari",
"Downloaded": "Telekargatua",
- "Downloading": "Deskargatua",
+ "Downloading": "Deskargatze",
"Edit": "Aldatu",
"Editing": "Aldaketa",
"Enable NAT traversal": "Ahalbidetu NAT",
diff --git a/gui/default/assets/lang/lang-fr-CA.json b/gui/default/assets/lang/lang-fr-CA.json
index c3462864d..c8016abd7 100644
--- a/gui/default/assets/lang/lang-fr-CA.json
+++ b/gui/default/assets/lang/lang-fr-CA.json
@@ -50,7 +50,7 @@
"Documentation": "Documentation",
"Download Rate": "Débit de réception",
"Downloaded": "Téléchargé",
- "Downloading": "En cours de téléchargement",
+ "Downloading": "Téléchargement",
"Edit": "Modifier",
"Editing": "Modifications",
"Enable NAT traversal": "Activer transfert d'adresses NAT",
diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json
index 4f7aaa2a0..1592b8f37 100644
--- a/gui/default/assets/lang/lang-fr.json
+++ b/gui/default/assets/lang/lang-fr.json
@@ -50,7 +50,7 @@
"Documentation": "Documentation",
"Download Rate": "Vitesse de réception",
"Downloaded": "Téléchargé",
- "Downloading": "En cours de téléchargement",
+ "Downloading": "Téléchargement",
"Edit": "Modifier",
"Editing": "Modifications",
"Enable NAT traversal": "Activer la translation d'adresses (NAT)",
diff --git a/gui/default/assets/lang/lang-pl.json b/gui/default/assets/lang/lang-pl.json
index ef256f7a5..6679cac1b 100644
--- a/gui/default/assets/lang/lang-pl.json
+++ b/gui/default/assets/lang/lang-pl.json
@@ -135,7 +135,7 @@
"Quick guide to supported patterns": "Krótki przewodnik po obsługiwanych wzorcach",
"RAM Utilization": "Użycie pamięci RAM",
"Random": "Losowo",
- "Reduced by ignore patterns": "Reduced by ignore patterns",
+ "Reduced by ignore patterns": "Ograniczono przez wzorce ignorowania",
"Release Notes": "Informacje o wydaniu",
"Remote Devices": "Urządzenia zdalne",
"Remove": "Usuń",
@@ -231,8 +231,8 @@
"Yes": "Tak",
"You must keep at least one version.": "Musisz posiadać przynajmniej jedną wersję",
"days": "dni",
- "directories": "directories",
- "files": "files",
+ "directories": "katalogi",
+ "files": "pliki",
"full documentation": "pełna dokumentacja",
"items": "pozycji",
"{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce udostępnić folder \"{{folder}}\"",
diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1
index e58a74e3b..332f5d976 100644
--- a/man/stdiscosrv.1
+++ b/man/stdiscosrv.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "STDISCOSRV" "1" "November 21, 2016" "v0.14" "Syncthing"
+.TH "STDISCOSRV" "1" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
stdiscosrv \- Syncthing Discovery Server
.
@@ -46,7 +46,7 @@ stdiscosrv [\-cert=<file>] [\-db\-backend=<string>] [\-db\-dsn=<string>] [\-debu
.SH DESCRIPTION
.sp
Syncthing relies on a discovery server to find peers on the internet. Anyone
-can run a discovery server and point its syncthing installations to it.
+can run a discovery server and point Syncthing installations to it.
.SH OPTIONS
.INDENT 0.0
.TP
@@ -137,9 +137,9 @@ to select a different location.
\fBNOTE:\fP
.INDENT 0.0
.INDENT 3.5
-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
+If you are running an instance of Syncthing on the discovery server,
+you must either add that instance to other devices using a static
+address or bind the discovery server and Syncthing instances to
different IP addresses.
.UNINDENT
.UNINDENT
diff --git a/man/strelaysrv.1 b/man/strelaysrv.1
index 612b83013..d8a77acaa 100644
--- a/man/strelaysrv.1
+++ b/man/strelaysrv.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "STRELAYSRV" "1" "November 21, 2016" "v0.14" "Syncthing"
+.TH "STRELAYSRV" "1" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
strelaysrv \- Syncthing Relay Server
.
diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7
index 1ea52aca0..39ae3e741 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-bep \- Block Exchange Protocol v1
.
diff --git a/man/syncthing-config.5 b/man/syncthing-config.5
index f1f8e35c6..b90e800a6 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-config \- Syncthing Configuration
.
@@ -233,7 +233,7 @@ If the original introducer unshares this folder with this device, our device wil
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.
+It is customary that the local device ID is included in all folders.
Syncthing will currently add this automatically if it is not present in
the configuration file.
.TP
diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7
index 092286f20..a9e5e76bd 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "November 25, 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 1c9fc31e6..7954c5318 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-event-api \- Event API
.
@@ -572,7 +572,7 @@ New in version 0.11.10: The \fBmetadata\fP action.
.sp
Generated upon scan whenever the local disk has discovered an updated file from the
previous scan. This does NOT include events that are discovered and copied from
-other nodes, only files that were changed on the local filesystem.
+other devices, only files that were changed on the local filesystem.
.INDENT 0.0
.INDENT 3.5
.sp
diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7
index 89e02623c..d77c3f623 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-faq \- Frequently Asked Questions
.
@@ -45,12 +45,12 @@ It\(aqs \fBSyncthing\fP, although the command and source repository is spelled
\fBsyncthing\fP so it may be referred to in that way as well. It\(aqs definitely not
SyncThing, even though the abbreviation \fBst\fP is used in some
circumstances and file names.
-.SS How does Syncthing differ from BitTorrent Sync?
+.SS How does Syncthing differ from BitTorrent/Resilio Sync?
.sp
-The two are different and not related. Syncthing and BitTorrent Sync accomplish
+The two are different and not related. Syncthing and BitTorrent/Resilio Sync accomplish
some of the same things, namely syncing files between two or more computers.
.sp
-BitTorrent Sync by BitTorrent, Inc is a proprietary peer\-to\-peer file
+BitTorrent Sync, now called Resilio Sync, is a proprietary peer\-to\-peer file
synchronization tool available for Windows, Mac, Linux, Android, iOS, Windows
Phone, Amazon Kindle Fire and BSD. [1] Syncthing is an open source file
synchronization tool.
@@ -103,8 +103,8 @@ Sparse file sparseness (will become sparse, when supported by the OS & filesyste
.sp
Syncthing segments files into pieces, called blocks, to transfer data from one
device to another. Therefore, multiple devices can share the synchronization
-load, in a similar way as the torrent protocol. The more devices you have online
-(and synchronized), the faster an additional device will receive the data
+load, in a similar way to the torrent protocol. The more devices you have online,
+the faster an additional device will receive the data
because small blocks will be fetched from all devices in parallel.
.sp
Syncthing handles renaming files and updating their metadata in an efficient
@@ -176,11 +176,11 @@ Android. For other setups, consider using \fI\%syncthing\-inotify\fP <\fBhttps:/
.SS Should I keep my device IDs secret?
.sp
No. The IDs are not sensitive. Given a device ID it\(aqs possible to find the IP
-address for that node, if global discovery is enabled on it. Knowing the device
-ID doesn\(aqt help you actually establish a connection to that node or get a list
+address for that device, if global discovery is enabled on it. Knowing the device
+ID doesn\(aqt help you actually establish a connection to that device or get a list
of files, etc.
.sp
-For a connection to be established, both nodes need to know about the other\(aqs
+For a connection to be established, both devices need to know about the other\(aqs
device ID. It\(aqs not possible (in practice) to forge a device ID. (To forge a
device ID you need to create a TLS certificate with that specific SHA\-256 hash.
If you can do that, you can spoof any TLS certificate. The world is your
@@ -226,12 +226,12 @@ the new path.
.sp
It\(aqs best to do this when the folder is already in sync between your
devices, as it is otherwise unpredictable which changes will "win" after the
-move. Changes made on other devices may be overwritten, or changed made
+move. Changes made on other devices may be overwritten, or changes made
locally may be overwritten by those on other devices.
.sp
An alternative way is to shut down Syncthing, move the folder on disk, edit
the path directly in the configuration file and then start Syncthing again.
-.SS How to configure multiple users on a single machine?
+.SS How do I configure multiple users on a single machine?
.sp
Each user should run their own Syncthing instance. Be aware that you might need
to configure listening ports such that they do not overlap (see config).
@@ -243,7 +243,7 @@ programs to achieve this such as rsync or Unison.
.SS Is Syncthing my ideal backup application?
.sp
No. Syncthing is not a great backup application because all changes to your
-files (modifications, deletions, etc) will be propagated to all your
+files (modifications, deletions, etc.) will be propagated to all your
devices. You can enable versioning, but we encourage the use of other tools
to keep your data safe from your (or our) mistakes.
.SS Why is there no iOS client?
@@ -264,11 +264,11 @@ the brackets, like so: \fBq\e[abc\e]x\fP\&.
On Windows, escaping special characters is not supported as the \fB\e\fP
character is used as a path separator. On the other hand, special characters
such as \fB[\fP and \fB?\fP are not allowed in file names on Windows.
-.SS Why is the setup more complicated than BTSync?
+.SS Why is the setup more complicated than BitTorrent/Resilio Sync?
.sp
Security over convenience. In Syncthing you have to setup both sides to
-connect two nodes. An attacker can\(aqt do much with a stolen node ID, because
-you have to add the node on the other side too. You have better control
+connect two devices. An attacker can\(aqt do much with a stolen device ID, because
+you have to add the device on the other side too. You have better control
where your files are transferred.
.sp
This is an area that we are working to improve in the long term.
@@ -306,7 +306,7 @@ to
Then the GUI is accessible from everywhere. You should set a password and
enable HTTPS with this configuration. You can do this from inside the GUI.
.sp
-If both your computers are Unixy (Linux, Mac, etc) You can also leave the
+If both your computers are Unix\-like (Linux, Mac, etc.) you can also leave the
GUI settings at default and use an ssh port forward to access it. For
example,
.INDENT 0.0
@@ -336,7 +336,7 @@ $ ssh \-N \-L 9090:127.0.0.1:8384 user@othercomputer.example.com
.UNINDENT
.UNINDENT
.sp
-If only your remote computer is Unixy,
+If only your remote computer is Unix\-like,
you can still access it with ssh from Windows.
.sp
Under Windows 10 (64 bit) you can use the same ssh command if you install
@@ -374,7 +374,7 @@ In all cases, username/password authentication and HTTPS should be used.
.SS My Syncthing database is corrupt
.sp
This is almost always a result of bad RAM, storage device or other hardware. When the index database is found to be corrupt Syncthing cannot operate and will note this in the logs and exit. To overcome this delete the \fI\%database folder\fP <\fBhttps://docs.syncthing.net/users/config.html#description\fP> inside Syncthing\(aqs home directory and re\-start Syncthing. It will then need to perform a full re\-hashing of all shared folders. You should check your system in case the underlying cause is indeed faulty hardware which may put the system at risk of further data loss.
-.SS I don\(aqt like the GUI / Theme. Can it be changed?
+.SS I don\(aqt like the GUI or the theme. Can it be changed?
.sp
You can change the theme in the settings. Syncthing ships with other themes
than the default.
diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7
index 0f7f25d6b..fc1f1bbae 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "November 25, 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 53d842364..3313aaf32 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "November 25, 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 abad9b3d5..ae2f12bc7 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-networking \- Firewall Setup
.
diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7
index 143286b8f..31d979c6e 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-relay \- Relay Protocol v1
.
@@ -604,12 +604,12 @@ did capture all the traffic, and even if the attacker did get their hands on the
device keys, they would still not be able to recover/decrypt any traffic which
was transported via the relay.
.sp
-After establishing a relay session, syncthing looks at the SessionInvitation
+After establishing a relay session, Syncthing looks at the SessionInvitation
message, and depending which side it has received, wraps the raw socket in
either a TLS client socket or a TLS server socket depending on the ServerSocket
boolean value in the SessionInvitation, and starts the TLS handshake.
.sp
-From that point onwards it functions exactly the same way as if syncthing was
+From that point onwards it functions exactly the same way as if Syncthing was
establishing a direct connection with the other device over the internet,
performing device ID validation, and full TLS encryption, and provides the same
security properties as it would provide when connecting over the internet.
diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7
index 047eeed90..2a0541945 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-rest-api \- REST API
.
diff --git a/man/syncthing-security.7 b/man/syncthing-security.7
index aea40b628..8da92ac92 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-security \- Security Principles
.
@@ -36,9 +36,9 @@ possible for an attacker to join a cluster uninvited, and it should not be
possible to extract private information from intercepted traffic. Currently this
is implemented as follows.
.sp
-All device to device traffic is protected by TLS. To prevent uninvited nodes
-from joining a cluster, the certificate fingerprint of each node is compared
-to a preset list of acceptable nodes at connection establishment. The
+All device to device traffic is protected by TLS. To prevent uninvited devices
+from joining a cluster, the certificate fingerprint of each device is compared
+to a preset list of acceptable devices at connection establishment. The
fingerprint is computed as the SHA\-256 hash of the certificate and displayed
in BASE32 encoding to form a reasonably compact and convenient string.
.sp
diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5
index 106918dcb..76ad0ca1c 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing-stignore \- Prevent files from being synchronized to other nodes
.
@@ -43,12 +43,12 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.UNINDENT
.SH DESCRIPTION
.sp
-If some files should not be synchronized to other nodes, a file called
+If some files should not be synchronized to other devices, a file called
\fB\&.stignore\fP can be created containing file patterns to ignore. The
-\fB\&.stignore\fP file must be placed in the root of the repository. The
-\fB\&.stignore\fP file itself will never be synced to other nodes, although it can
-\fB#include\fP files that \fIare\fP synchronized between nodes. All patterns are
-relative to the repository root.
+\fB\&.stignore\fP file must be placed in the root of the folder. The
+\fB\&.stignore\fP file itself will never be synced to other devices, although it can
+\fB#include\fP files that \fIare\fP synchronized between devices. All patterns are
+relative to the folder root.
.sp
\fBNOTE:\fP
.INDENT 0.0
@@ -88,7 +88,7 @@ A pattern beginning with \fB#include\fP results in loading patterns
from the named file. It is an error for a file to not exist or be
included more than once. Note that while this can be used to include
patterns from a file in a subdirectory, the patterns themselves are
-still relative to the repository \fIroot\fP\&. Example:
+still relative to the folder \fIroot\fP\&. Example:
\fB#include more\-patterns.txt\fP\&.
.IP \(bu 2
A pattern beginning with a \fB!\fP prefix negates the pattern: matching files
@@ -201,7 +201,7 @@ Currently the effects on who is in sync with what can be a bit confusing
when using ignore patterns. This should be cleared up in a future
version...
.sp
-Assume two nodes, Alice and Bob, where Alice has 100 files to share, but
+Assume two devices, Alice and Bob, where Alice has 100 files to share, but
Bob ignores 25 of these. From Alice\(aqs point of view Bob will become
about 75% in sync (the actual number depends on the sizes of the
individual files) and remain in "Syncing" state even though it is in
@@ -211,7 +211,7 @@ view.
.sp
If Bob adds files that have already been synced to the ignore list, they
will remain in the "global" view but disappear from the "local" view.
-The end result is more files in the global repository than in the local,
+The end result is more files in the global folder than in the local,
but still 100% in sync (\fI\%issue #624\fP <\fBhttps://github.com/syncthing/syncthing/issues/624\fP>). From Alice\(aqs point of view, Bob
will remain 100% in sync until the next reconnect, because Bob has
already announced that he has the files that are now suddenly ignored.
diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7
index 344abf592..9e7196785 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 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "November 25, 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 3e8e582d8..982547973 100644
--- a/man/syncthing.1
+++ b/man/syncthing.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "SYNCTHING" "1" "November 21, 2016" "v0.14" "Syncthing"
+.TH "SYNCTHING" "1" "November 25, 2016" "v0.14" "Syncthing"
.SH NAME
syncthing \- Syncthing
.