From c4e2793b06e9ee1041d4c274317bc9dd0576d805 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 9 Nov 2017 16:07:01 +0000 Subject: [PATCH] Docs updates --- core/language/en-GB/Help/import.tid | 2 +- core/language/en-GB/Help/load.tid | 2 +- editions/prerelease/tiddlers/Release 5.1.15.tid | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/language/en-GB/Help/import.tid b/core/language/en-GB/Help/import.tid index dcfe66661..7d12a8557 100644 --- a/core/language/en-GB/Help/import.tid +++ b/core/language/en-GB/Help/import.tid @@ -1,7 +1,7 @@ title: $:/language/Help/import description: Import tiddlers from a file -Import tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files. The deserializer must be explicitly specified, unlike the load command which infers the deserializer from the file extension. +Import tiddlers from TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` or other local files. The deserializer must be explicitly specified, unlike the `load` command which infers the deserializer from the file extension. ``` --import [] [<encoding>] diff --git a/core/language/en-GB/Help/load.tid b/core/language/en-GB/Help/load.tid index 699ec37b9..afc8642cb 100644 --- a/core/language/en-GB/Help/load.tid +++ b/core/language/en-GB/Help/load.tid @@ -1,7 +1,7 @@ title: $:/language/Help/load description: Load tiddlers from a file -Load tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files +Load tiddlers from TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` or other local files. The processing applied to incoming files is determined by the file extension. Use the alternative `import` command if you need to specify the deserializer and encoding explicitly. ``` --load <filepath> diff --git a/editions/prerelease/tiddlers/Release 5.1.15.tid b/editions/prerelease/tiddlers/Release 5.1.15.tid index b41782e55..133af074c 100644 --- a/editions/prerelease/tiddlers/Release 5.1.15.tid +++ b/editions/prerelease/tiddlers/Release 5.1.15.tid @@ -48,6 +48,7 @@ Another improvement that benefits users of translations is the addition of about !! Bug Fixes +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/2821]] problem with "new journal" button clearing the text field * [[Removed|https://github.com/Jermolene/TiddlyWiki5/commit/c069d48a2a690b333c0733328f3574ae8a76e435]] extraneous URI encoding of filename with PUT saver * [[Restored|https://github.com/Jermolene/TiddlyWiki5/pull/2940]] ability to use sub-filter with image-picker macro * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/ccac0258af9b6d8c93d41b1f170e20dbf2efe3f3]] problem with the download saver and filenames containing spaces, accents or other characters that need URL encoding