Fossil SCM

Merge from trunk tip.

larrybr 2021-03-26 17:53 panic-reduction merge

Commit 6e1cee191de9f8b96180c32e93c6cccef4283007738b170fbc82b3482f6362e8

Parent b5642541d641595…

2 files changed +1 -1 +4 -4

M www/changes.wiki

+1 -1

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -1,9 +1,9 @@
1	1	<title>Change Log</title>
2	2
3	3	<a name='v2_15'></a>
4		-<h2>Changes for Version 2.15 (pending)</h2>
	4	+<h2>Changes for Version 2.15 (2021-03-26)</h2>
5	5	* The [./defcsp.md\|default CSP] has been relaxed slightly to allow
6	6	images to be loaded from any URL. All other resources are still
7	7	locked down by default.
8	8	* The built-in skins all use the "[/help?cmd=mainmenu\|mainmenu]"
9	9	setting to determine the content of the main menu.
10	10

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,9 +1,9 @@
1	<title>Change Log</title>
2
3	<a name='v2_15'></a>
4	<h2>Changes for Version 2.15 (pending)</h2>
5	* The [./defcsp.md\|default CSP] has been relaxed slightly to allow
6	images to be loaded from any URL. All other resources are still
7	locked down by default.
8	* The built-in skins all use the "[/help?cmd=mainmenu\|mainmenu]"
9	setting to determine the content of the main menu.
10

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,9 +1,9 @@
1	<title>Change Log</title>
2
3	<a name='v2_15'></a>
4	<h2>Changes for Version 2.15 (2021-03-26)</h2>
5	* The [./defcsp.md\|default CSP] has been relaxed slightly to allow
6	images to be loaded from any URL. All other resources are still
7	locked down by default.
8	* The built-in skins all use the "[/help?cmd=mainmenu\|mainmenu]"
9	setting to determine the content of the main menu.
10

M www/index.wiki

+4 -4

		--- www/index.wiki
		+++ www/index.wiki
		@@ -82,16 +82,16 @@
82	82	the repository are consistent prior to each commit.
83	83
84	84	8. <b>Free and Open-Source</b> - [../COPYRIGHT-BSD2.txt\|2-clause BSD license].
85	85
86	86	<hr>
87		-<h3>Latest Release: 2.14 ([/timeline?c=version-2.14\|2021-01-20])</h3>
	87	+<h3>Latest Release: 2.15 ([/timeline?c=version-2.15\|2021-03-26])</h3>
88	88
89	89	* [/uv/download.html\|Download]
90		- * [./changes.wiki#v2_14\|Change Summary]
91		- * [/timeline?p=version-2.14&bt=version-2.13&y=ci\|Check-ins in version 2.14]
92		- * [/timeline?df=version-2.14&y=ci\|Check-ins derived from the 2.14 release]
	90	+ * [./changes.wiki#v2_15\|Change Summary]
	91	+ * [/timeline?p=version-2.15&bt=version-2.14&y=ci\|Check-ins in version 2.15]
	92	+ * [/timeline?df=version-2.15&y=ci\|Check-ins derived from the 2.15 release]
93	93	* [/timeline?t=release\|Timeline of all past releases]
94	94
95	95	<hr>
96	96	<h3>Quick Start</h3>
97	97
98	98

	--- www/index.wiki
	+++ www/index.wiki
	@@ -82,16 +82,16 @@
82	the repository are consistent prior to each commit.
83
84	8. <b>Free and Open-Source</b> - [../COPYRIGHT-BSD2.txt\|2-clause BSD license].
85
86	<hr>
87	<h3>Latest Release: 2.14 ([/timeline?c=version-2.14\|2021-01-20])</h3>
88
89	* [/uv/download.html\|Download]
90	* [./changes.wiki#v2_14\|Change Summary]
91	* [/timeline?p=version-2.14&bt=version-2.13&y=ci\|Check-ins in version 2.14]
92	* [/timeline?df=version-2.14&y=ci\|Check-ins derived from the 2.14 release]
93	* [/timeline?t=release\|Timeline of all past releases]
94
95	<hr>
96	<h3>Quick Start</h3>
97
98

	--- www/index.wiki
	+++ www/index.wiki
	@@ -82,16 +82,16 @@
82	the repository are consistent prior to each commit.
83
84	8. <b>Free and Open-Source</b> - [../COPYRIGHT-BSD2.txt\|2-clause BSD license].
85
86	<hr>
87	<h3>Latest Release: 2.15 ([/timeline?c=version-2.15\|2021-03-26])</h3>
88
89	* [/uv/download.html\|Download]
90	* [./changes.wiki#v2_15\|Change Summary]
91	* [/timeline?p=version-2.15&bt=version-2.14&y=ci\|Check-ins in version 2.15]
92	* [/timeline?df=version-2.15&y=ci\|Check-ins derived from the 2.15 release]
93	* [/timeline?t=release\|Timeline of all past releases]
94
95	<hr>
96	<h3>Quick Start</h3>
97
98