26eef7f84ad… — Fossil SCM

M src/attach.c

+2 -2

		--- src/attach.c
		+++ src/attach.c
		@@ -30,12 +30,12 @@
30	30	**
31	31	** At most one of technote=, tkt= or page= are supplied.
32	32	** If none is given, all attachments are listed. If one is given,
33	33	** only attachments for the designated technote, ticket or wiki page
34	34	** are shown. TECHNOTEUUID and TICKETUUID may be just a prefix of the
35		-** relevant tech note or ticket, in which case all attachments of all
36		-** tech notes or tickets with the prefix will be listed.
	35	+** relevant technical note or ticket, in which case all attachments
	36	+** of all technical notes or tickets with the prefix will be listed.
37	37	*/
38	38	void attachlist_page(void){
39	39	const char *zPage = P("page");
40	40	const char *zTkt = P("tkt");
41	41	const char *zTechNote = P("technote");
42	42

	--- src/attach.c
	+++ src/attach.c
	@@ -30,12 +30,12 @@
30	**
31	** At most one of technote=, tkt= or page= are supplied.
32	** If none is given, all attachments are listed. If one is given,
33	** only attachments for the designated technote, ticket or wiki page
34	** are shown. TECHNOTEUUID and TICKETUUID may be just a prefix of the
35	** relevant tech note or ticket, in which case all attachments of all
36	** tech notes or tickets with the prefix will be listed.
37	*/
38	void attachlist_page(void){
39	const char *zPage = P("page");
40	const char *zTkt = P("tkt");
41	const char *zTechNote = P("technote");
42

	--- src/attach.c
	+++ src/attach.c
	@@ -30,12 +30,12 @@
30	**
31	** At most one of technote=, tkt= or page= are supplied.
32	** If none is given, all attachments are listed. If one is given,
33	** only attachments for the designated technote, ticket or wiki page
34	** are shown. TECHNOTEUUID and TICKETUUID may be just a prefix of the
35	** relevant technical note or ticket, in which case all attachments
36	** of all technical notes or tickets with the prefix will be listed.
37	*/
38	void attachlist_page(void){
39	const char *zPage = P("page");
40	const char *zTkt = P("tkt");
41	const char *zTechNote = P("technote");
42

M src/browse.c

+1 -1

		--- src/browse.c
		+++ src/browse.c
		@@ -999,11 +999,11 @@
999	999	}
1000	1000	db_finalize(&q);
1001	1001	}
1002	1002
1003	1003	/*
1004		-** WEBPAGE: fileage
	1004	+** WEBPAGE: fileage
1005	1005	**
1006	1006	** Show all files in a single check-in (identified by the name= query
1007	1007	** parameter) in order of increasing age.
1008	1008	**
1009	1009	** Parameters:
1010	1010

	--- src/browse.c
	+++ src/browse.c
	@@ -999,11 +999,11 @@
999	}
1000	db_finalize(&q);
1001	}
1002
1003	/*
1004	** WEBPAGE: fileage
1005	**
1006	** Show all files in a single check-in (identified by the name= query
1007	** parameter) in order of increasing age.
1008	**
1009	** Parameters:
1010

	--- src/browse.c
	+++ src/browse.c
	@@ -999,11 +999,11 @@
999	}
1000	db_finalize(&q);
1001	}
1002
1003	/*
1004	** WEBPAGE: fileage
1005	**
1006	** Show all files in a single check-in (identified by the name= query
1007	** parameter) in order of increasing age.
1008	**
1009	** Parameters:
1010

M src/content.c

+4 -4

		--- src/content.c
		+++ src/content.c
		@@ -334,11 +334,11 @@
334	334	content_get(rid, &content);
335	335	blob_write_to_file(&content, zFile);
336	336	}
337	337
338	338	/*
339		-** COMMAND: test-content-rawget
	339	+** COMMAND: test-content-rawget
340	340	**
341	341	** Extract a blob from the database and write it into a file. This
342	342	** version does not expand the delta.
343	343	*/
344	344	void test_content_rawget_cmd(void){
		@@ -663,11 +663,11 @@
663	663	return rid;
664	664	}
665	665
666	666
667	667	/*
668		-** COMMAND: test-content-put
	668	+** COMMAND: test-content-put
669	669	**
670	670	** Usage: %fossil test-content-put FILE
671	671	**
672	672	** Read the content of FILE and add it to the Blob table as a new
673	673	** artifact using a direct call to content_put().
		@@ -703,11 +703,11 @@
703	703	}
704	704	}
705	705	}
706	706
707	707	/*
708		-** COMMAND: test-content-undelta
	708	+** COMMAND: test-content-undelta
709	709	**
710	710	** Make sure the content at RECORDID is not a delta
711	711	*/
712	712	void test_content_undelta_cmd(void){
713	713	int rid;
		@@ -814,11 +814,11 @@
814	814	blob_reset(&delta);
815	815	return rc;
816	816	}
817	817
818	818	/*
819		-** COMMAND: test-content-deltify
	819	+** COMMAND: test-content-deltify
820	820	**
821	821	** Convert the content at RID into a delta from SRCID.
822	822	*/
823	823	void test_content_deltify_cmd(void){
824	824	if( g.argc!=5 ) usage("RID SRCID FORCE");
825	825

	--- src/content.c
	+++ src/content.c
	@@ -334,11 +334,11 @@
334	content_get(rid, &content);
335	blob_write_to_file(&content, zFile);
336	}
337
338	/*
339	** COMMAND: test-content-rawget
340	**
341	** Extract a blob from the database and write it into a file. This
342	** version does not expand the delta.
343	*/
344	void test_content_rawget_cmd(void){
	@@ -663,11 +663,11 @@
663	return rid;
664	}
665
666
667	/*
668	** COMMAND: test-content-put
669	**
670	** Usage: %fossil test-content-put FILE
671	**
672	** Read the content of FILE and add it to the Blob table as a new
673	** artifact using a direct call to content_put().
	@@ -703,11 +703,11 @@
703	}
704	}
705	}
706
707	/*
708	** COMMAND: test-content-undelta
709	**
710	** Make sure the content at RECORDID is not a delta
711	*/
712	void test_content_undelta_cmd(void){
713	int rid;
	@@ -814,11 +814,11 @@
814	blob_reset(&delta);
815	return rc;
816	}
817
818	/*
819	** COMMAND: test-content-deltify
820	**
821	** Convert the content at RID into a delta from SRCID.
822	*/
823	void test_content_deltify_cmd(void){
824	if( g.argc!=5 ) usage("RID SRCID FORCE");
825

	--- src/content.c
	+++ src/content.c
	@@ -334,11 +334,11 @@
334	content_get(rid, &content);
335	blob_write_to_file(&content, zFile);
336	}
337
338	/*
339	** COMMAND: test-content-rawget
340	**
341	** Extract a blob from the database and write it into a file. This
342	** version does not expand the delta.
343	*/
344	void test_content_rawget_cmd(void){
	@@ -663,11 +663,11 @@
663	return rid;
664	}
665
666
667	/*
668	** COMMAND: test-content-put
669	**
670	** Usage: %fossil test-content-put FILE
671	**
672	** Read the content of FILE and add it to the Blob table as a new
673	** artifact using a direct call to content_put().
	@@ -703,11 +703,11 @@
703	}
704	}
705	}
706
707	/*
708	** COMMAND: test-content-undelta
709	**
710	** Make sure the content at RECORDID is not a delta
711	*/
712	void test_content_undelta_cmd(void){
713	int rid;
	@@ -814,11 +814,11 @@
814	blob_reset(&delta);
815	return rc;
816	}
817
818	/*
819	** COMMAND: test-content-deltify
820	**
821	** Convert the content at RID into a delta from SRCID.
822	*/
823	void test_content_deltify_cmd(void){
824	if( g.argc!=5 ) usage("RID SRCID FORCE");
825

M src/deltacmd.c

+4 -4

		--- src/deltacmd.c
		+++ src/deltacmd.c
		@@ -41,11 +41,11 @@
41	41	blob_resize(pDelta, len);
42	42	return 0;
43	43	}
44	44
45	45	/*
46		-** COMMAND: test-delta-create
	46	+** COMMAND: test-delta-create
47	47	**
48	48	** Usage: %fossil test-delta-create FILE1 FILE2 DELTA
49	49	**
50	50	** Create and output a delta that carries FILE1 into FILE2.
51	51	** Store the result in DELTA.
		@@ -69,11 +69,11 @@
69	69	blob_reset(&target);
70	70	blob_reset(&delta);
71	71	}
72	72
73	73	/*
74		-** COMMAND: test-delta-analyze
	74	+** COMMAND: test-delta-analyze
75	75	**
76	76	** Usage: %fossil test-delta-analyze FILE1 FILE2
77	77	**
78	78	** Create and a delta that carries FILE1 into FILE2. Print the
79	79	** number bytes copied and the number of bytes inserted.
		@@ -141,11 +141,11 @@
141	141	*pTarget = out;
142	142	return len;
143	143	}
144	144
145	145	/*
146		-** COMMAND: test-delta-apply
	146	+** COMMAND: test-delta-apply
147	147	**
148	148	** Usage: %fossil test-delta-apply FILE1 DELTA
149	149	**
150	150	** Apply DELTA to FILE1 and output the result.
151	151	*/
		@@ -169,11 +169,11 @@
169	169	blob_reset(&delta);
170	170	}
171	171
172	172
173	173	/*
174		-** COMMAND: test-delta
	174	+** COMMAND: test-delta
175	175	**
176	176	** Usage: %fossil test-delta FILE1 FILE2
177	177	**
178	178	** Read two files named on the command-line. Create and apply deltas
179	179	** going in both directions. Verify that the original files are
180	180

	--- src/deltacmd.c
	+++ src/deltacmd.c
	@@ -41,11 +41,11 @@
41	blob_resize(pDelta, len);
42	return 0;
43	}
44
45	/*
46	** COMMAND: test-delta-create
47	**
48	** Usage: %fossil test-delta-create FILE1 FILE2 DELTA
49	**
50	** Create and output a delta that carries FILE1 into FILE2.
51	** Store the result in DELTA.
	@@ -69,11 +69,11 @@
69	blob_reset(&target);
70	blob_reset(&delta);
71	}
72
73	/*
74	** COMMAND: test-delta-analyze
75	**
76	** Usage: %fossil test-delta-analyze FILE1 FILE2
77	**
78	** Create and a delta that carries FILE1 into FILE2. Print the
79	** number bytes copied and the number of bytes inserted.
	@@ -141,11 +141,11 @@
141	*pTarget = out;
142	return len;
143	}
144
145	/*
146	** COMMAND: test-delta-apply
147	**
148	** Usage: %fossil test-delta-apply FILE1 DELTA
149	**
150	** Apply DELTA to FILE1 and output the result.
151	*/
	@@ -169,11 +169,11 @@
169	blob_reset(&delta);
170	}
171
172
173	/*
174	** COMMAND: test-delta
175	**
176	** Usage: %fossil test-delta FILE1 FILE2
177	**
178	** Read two files named on the command-line. Create and apply deltas
179	** going in both directions. Verify that the original files are
180

	--- src/deltacmd.c
	+++ src/deltacmd.c
	@@ -41,11 +41,11 @@
41	blob_resize(pDelta, len);
42	return 0;
43	}
44
45	/*
46	** COMMAND: test-delta-create
47	**
48	** Usage: %fossil test-delta-create FILE1 FILE2 DELTA
49	**
50	** Create and output a delta that carries FILE1 into FILE2.
51	** Store the result in DELTA.
	@@ -69,11 +69,11 @@
69	blob_reset(&target);
70	blob_reset(&delta);
71	}
72
73	/*
74	** COMMAND: test-delta-analyze
75	**
76	** Usage: %fossil test-delta-analyze FILE1 FILE2
77	**
78	** Create and a delta that carries FILE1 into FILE2. Print the
79	** number bytes copied and the number of bytes inserted.
	@@ -141,11 +141,11 @@
141	*pTarget = out;
142	return len;
143	}
144
145	/*
146	** COMMAND: test-delta-apply
147	**
148	** Usage: %fossil test-delta-apply FILE1 DELTA
149	**
150	** Apply DELTA to FILE1 and output the result.
151	*/
	@@ -169,11 +169,11 @@
