Merge branch 'tiddlywiki-com'

editions/tw5.com/tiddlers/definitions/Federatial.tid

@@ -1,21 +0,0 @@
-created: 20130825154900000
-modified: 20170718160846820
-modified: 20221204165636777
-tags: Definitions
-title: Federatial
-type: text/vnd.tiddlywiki
-
-Federatial Limited helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools. Services include:
-
-* Consultancy advice on TiddlyWiki adoption
-* Development of custom solutions based on TiddlyWiki
-* Multi-user TiddlyWiki hosting – no outages since 2016
-* Sponsorship of TiddlyWiki core development
-
-See https://federatial.com/ and https://twitter.com/federatial for more information.
-
-JeremyRuston founded Federatial Limited in 2011 to support his work on TiddlyWiki for the advertised 25 years. Since then, Federatial has been privileged to have worked with a wide range of fantastic clients in very different sectors, on some very diverse projects:
-
-* For a law firm in the Washington DC, developing a custom multi-user ~TiddlyWiki application. It replaced a Microsoft Word document hosted on ~SharePoint that had grown to 18,000 pages and 10 million words, and was increasingly unwieldy to manage. We converted the document to a non-linear TiddlyWiki structure. Startup, searching and browsing are an order of magnitude faster than using Word and ~SharePoint
-* For a publishing firm in Paris, devising a new TiddlyWiki-based format for interactive electronic publications (including conversion from the established EPUB format). See https://twpub-tools.org/
-* For a charity in London, maintaining a multiuser instance of TiddlyWiki running on Amazon's serverless infrastructure. It has more than 1,000 users, and over 15,000 tiddlers in 500 interlinked wikis. See https://manuals.annafreud.org/ambit

editions/tw5.com/tiddlers/definitions/Intertwingled Innovations.tid

@@ -0,0 +1,9 @@
+created: 20240726184622817
+modified: 20240726184622817
+tags: Definitions
+title: Intertwingled Innovations
+type: text/vnd.tiddlywiki
+
+Intertwingled Innovations Limited is the company through which [[JeremyRuston]] performs commercial consultancy work helping companies and individuals release the businesss value of TiddlyWiki.
+
+See https://intertwingledinnovations.com/ for more information.

editions/tw5.com/tiddlers/definitions/JeremyRuston.tid

@@ -4,7 +4,7 @@ tags: Definitions
 title: JeremyRuston
 type: text/vnd.tiddlywiki
 
-I'm the original inventor of TiddlyWiki. You can hire me through [[Federatial]], and find me on these services:
+I'm the original inventor of TiddlyWiki. You can hire me through [[Intertwingled Innovations]], and find me on these services:
 
 * jeremy (at) jermolene (dot) com
 * [[Jermolene on GitHub|https://github.com/Jermolene]]

editions/tw5.com/tiddlers/definitions/Xememex.tid

@@ -5,10 +5,10 @@ modified: 20230410105035569
 
 <span style="float:right;">[img width=340 [Xememex Logo]]</span>
 
-Xememex is a multiuser TiddlyWiki from [[Federatial]]. It allows large groups of people to work together on intertwingled wikis that can share content. It is implemented as a serverless application on Amazon Web Services.
+Xememex is a multiuser TiddlyWiki from [[Intertwingled Innovations]]. It allows large groups of people to work together on intertwingled wikis that can share content. It is implemented as a serverless application on Amazon Web Services.
 
 The largest customer implementation has hundreds of online wikis with thousands of users. See https://manuals.annafreud.org/
 
-Xememex is currently only available under commercial terms from Federatial. Contact [[Jeremy Ruston at Federatial|mailto:jeremy@federatial.com]] for more details.
+Xememex is currently only available under commercial terms from Intertwingled Innovations. Contact [[Jeremy Ruston at Intertwingled Innovations|mailto:jeremy@intertwingledinnovations.com]] for more details.
 
 <div style="clear: both;"/>

editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid

@@ -1,5 +1,5 @@
 created: 20150414070451144
-list: [[HelloThumbnail - Newsletter]] [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Federatial]]
+list: [[HelloThumbnail - Newsletter]] [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Intertwingled Innovations]]
 modified: 20150414070948246
 title: HelloThumbnail
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/hellothere/quickstart/xememex.tid

@@ -7,4 +7,4 @@ button-text: Find out more
 background: linear-gradient(90deg,#fff1fe, #ffffff)
 link: Xememex
 
-For companies and teams, a multiuser ~TiddlyWiki from Federatial
+For companies and teams, a multiuser ~TiddlyWiki from Intertwingled Innovations

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Intertwingled Innovations.tid

@@ -0,0 +1,10 @@
+background-color: #EDB431
+caption: Intertwingled Innovations
+color: #ff0
+image: Intertwingled Innovations.png
+link: Intertwingled Innovations
+tags: HelloThumbnail
+title: HelloThumbnail - Intertwingled Innovations
+type: text/vnd.tiddlywiki
+
+Support the development of ~TiddlyWiki by hiring Jeremy Ruston through Intertwingled Innovations Limited

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid

@@ -1,11 +0,0 @@
-background-color: #EDB431
-caption: Federatial
-color: #ff0
-image: Federatial.png
-link: Federatial
-tags: HelloThumbnail
-title: HelloThumbnail - Federatial
-type: text/vnd.tiddlywiki
-ribbon-text: NEW
-
-Support the development of ~TiddlyWiki by hiring Jeremy Ruston through Federatial Limited

editions/tw5.com/tiddlers/images/Federatial.png.meta

@@ -1,3 +0,0 @@
-title: Federatial.png
-type: image/png
-tags: picture

editions/tw5.com/tiddlers/images/Intertwingled Innovations.png.meta

@@ -0,0 +1,3 @@
+title: Intertwingled Innovations.png
+type: image/png
+tags: picture

licenses/cla-entity.md

@@ -102,7 +102,7 @@ List of Contributors
 
 The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Entity Contributor License Agreement" as of **the date** beside his or her **real name**, **GitHub account name** and **Entity name**.
 
-eg: Jeremy Ruston, @Jermolene for Federatial Limited, 2011/11/22
+eg: Jeremy Ruston, @Jermolene for Intertwingled Innovations Limited, 2011/11/22
 
 ## Contributors
 
@@ -111,3 +111,5 @@ Jeremy Ruston, @Jermolene for Federatial Limited, 2011/11/22
 Google Inc, 2015/12/21
 
 Brooks Boyd, @MidnightLightning for MidnightDesign, LLC 2019/03/21
+
+Jeremy Ruston, @Jermolene for Intertwingled Innovations Limited, 2024/07/26

licenses/cla-individual.md

@@ -583,3 +583,5 @@ Andrei Rybak, @rybak, 2024/06/09
 Michael McDermott, @michaeljmcd, 2024-07-09
 
 @webplusai, 2024/07/23
+
+Val Packett, @valpackett, 2024/07/26