Merge branch 'tiddlywiki-com'

editions/tw5.com/tiddlers/concepts/TiddlerFields.tid

@@ -1,11 +1,11 @@
 created: 20130825213300000
-modified: 20160610081054535
+modified: 20180104000000000
 tags: Concepts
 title: TiddlerFields
 type: text/vnd.tiddlywiki
 
 \define lingo-base() $:/language/Docs/Fields/
-TiddlerFields are name:value pairs that make up a [[tiddler|Tiddlers]]. Field names must be lowercase letters, digits or the characters `-` (dash), `_` (underscore) and `.` (period).
+~TiddlerFields are name:value pairs that make up a [[tiddler|Tiddlers]]. Field names must be lowercase letters, digits or the characters `-` (dash), `_` (underscore) and `.` (period).
 
 The standard fields are:
 
@@ -30,6 +30,7 @@ Other fields used by the core are:
 |`draft.of` |DraftOfField |<<lingo draft.of>> |
 |`draft.title` |DraftTitleField |<<lingo draft.title>> |
 |`footer` |FooterField |<<lingo footer>> |
+|`hide-body`|HideBodyField|<<lingo hide-body>>|
 |`icon` |IconField |<<lingo icon>> |
 |`library` |LibraryField |<<lingo library>> |
 |`list-after` |ListAfterField |<<lingo list-after>> |
@@ -39,6 +40,7 @@ Other fields used by the core are:
 |`plugin-type` |PluginTypeField |<<lingo plugin-type>> |
 |`source` |SourceField |<<lingo source>> |
 |`subtitle` |SubtitleField |<<lingo subtitle>> |
+|`toc-link`|TocLink|<<lingo toc-link>>|
 
 The TiddlyWebAdaptor uses a few more fields:
 
@@ -46,4 +48,4 @@ The TiddlyWebAdaptor uses a few more fields:
 |`bag` |BagField |<<lingo bag>> |
 |`revision` |RevisionField |<<lingo revision>> |
 
-See the ''Advanced > Tiddler Fields'' tab of the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} for details of the fields used in this wiki.
+Details of the fields used in this ~TiddlyWiki are shown in the [[control panel|$:/ControlPanel]] {{$:/core/ui/Buttons/control-panel}} under the <<.controlpanel-tab Info>> tab >> <<.info-tab Advanced>> sub-tab >> Tiddler Fields

editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Filename.tid

@@ -1,13 +1,11 @@
 created: 20181215154811835
-modified: 20181215154811835
+modified: 20190122000000000
 tags: [[Hidden Settings]]
 title: Hidden Setting: Filename for Save Wiki Button
 type: text/vnd.tiddlywiki
 
-<<.from-version "5.1.19">> This value is wikified to determine the filename when saving via the "save wiki" page control button.
+<<.from-version "5.1.19">> When saving a ~TiddlyWiki using the <<.button save-wiki>> button, the default  file name used for saving is constructed using the Title of the ~TiddlyWiki as entered in the [[Control Panel|$:/ControlPanel]], which is stored in the tiddler [[$:/SiteTitle]].
 
-By default, this setting is empty, which triggers the default handling where the filename portion of the URL is used.
+The value used is in the form `{{$:/SiteTitle}}.html`. This causes the filename to be constructed from the site Title with a `.html` extension.
 
-The value `{{$:/SiteTitle}}.html` causes the filename to be constructed from the site title with a `.html` extension.
-
-$:/config/SaveWikiButton/Filename
+If a tiddler named [[$:/config/SaveWikiButton/Filename]] is created, the text in that tiddler will be used as the default file name used for saving the ~TiddlyWiki.

editions/tw5.com/tiddlers/howtos/Editor toolbar.tid

@@ -4,21 +4,16 @@ tags: Features [[Formatting text in TiddlyWiki]]
 title: Editor toolbar
 type: text/vnd.tiddlywiki
 
-tags: Features [[Formatting text in TiddlyWiki]]
-title: Editor toolbar
-type: text/vnd.tiddlywiki
-
 !! How it Works
 
 The editor toolbar is a toolbar that helps you format text easily. It appears above the text input field in a tiddler when in edit mode. It has a similar appearance to desktop text editors like Microsoft Word or Libre Office Write. 
 
-
 !! What the Editor toolbar does
 When you press the button for a function, it will insert the WikiText in the text field. As an example, if you press the bold button it will insert `'' ''`. 
 
 If you ''highlight'' a piece of text the markup code will automatically go around the highlighted text.
 
-If you are in another mode, like MarkDown, the toolbar will change to that syntax and insert appropriate code. However It will not change previously typed text or markup.
+If you are in another mode, like [[MarkDown|Markdown Plugin]], the toolbar will change to that syntax and insert appropriate code. However It will not change previously typed text or markup.
 
 Besides the standard WikiText formatting, the Editor toolbar has the following buttons:
 

editions/tw5.com/tiddlers/webserver/Using HTTPS.tid

@@ -15,5 +15,5 @@ To create the required certificate files with the popular [[openssl|https://www.
 ```
 openssl req -newkey rsa:2048 -new -nodes -keyout mywikifolder/key.pem -out mywikifolder/csr.pem
 openssl x509 -req -days 365 -in mywikifolder/csr.pem -signkey mywikifolder/key.pem -out mywikifolder/server.crt
-tiddlywiki mywikifolder --listen username=joe password=bloggs tlskey=key.pem tlscert=server.crt
+tiddlywiki mywikifolder --listen username=joe password=bloggs tls-key=key.pem tls-cert=server.crt
 ```

editions/tw5.com/tiddlers/widgets/CountWidget.tid

@@ -1,6 +1,6 @@
 title: CountWidget
 created: 201310241419
-modified: 201310300837
+modified: 20181231131
 tags: Widgets
 caption: count
 
@@ -14,3 +14,6 @@ The content of the `<$count>` widget is ignored.
 
 |!Attribute |!Description |
 |filter |The filter expression to count |
+
+! Example
+<<wikitext-example-without-html """There are <$count filter="[tag[Examples]]"/> tiddlers tagged with Examples""">>

licenses/cla-individual.md

@@ -349,3 +349,7 @@ Moritz Ulrich, @the-kenny, 2019/01/03
 Johannes Löthberg, @kyrias, 2019/01/07
 
 Ben Webber, @benwebber, 2019/01/09
+
+Jesse Weinstein, @JesseWeinstein, 2019/01/14
+
+Adam Sherwood, @admls, 2019/01/27