Merge branch 'tiddlywiki-com'

editions/tw5.com/tiddlers/saving/Encrypted Wiki Import Problems.tid

@@ -0,0 +1,22 @@
+created: 20250617180651017
+modified: 20250617183155928
+tags: Encryption
+title: Encrypted Wiki Import Problems
+type: text/vnd.tiddlywiki
+
+There have been some problems with ''importing encrypted'' TWs ''into'' version v5.2.0 and v5.2.1.
+
+While encrypting and decrypting single file wikis with v5.2.0 and v5.2.1 works as intended. There are some problems if encrypted wikis are ''imported'', if those wikis have been ''encrypted with any other version''.
+
+So if you import a wiki that was been encrypted with eg: TW v5.1.23 into v5.2.0 or v5.2.1 the v5.1.23 wiki could not be decrypted by v5.2.0 or v5.2.1.
+
+!! Upgrading
+
+* ''Importing'' encrypted wikis from any v5.1.x, v5.2.x and v5.3.x ''into the latest'' TW versions ''works as expected''
+* The ''only target'' TW versions that can cause ''importing problems'' are ''v5.2.0'' and ''v5.2.1''
+
+!! Downgrading
+
+* Importing an encrypted v5.''3''.x into v5.''2''.x and v5.''3''.x ''works'' as expected
+** ''Except'' v5.2.0 and v5.2.1
+* Importing an encrypted v5.''3''.x to v5.''1''.x ''does not work''

editions/tw5.com/tiddlers/system/TableOfContents.tid

@@ -1,6 +1,6 @@
 caption: {{$:/language/SideBar/Contents/Caption}}
 created: 20140809114010378
-list: HelloThere [[Quick Start]] Learning [[Working with TiddlyWiki]] [[Customise TiddlyWiki]] Features Filters Languages Editions Plugins Platforms Reference Community About
+list: Welcome HelloThere [[Quick Start]] Learning [[Working with TiddlyWiki]] [[Customise TiddlyWiki]] Features Filters Languages Editions Plugins Platforms Reference Community About
 list-before: 
 modified: 20230322150307580
 tags: $:/tags/SideBar

editions/tw5.com/tiddlers/wikitext/Typed Blocks in WikiText.tid

@@ -1,78 +1,67 @@
+caption: Typed Blocks
 created: 20131205161051792
-modified: 20140120171407764
+modified: 20251006150732150
 tags: WikiText
 title: Typed Blocks in WikiText
 type: text/vnd.tiddlywiki
-caption: Typed Blocks
 
 WikiText can include blocks of text that are rendered with an explicit ContentType like this:
 
-```
-$$$image/svg+xml
-<svg xmlns="http://www.w3.org/2000/svg" width="150" height="100">
-  <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="green" />
-</svg>
-$$$
-```
+!! Image SVG
 
-This renders as:
-
-$$$image/svg+xml
+<<wikitext-example-without-html 
+"""$$$image/svg+xml
 <svg xmlns="http://www.w3.org/2000/svg" width="150" height="100">
   <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="green" />
 </svg>
 $$$
+""">>
 
 It is also possible to abbreviate the ContentType to a file extension. For example:
 
-```
-$$$.svg
+<<wikitext-example-without-html
+"""$$$.svg
 <svg xmlns="http://www.w3.org/2000/svg" width="150" height="100">
   <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="red" />
 </svg>
 $$$
-```
+"""
+>>
 
-This renders as:
+!! Unknown Type
 
-$$$.svg
-<svg xmlns="http://www.w3.org/2000/svg" width="150" height="100">
-  <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="red" />
-</svg>
-$$$
+Unknown types render as plain text
 
-Unknown types render as plain text:
-
-```
-$$$text/unknown
+<<wikitext-example-without-html 
+"""$$$text/unknown
 Some plain text, which will not be //formatted//.
 $$$
-```
+""">>
 
-Which renders as:
-
-$$$text/unknown
-Some plain text, which will not be //formatted//.
-$$$
+!! Specific Type WikiText
 
 A render type can also be specified, causing a particular text rendering to be displayed. For example:
 
-```
-$$$text/vnd.tiddlywiki>text/html
+<<wikitext-example-without-html 
+"""$$$text/vnd.tiddlywiki>text/html
 This is ''some'' wikitext
 $$$
+""">>
 
-$$$text/vnd.tiddlywiki>text/plain
+<<wikitext-example-without-html 
+"""$$$text/vnd.tiddlywiki>text/plain
 This is ''some'' wikitext
 $$$
-```
+""">>
 
-Renders as:
+!! CSV Table
 
-$$$text/vnd.tiddlywiki>text/html
-This is ''some'' wikitext
-$$$
-
-$$$text/vnd.tiddlywiki>text/plain
-This is ''some'' wikitext
+<<wikitext-example-without-html 
+"""$$$text/csv
+a,b,c
+1,2,3
+4,5,6
+aye,bee,cee
+10,22,42
 $$$
+""">>