gui, man: Update docs & translations

It used to be an int32, but that's unnecessary and the spec now says
int16. Also relaxes the size requirement to that which fits in a signed
int16 instead of limiting to 1024 bytes, to allow for future growth.

As reported in
https://forum.syncthing.net/t/difference-between-documented-and-implemented-protocol/7798

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3406

cmd/stdiscosrv/psql.go

@@ -28,7 +28,7 @@ func postgresSetup(db *sql.DB) error {
 	}
 
 	row := db.QueryRow(`SELECT 'DevicesDeviceIDIndex'::regclass`)
-	if err := row.Scan(nil); err != nil {
+	if err = row.Scan(nil); err != nil {
 		_, err = db.Exec(`CREATE INDEX DevicesDeviceIDIndex ON Devices (DeviceID)`)
 	}
 	if err != nil {
@@ -36,7 +36,7 @@ func postgresSetup(db *sql.DB) error {
 	}
 
 	row = db.QueryRow(`SELECT 'DevicesSeenIndex'::regclass`)
-	if err := row.Scan(nil); err != nil {
+	if err = row.Scan(nil); err != nil {
 		_, err = db.Exec(`CREATE INDEX DevicesSeenIndex ON Devices (Seen)`)
 	}
 	if err != nil {
@@ -53,7 +53,7 @@ func postgresSetup(db *sql.DB) error {
 	}
 
 	row = db.QueryRow(`SELECT 'AddressesDeviceIDSeenIndex'::regclass`)
-	if err := row.Scan(nil); err != nil {
+	if err = row.Scan(nil); err != nil {
 		_, err = db.Exec(`CREATE INDEX AddressesDeviceIDSeenIndex ON Addresses (DeviceID, Seen)`)
 	}
 	if err != nil {
@@ -61,7 +61,7 @@ func postgresSetup(db *sql.DB) error {
 	}
 
 	row = db.QueryRow(`SELECT 'AddressesDeviceIDAddressIndex'::regclass`)
-	if err := row.Scan(nil); err != nil {
+	if err = row.Scan(nil); err != nil {
 		_, err = db.Exec(`CREATE INDEX AddressesDeviceIDAddressIndex ON Addresses (DeviceID, Address)`)
 	}
 	if err != nil {

cmd/strelaypoolsrv/main.go

@@ -130,7 +130,8 @@ func main() {
 			log.Println("Starting TLS listener on", listen)
 		}
 		certFile, keyFile := filepath.Join(dir, "http-cert.pem"), filepath.Join(dir, "http-key.pem")
-		cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+		var cert tls.Certificate
+		cert, err = tls.LoadX509KeyPair(certFile, keyFile)
 		if err != nil {
 			log.Fatalln("Failed to load HTTP X509 key pair:", err)
 		}

cmd/syncthing/main.go

@@ -539,8 +539,9 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 	errors := logger.NewRecorder(l, logger.LevelWarn, maxSystemErrors, 0)
 	systemLog := logger.NewRecorder(l, logger.LevelDebug, maxSystemLog, initialSystemLog)
 
-	// Event subscription for the API; must start early to catch the early events.  The LocalChangeDetected
-	// event might overwhelm the event reciever in some situations so we will not subscribe to it here.
+	// Event subscription for the API; must start early to catch the early
+	// events. The LocalChangeDetected event might overwhelm the event
+	// receiver in some situations so we will not subscribe to it here.
 	apiSub := events.NewBufferedSubscription(events.Default.Subscribe(events.AllEvents&^events.LocalChangeDetected), 1000)
 
 	if len(os.Getenv("GOMAXPROCS")) == 0 {

gui/default/assets/lang/lang-sv.json

@@ -18,7 +18,7 @@
     "All Data": "All data",
     "Allow Anonymous Usage Reporting?": "Tillåt anonym användarstatistiksrapportering?",
     "Alphabetic": "Alfabetisk",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ett externt kommando sköter versionshanteringen. Det måste ta bort filen från den synkroniserade mappen.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ett externt kommando sköter versionshanteringen. Den behöver ta bort filen från den synkroniserade mappen.",
     "Anonymous Usage Reporting": "Anonym användarstatistik rapportering",
     "Any devices configured on an introducer device will be added to this device as well.": "Enheter konfigurerade på en introduktörsenhet kommer också att läggas till den här enheten.",
     "Automatic upgrades": "Automatiska uppgraderingar",
@@ -60,21 +60,21 @@
     "Enable Relaying": "Aktivera reläa",
     "Enable UPnP": "Aktivera UPnP",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Ange kommaseparerade (\"tcp://ip:port\", \"tcp://host:port\")-adresser eller ordet \"dynamic\" för att använda automatisk uppslagning.",
-    "Enter ignore patterns, one per line.": "Ange filmönster, ett per rad.",
+    "Enter ignore patterns, one per line.": "Ange ignorera mönster, en per rad.",
     "Error": "Fel",
-    "External File Versioning": "Extern versionshantering",
+    "External File Versioning": "Extern filversionshantering",
     "Failed Items": "Misslyckade objekt",
-    "File Pull Order": "Hämtningsprioritering av filer",
-    "File Versioning": "Versionshantering",
+    "File Pull Order": "Filhämtningsprioritering",
+    "File Versioning": "Filversionshantering",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Filrättigheter ignoreras vid sökning efter förändringar. Används på FAT-filsystem.",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till katalogen .stversions om de ersätts eller raderas av Syncthing.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till datummärkta versioner i en .stversions-mapp när de ersatts eller raderats av 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.": "Filer skyddas från ändringar gjorda på andra enheter, men ändringar som görs på den här noden skickas till de andra klustermedlemmarna.",
     "Folder": "Katalog",
-    "Folder ID": "Katalog ID",
-    "Folder Label": "Katalogens etikett",
+    "Folder ID": "Katalog-ID",
+    "Folder Label": "Katalog-etikett",
     "Folder Master": "Huvudkatalog",
-    "Folder Path": "Katalogens sökväg",
+    "Folder Path": "Katalog-sökväg",
     "Folder Type": "Katalogtyp",
     "Folders": "Kataloger",
     "GUI": "Grafiskt gränssnitt",
@@ -82,16 +82,16 @@
     "GUI Authentication User": "Grafiska gränssnittets användare",
     "GUI Listen Addresses": "Grafiska gränssnittets avlyssningsadresser",
     "Generate": "Generera",
-    "Global Discovery": "Global uppslagning",
-    "Global Discovery Server": "Global uppslagningsserver",
-    "Global Discovery Servers": "Globala uppslagningsservrar",
+    "Global Discovery": "Global upptäckt",
+    "Global Discovery Server": "Global upptäcktsserver",
+    "Global Discovery Servers": "Globala upptäcktsservrar",
     "Global State": "Global status",
     "Help": "Hjälp",
     "Home page": "Hemsida",
     "Ignore": "Ignorera",
-    "Ignore Patterns": "Ignorerade filmönster",
-    "Ignore Permissions": "Ignorera filrättigheter",
-    "Incoming Rate Limit (KiB/s)": "Max nedladdningshastighet (KiB/s)",
+    "Ignore Patterns": "Ignorera mönster",
+    "Ignore Permissions": "Ignorera rättigheter",
+    "Incoming Rate Limit (KiB/s)": "Nedladdningshastighetsgräns (KiB/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Inkorrekt konfiguration kan skada innehållet i katalogen and få Syncthing att sluta fungera.",
     "Introducer": "introduktör",
     "Inversion of the given condition (i.e. do not exclude)": "Vänder på villkoret, d.v.s. exkluderar inte.",
@@ -105,7 +105,7 @@
     "Local Discovery": "Lokal uppslagning",
     "Local State": "Lokal status",
     "Local State (Total)": "Lokal status (totalt)",
-    "Major Upgrade": "Stor uppgradering",
+    "Major Upgrade": "Större uppgradering",
     "Master": "Huvud",
     "Maximum Age": "Maximum ålder",
     "Metadata Only": "Endast metadata",
@@ -117,7 +117,7 @@
     "New Folder": "Ny katalog",
     "Newest First": "Nyast först",
     "No": "Nej",
-    "No File Versioning": "Ingen versionshantering",
+    "No File Versioning": "Ingen filversionshantering",
     "Normal": "Normal",
     "Notice": "Observera",
     "OK": "OK",
@@ -155,7 +155,7 @@
     "Restart Needed": "Omstart behövs",
     "Restarting": "Startar om",
     "Resume": "Återuppta",
-    "Reused": "Återanvänt",
+    "Reused": "Återanvänd",
     "Save": "Spara",
     "Scan Time Remaining": "Återstående skanningstid",
     "Scanning": "Skannar",
@@ -175,11 +175,11 @@
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visas i stället för enhetens ID. Sätts till namnet på den andra enheten vid första anslutning om det lämnas tomt.",
     "Shutdown": "Stäng av",
     "Shutdown Complete": "Avstängning klar",
-    "Simple File Versioning": "Enkel versionshantering",
+    "Simple File Versioning": "Enkel filversionshantering",
     "Single level wildcard (matches within a directory only)": "Jokertecken som representerar noll eller fler godtyckliga tecken i ett filnamn.",
     "Smallest First": "Minst först",
     "Source Code": "Källkod",
-    "Staggered File Versioning": "Versionshantering i intervall",
+    "Staggered File Versioning": "Filversionshantering i intervall",
     "Start Browser": "Starta webbläsare",
     "Statistics": "Statistik",
     "Stopped": "Stoppad",
@@ -212,7 +212,7 @@
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Den längsta tiden att behålla en version (i dagar, sätt till 0 för att behålla versioner för evigt).",
     "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Minimum ledigt diskutrymme i procent måste vara en icke negativ siffra mellan 0 och 100 (inklusive).",
     "The number of days must be a number and cannot be blank.": "Antalet dagar måste vara en siffra och får inte vara tomt.",
-    "The number of days to keep files in the trash can. Zero means forever.": "Antal dagar som filer ligger kvar i papperskorgen. Noll betyder för alltid.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Antalet dagar som filer ligger kvar i papperskorgen. Noll betyder för alltid.",
     "The number of old versions to keep, per file.": "Antalet gamla versioner som ska behållas, per fil.",
     "The number of versions must be a number and cannot be blank.": "Antalet versioner måste vara ett nummer och kan inte lämnas tomt.",
     "The path cannot be blank.": "Sökvägen kan inte vara tom.",
@@ -222,7 +222,7 @@
     "This Device": "Denna enhet",
     "This can easily give hackers access to read and change any files on your computer.": "Detta kan lätt ge hackare tillgång till att läsa och ändra några filer på datorn.",
     "This is a major version upgrade.": "Det här är en stor uppgradering.",
-    "Trash Can File Versioning": "Versionshantering av filer i papperskorgen",
+    "Trash Can File Versioning": "Papperskorgs filversionshantering",
     "Unknown": "Okänd",
     "Unshared": "Inte delad",
     "Unused": "Oanvänd",

gui/default/syncthing/usagereport/usageReportPreviewModalView.html

@@ -3,9 +3,8 @@
     <p translate>
       The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.
     </p>
-    <p translate translate-value-url="<a href=&quot;https://data.syncthing.net&quot; target=&quot;_blank&quot;>https://data.syncthing.net</a>">
-      The aggregated statistics are publicly available at {%url%}.
-    </p>
+    <p translate>The aggregated statistics are publicly available at the URL below.</p>
+    <p><a href="https://data.syncthing.net/" target="_blank">https://data.syncthing.net/</a></p>
     <form>
       <textarea class="form-control" rows="20">{{reportData | json}}</textarea>
     </form>

lib/config/config.go

@@ -105,7 +105,9 @@ func ReadJSON(r io.Reader, myID protocol.DeviceID) (Configuration, error) {
 		return Configuration{}, err
 	}
 
-	err = json.Unmarshal(bs, &cfg)
+	if err := json.Unmarshal(bs, &cfg); err != nil {
+		return Configuration{}, err
+	}
 	cfg.OriginalVersion = cfg.Version
 
 	if err := cfg.prepare(myID); err != nil {

lib/config/config_test.go

@@ -549,6 +549,9 @@ func TestPullOrder(t *testing.T) {
 	t.Logf("%s", buf.Bytes())
 
 	cfg, err = ReadXML(buf, device1)
+	if err != nil {
+		t.Fatal(err)
+	}
 	wrapper = Wrap("testdata/pullorder.xml", cfg)
 	folders = wrapper.Folders()
 

lib/model/model.go

@@ -1293,7 +1293,7 @@ func (m *Model) localChangeDetected(folder, path string, files []protocol.FileIn
 		objType := "file"
 		action := "modified"
 
-		// If our local vector is verison 1 AND it is the only version
+		// If our local vector is version 1 AND it is the only version
 		// vector so far seen for this file then it is a new file.  Else if
 		// it is > 1 it's not new, and if it is 1 but another shortId
 		// version vector exists then it is new for us but created elsewhere
@@ -1311,11 +1311,8 @@ func (m *Model) localChangeDetected(folder, path string, files []protocol.FileIn
 			action = "deleted"
 		}
 
-		// If the file is a level or more deep then the forward slash seperator is embedded
-		// in the filename and makes the path look wierd on windows, so lets fix it
-		filename := filepath.FromSlash(file.Name)
-		// And append it to the filepath
-		path := filepath.Join(path, filename)
+		// The full file path, adjusted to the local path separator character.
+		path := filepath.Join(path, filepath.FromSlash(file.Name))
 
 		events.Default.Log(events.LocalChangeDetected, map[string]string{
 			"folder": folder,

lib/model/model_test.go

@@ -563,7 +563,7 @@ func TestIgnores(t *testing.T) {
 
 	// Invalid path, marker should be missing, hence returns an error.
 	m.AddFolder(config.FolderConfiguration{ID: "fresh", RawPath: "XXX"})
-	ignores, _, err = m.GetIgnores("fresh")
+	_, _, err = m.GetIgnores("fresh")
 	if err == nil {
 		t.Error("No error")
 	}

lib/model/sharedpullerstate_test.go

@@ -29,6 +29,9 @@ func TestSourceFileOK(t *testing.T) {
 
 	bs := make([]byte, 6)
 	n, err := fd.Read(bs)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	if n != len(bs) {
 		t.Fatalf("Wrong read length %d != %d", n, len(bs))

lib/protocol/hello.go

@@ -56,16 +56,19 @@ func IsVersionMismatch(err error) bool {
 }
 
 func readHello(c io.Reader) (HelloResult, error) {
-	header := make([]byte, 8)
+	header := make([]byte, 4)
 	if _, err := io.ReadFull(c, header); err != nil {
 		return HelloResult{}, err
 	}
 
-	switch binary.BigEndian.Uint32(header[:4]) {
+	switch binary.BigEndian.Uint32(header) {
 	case HelloMessageMagic:
 		// This is a v0.14 Hello message in proto format
-		msgSize := binary.BigEndian.Uint32(header[4:])
-		if msgSize > 1024 {
+		if _, err := io.ReadFull(c, header[:2]); err != nil {
+			return HelloResult{}, err
+		}
+		msgSize := binary.BigEndian.Uint16(header[:2])
+		if msgSize > 32767 {
 			return HelloResult{}, fmt.Errorf("hello message too big")
 		}
 		buf := make([]byte, msgSize)
@@ -86,7 +89,10 @@ func readHello(c io.Reader) (HelloResult, error) {
 
 	case Version13HelloMagic:
 		// This is a v0.13 Hello message in XDR format
-		msgSize := binary.BigEndian.Uint32(header[4:])
+		if _, err := io.ReadFull(c, header[:4]); err != nil {
+			return HelloResult{}, err
+		}
+		msgSize := binary.BigEndian.Uint32(header[:4])
 		if msgSize > 1024 {
 			return HelloResult{}, fmt.Errorf("hello message too big")
 		}
@@ -120,10 +126,14 @@ func writeHello(c io.Writer, h HelloIntf) error {
 	if err != nil {
 		return err
 	}
+	if len(msg) > 32767 {
+		// The header length must be a positive signed int16
+		panic("bug: attempting to serialize too large hello message")
+	}
 
-	header := make([]byte, 8)
+	header := make([]byte, 6)
 	binary.BigEndian.PutUint32(header[:4], h.Magic())
-	binary.BigEndian.PutUint32(header[4:], uint32(len(msg)))
+	binary.BigEndian.PutUint16(header[4:], uint16(len(msg)))
 
 	_, err = c.Write(append(header, msg...))
 	return err

lib/protocol/hello_test.go

@@ -26,9 +26,9 @@ func TestVersion14Hello(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	hdrBuf := make([]byte, 8)
+	hdrBuf := make([]byte, 6)
 	binary.BigEndian.PutUint32(hdrBuf, HelloMessageMagic)
-	binary.BigEndian.PutUint32(hdrBuf[4:], uint32(len(msgBuf)))
+	binary.BigEndian.PutUint16(hdrBuf[4:], uint16(len(msgBuf)))
 
 	outBuf := new(bytes.Buffer)
 	outBuf.Write(hdrBuf)

lib/scanner/walk.go

@@ -470,8 +470,6 @@ func (w *walker) normalizePath(absPath, relPath string) (normPath string, skip b
 			l.Infof(`File "%s" has UTF8 encoding conflict with another file; ignoring.`, relPath)
 			return "", true
 		}
-
-		relPath = normPath
 	}
 
 	return normPath, false

lib/stats/folder.go

@@ -45,7 +45,7 @@ func (s *FolderStatisticsReference) GetLastFile() LastFile {
 	if !ok {
 		return LastFile{}
 	}
-	deleted, ok := s.ns.Bool("lastFileDeleted")
+	deleted, _ := s.ns.Bool("lastFileDeleted")
 	return LastFile{
 		At:       at,
 		Filename: file,

man/syncthing-bep.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "July 17, 2016" "v0.14" "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" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "July 17, 2016" "v0.14" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
@@ -455,7 +455,7 @@ These are equivalent and will result in Syncthing listening on all
 interfaces via both IPv4 and IPv6.
 .UNINDENT
 .TP
-.B username
+.B user
 Set to require authentication.
 .TP
 .B password

man/syncthing-device-ids.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "July 17, 2016" "v0.14" "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" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "July 17, 2016" "v0.14" "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" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "July 17, 2016" "v0.14" "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" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "July 17, 2016" "v0.14" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .

man/syncthing-localdisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "July 17, 2016" "v0.14" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .

man/syncthing-networking.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "July 17, 2016" "v0.14" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .

man/syncthing-relay.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-RELAY" "7" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "July 17, 2016" "v0.14" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .

man/syncthing-rest-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "July 17, 2016" "v0.14" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .

man/syncthing-security.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "July 17, 2016" "v0.14" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .

man/syncthing-stignore.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "July 17, 2016" "v0.14" "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" "July 05, 2016" "v0.13" "Syncthing"
+.TH "TODO" "7" "July 17, 2016" "v0.14" "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" "July 05, 2016" "v0.13" "Syncthing"
+.TH "SYNCTHING" "1" "July 17, 2016" "v0.14" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .

test/transfer-bench_test.go

@@ -50,7 +50,8 @@ func benchmarkTransfer(t *testing.T, files, sizeExp int) {
 	log.Println("Generating files...")
 	if files == 1 {
 		// Special case. Generate one file with the specified size exactly.
-		fd, err := os.Open("../LICENSE")
+		var fd *os.File
+		fd, err = os.Open("../LICENSE")
 		if err != nil {
 			t.Fatal(err)
 		}