169	blob_reset(&delta);
170	}
171
172
173	/*
174	** COMMAND: test-delta
175	**
176	** Usage: %fossil test-delta FILE1 FILE2
177	**
178	** Read two files named on the command-line. Create and apply deltas
179	** going in both directions. Verify that the original files are
180

M src/descendants.c

+1 -1

		--- src/descendants.c
		+++ src/descendants.c
		@@ -431,11 +431,11 @@
431	431	fossil_free(zLastBr);
432	432	db_finalize(&q);
433	433	}
434	434
435	435	/*
436		-** WEBPAGE: leaves
	436	+** WEBPAGE: leaves
437	437	**
438	438	** Show leaf check-ins in a timeline. By default only open leaves
439	439	** are listed.
440	440	**
441	441	** A "leaf" is a check-in with no children in the same branch. A
442	442

	--- src/descendants.c
	+++ src/descendants.c
	@@ -431,11 +431,11 @@
431	fossil_free(zLastBr);
432	db_finalize(&q);
433	}
434
435	/*
436	** WEBPAGE: leaves
437	**
438	** Show leaf check-ins in a timeline. By default only open leaves
439	** are listed.
440	**
441	** A "leaf" is a check-in with no children in the same branch. A
442

	--- src/descendants.c
	+++ src/descendants.c
	@@ -431,11 +431,11 @@
431	fossil_free(zLastBr);
432	db_finalize(&q);
433	}
434
435	/*
436	** WEBPAGE: leaves
437	**
438	** Show leaf check-ins in a timeline. By default only open leaves
439	** are listed.
440	**
441	** A "leaf" is a check-in with no children in the same branch. A
442

M src/diffcmd.c

+6 -6

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -797,19 +797,19 @@
797	797	** --brief Show filenames only
798	798	** --context\|-c N Use N lines of context
799	799	** --diff-binary BOOL Include binary files when using external commands
800	800	** --exec-abs-paths Force absolute path names with external commands.
801	801	** --exec-rel-paths Force relative path names with external commands.
802		-** --from\|-r VERSION select VERSION as source for the diff
803		-** --internal\|-i use internal diff logic
804		-** --side-by-side\|-y side-by-side diff
	802	+** --from\|-r VERSION Select VERSION as source for the diff
	803	+** --internal\|-i Use internal diff logic
	804	+** --side-by-side\|-y Side-by-side diff
805	805	** --strip-trailing-cr Strip trailing CR
806	806	** --tk Launch a Tcl/Tk GUI for display
807		-** --to VERSION select VERSION as target for the diff
	807	+** --to VERSION Select VERSION as target for the diff
808	808	** --undo Diff against the "undo" buffer
809		-** --unified unified diff
810		-** -v\|--verbose output complete text of added or deleted files
	809	+** --unified Unified diff
	810	+** -v\|--verbose Output complete text of added or deleted files
811	811	** -w\|--ignore-all-space Ignore white space when comparing lines
812	812	** -W\|--width <num> Width of lines in side-by-side diff
813	813	** -Z\|--ignore-trailing-space Ignore changes to end-of-line whitespace
814	814	*/
815	815	void diff_cmd(void){
816	816

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -797,19 +797,19 @@
797	** --brief Show filenames only
798	** --context\|-c N Use N lines of context
799	** --diff-binary BOOL Include binary files when using external commands
800	** --exec-abs-paths Force absolute path names with external commands.
801	** --exec-rel-paths Force relative path names with external commands.
802	** --from\|-r VERSION select VERSION as source for the diff
803	** --internal\|-i use internal diff logic
804	** --side-by-side\|-y side-by-side diff
805	** --strip-trailing-cr Strip trailing CR
806	** --tk Launch a Tcl/Tk GUI for display
807	** --to VERSION select VERSION as target for the diff
808	** --undo Diff against the "undo" buffer
809	** --unified unified diff
810	** -v\|--verbose output complete text of added or deleted files
811	** -w\|--ignore-all-space Ignore white space when comparing lines
812	** -W\|--width <num> Width of lines in side-by-side diff
813	** -Z\|--ignore-trailing-space Ignore changes to end-of-line whitespace
814	*/
815	void diff_cmd(void){
816

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -797,19 +797,19 @@
797	** --brief Show filenames only
798	** --context\|-c N Use N lines of context
799	** --diff-binary BOOL Include binary files when using external commands
800	** --exec-abs-paths Force absolute path names with external commands.
801	** --exec-rel-paths Force relative path names with external commands.
802	** --from\|-r VERSION Select VERSION as source for the diff
803	** --internal\|-i Use internal diff logic
804	** --side-by-side\|-y Side-by-side diff
805	** --strip-trailing-cr Strip trailing CR
806	** --tk Launch a Tcl/Tk GUI for display
807	** --to VERSION Select VERSION as target for the diff
808	** --undo Diff against the "undo" buffer
809	** --unified Unified diff
810	** -v\|--verbose Output complete text of added or deleted files
811	** -w\|--ignore-all-space Ignore white space when comparing lines
812	** -W\|--width <num> Width of lines in side-by-side diff
813	** -Z\|--ignore-trailing-space Ignore changes to end-of-line whitespace
814	*/
815	void diff_cmd(void){
816

M src/doc.c

+5 -5

		--- src/doc.c
		+++ src/doc.c
		@@ -346,11 +346,11 @@
346	346	}
347	347	return "application/x-fossil-artifact";
348	348	}
349	349
350	350	/*
351		-** COMMAND: test-mimetype
	351	+** COMMAND: test-mimetype
352	352	**
353	353	** Usage: %fossil test-mimetype FILENAME...
354	354	**
355	355	** Return the deduced mimetype for each file listed.
356	356	**
		@@ -551,14 +551,14 @@
551	551	** with TH1 embedded documentation support and the "th1-docs" setting is
552	552	** enabled, the name "FILE/index.th1" is also tried. If none of those are
553	553	** found, then FILE is completely replaced by "404.md" and tried. If that
554	554	** is not found, then a default 404 screen is generated.
555	555	**
556		-** Headers and footers are added for text/x-fossil-wiki and text/md
557		-** If the document has mimetype text/html then headers and footers are
558		-** usually not added. However, a text/html document begins with the
559		-** following div:
	556	+** If the file's mimetype is "text/x-fossil-wiki" or "text/x-markdown"
	557	+** then headers and footers are added. If the document has mimetype
	558	+** text/html then headers and footers are usually not added. However,
	559	+** if a "text/html" document begins with the following div:
560	560	**
561	561	** <div class='fossil-doc' data-title='TEXT'>
562	562	**
563	563	** then headers and footers are supplied. The optional data-title field
564	564	** specifies the title of the document in that case.
565	565

	--- src/doc.c
	+++ src/doc.c
	@@ -346,11 +346,11 @@
346	}
347	return "application/x-fossil-artifact";
348	}
349
350	/*
351	** COMMAND: test-mimetype
352	**
353	** Usage: %fossil test-mimetype FILENAME...
354	**
355	** Return the deduced mimetype for each file listed.
356	**
	@@ -551,14 +551,14 @@
551	** with TH1 embedded documentation support and the "th1-docs" setting is
552	** enabled, the name "FILE/index.th1" is also tried. If none of those are
553	** found, then FILE is completely replaced by "404.md" and tried. If that
554	** is not found, then a default 404 screen is generated.
555	**
556	** Headers and footers are added for text/x-fossil-wiki and text/md
557	** If the document has mimetype text/html then headers and footers are
558	** usually not added. However, a text/html document begins with the
559	** following div:
560	**
561	** <div class='fossil-doc' data-title='TEXT'>
562	**
563	** then headers and footers are supplied. The optional data-title field
564	** specifies the title of the document in that case.
565

	--- src/doc.c
	+++ src/doc.c
	@@ -346,11 +346,11 @@
346	}
347	return "application/x-fossil-artifact";
348	}
349
350	/*
351	** COMMAND: test-mimetype
352	**
353	** Usage: %fossil test-mimetype FILENAME...
354	**
355	** Return the deduced mimetype for each file listed.
356	**
	@@ -551,14 +551,14 @@
551	** with TH1 embedded documentation support and the "th1-docs" setting is
552	** enabled, the name "FILE/index.th1" is also tried. If none of those are
553	** found, then FILE is completely replaced by "404.md" and tried. If that
554	** is not found, then a default 404 screen is generated.
555	**
556	** If the file's mimetype is "text/x-fossil-wiki" or "text/x-markdown"
557	** then headers and footers are added. If the document has mimetype
558	** text/html then headers and footers are usually not added. However,
559	** if a "text/html" document begins with the following div:
560	**
561	** <div class='fossil-doc' data-title='TEXT'>
562	**
563	** then headers and footers are supplied. The optional data-title field
564	** specifies the title of the document in that case.
565

M src/event.c

+9 -7

		--- src/event.c
		+++ src/event.c
		@@ -49,19 +49,21 @@
49	49
50	50	/*
51	51	** WEBPAGE: technote
52	52	** WEBPAGE: event
53	53	**
54		-** Display a "technical note" or "tech-note" (formerly called an "event").
	54	+** Display a technical note (formerly called an "event").
55	55	**
56	56	** PARAMETERS:
57	57	**
58		-** name=ID // Identify the tech-note to display. ID must be complete
59		-** aid=ARTIFACTID // Which specific version of the tech-note. Optional.
60		-** v=BOOLEAN // Show details if TRUE. Default is FALSE. Optional.
	58	+** name=ID Identify the technical note to display. ID must be
	59	+** complete.
	60	+** aid=ARTIFACTID Which specific version of the tech-note. Optional.
	61	+** v=BOOLEAN Show details if TRUE. Default is FALSE. Optional.
61	62	**
62		-** Display an existing event identified by EVENTID
	63	+** Display an existing tech-note identified by its ID, optionally at a
	64	+** specific version, and optionally with additional details.
63	65	*/
64	66	void event_page(void){
65	67	int rid = 0; /* rid of the event artifact */
66	68	char zUuid; / UUID corresponding to rid */
67	69	const char zId; / Event identifier */
		@@ -340,15 +342,15 @@
340	342
341	343	/*
342	344	** WEBPAGE: technoteedit
343	345	** WEBPAGE: eventedit
344	346	**
345		-** Revise or create a technical note (formerly called an 'event').
	347	+** Revise or create a technical note (formerly called an "event").
346	348	**
347	349	** Parameters:
348	350	**
349		-** name=ID Hex hash ID of the tech-note. If omitted, a new
	351	+** name=ID Hex hash ID of the tech-note. If omitted, a new
350	352	** tech-note is created.
351	353	*/
352	354	void eventedit_page(void){
353	355	char *zTag;
354	356	int rid = 0;
355	357

	--- src/event.c
	+++ src/event.c
	@@ -49,19 +49,21 @@
49
50	/*
51	** WEBPAGE: technote
52	** WEBPAGE: event
53	**
54	** Display a "technical note" or "tech-note" (formerly called an "event").
55	**
56	** PARAMETERS:
57	**
58	** name=ID // Identify the tech-note to display. ID must be complete
59	** aid=ARTIFACTID // Which specific version of the tech-note. Optional.
60	** v=BOOLEAN // Show details if TRUE. Default is FALSE. Optional.

61	**
62	** Display an existing event identified by EVENTID

63	*/
64	void event_page(void){
65	int rid = 0; /* rid of the event artifact */
66	char zUuid; / UUID corresponding to rid */
67	const char zId; / Event identifier */
	@@ -340,15 +342,15 @@
340
341	/*
342	** WEBPAGE: technoteedit
343	** WEBPAGE: eventedit
344	**
345	** Revise or create a technical note (formerly called an 'event').
346	**
347	** Parameters:
348	**
349	** name=ID Hex hash ID of the tech-note. If omitted, a new
350	** tech-note is created.
351	*/
352	void eventedit_page(void){
353	char *zTag;
354	int rid = 0;
355

	--- src/event.c
	+++ src/event.c
	@@ -49,19 +49,21 @@
49
50	/*
51	** WEBPAGE: technote
52	** WEBPAGE: event
53	**
54	** Display a technical note (formerly called an "event").
55	**
56	** PARAMETERS:
57	**
58	** name=ID Identify the technical note to display. ID must be
59	** complete.
60	** aid=ARTIFACTID Which specific version of the tech-note. Optional.
61	** v=BOOLEAN Show details if TRUE. Default is FALSE. Optional.
62	**
63	** Display an existing tech-note identified by its ID, optionally at a
64	** specific version, and optionally with additional details.
65	*/
66	void event_page(void){
67	int rid = 0; /* rid of the event artifact */
68	char zUuid; / UUID corresponding to rid */
69	const char zId; / Event identifier */
	@@ -340,15 +342,15 @@
342
343	/*
344	** WEBPAGE: technoteedit
345	** WEBPAGE: eventedit
346	**
347	** Revise or create a technical note (formerly called an "event").
348	**
349	** Parameters:
350	**
351	** name=ID Hex hash ID of the tech-note. If omitted, a new
352	** tech-note is created.
353	*/
354	void eventedit_page(void){
355	char *zTag;
356	int rid = 0;
357

M src/file.c

+3 -3

		--- src/file.c
		+++ src/file.c
		@@ -922,11 +922,11 @@
922	922	blob_resize(pOut, file_simplify_name(blob_buffer(pOut),
923	923	blob_size(pOut), slash));
924	924	}
925	925
926	926	/*
927		-** COMMAND: test-canonical-name
	927	+** COMMAND: test-canonical-name
928	928	** Usage: %fossil test-canonical-name FILENAME...
929	929	**
930	930	** Test the operation of the canonical name generator.
931	931	** Also test Fossil's ability to measure attributes of a file.
932	932	*/
		@@ -1059,11 +1059,11 @@
1059	1059	memcpy(pOut, &tmp, sizeof(tmp));
1060	1060	}
1061	1061	}
1062	1062
1063	1063	/*
1064		-** COMMAND: test-relative-name
	1064	+** COMMAND: test-relative-name
1065	1065	**
1066	1066	** Test the operation of the relative name generator.
1067	1067	*/
1068	1068	void cmd_test_relative_name(void){
1069	1069	int i;
		@@ -1173,11 +1173,11 @@
1173	1173	blob_reset(&full);
1174	1174	return 1;
1175	1175	}
1176	1176
1177	1177	/*
1178		-** COMMAND: test-tree-name
	1178	+** COMMAND: test-tree-name
1179	1179	**
1180	1180	** Test the operation of the tree name generator.
1181	1181	**
1182	1182	** Options:
1183	1183	** --absolute Return an absolute path instead of a relative one.
1184	1184

	--- src/file.c
	+++ src/file.c
	@@ -922,11 +922,11 @@
922	blob_resize(pOut, file_simplify_name(blob_buffer(pOut),
923	blob_size(pOut), slash));
924	}
925
926	/*
927	** COMMAND: test-canonical-name
928	** Usage: %fossil test-canonical-name FILENAME...
929	**
930	** Test the operation of the canonical name generator.
931	** Also test Fossil's ability to measure attributes of a file.
932	*/
	@@ -1059,11 +1059,11 @@
1059	memcpy(pOut, &tmp, sizeof(tmp));
1060	}
1061	}
1062
1063	/*
1064	** COMMAND: test-relative-name
1065	**
1066	** Test the operation of the relative name generator.
1067	*/
1068	void cmd_test_relative_name(void){
1069	int i;
	@@ -1173,11 +1173,11 @@
1173	blob_reset(&full);
1174	return 1;
1175	}
1176
1177	/*
1178	** COMMAND: test-tree-name
1179	**
1180	** Test the operation of the tree name generator.
1181	**
1182	** Options:
1183	** --absolute Return an absolute path instead of a relative one.
1184

	--- src/file.c
	+++ src/file.c
	@@ -922,11 +922,11 @@
922	blob_resize(pOut, file_simplify_name(blob_buffer(pOut),
923	blob_size(pOut), slash));
924	}
925
926	/*
927	** COMMAND: test-canonical-name
928	** Usage: %fossil test-canonical-name FILENAME...
929	**
930	** Test the operation of the canonical name generator.
931	** Also test Fossil's ability to measure attributes of a file.
932	*/
	@@ -1059,11 +1059,11 @@
1059	memcpy(pOut, &tmp, sizeof(tmp));
1060	}
1061	}
1062
1063	/*
1064	** COMMAND: test-relative-name
1065	**
1066	** Test the operation of the relative name generator.
1067	*/
1068	void cmd_test_relative_name(void){
1069	int i;
	@@ -1173,11 +1173,11 @@
1173	blob_reset(&full);
1174	return 1;
1175	}
1176
1177	/*
1178	** COMMAND: test-tree-name
1179	**
1180	** Test the operation of the tree name generator.
1181	**
1182	** Options:
1183	** --absolute Return an absolute path instead of a relative one.
1184

M src/fusefs.c

+6 -6

		--- src/fusefs.c
		+++ src/fusefs.c
		@@ -289,28 +289,28 @@
289	289	/*
290	290	** COMMAND: fusefs
291	291	**
292	292	** Usage: %fossil fusefs [--debug] DIRECTORY
293	293	**
294		-** This command uses the Fuse Filesystem to mount a directory at
295		-** DIRECTORY that contains the content of all check-ins in the
	294	+** This command uses the Fuse Filesystem (FuseFS) to mount a directory
	295	+** at DIRECTORY that contains the content of all check-ins in the
296	296	** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297	297	** where DIRECTORY is the root of the mount, VERSION is any valid
298	298	** check-in name (examples: "trunk" or "tip" or a tag or any unique
299		-** prefix of a SHA1 hash, etc) and PATH is the pathname of the file
300		-** in the check-in. If DIRECTORY does not exist, then an attempt is
301		-** made to create it.
	299	+** prefix of a SHA1 hash, etc) and PATH is the pathname of the file in
	300	+** the check-in. If DIRECTORY does not exist, then an attempt is made
	301	+** to create it.
302	302	**
303	303	** The DIRECTORY/checkins directory is not searchable so one cannot
304	304	** do "ls DIRECTORY/checkins" to get a listing of all possible check-in
305	305	** names. There are countless variations on check-in names and it is
306	306	** impractical to list them all. But all other directories are searchable
307	307	** and so the "ls" command will work everywhere else in the fusefs
308	308	** file hierarchy.
309	309	**
310	310	** The FuseFS typically only works on Linux, and then only on Linux
311		-** systems that have the right kernel drivers and have install the
	311	+** systems that have the right kernel drivers and have installed the
312	312	** appropriate support libraries.
313	313	**
314	314	** After stopping the "fossil fusefs" command, it might also be necessary
315	315	** to run "fusermount -u DIRECTORY" to reset the FuseFS before using it
316	316	** again.
317	317

	--- src/fusefs.c
	+++ src/fusefs.c
	@@ -289,28 +289,28 @@
289	/*
290	** COMMAND: fusefs
291	**
292	** Usage: %fossil fusefs [--debug] DIRECTORY
293	**
294	** This command uses the Fuse Filesystem to mount a directory at
295	** DIRECTORY that contains the content of all check-ins in the
296	** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297	** where DIRECTORY is the root of the mount, VERSION is any valid
298	** check-in name (examples: "trunk" or "tip" or a tag or any unique
299	** prefix of a SHA1 hash, etc) and PATH is the pathname of the file
300	** in the check-in. If DIRECTORY does not exist, then an attempt is
301	** made to create it.
302	**
303	** The DIRECTORY/checkins directory is not searchable so one cannot
304	** do "ls DIRECTORY/checkins" to get a listing of all possible check-in
305	** names. There are countless variations on check-in names and it is
306	** impractical to list them all. But all other directories are searchable
307	** and so the "ls" command will work everywhere else in the fusefs
308	** file hierarchy.
309	**
310	** The FuseFS typically only works on Linux, and then only on Linux
311	** systems that have the right kernel drivers and have install the
312	** appropriate support libraries.
313	**
314	** After stopping the "fossil fusefs" command, it might also be necessary
315	** to run "fusermount -u DIRECTORY" to reset the FuseFS before using it
316	** again.
317

	--- src/fusefs.c
	+++ src/fusefs.c
	@@ -289,28 +289,28 @@
289	/*
290	** COMMAND: fusefs
291	**
292	** Usage: %fossil fusefs [--debug] DIRECTORY
293	**
294	** This command uses the Fuse Filesystem (FuseFS) to mount a directory
295	** at DIRECTORY that contains the content of all check-ins in the
296	** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297	** where DIRECTORY is the root of the mount, VERSION is any valid
298	** check-in name (examples: "trunk" or "tip" or a tag or any unique
299	** prefix of a SHA1 hash, etc) and PATH is the pathname of the file in
300	** the check-in. If DIRECTORY does not exist, then an attempt is made
301	** to create it.
302	**
303	** The DIRECTORY/checkins directory is not searchable so one cannot
304	** do "ls DIRECTORY/checkins" to get a listing of all possible check-in
305	** names. There are countless variations on check-in names and it is
306	** impractical to list them all. But all other directories are searchable
307	** and so the "ls" command will work everywhere else in the fusefs
308	** file hierarchy.
309	**
310	** The FuseFS typically only works on Linux, and then only on Linux
311	** systems that have the right kernel drivers and have installed the
312	** appropriate support libraries.
313	**
314	** After stopping the "fossil fusefs" command, it might also be necessary
315	** to run "fusermount -u DIRECTORY" to reset the FuseFS before using it
316	** again.
317

M src/info.c

+3 -2

		--- src/info.c
		+++ src/info.c
		@@ -1427,11 +1427,12 @@
1427	1427	** WEBPAGE: fdiff
1428	1428	** URL: fdiff?v1=UUID&v2=UUID&patch&sbs=BOOLEAN&regex=REGEX
1429	1429	**
1430	1430	** Two arguments, v1 and v2, identify the files to be diffed. Show the
1431	1431	** difference between the two artifacts. Show diff side by side unless sbs
1432		-** is 0. Generate plaintext if "patch" is present.
	1432	+** is 0. Generate plain text if "patch" is present, otherwise generate
	1433	+** "pretty" HTML.
1433	1434	**
1434	1435	** Additional parameters:
1435	1436	**
1436	1437	** verbose Show more detail when describing artifacts
1437	1438	** dc=N Show N lines of context around each diff
		@@ -1815,11 +1816,11 @@
1815	1816	** Additional query parameters:
1816	1817	**
1817	1818	** ln - show line numbers
1818	1819	** ln=N - highlight line number N
1819	1820	** ln=M-N - highlight lines M through N inclusive
1820		-** ln=M-N+Y-Z - higllight lines M through N and Y through Z (inclusive)
	1821	+** ln=M-N+Y-Z - highlight lines M through N and Y through Z (inclusive)
1821	1822	** verbose - show more detail in the description
1822	1823	** download - redirect to the download (artifact page only)
1823	1824	**
1824	1825	** The /artifact page show the complete content of a file
1825	1826	** identified by SHA1HASH as preformatted text. The
1826	1827

	--- src/info.c
	+++ src/info.c
	@@ -1427,11 +1427,12 @@
1427	** WEBPAGE: fdiff
1428	** URL: fdiff?v1=UUID&v2=UUID&patch&sbs=BOOLEAN&regex=REGEX
1429	**
1430	** Two arguments, v1 and v2, identify the files to be diffed. Show the
1431	** difference between the two artifacts. Show diff side by side unless sbs
1432	** is 0. Generate plaintext if "patch" is present.

1433	**
1434	** Additional parameters:
1435	**
1436	** verbose Show more detail when describing artifacts
1437	** dc=N Show N lines of context around each diff
	@@ -1815,11 +1816,11 @@
1815	** Additional query parameters:
1816	**
1817	** ln - show line numbers
1818	** ln=N - highlight line number N
1819	** ln=M-N - highlight lines M through N inclusive
1820	** ln=M-N+Y-Z - higllight lines M through N and Y through Z (inclusive)
1821	** verbose - show more detail in the description
1822	** download - redirect to the download (artifact page only)
1823	**
1824	** The /artifact page show the complete content of a file
1825	** identified by SHA1HASH as preformatted text. The
1826

	--- src/info.c
	+++ src/info.c
	@@ -1427,11 +1427,12 @@
1427	** WEBPAGE: fdiff
1428	** URL: fdiff?v1=UUID&v2=UUID&patch&sbs=BOOLEAN&regex=REGEX
1429	**
1430	** Two arguments, v1 and v2, identify the files to be diffed. Show the
1431	** difference between the two artifacts. Show diff side by side unless sbs
1432	** is 0. Generate plain text if "patch" is present, otherwise generate
1433	** "pretty" HTML.
1434	**
1435	** Additional parameters:
1436	**
1437	** verbose Show more detail when describing artifacts
1438	** dc=N Show N lines of context around each diff
	@@ -1815,11 +1816,11 @@
1816	** Additional query parameters:
1817	**
1818	** ln - show line numbers
1819	** ln=N - highlight line number N
1820	** ln=M-N - highlight lines M through N inclusive
1821	** ln=M-N+Y-Z - highlight lines M through N and Y through Z (inclusive)
1822	** verbose - show more detail in the description
1823	** download - redirect to the download (artifact page only)
1824	**
1825	** The /artifact page show the complete content of a file
1826	** identified by SHA1HASH as preformatted text. The
1827

M src/main.c

+45 -1

		--- src/main.c
		+++ src/main.c
		@@ -1222,10 +1222,54 @@
1222	1222	z++;
1223	1223	}
1224	1224	}
1225	1225	putchar('\n');
1226	1226	}
	1227	+
	1228	+
	1229	+/*
	1230	+** COMMAND: test-all-help
	1231	+** %fossil test-all-help ?OPTIONS?
	1232	+**
	1233	+** Show help text for commands and pages. Useful for proof-reading.
	1234	+** Defaults to just the CLI commands. Specify --www to see only the web
	1235	+** pages, or --everything to see both commands and pages.
	1236	+**
	1237	+** Options:
	1238	+** -e\|--everything Show all commands and pages.
	1239	+** -t\|--test Include test- commands
	1240	+** -w\|--www Show WWW pages.
	1241	+*/
	1242	+void test_all_help_cmd(void){
	1243	+ int i;
	1244	+ int mask = CMDFLAG_1ST_TIER \| CMDFLAG_2ND_TIER;
	1245	+
	1246	+ if( find_option("www","w",0) ){
	1247	+ mask = CMDFLAG_WEBPAGE;
	1248	+ }
	1249	+ if( find_option("everything","e",0) ){
	1250	+ mask = CMDFLAG_1ST_TIER \| CMDFLAG_2ND_TIER \| CMDFLAG_WEBPAGE;
	1251	+ }
	1252	+ if( find_option("test","t",0) ){
	1253	+ mask \|= CMDFLAG_TEST;
	1254	+ }
	1255	+
	1256	+ fossil_print("Help text for:\n");
	1257	+ if( mask & CMDFLAG_1ST_TIER ) fossil_print(" * Commands\n");
	1258	+ if( mask & CMDFLAG_2ND_TIER ) fossil_print(" * Auxiliary commands\n");
	1259	+ if( mask & CMDFLAG_TEST ) fossil_print(" * Test commands\n");
	1260	+ if( mask & CMDFLAG_WEBPAGE ) fossil_print(" * Web pages\n");
	1261	+ fossil_print("---\n");
	1262	+ for(i=0; i<count(aCommand); i++){
	1263	+ if( (aCommand[i].cmdFlags & mask)==0 ) continue;
	1264	+ fossil_print("# %s\n", aCommand[i].zName);
	1265	+ fossil_print("%s\n\n", aCmdHelp[i].zText);
	1266	+ }
	1267	+ fossil_print("---\n");
	1268	+ version_cmd();
	1269	+}
	1270	+
