From c482cbbe70e9fabeacc9f30af678c5a722a9eb67 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 14 Feb 2016 20:26:33 +0100 Subject: [PATCH] Docs & translations --- lib/auto/gui.files.go | 2 +- man/syncthing-bep.7 | 2 +- man/syncthing-config.5 | 2 +- man/syncthing-device-ids.7 | 2 +- man/syncthing-event-api.7 | 2 +- man/syncthing-faq.7 | 5 ++++- man/syncthing-globaldisco.7 | 2 +- man/syncthing-localdisco.7 | 2 +- man/syncthing-networking.7 | 2 +- man/syncthing-relay.7 | 2 +- man/syncthing-rest-api.7 | 2 +- man/syncthing-security.7 | 2 +- man/syncthing-stignore.5 | 2 +- man/syncthing-versioning.7 | 2 +- man/syncthing.1 | 9 +++++++-- 15 files changed, 24 insertions(+), 16 deletions(-) diff --git a/lib/auto/gui.files.go b/lib/auto/gui.files.go index d1683ec1a..87762ffa0 100644 --- a/lib/auto/gui.files.go +++ b/lib/auto/gui.files.go @@ -5,7 +5,7 @@ import ( ) const ( - AssetsBuildDate = "Mon, 08 Feb 2016 16:39:33 GMT" + AssetsBuildDate = "Sun, 14 Feb 2016 19:26:12 GMT" ) func Assets() map[string][]byte { diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 29a1fcf49..02eb91298 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-BEP" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 57b0dae0b..5472c1f16 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index d255f7962..6ad7dfc77 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" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs . diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index b9d9957ef..1da5dd193 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" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 9d0500322..29d9a228f 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . @@ -156,6 +156,9 @@ causes a conflict on change you\(aqll end up with \fBsync\-conflict\-...sync\-co .sp Each user should run their own Syncthing instance. Be aware that you might need to configure ports such that they do not overlap (see the config.xml). +.SS Does Syncthing support syncing between folders on the same system? +.sp +Syncthing is not designed to sync locally and the overhead involved in doing so will waste resources. There are better programs to achieve this such as rsync or Unison. .SS Is Syncthing my ideal backup application? .sp No, Syncthing is not a backup application because all changes to your files diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 850ecb7cd..1025092db 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index ace1d95c3..1f330b7d4 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v3 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 507a7bcbc..d201fff45 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 95349aade..1111f5dd3 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index b43283b73..8131650f7 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" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-rest-api \- REST API . diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index fbbba9d4d..3aa8931c8 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 12ad1a7fd..8dd81c85a 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "February 12, 2016" "v0.12" "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 3eb5a6527..74b9316c7 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "TODO" "7" "February 08, 2016" "v0.12" "Syncthing" +.TH "TODO" "7" "February 12, 2016" "v0.12" "Syncthing" .SH NAME Todo \- Keep automatic backups of deleted files by other nodes . diff --git a/man/syncthing.1 b/man/syncthing.1 index fd8a9218c..11eec1d8a 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "February 08, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING" "1" "February 12, 2016" "v0.12" "Syncthing" .SH NAME syncthing \- Syncthing . @@ -38,7 +38,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .ft C syncthing [\-audit] [\-generate=] [\-gui\-address=
] [\-gui\-apikey=] [\-home=] [\-logfile=] [\-logflags=] [\-no\-browser] - [\-no\-console] [\-no\-restart] [\-reset] [\-upgrade] [\-upgrade\-check] + [\-no\-console] [\-no\-restart] [\-paths] [\-reset] [\-upgrade] [\-upgrade\-check] [\-upgrade\-to=] [\-verbose] [\-version] .ft P .fi @@ -123,6 +123,11 @@ Do not restart; just exit. .UNINDENT .INDENT 0.0 .TP +.B \-paths +Print the paths used for configuration, keys, database, GUI overrides, default sync folder and the log file. +.UNINDENT +.INDENT 0.0 +.TP .B \-reset Reset the database. .UNINDENT