From b3a2bf367b48c7a2999b02dcba438348b75eb627 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Thu, 22 Oct 2015 09:01:10 +0200
Subject: [PATCH] Tweak new folder defaults

---
 cmd/syncthing/locations.go | 2 +-
 cmd/syncthing/main.go      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmd/syncthing/locations.go b/cmd/syncthing/locations.go
index 54c6dd86..a7671c23 100644
--- a/cmd/syncthing/locations.go
+++ b/cmd/syncthing/locations.go
@@ -54,7 +54,7 @@ var locations = map[locationEnum]string{
 	locPanicLog:      "${config}/panic-${timestamp}.log",
 	locAuditLog:      "${config}/audit-${timestamp}.log",
 	locGUIAssets:     "${config}/gui",
-	locDefFolder:     "${home}/Sync",
+	locDefFolder:     "${home}/Sync/",
 }
 
 // expandLocations replaces the variables in the location map with actual
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index 21c2d9a8..8f35d3ff 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -961,6 +961,7 @@ func defaultConfig(myName string) config.Configuration {
 			RescanIntervalS: 60,
 			MinDiskFreePct:  1,
 			Devices:         []config.FolderDeviceConfiguration{{DeviceID: myID}},
+			AutoNormalize:   true,
 		},
 	}
 	newCfg.Devices = []config.DeviceConfiguration{