From 02601a02fce3c83bd4d45dc78c39c46543ff6d13 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Fri, 19 Sep 2014 09:13:18 +0100
Subject: [PATCH] Add note clarifying purpose of TiddlySpot settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We’ve had a couple of cases where users have assumed that the “backup”
setting applies to ordinary, local saves
---
 core/language/en-GB/ControlPanel.multids | 1 +
 core/ui/ControlPanel/Saving.tid          | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index b5ebdd464..7bb60a790 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -51,6 +51,7 @@ Saving/Heading: Saving
 Saving/TiddlySpot/Advanced/Heading: Advanced Settings
 Saving/TiddlySpot/BackupDir: Backup Directory
 Saving/TiddlySpot/Backups: Backups
+Saving/TiddlySpot/Description: These settings are only used when saving to http://tiddlyspot.com or a compatible remote server
 Saving/TiddlySpot/Filename: Upload Filename
 Saving/TiddlySpot/Heading: ~TiddlySpot
 Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address//
diff --git a/core/ui/ControlPanel/Saving.tid b/core/ui/ControlPanel/Saving.tid
index ed3a7932a..10583513d 100644
--- a/core/ui/ControlPanel/Saving.tid
+++ b/core/ui/ControlPanel/Saving.tid
@@ -15,11 +15,13 @@ http://$(userName)$.tiddlyspot.com/backup/
 \end
 ! <<lingo TiddlySpot/Heading>>
 
+<<lingo TiddlySpot/Description>>
+
 |<<lingo TiddlySpot/UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
 |<<lingo TiddlySpot/Password>> |<$password name="upload"/> |
 |<<lingo TiddlySpot/Backups>> |<<backupLink>> |
 
-!! <<lingo TiddlySpot/Advanced/Heading>>
+''<<lingo TiddlySpot/Advanced/Heading>>''
 
 |<<lingo TiddlySpot/ServerURL>>  |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> |
 |<<lingo TiddlySpot/Filename>> |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> |