From a66b04f532b1dd695531bc6076bf8263c25969ad Mon Sep 17 00:00:00 2001 From: WhiteFall <32425955+Zacharia2@users.noreply.github.com> Date: Fri, 9 Jun 2023 04:39:33 +0800 Subject: [PATCH 1/3] Signing the CLA (#7516) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index ac868477f..9693779c5 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -531,3 +531,5 @@ Michelle Saad, @michsa, 2023-03-08 Carmine Guida, @carmineguida, 2023-05-17 Tavin Cole, @tavin, 2023/05/25 + +WhiteFall, @Zacharia2, 2023/06/04 From 5947140b61793ef85473e285039e05cf1e4b00d6 Mon Sep 17 00:00:00 2001 From: TonyM <31584658+AnthonyMuscio@users.noreply.github.com> Date: Tue, 13 Jun 2023 19:59:40 +1000 Subject: [PATCH 2/3] Update Using Excise.tid (#7504) Added a comma and fixed a typo --- editions/tw5.com/tiddlers/howtos/Using Excise.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/howtos/Using Excise.tid b/editions/tw5.com/tiddlers/howtos/Using Excise.tid index 7d618a3b9..cd916a752 100644 --- a/editions/tw5.com/tiddlers/howtos/Using Excise.tid +++ b/editions/tw5.com/tiddlers/howtos/Using Excise.tid @@ -5,13 +5,13 @@ title: Using Excise type: text/vnd.tiddlywiki ! Excise text -From the EditorToolbar you can export selected text to a new tiddler and insert a [[link|Linking in WikiText]] [[Transclusion]] or [[macro|Macros]] in its place. Click ''Excise text'' (<<.icon $:/core/images/excise>>), input name of the new tiddler, and choose excise method. +From the EditorToolbar you can export selected text to a new tiddler and insert a [[link|Linking in WikiText]], [[Transclusion]] or [[macro|Macros]] in its place. Click ''Excise text'' (<<.icon $:/core/images/excise>>), input name of the new tiddler, and choose excise method. !! How to excise text # Highlight the relevant piece of text # Click ''Excise text'' (<<.icon $:/core/images/excise>>) # Give the new tiddler a title. -# Chosse if the new tiddler will be tagged with the title of the current tiddler (see note below). +# Choose if the new tiddler will be tagged with the title of the current tiddler (see note below). # Choose replacing method: [[link|Linking in WikiText]], [[transclusion|Transclusion]], or [[macro|Macros]]. # Click the ''{{$:/language/Buttons/Excise/Caption/Excise}}'' button From 46d0aea0f219d3686694b2094564b755f97bef0c Mon Sep 17 00:00:00 2001 From: twMat Date: Tue, 13 Jun 2023 12:02:06 +0200 Subject: [PATCH 3/3] Update ShadowTiddlers.tid (updated) (#7518) * Update ShadowTiddlers.tid main change is added section about "overriding shadow tids" * The word "extracted" might be confusing --------- Co-authored-by: jeremy@jermolene.com --- editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid b/editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid index 11abdd2e9..89417bc65 100644 --- a/editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid +++ b/editions/tw5.com/tiddlers/concepts/ShadowTiddlers.tid @@ -9,9 +9,13 @@ tags: Concepts <$button actions=<>>$text$ \end -ShadowTiddlers are tiddlers that are loaded from within [[Plugins]]. Unlike ordinary tiddlers, they don't appear in most lists. +ShadowTiddlers are tiddlers that are loaded from [[Plugins]] at the wiki startup. Unlike ordinary tiddlers, they don't appear in most lists. -ShadowTiddlers can be overridden with an ordinary tiddler of the same name. If that tiddler is subsequently deleted then the original shadow tiddler is automatically restored. +!! Overriding Shadow Tiddlers to modify plugins + +A ShadowTiddler can be overridden with an ordinary tiddler of the same name. This leaves the shadow tiddler intact but the plugin will use the overriding tiddler in its place, effectively allowing users to modify the behaviour of plugins. + +Users are cautioned against overriding shadow tiddlers because if the shadow tiddler is changed in a plugin update, the overriding tiddler may no longer perform as intended. To remedy this, the overriding tiddler may be modified or deleted. If the overriding tiddler is deleted, then the plugin falls back to using the original shadow tiddler. !! Overridden Shadow Tiddlers