1227	1271
1228	1272	/*
1229	1273	** WEBPAGE: help
1230	1274	** URL: /help?name=CMD
1231	1275	**
		@@ -2619,11 +2663,11 @@
2619	2663	}
2620	2664	#endif
2621	2665	}
2622	2666
2623	2667	/*
2624		-** COMMAND: test-echo
	2668	+** COMMAND: test-echo
2625	2669	**
2626	2670	** Usage: %fossil test-echo [--hex] ARGS...
2627	2671	**
2628	2672	** Echo all command-line arguments (enclosed in [...]) to the screen so that
2629	2673	** wildcard expansion behavior of the host shell can be investigated.
2630	2674

	--- src/main.c
	+++ src/main.c
	@@ -1222,10 +1222,54 @@
1222	z++;
1223	}
1224	}
1225	putchar('\n');
1226	}












































1227
1228	/*
1229	** WEBPAGE: help
1230	** URL: /help?name=CMD
1231	**
	@@ -2619,11 +2663,11 @@
2619	}
2620	#endif
2621	}
2622
2623	/*
2624	** COMMAND: test-echo
2625	**
2626	** Usage: %fossil test-echo [--hex] ARGS...
2627	**
2628	** Echo all command-line arguments (enclosed in [...]) to the screen so that
2629	** wildcard expansion behavior of the host shell can be investigated.
2630

	--- src/main.c
	+++ src/main.c
	@@ -1222,10 +1222,54 @@
1222	z++;
1223	}
1224	}
1225	putchar('\n');
1226	}
1227
1228
1229	/*
1230	** COMMAND: test-all-help
1231	** %fossil test-all-help ?OPTIONS?
1232	**
1233	** Show help text for commands and pages. Useful for proof-reading.
1234	** Defaults to just the CLI commands. Specify --www to see only the web
1235	** pages, or --everything to see both commands and pages.
1236	**
1237	** Options:
1238	** -e\|--everything Show all commands and pages.
1239	** -t\|--test Include test- commands
1240	** -w\|--www Show WWW pages.
1241	*/
1242	void test_all_help_cmd(void){
1243	int i;
1244	int mask = CMDFLAG_1ST_TIER \| CMDFLAG_2ND_TIER;
1245
1246	if( find_option("www","w",0) ){
1247	mask = CMDFLAG_WEBPAGE;
1248	}
1249	if( find_option("everything","e",0) ){
1250	mask = CMDFLAG_1ST_TIER \| CMDFLAG_2ND_TIER \| CMDFLAG_WEBPAGE;
1251	}
1252	if( find_option("test","t",0) ){
1253	mask \|= CMDFLAG_TEST;
1254	}
1255
1256	fossil_print("Help text for:\n");
1257	if( mask & CMDFLAG_1ST_TIER ) fossil_print(" * Commands\n");
1258	if( mask & CMDFLAG_2ND_TIER ) fossil_print(" * Auxiliary commands\n");
1259	if( mask & CMDFLAG_TEST ) fossil_print(" * Test commands\n");
1260	if( mask & CMDFLAG_WEBPAGE ) fossil_print(" * Web pages\n");
1261	fossil_print("---\n");
1262	for(i=0; i<count(aCommand); i++){
1263	if( (aCommand[i].cmdFlags & mask)==0 ) continue;
1264	fossil_print("# %s\n", aCommand[i].zName);
1265	fossil_print("%s\n\n", aCmdHelp[i].zText);
1266	}
1267	fossil_print("---\n");
1268	version_cmd();
1269	}
1270
1271
1272	/*
1273	** WEBPAGE: help
1274	** URL: /help?name=CMD
1275	**
	@@ -2619,11 +2663,11 @@
2663	}
2664	#endif
2665	}
2666
2667	/*
2668	** COMMAND: test-echo
2669	**
2670	** Usage: %fossil test-echo [--hex] ARGS...
2671	**
2672	** Echo all command-line arguments (enclosed in [...]) to the screen so that
2673	** wildcard expansion behavior of the host shell can be investigated.
2674

M src/merge3.c

+1 -1

		--- src/merge3.c
		+++ src/merge3.c
		@@ -340,11 +340,11 @@
340	340	blob_reset(&file);
341	341	return rc;
342	342	}
343	343
344	344	/*
345		-** COMMAND: 3-way-merge*
	345	+** COMMAND: 3-way-merge*
346	346	**
347	347	** Usage: %fossil 3-way-merge BASELINE V1 V2 MERGED
348	348	**
349	349	** Inputs are files BASELINE, V1, and V2. The file MERGED is generated
350	350	** as output.
351	351

	--- src/merge3.c
	+++ src/merge3.c
	@@ -340,11 +340,11 @@
340	blob_reset(&file);
341	return rc;
342	}
343
344	/*
345	** COMMAND: 3-way-merge*
346	**
347	** Usage: %fossil 3-way-merge BASELINE V1 V2 MERGED
348	**
349	** Inputs are files BASELINE, V1, and V2. The file MERGED is generated
350	** as output.
351

	--- src/merge3.c
	+++ src/merge3.c
	@@ -340,11 +340,11 @@
340	blob_reset(&file);
341	return rc;
342	}
343
344	/*
345	** COMMAND: 3-way-merge*
346	**
347	** Usage: %fossil 3-way-merge BASELINE V1 V2 MERGED
348	**
349	** Inputs are files BASELINE, V1, and V2. The file MERGED is generated
350	** as output.
351

M src/name.c

+1 -1

		--- src/name.c
		+++ src/name.c
		@@ -371,11 +371,11 @@
371	371	}
372	372	return c;
373	373	}
374	374
375	375	/*
376		-** COMMAND: test-name-to-id
	376	+** COMMAND: test-name-to-id
377	377	**
378	378	** Convert a name to a full artifact ID.
379	379	*/
380	380	void test_name_to_id(void){
381	381	int i;
382	382

	--- src/name.c
	+++ src/name.c
	@@ -371,11 +371,11 @@
371	}
372	return c;
373	}
374
375	/*
376	** COMMAND: test-name-to-id
377	**
378	** Convert a name to a full artifact ID.
379	*/
380	void test_name_to_id(void){
381	int i;
382

	--- src/name.c
	+++ src/name.c
	@@ -371,11 +371,11 @@
371	}
372	return c;
373	}
374
375	/*
376	** COMMAND: test-name-to-id
377	**
378	** Convert a name to a full artifact ID.
379	*/
380	void test_name_to_id(void){
381	int i;
382

M src/path.c

+2 -2

		--- src/path.c
		+++ src/path.c
		@@ -195,11 +195,11 @@
195	195	for(p=path.pEnd, i=0; p && i<path.nStep/2; p=p->pFrom, i++){}
196	196	return p;
197	197	}
198	198
199	199	/*
200		-** COMMAND: test-shortest-path
	200	+** COMMAND: test-shortest-path
201	201	**
202	202	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
203	203	**
204	204	** Report the shortest path between two check-ins. If the --no-merge flag
205	205	** is used, follow only direct parent-child paths and omit merge links.
		@@ -301,11 +301,11 @@
301	301	path_reset();
302	302	return 0;
303	303	}
304	304
305	305	/*
306		-** COMMAND: test-ancestor-path
	306	+** COMMAND: test-ancestor-path
307	307	**
308	308	** Usage: %fossil test-ancestor-path VERSION1 VERSION2
309	309	**
310	310	** Report the path from VERSION1 to VERSION2 through their most recent
311	311	** common ancestor.
312	312

	--- src/path.c
	+++ src/path.c
	@@ -195,11 +195,11 @@
195	for(p=path.pEnd, i=0; p && i<path.nStep/2; p=p->pFrom, i++){}
196	return p;
197	}
198
199	/*
200	** COMMAND: test-shortest-path
201	**
202	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
203	**
204	** Report the shortest path between two check-ins. If the --no-merge flag
205	** is used, follow only direct parent-child paths and omit merge links.
	@@ -301,11 +301,11 @@
301	path_reset();
302	return 0;
303	}
304
305	/*
306	** COMMAND: test-ancestor-path
307	**
308	** Usage: %fossil test-ancestor-path VERSION1 VERSION2
309	**
310	** Report the path from VERSION1 to VERSION2 through their most recent
311	** common ancestor.
312

	--- src/path.c
	+++ src/path.c
	@@ -195,11 +195,11 @@
195	for(p=path.pEnd, i=0; p && i<path.nStep/2; p=p->pFrom, i++){}
196	return p;
197	}
198
199	/*
200	** COMMAND: test-shortest-path
201	**
202	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
203	**
204	** Report the shortest path between two check-ins. If the --no-merge flag
205	** is used, follow only direct parent-child paths and omit merge links.
	@@ -301,11 +301,11 @@
301	path_reset();
302	return 0;
303	}
304
305	/*
306	** COMMAND: test-ancestor-path
307	**
308	** Usage: %fossil test-ancestor-path VERSION1 VERSION2
309	**
310	** Report the path from VERSION1 to VERSION2 through their most recent
311	** common ancestor.
312

M src/pivot.c

+1 -1

		--- src/pivot.c
		+++ src/pivot.c
		@@ -147,11 +147,11 @@
147	147	db_finalize(&u1);
148	148	return rid;
149	149	}
150	150
151	151	/*
152		-** COMMAND: test-find-pivot
	152	+** COMMAND: test-find-pivot
153	153	**
154	154	** Test the pivot_find() procedure.
155	155	*/
156	156	void test_find_pivot(void){
157	157	int i, rid;
158	158

	--- src/pivot.c
	+++ src/pivot.c
	@@ -147,11 +147,11 @@
147	db_finalize(&u1);
148	return rid;
149	}
150
151	/*
152	** COMMAND: test-find-pivot
153	**
154	** Test the pivot_find() procedure.
155	*/
156	void test_find_pivot(void){
157	int i, rid;
158

	--- src/pivot.c
	+++ src/pivot.c
	@@ -147,11 +147,11 @@
147	db_finalize(&u1);
148	return rid;
149	}
150
151	/*
152	** COMMAND: test-find-pivot
153	**
154	** Test the pivot_find() procedure.
155	*/
156	void test_find_pivot(void){
157	int i, rid;
158

M src/purge.c

+2 -2

		--- src/purge.c
		+++ src/purge.c
		@@ -437,14 +437,14 @@
437	437	**
438	438	** fossil purge ?checkins? TAGS... ?OPTIONS?
439	439	**
440	440	** Move the check-ins identified by TAGS and all of their descendants
441	441	** out of the repository and into the graveyard. The "checkins"
442		-** subcommand keyword is option and can be omitted as long as TAGS
	442	+** subcommand keyword is optional and can be omitted as long as TAGS
443	443	** does not conflict with any other subcommand.
444	444	**
445		-** If a TAGS includes a branch name then it means all the check-ins
	445	+** If TAGS includes a branch name then it means all the check-ins
446	446	** on the most recent occurrance of that branch.
447	447	**
448	448	** --explain Make no changes, but show what would happen.
449	449	** --dry-run Make no changes.
450	450	**
451	451

	--- src/purge.c
	+++ src/purge.c
	@@ -437,14 +437,14 @@
437	**
438	** fossil purge ?checkins? TAGS... ?OPTIONS?
439	**
440	** Move the check-ins identified by TAGS and all of their descendants
441	** out of the repository and into the graveyard. The "checkins"
442	** subcommand keyword is option and can be omitted as long as TAGS
443	** does not conflict with any other subcommand.
444	**
445	** If a TAGS includes a branch name then it means all the check-ins
446	** on the most recent occurrance of that branch.
447	**
448	** --explain Make no changes, but show what would happen.
449	** --dry-run Make no changes.
450	**
451

	--- src/purge.c
	+++ src/purge.c
	@@ -437,14 +437,14 @@
437	**
438	** fossil purge ?checkins? TAGS... ?OPTIONS?
439	**
440	** Move the check-ins identified by TAGS and all of their descendants
441	** out of the repository and into the graveyard. The "checkins"
442	** subcommand keyword is optional and can be omitted as long as TAGS
443	** does not conflict with any other subcommand.
444	**
445	** If TAGS includes a branch name then it means all the check-ins
446	** on the most recent occurrance of that branch.
447	**
448	** --explain Make no changes, but show what would happen.
449	** --dry-run Make no changes.
450	**
451

M src/rebuild.c

+2 -2

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -682,11 +682,11 @@
682	682	fossil_print("%-15s %6d\n", "Other:", g.parseCnt[CFTYPE_ANY] - subtotal);
683	683	}
684	684	}
685	685
686	686	/*
687		-** COMMAND: test-detach ?REPOSITORY?
	687	+** COMMAND: test-detach ?REPOSITORY?
688	688	**
689	689	** Change the project-code and make other changes in order to prevent
690	690	** the repository from ever again pushing or pulling to other
691	691	** repositories. Used to create a "test" repository for development
692	692	** testing by cloning a working project repository.
		@@ -703,11 +703,11 @@
703	703	);
704	704	db_end_transaction(0);
705	705	}
706	706
707	707	/*
708		-** COMMAND: test-create-clusters
	708	+** COMMAND: test-create-clusters
709	709	**
710	710	** Create clusters for all unclustered artifacts if the number of unclustered
711	711	** artifacts exceeds the current clustering threshold.
712	712	*/
713	713	void test_createcluster_cmd(void){
714	714

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -682,11 +682,11 @@
682	fossil_print("%-15s %6d\n", "Other:", g.parseCnt[CFTYPE_ANY] - subtotal);
683	}
684	}
685
686	/*
687	** COMMAND: test-detach ?REPOSITORY?
688	**
689	** Change the project-code and make other changes in order to prevent
690	** the repository from ever again pushing or pulling to other
691	** repositories. Used to create a "test" repository for development
692	** testing by cloning a working project repository.
	@@ -703,11 +703,11 @@
703	);
704	db_end_transaction(0);
705	}
706
707	/*
708	** COMMAND: test-create-clusters
709	**
710	** Create clusters for all unclustered artifacts if the number of unclustered
711	** artifacts exceeds the current clustering threshold.
712	*/
713	void test_createcluster_cmd(void){
714

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -682,11 +682,11 @@
682	fossil_print("%-15s %6d\n", "Other:", g.parseCnt[CFTYPE_ANY] - subtotal);
683	}
684	}
685
686	/*
687	** COMMAND: test-detach ?REPOSITORY?
688	**
689	** Change the project-code and make other changes in order to prevent
690	** the repository from ever again pushing or pulling to other
691	** repositories. Used to create a "test" repository for development
692	** testing by cloning a working project repository.
	@@ -703,11 +703,11 @@
703	);
704	db_end_transaction(0);
705	}
706
707	/*
708	** COMMAND: test-create-clusters
709	**
710	** Create clusters for all unclustered artifacts if the number of unclustered
711	** artifacts exceeds the current clustering threshold.
712	*/
713	void test_createcluster_cmd(void){
714

M src/search.c

+15 -10

		--- src/search.c
		+++ src/search.c
		@@ -518,21 +518,26 @@
518	518	** Testing the search function.
519	519	**
520	520	** COMMAND: search*
521	521	** %fossil search [-all\|-a] [-limit\|-n #] [-width\|-W #] pattern...
522	522	**
523		-** Search for timeline entries matching all words
524		-** provided on the command line. Whole-word matches
525		-** scope more highly than partial matches.
526		-**
527		-** Outputs, by default, some top-N fraction of the
528		-** results. The -all option can be used to output
529		-** all matches, regardless of their search score.
530		-** The -limit option can be used to limit the number
531		-** of entries returned. The -width option can be
532		-** used to set the output width used when printing
	523	+** Search for timeline entries matching all words provided on the
	524	+** command line. Whole-word matches scope more highly than partial
533	525	** matches.
	526	+**
	527	+** Outputs, by default, some top-N fraction of the results. The -all
	528	+** option can be used to output all matches, regardless of their search
	529	+** score. The -limit option can be used to limit the number of entries
	530	+** returned. The -width option can be used to set the output width used
	531	+** when printing matches.
	532	+**
	533	+** Options:
	534	+**
	535	+** -a\|--all Output all matches, not just best matches.
	536	+** -n\|--limit N Limit output to N matches.
	537	+** -W\|--width WIDTH Set display width to WIDTH columns, 0 for
	538	+** unlimited. Defaults the terminal's width.
534	539	*/
535	540	void search_cmd(void){
536	541	Blob pattern;
537	542	int i;
538	543	Blob sql = empty_blob;
539	544

	--- src/search.c
	+++ src/search.c
	@@ -518,21 +518,26 @@
518	** Testing the search function.
519	**
520	** COMMAND: search*
521	** %fossil search [-all\|-a] [-limit\|-n #] [-width\|-W #] pattern...
522	**
523	** Search for timeline entries matching all words
524	** provided on the command line. Whole-word matches
525	** scope more highly than partial matches.
526	**
527	** Outputs, by default, some top-N fraction of the
528	** results. The -all option can be used to output
529	** all matches, regardless of their search score.
530	** The -limit option can be used to limit the number
531	** of entries returned. The -width option can be
532	** used to set the output width used when printing
533	** matches.













534	*/
535	void search_cmd(void){
536	Blob pattern;
537	int i;
538	Blob sql = empty_blob;
539

	--- src/search.c
	+++ src/search.c
	@@ -518,21 +518,26 @@
518	** Testing the search function.
519	**
520	** COMMAND: search*
521	** %fossil search [-all\|-a] [-limit\|-n #] [-width\|-W #] pattern...
522	**
523	** Search for timeline entries matching all words provided on the
524	** command line. Whole-word matches scope more highly than partial








525	** matches.
526	**
527	** Outputs, by default, some top-N fraction of the results. The -all
528	** option can be used to output all matches, regardless of their search
529	** score. The -limit option can be used to limit the number of entries
530	** returned. The -width option can be used to set the output width used
531	** when printing matches.
532	**
533	** Options:
534	**
535	** -a\|--all Output all matches, not just best matches.
536	** -n\|--limit N Limit output to N matches.
537	** -W\|--width WIDTH Set display width to WIDTH columns, 0 for
538	** unlimited. Defaults the terminal's width.
539	*/
540	void search_cmd(void){
541	Blob pattern;
542	int i;
543	Blob sql = empty_blob;
544

M src/setup.c

+1 -1

		--- src/setup.c
		+++ src/setup.c
		@@ -1433,11 +1433,11 @@
1433	1433	}
1434	1434
1435	1435	/*
1436	1436	** WEBPAGE: setup_settings
1437	1437	**
1438		-** Change or view miscellanous settings. Part of the
	1438	+** Change or view miscellaneous settings. Part of the
1439	1439	** Admin pages requiring Admin privileges.
1440	1440	*/
1441	1441	void setup_settings(void){
1442	1442	Setting const *pSet;
1443	1443
1444	1444

	--- src/setup.c
	+++ src/setup.c
	@@ -1433,11 +1433,11 @@
1433	}
1434
1435	/*
1436	** WEBPAGE: setup_settings
1437	**
1438	** Change or view miscellanous settings. Part of the
1439	** Admin pages requiring Admin privileges.
1440	*/
1441	void setup_settings(void){
1442	Setting const *pSet;
1443
1444

	--- src/setup.c
	+++ src/setup.c
	@@ -1433,11 +1433,11 @@
1433	}
1434
1435	/*
1436	** WEBPAGE: setup_settings
1437	**
1438	** Change or view miscellaneous settings. Part of the
1439	** Admin pages requiring Admin privileges.
1440	*/
1441	void setup_settings(void){
1442	Setting const *pSet;
1443
1444

M src/sitemap.c

+2 -2

		--- src/sitemap.c
		+++ src/sitemap.c
		@@ -20,14 +20,14 @@
20	20	#include "config.h"
21	21	#include "sitemap.h"
22	22	#include <assert.h>
23	23
24	24	/*
25		-** WEBPAGE: sitemap
	25	+** WEBPAGE: sitemap
26	26	**
27	27	** List some of the web pages offered by the Fossil web engine. This
28		-** page is intended as a suppliment to the menu bar on the main screen.
	28	+** page is intended as a supplement to the menu bar on the main screen.
29	29	** That is, this page is designed to hold links that are omitted from
30	30	** the main menu due to lack of space.
31	31	*/
32	32	void sitemap_page(void){
33	33	int srchFlags;
34	34

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -20,14 +20,14 @@
20	#include "config.h"
21	#include "sitemap.h"
22	#include <assert.h>
23
24	/*
25	** WEBPAGE: sitemap
26	**
27	** List some of the web pages offered by the Fossil web engine. This
28	** page is intended as a suppliment to the menu bar on the main screen.
29	** That is, this page is designed to hold links that are omitted from
30	** the main menu due to lack of space.
31	*/
32	void sitemap_page(void){
33	int srchFlags;
34

	--- src/sitemap.c
	+++ src/sitemap.c
	@@ -20,14 +20,14 @@
20	#include "config.h"
21	#include "sitemap.h"
22	#include <assert.h>
23
24	/*
25	** WEBPAGE: sitemap
26	**
27	** List some of the web pages offered by the Fossil web engine. This
28	** page is intended as a supplement to the menu bar on the main screen.
29	** That is, this page is designed to hold links that are omitted from
30	** the main menu due to lack of space.
31	*/
32	void sitemap_page(void){
33	int srchFlags;
34

M src/sqlcmd.c

+1 -1

		--- src/sqlcmd.c
		+++ src/sqlcmd.c
		@@ -188,11 +188,11 @@
188	188	** now() Return the number of seconds since 1970.
189	189	**
190	190	** REGEXP The REGEXP operator works, unlike in
191	191	** standard SQLite.
192	192	**
193		-** files_of_checkin The "files_of_check" virtual table is
	193	+** files_of_checkin The "files_of_checkin" virtual table is
194	194	** available for decoding manifests.
195	195	**
196	196	** Usage example for files_of_checkin:
197	197	**
198	198	** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin;
199	199

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -188,11 +188,11 @@
188	** now() Return the number of seconds since 1970.
189	**
190	** REGEXP The REGEXP operator works, unlike in
191	** standard SQLite.
192	**
193	** files_of_checkin The "files_of_check" virtual table is
194	** available for decoding manifests.
195	**
196	** Usage example for files_of_checkin:
197	**
198	** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin;
199

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -188,11 +188,11 @@
188	** now() Return the number of seconds since 1970.
189	**
190	** REGEXP The REGEXP operator works, unlike in
191	** standard SQLite.
192	**
193	** files_of_checkin The "files_of_checkin" virtual table is
194	** available for decoding manifests.
195	**
196	** Usage example for files_of_checkin:
197	**
198	** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin;
199

M src/sync.c

+3 -3

		--- src/sync.c
		+++ src/sync.c
		@@ -251,13 +251,13 @@
251	251	/*
252	252	** COMMAND: sync
253	253	**
254	254	** Usage: %fossil sync ?URL? ?options?
255	255	**
256		-** Synchronize all sharable changes between the local repository and a
257		-** a remote repository. Sharable changes include public check-ins, and wiki,
258		-** ticket, and tech-note edits.
	256	+** Synchronize all sharable changes between the local repository and a a
	257	+** remote repository. Sharable changes include public check-ins and
	258	+** edits to wiki pages, tickets, and technical notes.
259	259	**
260	260	** If URL is not specified, then the URL from the most recent clone, push,
261	261	** pull, remote-url, or sync command is used. See "fossil help clone" for
262	262	** details on the URL formats.
263	263	**
264	264

	--- src/sync.c
	+++ src/sync.c
	@@ -251,13 +251,13 @@
251	/*
252	** COMMAND: sync
253	**
254	** Usage: %fossil sync ?URL? ?options?
255	**
256	** Synchronize all sharable changes between the local repository and a
257	** a remote repository. Sharable changes include public check-ins, and wiki,
258	** ticket, and tech-note edits.
259	**
260	** If URL is not specified, then the URL from the most recent clone, push,
261	** pull, remote-url, or sync command is used. See "fossil help clone" for
262	** details on the URL formats.
263	**
264

	--- src/sync.c
	+++ src/sync.c
	@@ -251,13 +251,13 @@
251	/*
252	** COMMAND: sync
253	**
254	** Usage: %fossil sync ?URL? ?options?
255	**
256	** Synchronize all sharable changes between the local repository and a a
257	** remote repository. Sharable changes include public check-ins and
258	** edits to wiki pages, tickets, and technical notes.
259	**
260	** If URL is not specified, then the URL from the most recent clone, push,
261	** pull, remote-url, or sync command is used. See "fossil help clone" for
262	** details on the URL formats.
263	**
264

M src/tag.c

+18 -7

		--- src/tag.c
		+++ src/tag.c
		@@ -335,29 +335,44 @@
335	335
336	336	/*
337	337	** COMMAND: tag
338	338	** Usage: %fossil tag SUBCOMMAND ...
339	339	**
340		-** Run various subcommands to control tags and properties
	340	+** Run various subcommands to control tags and properties.
341	341	**
342		-** %fossil tag add ?--raw? ?--propagate? TAGNAME CHECK-IN ?VALUE?
	342	+** %fossil tag add ?OPTIONS? TAGNAME CHECK-IN ?VALUE?
343	343	**
344	344	** Add a new tag or property to CHECK-IN. The tag will
345	345	** be usable instead of a CHECK-IN in commands such as
346	346	** update and merge. If the --propagate flag is present,
347	347	** the tag value propagates to all descendants of CHECK-IN
348	348	**
	349	+** Options:
	350	+** --raw Raw tag name.
	351	+** --propagate Propagating tag.
	352	+** --date-override DATETIME Set date and time added.
	353	+** --user-override USER Name USER when adding the tag.
	354	+**
	355	+** The --date-override and --user-override options support
	356	+** importing history from other SCM systems. DATETIME has
	357	+** the form 'YYYY-MMM-DD HH:MM:SS'.
	358	+**
349	359	** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
350	360	**
351	361	** Remove the tag TAGNAME from CHECK-IN, and also remove
352	362	** the propagation of the tag to any descendants.
353	363	**
354		-** %fossil tag find ?--raw? ?-t\|--type TYPE? ?-n\|--limit #? TAGNAME
	364	+** %fossil tag find ?OPTIONS? TAGNAME
355	365	**
356	366	** List all objects that use TAGNAME. TYPE can be "ci" for
357	367	** check-ins or "e" for events. The limit option limits the number
358	368	** of results to the given value.
	369	+**
	370	+** Options:
	371	+** --raw Raw tag name.
	372	+** -t\|--type TYPE One of "ci", or "e".
	373	+** -n\|--limit N Limit to N results.
359	374	**
360	375	** %fossil tag list\|ls ?--raw? ?CHECK-IN?
361	376	**
362	377	** List all tags, or if CHECK-IN is supplied, list
363	378	** all tags and their values for CHECK-IN.
		@@ -379,14 +394,10 @@
379	394	**
380	395	** fossil update tag:decaf
381	396	**
382	397	** will assume that "decaf" is a tag/branch name.
383	398	**
384		-** only allow --date-override and --user-override in
385		-** %fossil tag add --date-override 'YYYY-MMM-DD HH:MM:SS' \\
386		-** --user-override user
387		-** in order to import history from other scm systems
388	399	*/
389	400	void tag_cmd(void){
390	401	int n;
391	402	int fRaw = find_option("raw","",0)!=0;
392	403	int fPropagate = find_option("propagate","",0)!=0;
393	404

	--- src/tag.c
	+++ src/tag.c
	@@ -335,29 +335,44 @@
335
336	/*
337	** COMMAND: tag
338	** Usage: %fossil tag SUBCOMMAND ...
339	**
340	** Run various subcommands to control tags and properties
341	**
342	** %fossil tag add ?--raw? ?--propagate? TAGNAME CHECK-IN ?VALUE?
343	**
344	** Add a new tag or property to CHECK-IN. The tag will
345	** be usable instead of a CHECK-IN in commands such as
346	** update and merge. If the --propagate flag is present,
347	** the tag value propagates to all descendants of CHECK-IN
348	**










349	** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
350	**
351	** Remove the tag TAGNAME from CHECK-IN, and also remove
352	** the propagation of the tag to any descendants.
353	**
354	** %fossil tag find ?--raw? ?-t\|--type TYPE? ?-n\|--limit #? TAGNAME
355	**
356	** List all objects that use TAGNAME. TYPE can be "ci" for
357	** check-ins or "e" for events. The limit option limits the number
358	** of results to the given value.





359	**
360	** %fossil tag list\|ls ?--raw? ?CHECK-IN?
361	**
362	** List all tags, or if CHECK-IN is supplied, list
363	** all tags and their values for CHECK-IN.
	@@ -379,14 +394,10 @@
379	**
380	** fossil update tag:decaf
381	**
382	** will assume that "decaf" is a tag/branch name.
383	**
384	** only allow --date-override and --user-override in
385	** %fossil tag add --date-override 'YYYY-MMM-DD HH:MM:SS' \\
386	** --user-override user
387	** in order to import history from other scm systems
388	*/
389	void tag_cmd(void){
390	int n;
391	int fRaw = find_option("raw","",0)!=0;
392	int fPropagate = find_option("propagate","",0)!=0;
393

	--- src/tag.c
	+++ src/tag.c
	@@ -335,29 +335,44 @@
335
336	/*
337	** COMMAND: tag
338	** Usage: %fossil tag SUBCOMMAND ...
339	**
340	** Run various subcommands to control tags and properties.
341	**
342	** %fossil tag add ?OPTIONS? TAGNAME CHECK-IN ?VALUE?
343	**
344	** Add a new tag or property to CHECK-IN. The tag will
345	** be usable instead of a CHECK-IN in commands such as
346	** update and merge. If the --propagate flag is present,
347	** the tag value propagates to all descendants of CHECK-IN
348	**
349	** Options:
350	** --raw Raw tag name.
351	** --propagate Propagating tag.
352	** --date-override DATETIME Set date and time added.
353	** --user-override USER Name USER when adding the tag.
354	**
355	** The --date-override and --user-override options support
356	** importing history from other SCM systems. DATETIME has
357	** the form 'YYYY-MMM-DD HH:MM:SS'.
358	**
359	** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
360	**
361	** Remove the tag TAGNAME from CHECK-IN, and also remove
362	** the propagation of the tag to any descendants.
363	**
364	** %fossil tag find ?OPTIONS? TAGNAME
365	**
366	** List all objects that use TAGNAME. TYPE can be "ci" for
367	** check-ins or "e" for events. The limit option limits the number
368	** of results to the given value.
369	**
370	** Options:
371	** --raw Raw tag name.
372	** -t\|--type TYPE One of "ci", or "e".
373	** -n\|--limit N Limit to N results.
374	**
375	** %fossil tag list\|ls ?--raw? ?CHECK-IN?
376	**
377	** List all tags, or if CHECK-IN is supplied, list
378	** all tags and their values for CHECK-IN.
	@@ -379,14 +394,10 @@
394	**
395	** fossil update tag:decaf
396	**
397	** will assume that "decaf" is a tag/branch name.
398	**




399	*/
400	void tag_cmd(void){
401	int n;
402	int fRaw = find_option("raw","",0)!=0;
403	int fPropagate = find_option("propagate","",0)!=0;
404

M src/timeline.c

+4 -4

		--- src/timeline.c
		+++ src/timeline.c
		@@ -139,11 +139,11 @@
139	139	sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b);
140	140	return zColor;
141	141	}
142	142
143	143	/*
144		-** COMMAND: test-hash-color
	144	+** COMMAND: test-hash-color
145	145	**
146	146	** Usage: %fossil test-hash-color TAG ...
147	147	**
148	148	** Print out the color names associated with each tag. Used for
149	149	** testing the hash_color() function.
		@@ -154,11 +154,11 @@
154	154	fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i]));
155	155	}
156	156	}
157	157
158	158	/*
159		-** WEBPAGE: hash-color-test
	159	+** WEBPAGE: hash-color-test
160	160	**
161	161	** Print out the color names associated with each tag. Used for
162	162	** testing the hash_color() function.
163	163	*/
164	164	void test_hash_color_page(void){
		@@ -1212,11 +1212,11 @@
1212	1212	** to=UUID ... to this
1213	1213	** shortest ... show only the shortest path
1214	1214	** uf=FUUID Show only check-ins that use given file version
1215	1215	** brbg Background color from branch name
1216	1216	** ubg Background color from user
1217		-** namechng Show only check-ins that filename changes
	1217	+** namechng Show only check-ins that have filename changes
1218	1218	** forks Show only forks and their children
1219	1219	** ym=YYYY-MM Show only events for the given year/month.
1220	1220	** ymd=YYYY-MM-DD Show only events on the given day
1221	1221	** datefmt=N Override the date format
1222	1222	** bisect Show the check-ins that are in the current bisect
		@@ -2014,11 +2014,11 @@
2014	2014	** descendants \| children
2015	2015	** ancestors \| parents
2016	2016	**
2017	2017	** The CHECKIN can be any unique prefix of 4 characters or more.
2018	2018	** The DATETIME should be in the ISO8601 format. For
2019		-** examples: "2007-08-18 07:21:21". You can also say "current"
	2019	+** example: "2007-08-18 07:21:21". You can also say "current"
2020	2020	** for the current version or "now" for the current time.
2021	2021	**
2022	2022	** Options:
2023	2023	** -n\|--limit N Output the first N entries (default 20 lines).
2024	2024	** N=0 means no limit.
2025	2025

	--- src/timeline.c
	+++ src/timeline.c
	@@ -139,11 +139,11 @@
139	sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b);
140	return zColor;
141	}
142
143	/*
144	** COMMAND: test-hash-color
145	**
146	** Usage: %fossil test-hash-color TAG ...
147	**
148	** Print out the color names associated with each tag. Used for
149	** testing the hash_color() function.
	@@ -154,11 +154,11 @@
154	fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i]));
155	}
156	}
157
158	/*
159	** WEBPAGE: hash-color-test
160	**
161	** Print out the color names associated with each tag. Used for
162	** testing the hash_color() function.
163	*/
164	void test_hash_color_page(void){
	@@ -1212,11 +1212,11 @@
1212	** to=UUID ... to this
1213	** shortest ... show only the shortest path
1214	** uf=FUUID Show only check-ins that use given file version
1215	** brbg Background color from branch name
1216	** ubg Background color from user
1217	** namechng Show only check-ins that filename changes
1218	** forks Show only forks and their children
1219	** ym=YYYY-MM Show only events for the given year/month.
1220	** ymd=YYYY-MM-DD Show only events on the given day
1221	** datefmt=N Override the date format
1222	** bisect Show the check-ins that are in the current bisect
	@@ -2014,11 +2014,11 @@
2014	** descendants \| children
2015	** ancestors \| parents
2016	**
2017	** The CHECKIN can be any unique prefix of 4 characters or more.
2018	** The DATETIME should be in the ISO8601 format. For
2019	** examples: "2007-08-18 07:21:21". You can also say "current"
2020	** for the current version or "now" for the current time.
2021	**
2022	** Options:
2023	** -n\|--limit N Output the first N entries (default 20 lines).
2024	** N=0 means no limit.
2025

	--- src/timeline.c
	+++ src/timeline.c
	@@ -139,11 +139,11 @@
139	sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b);
140	return zColor;
141	}
142
143	/*
144	** COMMAND: test-hash-color
145	**
146	** Usage: %fossil test-hash-color TAG ...
147	**
148	** Print out the color names associated with each tag. Used for
149	** testing the hash_color() function.
	@@ -154,11 +154,11 @@
154	fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i]));
155	}
156	}
157
158	/*
159	** WEBPAGE: hash-color-test
160	**
161	** Print out the color names associated with each tag. Used for
162	** testing the hash_color() function.
163	*/
164	void test_hash_color_page(void){
	@@ -1212,11 +1212,11 @@
1212	** to=UUID ... to this
1213	** shortest ... show only the shortest path
1214	** uf=FUUID Show only check-ins that use given file version
1215	** brbg Background color from branch name
1216	** ubg Background color from user
1217	** namechng Show only check-ins that have filename changes
1218	** forks Show only forks and their children
1219	** ym=YYYY-MM Show only events for the given year/month.
1220	** ymd=YYYY-MM-DD Show only events on the given day
1221	** datefmt=N Override the date format
1222	** bisect Show the check-ins that are in the current bisect
	@@ -2014,11 +2014,11 @@
2014	** descendants \| children
2015	** ancestors \| parents
2016	**
2017	** The CHECKIN can be any unique prefix of 4 characters or more.
2018	** The DATETIME should be in the ISO8601 format. For
2019	** example: "2007-08-18 07:21:21". You can also say "current"
2020	** for the current version or "now" for the current time.
2021	**
2022	** Options:
2023	** -n\|--limit N Output the first N entries (default 20 lines).
2024	** N=0 means no limit.
2025

M src/tkt.c

+27 -26

		--- src/tkt.c
		+++ src/tkt.c
		@@ -1060,75 +1060,76 @@
1060	1060	** COMMAND: ticket*
1061	1061	** Usage: %fossil ticket SUBCOMMAND ...
1062	1062	**
1063	1063	** Run various subcommands to control tickets
1064	1064	**
1065		-** %fossil ticket show (REPORTTITLE\|REPORTNR) ?TICKETFILTER? ?options?
	1065	+** %fossil ticket show (REPORTTITLE\|REPORTNR) ?TICKETFILTER? ?OPTIONS?
1066	1066	**
1067		-** options can be:
1068		-** ?-l\|--limit LIMITCHAR?
1069		-** ?-q\|--quote?
1070		-** ?-R\|--repository FILE?
	1067	+** Options:
	1068	+** -l\|--limit LIMITCHAR
	1069	+** -q\|--quote
	1070	+** -R\|--repository FILE
1071	1071	**
1072	1072	** Run the ticket report, identified by the report format title
1073		-** used in the gui. The data is written as flat file on stdout,
	1073	+** used in the GUI. The data is written as flat file on stdout,
1074	1074	** using TAB as separator. The separator can be changed using
1075	1075	** the -l or --limit option.
1076	1076	**
1077	1077	** If TICKETFILTER is given on the commandline, the query is
1078	1078	** limited with a new WHERE-condition.
1079	1079	** example: Report lists a column # with the uuid
1080	1080	** TICKETFILTER may be [#]='uuuuuuuuu'
1081	1081	** example: Report only lists rows with status not open
1082	1082	** TICKETFILTER: status != 'open'
1083		-** If the option -q\|--quote is used, the tickets are encoded by
1084		-** quoting special chars(space -> \\s, tab -> \\t, newline -> \\n,
1085		-** cr -> \\r, formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\).
1086		-** Otherwise, the simplified encoding as on the show report raw
1087		-** page in the gui is used. This has no effect in JSON mode.
	1083	+**
	1084	+** If --quote is used, the tickets are encoded by quoting special
	1085	+** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r,
	1086	+** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\).
	1087	+** Otherwise, the simplified encoding as on the show report raw page
	1088	+** in the GUI is used. This has no effect in JSON mode.
1088	1089	**
1089		-** Instead of the report title its possible to use the report
1090		-** number. Using the special report number 0 list all columns,
1091		-** defined in the ticket table.
	1090	+** Instead of the report title it's possible to use the report
	1091	+** number; the special report number 0 lists all columns defined in
	1092	+** the ticket table.
1092	1093	**
1093	1094	** %fossil ticket list fields
1094	1095	** %fossil ticket ls fields
1095	1096	**
1096		-** list all fields, defined for ticket in the fossil repository
	1097	+** List all fields defined for ticket in the fossil repository.
1097	1098	**
1098	1099	** %fossil ticket list reports
1099	1100	** %fossil ticket ls reports
1100	1101	**
1101		-** list all ticket reports, defined in the fossil repository
	1102	+** List all ticket reports defined in the fossil repository.
1102	1103	**
1103	1104	** %fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1104	1105	** %fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1105	1106	**
1106		-** change ticket identified by TICKETUUID and set the value of
1107		-** field FIELD to VALUE.
	1107	+** Change ticket identified by TICKETUUID to set the values of
	1108	+** each field FIELD to VALUE.
1108	1109	**
1109	1110	** Field names as defined in the TICKET table. By default, these
1110	1111	** names include: type, status, subsystem, priority, severity, foundin,
1111	1112	** resolution, title, and comment, but other field names can be added
1112	1113	** or substituted in customized installations.
1113	1114	**
1114		-** If you use +FIELD, the VALUE is appended to the field FIELD.
1115		-** You can use more than one field/value pair on the commandline.
1116		-** Using -q\|--quote enables the special character decoding as
1117		-** in "ticket show". So it's possible, to set multiline text or
1118		-** text with special characters.
	1115	+** If you use +FIELD, the VALUE is appended to the field FIELD. You
	1116	+** can use more than one field/value pair on the commandline. Using
	1117	+** --quote enables the special character decoding as in "ticket
	1118	+** show", which allows setting multiline text or text with special
	1119	+** characters.
1119	1120	**
1120	1121	** %fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1121	1122	**
1122		-** like set, but create a new ticket with the given values.
	1123	+** Like set, but create a new ticket with the given values.
1123	1124	**
1124	1125	** %fossil ticket history TICKETUUID
1125	1126	**
1126	1127	** Show the complete change history for the ticket
1127	1128	**
1128		-** The values in set\|add are not validated against the definitions
1129		-** given in "Ticket Common Script".
	1129	+** Note that the values in set\|add are not validated against the
	1130	+** definitions given in "Ticket Common Script".
1130	1131	*/
1131	1132	void ticket_cmd(void){
1132	1133	int n;
1133	1134	const char *zUser;
1134	1135	const char *zDate;
1135	1136

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1060,75 +1060,76 @@
1060	** COMMAND: ticket*
1061	** Usage: %fossil ticket SUBCOMMAND ...
1062	**
1063	** Run various subcommands to control tickets
1064	**
1065	** %fossil ticket show (REPORTTITLE\|REPORTNR) ?TICKETFILTER? ?options?
1066	**
1067	** options can be:
1068	** ?-l\|--limit LIMITCHAR?
1069	** ?-q\|--quote?
1070	** ?-R\|--repository FILE?
1071	**
1072	** Run the ticket report, identified by the report format title
1073	** used in the gui. The data is written as flat file on stdout,
1074	** using TAB as separator. The separator can be changed using
1075	** the -l or --limit option.
1076	**
1077	** If TICKETFILTER is given on the commandline, the query is
1078	** limited with a new WHERE-condition.
1079	** example: Report lists a column # with the uuid
1080	** TICKETFILTER may be [#]='uuuuuuuuu'
1081	** example: Report only lists rows with status not open
1082	** TICKETFILTER: status != 'open'
1083	** If the option -q\|--quote is used, the tickets are encoded by
1084	** quoting special chars(space -> \\s, tab -> \\t, newline -> \\n,
1085	** cr -> \\r, formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\).
1086	** Otherwise, the simplified encoding as on the show report raw
1087	** page in the gui is used. This has no effect in JSON mode.

1088	**
1089	** Instead of the report title its possible to use the report
1090	** number. Using the special report number 0 list all columns,
1091	** defined in the ticket table.
1092	**
1093	** %fossil ticket list fields
1094	** %fossil ticket ls fields
1095	**
1096	** list all fields, defined for ticket in the fossil repository
1097	**
1098	** %fossil ticket list reports
1099	** %fossil ticket ls reports
1100	**
1101	** list all ticket reports, defined in the fossil repository
1102	**
1103	** %fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1104	** %fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1105	**
1106	** change ticket identified by TICKETUUID and set the value of
1107	** field FIELD to VALUE.
1108	**
1109	** Field names as defined in the TICKET table. By default, these
1110	** names include: type, status, subsystem, priority, severity, foundin,
1111	** resolution, title, and comment, but other field names can be added
1112	** or substituted in customized installations.
1113	**
1114	** If you use +FIELD, the VALUE is appended to the field FIELD.
1115	** You can use more than one field/value pair on the commandline.
1116	** Using -q\|--quote enables the special character decoding as
1117	** in "ticket show". So it's possible, to set multiline text or
1118	** text with special characters.
1119	**
1120	** %fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1121	**
1122	** like set, but create a new ticket with the given values.
1123	**
1124	** %fossil ticket history TICKETUUID
1125	**
1126	** Show the complete change history for the ticket
1127	**
1128	** The values in set\|add are not validated against the definitions
1129	** given in "Ticket Common Script".
1130	*/
1131	void ticket_cmd(void){
1132	int n;
1133	const char *zUser;
1134	const char *zDate;
1135

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1060,75 +1060,76 @@
1060	** COMMAND: ticket*
1061	** Usage: %fossil ticket SUBCOMMAND ...
1062	**
1063	** Run various subcommands to control tickets
1064	**
1065	** %fossil ticket show (REPORTTITLE\|REPORTNR) ?TICKETFILTER? ?OPTIONS?
1066	**
1067	** Options:
1068	** -l\|--limit LIMITCHAR
1069	** -q\|--quote
1070	** -R\|--repository FILE
1071	**
1072	** Run the ticket report, identified by the report format title
1073	** used in the GUI. The data is written as flat file on stdout,
1074	** using TAB as separator. The separator can be changed using
1075	** the -l or --limit option.
1076	**
1077	** If TICKETFILTER is given on the commandline, the query is
1078	** limited with a new WHERE-condition.
1079	** example: Report lists a column # with the uuid
1080	** TICKETFILTER may be [#]='uuuuuuuuu'
1081	** example: Report only lists rows with status not open
1082	** TICKETFILTER: status != 'open'
1083	**
1084	** If --quote is used, the tickets are encoded by quoting special
1085	** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r,
1086	** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\).
1087	** Otherwise, the simplified encoding as on the show report raw page
1088	** in the GUI is used. This has no effect in JSON mode.
1089	**
1090	** Instead of the report title it's possible to use the report
1091	** number; the special report number 0 lists all columns defined in
1092	** the ticket table.
1093	**
1094	** %fossil ticket list fields
1095	** %fossil ticket ls fields
1096	**
1097	** List all fields defined for ticket in the fossil repository.
1098	**
1099	** %fossil ticket list reports
1100	** %fossil ticket ls reports
1101	**
1102	** List all ticket reports defined in the fossil repository.
1103	**
1104	** %fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1105	** %fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1106	**
1107	** Change ticket identified by TICKETUUID to set the values of
1108	** each field FIELD to VALUE.
1109	**
1110	** Field names as defined in the TICKET table. By default, these
1111	** names include: type, status, subsystem, priority, severity, foundin,
1112	** resolution, title, and comment, but other field names can be added
1113	** or substituted in customized installations.
1114	**
1115	** If you use +FIELD, the VALUE is appended to the field FIELD. You
1116	** can use more than one field/value pair on the commandline. Using
1117	** --quote enables the special character decoding as in "ticket
1118	** show", which allows setting multiline text or text with special
1119	** characters.
1120	**
1121	** %fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1122	**
1123	** Like set, but create a new ticket with the given values.
1124	**
1125	** %fossil ticket history TICKETUUID
1126	**
1127	** Show the complete change history for the ticket
1128	**
1129	** Note that the values in set\|add are not validated against the
1130	** definitions given in "Ticket Common Script".
1131	*/
1132	void ticket_cmd(void){
1133	int n;
1134	const char *zUser;
1135	const char *zDate;
1136

M src/tktsetup.c

+1 -1

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -277,11 +277,11 @@
277	277	return db_get("ticket-change", zDefaultTicketChange);
278	278	}
279	279
280	280	/*
281	281	** WEBPAGE: tktsetup_change
282		-** Adminstrative screen used to view or edit the TH1 script
	282	+** Administrative screen used to view or edit the TH1 script
283	283	** that shows ticket changes.
284	284	*/
285	285	void tktsetup_change_page(void){
286	286	static const char zDesc[] =
287	287	@ Enter TH1 script that runs after processing the ticket editing
288	288

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -277,11 +277,11 @@
277	return db_get("ticket-change", zDefaultTicketChange);
278	}
279
280	/*
281	** WEBPAGE: tktsetup_change
282	** Adminstrative screen used to view or edit the TH1 script
283	** that shows ticket changes.
284	*/
285	void tktsetup_change_page(void){
286	static const char zDesc[] =
287	@ Enter TH1 script that runs after processing the ticket editing
288

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -277,11 +277,11 @@
277	return db_get("ticket-change", zDefaultTicketChange);
278	}
279
280	/*
281	** WEBPAGE: tktsetup_change
282	** Administrative screen used to view or edit the TH1 script
283	** that shows ticket changes.
284	*/
285	void tktsetup_change_page(void){
286	static const char zDesc[] =
287	@ Enter TH1 script that runs after processing the ticket editing
288

M src/wiki.c

+8 -9

		--- src/wiki.c
		+++ src/wiki.c
		@@ -1137,38 +1137,37 @@
1137	1137	}
1138	1138
1139	1139	/*
1140	1140	** COMMAND: wiki*
1141	1141	**
1142		-** Usage: ../fossil wiki (export\|create\|commit\|list) WikiName
	1142	+** Usage: %fossil wiki (export\|create\|commit\|list) WikiName
1143	1143	**
1144	1144	** Run various subcommands to work with wiki entries or tech notes.
1145	1145	**
1146		-** ../fossil wiki export ?PAGENAME? ?FILE? [-t\|--technote DATETIME ]
	1146	+** %fossil wiki export ?PAGENAME? ?FILE? [-t\|--technote DATETIME ]
1147	1147	**
1148	1148	** Sends the latest version of either the PAGENAME wiki entry
1149	1149	** or the DATETIME tech note to the given file or standard
1150	1150	** output. One of PAGENAME or DATETIME must be specified.
1151	1151	**
1152		-** ../fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
	1152	+** %fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1153	1153	**
1154	1154	** Create a new or commit changes to an existing wiki page or
1155	1155	** technote from FILE or from standard input.
1156	1156	**
1157	1157	** Options:
1158		-** -M\|--mimetype TEXT-FORMAT The mime type of the update defaulting
1159		-** defaulting to the type used by the
1160		-** previous version of the page or (for
1161		-** new pages) text/x-fossil-wiki.
	1158	+** -M\|--mimetype TEXT-FORMAT The mimetype of the update defaulting
	1159	+** to the type used by the previous version
	1160	+** of the page or text/x-fossil-wiki.
1162	1161	** -t\|--technote DATETIME Specifies the timestamp of the technote
1163	1162	** to be created or updated.
1164	1163	** --technote-tags TAGS The set of tags for a technote.
1165	1164	** --technote-bgcolor COLOR The color used for the technote on the
1166	1165	** timeline.
1167	1166	**
1168		-** ../fossil wiki list ?--technote?
1169		-** ../fossil wiki ls ?--technote?
	1167	+** %fossil wiki list ?--technote?
	1168	+** %fossil wiki ls ?--technote?
1170	1169	**
1171	1170	** Lists all wiki entries, one per line, ordered
1172	1171	** case-insensitively by name. The --technote flag
1173	1172	** specifies that technotes will be listed instead of
1174	1173	** the wiki entries, which will be listed in order
1175	1174

	--- src/wiki.c
	+++ src/wiki.c
	@@ -1137,38 +1137,37 @@
1137	}
1138
1139	/*
1140	** COMMAND: wiki*
1141	**
1142	** Usage: ../fossil wiki (export\|create\|commit\|list) WikiName
1143	**
1144	** Run various subcommands to work with wiki entries or tech notes.
1145	**
1146	** ../fossil wiki export ?PAGENAME? ?FILE? [-t\|--technote DATETIME ]
1147	**
1148	** Sends the latest version of either the PAGENAME wiki entry
1149	** or the DATETIME tech note to the given file or standard
1150	** output. One of PAGENAME or DATETIME must be specified.
1151	**
1152	** ../fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1153	**
1154	** Create a new or commit changes to an existing wiki page or
1155	** technote from FILE or from standard input.
1156	**
1157	** Options:
1158	** -M\|--mimetype TEXT-FORMAT The mime type of the update defaulting
1159	** defaulting to the type used by the
1160	** previous version of the page or (for
1161	** new pages) text/x-fossil-wiki.
1162	** -t\|--technote DATETIME Specifies the timestamp of the technote
1163	** to be created or updated.
1164	** --technote-tags TAGS The set of tags for a technote.
1165	** --technote-bgcolor COLOR The color used for the technote on the
1166	** timeline.
1167	**
1168	** ../fossil wiki list ?--technote?
1169	** ../fossil wiki ls ?--technote?
1170	**
1171	** Lists all wiki entries, one per line, ordered
1172	** case-insensitively by name. The --technote flag
1173	** specifies that technotes will be listed instead of
1174	** the wiki entries, which will be listed in order
1175

	--- src/wiki.c
	+++ src/wiki.c
	@@ -1137,38 +1137,37 @@
1137	}
1138
1139	/*
1140	** COMMAND: wiki*
1141	**
1142	** Usage: %fossil wiki (export\|create\|commit\|list) WikiName
1143	**
1144	** Run various subcommands to work with wiki entries or tech notes.
1145	**
1146	** %fossil wiki export ?PAGENAME? ?FILE? [-t\|--technote DATETIME ]
1147	**
1148	** Sends the latest version of either the PAGENAME wiki entry
1149	** or the DATETIME tech note to the given file or standard
1150	** output. One of PAGENAME or DATETIME must be specified.
1151	**
1152	** %fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1153	**
1154	** Create a new or commit changes to an existing wiki page or
1155	** technote from FILE or from standard input.
1156	**
1157	** Options:
1158	** -M\|--mimetype TEXT-FORMAT The mimetype of the update defaulting
1159	** to the type used by the previous version
1160	** of the page or text/x-fossil-wiki.

1161	** -t\|--technote DATETIME Specifies the timestamp of the technote
1162	** to be created or updated.
1163	** --technote-tags TAGS The set of tags for a technote.
1164	** --technote-bgcolor COLOR The color used for the technote on the
1165	** timeline.
1166	**
1167	** %fossil wiki list ?--technote?
1168	** %fossil wiki ls ?--technote?
1169	**
1170	** Lists all wiki entries, one per line, ordered
1171	** case-insensitively by name. The --technote flag
1172	** specifies that technotes will be listed instead of
1173	** the wiki entries, which will be listed in order
1174

M src/winhttp.c

+6 -6

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -572,11 +572,11 @@
572	572	return 0;
573	573	}
574	574
575	575	/* dupe ifdef needed for mkindex
576	576	** COMMAND: winsrv*
577		-** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
	577	+** Usage: %fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
578	578	**
579	579	** Where METHOD is one of: create delete show start stop.
580	580	**
581	581	** The winsrv command manages Fossil as a Windows service. This allows
582	582	** (for example) Fossil to be running in the background when no user
		@@ -583,11 +583,11 @@
583	583	** is logged in.
584	584	**
585	585	** In the following description of the methods, "Fossil-DSCM" will be
586	586	** used as the default SERVICE-NAME:
587	587	**
588		-** fossil winsrv create ?SERVICE-NAME? ?OPTIONS?
	588	+** %fossil winsrv create ?SERVICE-NAME? ?OPTIONS?
589	589	**
590	590	** Creates a service. Available options include:
591	591	**
592	592	** -D\|--display DISPLAY-NAME
593	593	**
		@@ -656,27 +656,27 @@
656	656	** --scgi
657	657	**
658	658	** Create an SCGI server instead of an HTTP server
659	659	**
660	660	**
661		-** fossil winsrv delete ?SERVICE-NAME?
	661	+** %fossil winsrv delete ?SERVICE-NAME?
662	662	**
663	663	** Deletes a service. If the service is currently running, it will be
664	664	** stopped first and then deleted.
665	665	**
666	666	**
667		-** fossil winsrv show ?SERVICE-NAME?
	667	+** %fossil winsrv show ?SERVICE-NAME?
668	668	**
669	669	** Shows how the service is configured and its current state.
670	670	**
671	671	**
672		-** fossil winsrv start ?SERVICE-NAME?
	672	+** %fossil winsrv start ?SERVICE-NAME?
673	673	**
674	674	** Start the service.
675	675	**
676	676	**
677		-** fossil winsrv stop ?SERVICE-NAME?
	677	+** %fossil winsrv stop ?SERVICE-NAME?
678	678	**
679	679	** Stop the service.
680	680	**
681	681	**
682	682	** NOTE: This command is available on Windows operating systems only and
683	683

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -572,11 +572,11 @@
572	return 0;
573	}
574
575	/* dupe ifdef needed for mkindex
576	** COMMAND: winsrv*
577	** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
578	**
579	** Where METHOD is one of: create delete show start stop.
580	**
581	** The winsrv command manages Fossil as a Windows service. This allows
582	** (for example) Fossil to be running in the background when no user
	@@ -583,11 +583,11 @@
583	** is logged in.
584	**
585	** In the following description of the methods, "Fossil-DSCM" will be
586	** used as the default SERVICE-NAME:
587	**
588	** fossil winsrv create ?SERVICE-NAME? ?OPTIONS?
589	**
590	** Creates a service. Available options include:
591	**
592	** -D\|--display DISPLAY-NAME
593	**
	@@ -656,27 +656,27 @@
656	** --scgi
657	**
658	** Create an SCGI server instead of an HTTP server
659	**
660	**
661	** fossil winsrv delete ?SERVICE-NAME?
662	**
663	** Deletes a service. If the service is currently running, it will be
664	** stopped first and then deleted.
665	**
666	**
667	** fossil winsrv show ?SERVICE-NAME?
668	**
669	** Shows how the service is configured and its current state.
670	**
671	**
672	** fossil winsrv start ?SERVICE-NAME?
673	**
674	** Start the service.
675	**
676	**
677	** fossil winsrv stop ?SERVICE-NAME?
678	**
679	** Stop the service.
680	**
681	**
682	** NOTE: This command is available on Windows operating systems only and
683

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -572,11 +572,11 @@
572	return 0;
573	}
574
575	/* dupe ifdef needed for mkindex
576	** COMMAND: winsrv*
577	** Usage: %fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
578	**
579	** Where METHOD is one of: create delete show start stop.
580	**
581	** The winsrv command manages Fossil as a Windows service. This allows
582	** (for example) Fossil to be running in the background when no user
	@@ -583,11 +583,11 @@
583	** is logged in.
584	**
585	** In the following description of the methods, "Fossil-DSCM" will be
586	** used as the default SERVICE-NAME:
587	**
588	** %fossil winsrv create ?SERVICE-NAME? ?OPTIONS?
589	**
590	** Creates a service. Available options include:
591	**
592	** -D\|--display DISPLAY-NAME
593	**
	@@ -656,27 +656,27 @@
656	** --scgi
657	**
658	** Create an SCGI server instead of an HTTP server
659	**
660	**
661	** %fossil winsrv delete ?SERVICE-NAME?
662	**
663	** Deletes a service. If the service is currently running, it will be
664	** stopped first and then deleted.
665	**
666	**
667	** %fossil winsrv show ?SERVICE-NAME?
668	**
669	** Shows how the service is configured and its current state.
670	**
671	**
672	** %fossil winsrv start ?SERVICE-NAME?
673	**
674	** Start the service.
675	**
676	**
677	** %fossil winsrv stop ?SERVICE-NAME?
678	**
679	** Stop the service.
680	**
681	**
682	** NOTE: This command is available on Windows operating systems only and
683

Fossil SCM

Keyboard Shortcuts