From 271b8f9e0df1ef4920046a2eb91efea84f801b73 Mon Sep 17 00:00:00 2001 From: MatthewSalmon <43498574+matthewsalmon@users.noreply.github.com> Date: Sun, 27 Apr 2025 09:24:16 +0100 Subject: [PATCH 1/2] Update cla-individual.md (#9039) Signing the CLA with GitHub handle --- licenses/cla-individual.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 4033e9fc1..ba091524d 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -611,4 +611,7 @@ Galen Huntington, @galenhuntington, 2025/01/19 @Rhys-T, 2025/01/23 @Rumman157, 2025/03/17 -@bob.jansen@cultconv.com, 2025/03/22 \ No newline at end of file + +@bob.jansen@cultconv.com, 2025/03/22 + +Matthew Salmon, @matthewsalmon, 2025/04/24 From 4060f762e07e1f43d031410b3ebc7c7bdd03ab95 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Tue, 29 Apr 2025 14:01:43 +0100 Subject: [PATCH 2/2] Cherry pick 1519ff638db064985a364cb9f803f06ecf183347 from master --- editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid index d861de232..d70ed70cc 100644 --- a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid +++ b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid @@ -28,5 +28,4 @@ Note that JavaScript macros work on both the client and the server, and so do no !! Macro Behaviour -Macros are just used to return a chunk of wikitext for further processing. They should not make modifications to tiddlers in the wiki store. The reason is that you cannott control when the macro is called; it may be called repeatedly as part of refresh processing. So it is important that macros do not have any other side effects beyond generating their text. - +Macros are just used to return a chunk of wikitext for further processing. They should not make modifications to tiddlers in the wiki store. The reason is that you cannot control when the macro is called; it may be called repeatedly as part of refresh processing. So it is important that macros do not have any other side effects beyond generating their text.