33d3bf3edb8… — Fossil SCM

M src/alerts.c

+2 -2

		--- src/alerts.c
		+++ src/alerts.c
		@@ -2259,11 +2259,11 @@
2259	2259	** Users visit this page to be delisted from email alerts.
2260	2260	**
2261	2261	** If a valid subscriber code is supplied in the name= query parameter,
2262	2262	** then that subscriber is delisted.
2263	2263	**
2264		-** Otherwise, If the users is logged in, then they are redirected
	2264	+** Otherwise, if the users are logged in, then they are redirected
2265	2265	** to the /alerts page where they have an unsubscribe button.
2266	2266	**
2267	2267	** Non-logged-in users with no name= query parameter are invited to enter
2268	2268	** an email address to which will be sent the unsubscribe link that
2269	2269	** contains the correct subscriber code.
		@@ -2606,11 +2606,11 @@
2606	2606	/*
2607	2607	** Compute a string that is appropriate for the EmailEvent.zPriors field
2608	2608	** for a particular forum post.
2609	2609	**
2610	2610	** This string is an encode list of sender names and rids for all ancestors
2611		-** of the fpdi post - the post that fpid answer, the post that that parent
	2611	+** of the fpid post - the post that fpid answers, the post that parent
2612	2612	** post answers, and so forth back up to the root post. Duplicates sender
2613	2613	** names are omitted.
2614	2614	**
2615	2615	** The EmailEvent.zPriors field is used to screen events for people who
2616	2616	** only want to see replies to their own posts or to specific posts.
2617	2617

	--- src/alerts.c
	+++ src/alerts.c
	@@ -2259,11 +2259,11 @@
2259	** Users visit this page to be delisted from email alerts.
2260	**
2261	** If a valid subscriber code is supplied in the name= query parameter,
2262	** then that subscriber is delisted.
2263	**
2264	** Otherwise, If the users is logged in, then they are redirected
2265	** to the /alerts page where they have an unsubscribe button.
2266	**
2267	** Non-logged-in users with no name= query parameter are invited to enter
2268	** an email address to which will be sent the unsubscribe link that
2269	** contains the correct subscriber code.
	@@ -2606,11 +2606,11 @@
2606	/*
2607	** Compute a string that is appropriate for the EmailEvent.zPriors field
2608	** for a particular forum post.
2609	**
2610	** This string is an encode list of sender names and rids for all ancestors
2611	** of the fpdi post - the post that fpid answer, the post that that parent
2612	** post answers, and so forth back up to the root post. Duplicates sender
2613	** names are omitted.
2614	**
2615	** The EmailEvent.zPriors field is used to screen events for people who
2616	** only want to see replies to their own posts or to specific posts.
2617

	--- src/alerts.c
	+++ src/alerts.c
	@@ -2259,11 +2259,11 @@
2259	** Users visit this page to be delisted from email alerts.
2260	**
2261	** If a valid subscriber code is supplied in the name= query parameter,
2262	** then that subscriber is delisted.
2263	**
2264	** Otherwise, if the users are logged in, then they are redirected
2265	** to the /alerts page where they have an unsubscribe button.
2266	**
2267	** Non-logged-in users with no name= query parameter are invited to enter
2268	** an email address to which will be sent the unsubscribe link that
2269	** contains the correct subscriber code.
	@@ -2606,11 +2606,11 @@
2606	/*
2607	** Compute a string that is appropriate for the EmailEvent.zPriors field
2608	** for a particular forum post.
2609	**
2610	** This string is an encode list of sender names and rids for all ancestors
2611	** of the fpid post - the post that fpid answers, the post that parent
2612	** post answers, and so forth back up to the root post. Duplicates sender
2613	** names are omitted.
2614	**
2615	** The EmailEvent.zPriors field is used to screen events for people who
2616	** only want to see replies to their own posts or to specific posts.
2617

M src/bisect.c

+1 -1

		--- src/bisect.c
		+++ src/bisect.c
		@@ -171,11 +171,11 @@
171	171
172	172	/*
173	173	** Append a new entry to the bisect log. Update the bisect-good or
174	174	** bisect-bad values as appropriate.
175	175	**
176		-** The bisect-log consists of a list of token. Each token is an
	176	+** The bisect-log consists of a list of tokens. Each token is an
177	177	** integer RID of a check-in. The RID is negative for "bad" check-ins
178	178	** and positive for "good" check-ins.
179	179	*/
180	180	static void bisect_append_log(int rid){
181	181	if( rid<0 ){
182	182

	--- src/bisect.c
	+++ src/bisect.c
	@@ -171,11 +171,11 @@
171
172	/*
173	** Append a new entry to the bisect log. Update the bisect-good or
174	** bisect-bad values as appropriate.
175	**
176	** The bisect-log consists of a list of token. Each token is an
177	** integer RID of a check-in. The RID is negative for "bad" check-ins
178	** and positive for "good" check-ins.
179	*/
180	static void bisect_append_log(int rid){
181	if( rid<0 ){
182

	--- src/bisect.c
	+++ src/bisect.c
	@@ -171,11 +171,11 @@
171
172	/*
173	** Append a new entry to the bisect log. Update the bisect-good or
174	** bisect-bad values as appropriate.
175	**
176	** The bisect-log consists of a list of tokens. Each token is an
177	** integer RID of a check-in. The RID is negative for "bad" check-ins
178	** and positive for "good" check-ins.
179	*/
180	static void bisect_append_log(int rid){
181	if( rid<0 ){
182

M src/blob.c

+1 -1

		--- src/blob.c
		+++ src/blob.c
		@@ -1806,11 +1806,11 @@
1806	1806	** unusual characters as an argument for testing.
1807	1807	**
1808	1808	** --compare HEX ASCII Verify that argument ASCII is identical to
1809	1809	** to decoded HEX.
1810	1810	**
1811		-** --fuzz N Run N fuzz cases. Each cases is a call
	1811	+** --fuzz N Run N fuzz cases. Each case is a call
1812	1812	** to "fossil test-escaped-arg --compare HEX ARG"
1813	1813	** where HEX and ARG are the same argument.
1814	1814	** The argument is chosen at random.
1815	1815	*/
1816	1816	void test_escaped_arg_command(void){
1817	1817

	--- src/blob.c
	+++ src/blob.c
	@@ -1806,11 +1806,11 @@
1806	** unusual characters as an argument for testing.
1807	**
1808	** --compare HEX ASCII Verify that argument ASCII is identical to
1809	** to decoded HEX.
1810	**
1811	** --fuzz N Run N fuzz cases. Each cases is a call
1812	** to "fossil test-escaped-arg --compare HEX ARG"
1813	** where HEX and ARG are the same argument.
1814	** The argument is chosen at random.
1815	*/
1816	void test_escaped_arg_command(void){
1817

	--- src/blob.c
	+++ src/blob.c
	@@ -1806,11 +1806,11 @@
1806	** unusual characters as an argument for testing.
1807	**
1808	** --compare HEX ASCII Verify that argument ASCII is identical to
1809	** to decoded HEX.
1810	**
1811	** --fuzz N Run N fuzz cases. Each case is a call
1812	** to "fossil test-escaped-arg --compare HEX ARG"
1813	** where HEX and ARG are the same argument.
1814	** The argument is chosen at random.
1815	*/
1816	void test_escaped_arg_command(void){
1817

M src/cgi.c

+4 -4

		--- src/cgi.c
		+++ src/cgi.c
		@@ -13,11 +13,11 @@
13	13	** [email protected]
14	14	** http://www.hwaci.com/drh/
15	15	**
16	16	*******************************************************************************
17	17	**
18		-** This file began as a set of C functions and procedures used intepret
	18	+** This file began as a set of C functions and procedures used to interpret
19	19	** CGI environment variables for Fossil web pages that were invoked by
20	20	** CGI. That's where the file name comes from. But over the years it
21	21	** has grown to incorporate lots of related functionality, including:
22	22	**
23	23	** * Interpreting CGI environment variables when Fossil is run as
		@@ -942,12 +942,12 @@
942	942	}
943	943	return cnt;
944	944	}
945	945
946	946	/*
947		-** Add an environment varaible value to the parameter set. The zName
948		-** portion is fixed but a copy is be made of zValue.
	947	+** Add an environment variable value to the parameter set. The zName
	948	+** portion is fixed but a copy is made of zValue.
949	949	*/
950	950	void cgi_setenv(const char zName, const char zValue){
951	951	cgi_set_parameter_nocopy(zName, fossil_strdup(zValue), 0);
952	952	}
953	953
		@@ -968,11 +968,11 @@
968	968	** Each parameter is of the form NAME=VALUE. Both the NAME and the
969	969	** VALUE may be url-encoded ("+" for space, "%HH" for other special
970	970	** characters). But this routine assumes that NAME contains no
971	971	** special character and therefore does not decode it.
972	972	**
973		-** If NAME begins with another other than a lower-case letter then
	973	+** If NAME begins with something other than a lower-case letter then
974	974	** the entire NAME=VALUE term is ignored. Hence:
975	975	**
976	976	** * cookies and query parameters that have uppercase names
977	977	** are ignored.
978	978	**
979	979

	--- src/cgi.c
	+++ src/cgi.c
	@@ -13,11 +13,11 @@
13	** [email protected]
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file began as a set of C functions and procedures used intepret
19	** CGI environment variables for Fossil web pages that were invoked by
20	** CGI. That's where the file name comes from. But over the years it
21	** has grown to incorporate lots of related functionality, including:
22	**
23	** * Interpreting CGI environment variables when Fossil is run as
	@@ -942,12 +942,12 @@
942	}
943	return cnt;
944	}
945
946	/*
947	** Add an environment varaible value to the parameter set. The zName
948	** portion is fixed but a copy is be made of zValue.
949	*/
950	void cgi_setenv(const char zName, const char zValue){
951	cgi_set_parameter_nocopy(zName, fossil_strdup(zValue), 0);
952	}
953
	@@ -968,11 +968,11 @@
968	** Each parameter is of the form NAME=VALUE. Both the NAME and the
969	** VALUE may be url-encoded ("+" for space, "%HH" for other special
970	** characters). But this routine assumes that NAME contains no
971	** special character and therefore does not decode it.
972	**
973	** If NAME begins with another other than a lower-case letter then
974	** the entire NAME=VALUE term is ignored. Hence:
975	**
976	** * cookies and query parameters that have uppercase names
977	** are ignored.
978	**
979

	--- src/cgi.c
	+++ src/cgi.c
	@@ -13,11 +13,11 @@
13	** [email protected]
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file began as a set of C functions and procedures used to interpret
19	** CGI environment variables for Fossil web pages that were invoked by
20	** CGI. That's where the file name comes from. But over the years it
21	** has grown to incorporate lots of related functionality, including:
22	**
23	** * Interpreting CGI environment variables when Fossil is run as
	@@ -942,12 +942,12 @@
942	}
943	return cnt;
944	}
945
946	/*
947	** Add an environment variable value to the parameter set. The zName
948	** portion is fixed but a copy is made of zValue.
949	*/
950	void cgi_setenv(const char zName, const char zValue){
951	cgi_set_parameter_nocopy(zName, fossil_strdup(zValue), 0);
952	}
953
	@@ -968,11 +968,11 @@
968	** Each parameter is of the form NAME=VALUE. Both the NAME and the
969	** VALUE may be url-encoded ("+" for space, "%HH" for other special
970	** characters). But this routine assumes that NAME contains no
971	** special character and therefore does not decode it.
972	**
973	** If NAME begins with something other than a lower-case letter then
974	** the entire NAME=VALUE term is ignored. Hence:
975	**
976	** * cookies and query parameters that have uppercase names
977	** are ignored.
978	**
979

M src/content.c

+1 -1

		--- src/content.c
		+++ src/content.c
		@@ -651,11 +651,11 @@
651	651	** pBlob is uncompressed and is not deltaed. It is exactly the content
652	652	** to be inserted.
653	653	**
654	654	** The original content of pBlob is not disturbed. The caller continues
655	655	** to be responsible for pBlob. This routine does not take over
656		-** responsiblity for freeing pBlob.
	656	+** responsibility for freeing pBlob.
657	657	*/
658	658	int content_put(Blob *pBlob){
659	659	return content_put_ex(pBlob, 0, 0, 0, 0);
660	660	}
661	661
662	662

	--- src/content.c
	+++ src/content.c
	@@ -651,11 +651,11 @@
651	** pBlob is uncompressed and is not deltaed. It is exactly the content
652	** to be inserted.
653	**
654	** The original content of pBlob is not disturbed. The caller continues
655	** to be responsible for pBlob. This routine does not take over
656	** responsiblity for freeing pBlob.
657	*/
658	int content_put(Blob *pBlob){
659	return content_put_ex(pBlob, 0, 0, 0, 0);
660	}
661
662

	--- src/content.c
	+++ src/content.c
	@@ -651,11 +651,11 @@
651	** pBlob is uncompressed and is not deltaed. It is exactly the content
652	** to be inserted.
653	**
654	** The original content of pBlob is not disturbed. The caller continues
655	** to be responsible for pBlob. This routine does not take over
656	** responsibility for freeing pBlob.
657	*/
658	int content_put(Blob *pBlob){
659	return content_put_ex(pBlob, 0, 0, 0, 0);
660	}
661
662

M src/db.c

+3 -3

		--- src/db.c
		+++ src/db.c
		@@ -4569,11 +4569,11 @@
4569	4569	**
4570	4570	** var is the name of the internal configuration name for db_(un)set.
4571	4571	** If var is 0, the settings name is used.
4572	4572	**
4573	4573	** width is the length for the edit field on the behavior page, 0 is
4574		-** used for on/off checkboxes. A negative value indicates that that
	4574	+** used for on/off checkboxes. A negative value indicates that the
4575	4575	** page should not render this setting. Such values may be rendered
4576	4576	** separately/manually on another page, e.g., /setup_access, and are
4577	4577	** exposed via the CLI settings command.
4578	4578	**
4579	4579	** The behaviour page doesn't use a special layout. It lists all
		@@ -5576,17 +5576,17 @@
5576	5576	fossil_print("Config database: %s\n", g.zConfigDbName);
5577	5577	}
5578	5578
5579	5579	/*
5580	5580	** Compute a "fingerprint" on the repository. A fingerprint is used
5581		-** to verify that that the repository has not been replaced by a clone
	5581	+** to verify that the repository has not been replaced by a clone
5582	5582	** of the same repository. More precisely, a fingerprint is used to
5583	5583	** verify that the mapping between SHA3 hashes and RID values is unchanged.
5584	5584	**
5585	5585	** The check-out database ("localdb") stores RID values. When associating
5586	5586	** a check-out database against a repository database, it is useful to verify
5587		-** the fingerprint so that we know tha the RID values in the check-out
	5587	+** the fingerprint so that we know that the RID values in the check-out
5588	5588	** database still correspond to the correct entries in the BLOB table of
5589	5589	** the repository.
5590	5590	**
5591	5591	** The fingerprint is based on the RCVFROM table. When constructing a
5592	5592	** new fingerprint, use the most recent RCVFROM entry. (Set rcvid==0 to
5593	5593

	--- src/db.c
	+++ src/db.c
	@@ -4569,11 +4569,11 @@
4569	**
4570	** var is the name of the internal configuration name for db_(un)set.
4571	** If var is 0, the settings name is used.
4572	**
4573	** width is the length for the edit field on the behavior page, 0 is
4574	** used for on/off checkboxes. A negative value indicates that that
4575	** page should not render this setting. Such values may be rendered
4576	** separately/manually on another page, e.g., /setup_access, and are
4577	** exposed via the CLI settings command.
4578	**
4579	** The behaviour page doesn't use a special layout. It lists all
	@@ -5576,17 +5576,17 @@
5576	fossil_print("Config database: %s\n", g.zConfigDbName);
5577	}
5578
5579	/*
5580	** Compute a "fingerprint" on the repository. A fingerprint is used
5581	** to verify that that the repository has not been replaced by a clone
5582	** of the same repository. More precisely, a fingerprint is used to
5583	** verify that the mapping between SHA3 hashes and RID values is unchanged.
5584	**
5585	** The check-out database ("localdb") stores RID values. When associating
5586	** a check-out database against a repository database, it is useful to verify
5587	** the fingerprint so that we know tha the RID values in the check-out
5588	** database still correspond to the correct entries in the BLOB table of
5589	** the repository.
5590	**
5591	** The fingerprint is based on the RCVFROM table. When constructing a
5592	** new fingerprint, use the most recent RCVFROM entry. (Set rcvid==0 to
5593

	--- src/db.c
	+++ src/db.c
	@@ -4569,11 +4569,11 @@
4569	**
4570	** var is the name of the internal configuration name for db_(un)set.
4571	** If var is 0, the settings name is used.
4572	**
4573	** width is the length for the edit field on the behavior page, 0 is
4574	** used for on/off checkboxes. A negative value indicates that the
4575	** page should not render this setting. Such values may be rendered
4576	** separately/manually on another page, e.g., /setup_access, and are
4577	** exposed via the CLI settings command.
4578	**
4579	** The behaviour page doesn't use a special layout. It lists all
	@@ -5576,17 +5576,17 @@
5576	fossil_print("Config database: %s\n", g.zConfigDbName);
5577	}
5578
5579	/*
5580	** Compute a "fingerprint" on the repository. A fingerprint is used
5581	** to verify that the repository has not been replaced by a clone
5582	** of the same repository. More precisely, a fingerprint is used to
5583	** verify that the mapping between SHA3 hashes and RID values is unchanged.
5584	**
5585	** The check-out database ("localdb") stores RID values. When associating
5586	** a check-out database against a repository database, it is useful to verify
5587	** the fingerprint so that we know that the RID values in the check-out
5588	** database still correspond to the correct entries in the BLOB table of
5589	** the repository.
5590	**
5591	** The fingerprint is based on the RCVFROM table. When constructing a
5592	** new fingerprint, use the most recent RCVFROM entry. (Set rcvid==0 to
5593

M src/diffcmd.c

+1 -1

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -1329,11 +1329,11 @@
1329	1329	**
1330	1330	** The "--binary" option causes files matching the glob PATTERN to be treated
1331	1331	** as binary when considering if they should be used with the external diff
1332	1332	** program. This option overrides the "binary-glob" setting.
1333	1333	**
1334		-** These command show differences between managed files. Use the "fossil xdiff"
	1334	+** These commands show differences between managed files. Use the "fossil xdiff"
1335	1335	** command to see differences in unmanaged files.
1336	1336	**
1337	1337	** Options:
1338	1338	** --binary PATTERN Treat files that match the glob PATTERN
1339	1339	** as binary
1340	1340

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -1329,11 +1329,11 @@
1329	**
1330	** The "--binary" option causes files matching the glob PATTERN to be treated
1331	** as binary when considering if they should be used with the external diff
1332	** program. This option overrides the "binary-glob" setting.
1333	**
1334	** These command show differences between managed files. Use the "fossil xdiff"
1335	** command to see differences in unmanaged files.
1336	**
1337	** Options:
1338	** --binary PATTERN Treat files that match the glob PATTERN
1339	** as binary
1340

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -1329,11 +1329,11 @@
1329	**
1330	** The "--binary" option causes files matching the glob PATTERN to be treated
1331	** as binary when considering if they should be used with the external diff
1332	** program. This option overrides the "binary-glob" setting.
1333	**
1334	** These commands show differences between managed files. Use the "fossil xdiff"
1335	** command to see differences in unmanaged files.
1336	**
1337	** Options:
1338	** --binary PATTERN Treat files that match the glob PATTERN
1339	** as binary
1340

M src/file.c

+1 -1

		--- src/file.c
		+++ src/file.c
		@@ -51,11 +51,11 @@
51	51	** a few special cases such as the "fossil test-tarball" command when we never
52	52	** want to follow symlinks.
53	53	**
54	54	** ExtFILE Symbolic links always refer to the object to which the
55	55	** link points. Symlinks are never recognized as symlinks but
56		-** instead always appear to the the target object.
	56	+** instead always appear to be the target object.
57	57	**
58	58	** SymFILE Symbolic links always appear to be files whose name is
59	59	** the target pathname of the symbolic link.
60	60	**
61	61	** RepoFILE Like SymFILE if allow-symlinks is true, or like
62	62

	--- src/file.c
	+++ src/file.c
	@@ -51,11 +51,11 @@
51	** a few special cases such as the "fossil test-tarball" command when we never
52	** want to follow symlinks.
53	**
54	** ExtFILE Symbolic links always refer to the object to which the
55	** link points. Symlinks are never recognized as symlinks but
56	** instead always appear to the the target object.
57	**
58	** SymFILE Symbolic links always appear to be files whose name is
59	** the target pathname of the symbolic link.
60	**
61	** RepoFILE Like SymFILE if allow-symlinks is true, or like
62

	--- src/file.c
	+++ src/file.c
	@@ -51,11 +51,11 @@
51	** a few special cases such as the "fossil test-tarball" command when we never
52	** want to follow symlinks.
53	**
54	** ExtFILE Symbolic links always refer to the object to which the
55	** link points. Symlinks are never recognized as symlinks but
56	** instead always appear to be the target object.
57	**
58	** SymFILE Symbolic links always appear to be files whose name is
59	** the target pathname of the symbolic link.
60	**
61	** RepoFILE Like SymFILE if allow-symlinks is true, or like
62

M src/http.c

+1 -1

		--- src/http.c
		+++ src/http.c
		@@ -246,11 +246,11 @@
246	246	}
247	247	return zHttpAuth;
248	248	}
249	249
250	250	/*
251		-** Send content pSend to the the server identified by g.url using the
	251	+** Send content pSend to the server identified by g.url using the
252	252	** external program given by g.zHttpCmd. Capture the reply from that
253	253	** program and load it into pReply.
254	254	**
255	255	** This routine implements the --transport-command option for "fossil sync".
256	256	*/
257	257

	--- src/http.c
	+++ src/http.c
	@@ -246,11 +246,11 @@
246	}
247	return zHttpAuth;
248	}
249
250	/*
251	** Send content pSend to the the server identified by g.url using the
252	** external program given by g.zHttpCmd. Capture the reply from that
253	** program and load it into pReply.
254	**
255	** This routine implements the --transport-command option for "fossil sync".
256	*/
257

	--- src/http.c
	+++ src/http.c
	@@ -246,11 +246,11 @@
246	}
247	return zHttpAuth;
248	}
249
250	/*
251	** Send content pSend to the server identified by g.url using the
252	** external program given by g.zHttpCmd. Capture the reply from that
253	** program and load it into pReply.
254	**
255	** This routine implements the --transport-command option for "fossil sync".
256	*/
257

M src/json_status.c

+1 -1

		--- src/json_status.c
		+++ src/json_status.c
		@@ -126,11 +126,11 @@
126	126	zStatus = "missing";
127	127	++nErr;
128	128	}
129	129	}else if( isChnged ){
130	130	switch( isChnged ){
131		- /* These numbers from from checkin.c: status_report() */
	131	+ /* These numbers from checkin.c: status_report() */
132	132	case 1:
133	133	if( file_contains_merge_marker(zFullName) ){
134	134	zStatus = "conflict";
135	135	}else{
136	136	zStatus = "edited";
137	137

	--- src/json_status.c
	+++ src/json_status.c
	@@ -126,11 +126,11 @@
126	zStatus = "missing";
127	++nErr;
128	}
129	}else if( isChnged ){
130	switch( isChnged ){
131	/* These numbers from from checkin.c: status_report() */
132	case 1:
133	if( file_contains_merge_marker(zFullName) ){
134	zStatus = "conflict";
135	}else{
136	zStatus = "edited";
137

	--- src/json_status.c
	+++ src/json_status.c
	@@ -126,11 +126,11 @@
126	zStatus = "missing";
127	++nErr;
128	}
129	}else if( isChnged ){
130	switch( isChnged ){
131	/* These numbers from checkin.c: status_report() */
132	case 1:
133	if( file_contains_merge_marker(zFullName) ){
134	zStatus = "conflict";
135	}else{
136	zStatus = "edited";
137

M src/login.c

+1 -1

		--- src/login.c
		+++ src/login.c
		@@ -2157,11 +2157,11 @@
2157	2157	Blob sql;
2158	2158	int uid;
2159	2159	char *zPass = sha1_shared_secret(zPasswd, zUserID, 0);
2160	2160	const char *zStartPerms = zPerms;
2161	2161	if( db_get_boolean("selfreg-verify",0) ){
2162		- /* If email verification is required for self-registration, initalize
	2162	+ /* If email verification is required for self-registration, initialize
2163	2163	** the new user capabilities to just "7" (Sign up for email). The
2164	2164	** full "default-perms" permissions will be added when they click
2165	2165	** the verification link on the email they are sent. */
2166	2166	zStartPerms = "7";
2167	2167	}
2168	2168

	--- src/login.c
	+++ src/login.c
	@@ -2157,11 +2157,11 @@
2157	Blob sql;
2158	int uid;
2159	char *zPass = sha1_shared_secret(zPasswd, zUserID, 0);
2160	const char *zStartPerms = zPerms;
2161	if( db_get_boolean("selfreg-verify",0) ){
2162	/* If email verification is required for self-registration, initalize
2163	** the new user capabilities to just "7" (Sign up for email). The
2164	** full "default-perms" permissions will be added when they click
2165	** the verification link on the email they are sent. */
2166	zStartPerms = "7";
2167	}
2168

	--- src/login.c
	+++ src/login.c
	@@ -2157,11 +2157,11 @@
2157	Blob sql;
2158	int uid;
2159	char *zPass = sha1_shared_secret(zPasswd, zUserID, 0);
2160	const char *zStartPerms = zPerms;
2161	if( db_get_boolean("selfreg-verify",0) ){
2162	/* If email verification is required for self-registration, initialize
2163	** the new user capabilities to just "7" (Sign up for email). The
2164	** full "default-perms" permissions will be added when they click
2165	** the verification link on the email they are sent. */
2166	zStartPerms = "7";
2167	}
2168

M src/main.c

+3 -3

		--- src/main.c
		+++ src/main.c
		@@ -2876,11 +2876,11 @@
2876	2876	** then the server redirects (HTTP code 302) to the URL of --notfound.
2877	2877	** When REPOSITORY is a directory, the pathname must contain only
2878	2878	** alphanumerics, "_", "/", "-" and "." and no "-" may occur after a "/"
2879	2879	** and every "." must be surrounded on both sides by alphanumerics or else
2880	2880	** a 404 error is returned. Static content files in the directory are
2881		-** returned if they match comma-separate GLOB pattern specified by --files
	2881	+** returned if they match comma-separated GLOB pattern specified by --files
2882	2882	** and do not match ".fossil" and have a well-known suffix.
2883	2883	**
2884	2884	** Options:
2885	2885	** --acme Deliver files from the ".well-known" subdirectory
2886	2886	** --baseurl URL Base URL (useful with reverse proxies)
		@@ -2888,11 +2888,11 @@
2888	2888	** fullchain.pem) taken from FILE.
2889	2889	** --chroot DIR Use directory for chroot instead of repository path.
2890	2890	** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
2891	2891	** /doc/ckout/...
2892	2892	** --extroot DIR Document root for the /ext extension mechanism
2893		-** --files GLOB Comma-separate glob patterns for static file to serve
	2893	+** --files GLOB Comma-separated glob patterns for static files to serve
2894	2894	** --host NAME DNS Hostname of the server
2895	2895	** --https The HTTP request originated from https but has already
2896	2896	** been decoded by a reverse proxy. Hence, URLs created
2897	2897	** by Fossil should use "https:" rather than "http:".
2898	2898	** --in FILE Take input from FILE instead of standard input
		@@ -3109,11 +3109,11 @@
3109	3109	** using this command interactively over SSH. A better solution would be
3110	3110	** to use a different command for "ssh" sync, but we cannot do that without
3111	3111	** breaking legacy.
3112	3112	**
3113	3113	** Options:
3114		-** --csrf-safe N Set cgi_csrf_safe() to to return N
	3114	+** --csrf-safe N Set cgi_csrf_safe() to return N
3115	3115	** --nobody Pretend to be user "nobody"
3116	3116	** --ssh-sim Pretend to be over an SSH connection
3117	3117	** --test Do not do special "sync" processing when operating
3118	3118	** over an SSH link
3119	3119	** --th-trace Trace TH1 execution (for debugging purposes)
3120	3120

	--- src/main.c
	+++ src/main.c
	@@ -2876,11 +2876,11 @@
2876	** then the server redirects (HTTP code 302) to the URL of --notfound.
2877	** When REPOSITORY is a directory, the pathname must contain only
2878	** alphanumerics, "_", "/", "-" and "." and no "-" may occur after a "/"
2879	** and every "." must be surrounded on both sides by alphanumerics or else
2880	** a 404 error is returned. Static content files in the directory are
2881	** returned if they match comma-separate GLOB pattern specified by --files
2882	** and do not match ".fossil" and have a well-known suffix.
2883	**
2884	** Options:
2885	** --acme Deliver files from the ".well-known" subdirectory
2886	** --baseurl URL Base URL (useful with reverse proxies)
	@@ -2888,11 +2888,11 @@
2888	** fullchain.pem) taken from FILE.
2889	** --chroot DIR Use directory for chroot instead of repository path.
2890	** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
2891	** /doc/ckout/...
2892	** --extroot DIR Document root for the /ext extension mechanism
2893	** --files GLOB Comma-separate glob patterns for static file to serve
2894	** --host NAME DNS Hostname of the server
2895	** --https The HTTP request originated from https but has already
2896	** been decoded by a reverse proxy. Hence, URLs created
2897	** by Fossil should use "https:" rather than "http:".
2898	** --in FILE Take input from FILE instead of standard input
	@@ -3109,11 +3109,11 @@
3109	** using this command interactively over SSH. A better solution would be
3110	** to use a different command for "ssh" sync, but we cannot do that without
3111	** breaking legacy.
3112	**
3113	** Options:
3114	** --csrf-safe N Set cgi_csrf_safe() to to return N
3115	** --nobody Pretend to be user "nobody"
3116	** --ssh-sim Pretend to be over an SSH connection
3117	** --test Do not do special "sync" processing when operating
3118	** over an SSH link
3119	** --th-trace Trace TH1 execution (for debugging purposes)
3120

	--- src/main.c
	+++ src/main.c
	@@ -2876,11 +2876,11 @@
2876	** then the server redirects (HTTP code 302) to the URL of --notfound.
2877	** When REPOSITORY is a directory, the pathname must contain only
2878	** alphanumerics, "_", "/", "-" and "." and no "-" may occur after a "/"
2879	** and every "." must be surrounded on both sides by alphanumerics or else
2880	** a 404 error is returned. Static content files in the directory are
2881	** returned if they match comma-separated GLOB pattern specified by --files
2882	** and do not match ".fossil" and have a well-known suffix.
2883	**
2884	** Options:
2885	** --acme Deliver files from the ".well-known" subdirectory
2886	** --baseurl URL Base URL (useful with reverse proxies)
	@@ -2888,11 +2888,11 @@
2888	** fullchain.pem) taken from FILE.
2889	** --chroot DIR Use directory for chroot instead of repository path.
2890	** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
2891	** /doc/ckout/...
2892	** --extroot DIR Document root for the /ext extension mechanism
2893	** --files GLOB Comma-separated glob patterns for static files to serve
2894	** --host NAME DNS Hostname of the server
2895	** --https The HTTP request originated from https but has already
2896	** been decoded by a reverse proxy. Hence, URLs created
2897	** by Fossil should use "https:" rather than "http:".
2898	** --in FILE Take input from FILE instead of standard input
	@@ -3109,11 +3109,11 @@
3109	** using this command interactively over SSH. A better solution would be
3110	** to use a different command for "ssh" sync, but we cannot do that without
3111	** breaking legacy.
3112	**
3113	** Options:
3114	** --csrf-safe N Set cgi_csrf_safe() to return N
3115	** --nobody Pretend to be user "nobody"
3116	** --ssh-sim Pretend to be over an SSH connection
3117	** --test Do not do special "sync" processing when operating
3118	** over an SSH link
3119	** --th-trace Trace TH1 execution (for debugging purposes)
3120

M src/manifest.c

+1 -2

		--- src/manifest.c
		+++ src/manifest.c
		@@ -946,12 +946,11 @@
946	946	** T (+\|*\|-)<tagname> <uuid> ?<value>?
947	947	**
948	948	** Create or cancel a tag or property. The tagname is fossil-encoded.
949	949	** The first character of the name must be either "+" to create a
950	950	** singleton tag, "*" to create a propagating tag, or "-" to create
951		- ** anti-tag that undoes a prior "+" or blocks propagation of of
952		- ** a "*".
	951	+ ** anti-tag that undoes a prior "+" or blocks propagation of a "*".
953	952	**
954	953	** The tag is applied to <uuid>. If <uuid> is "*" then the tag is
955	954	** applied to the current manifest. If <value> is provided then
956	955	** the tag is really a property with the given value.
957	956	**
958	957

	--- src/manifest.c
	+++ src/manifest.c
	@@ -946,12 +946,11 @@
946	** T (+\|*\|-)<tagname> <uuid> ?<value>?
947	**
948	** Create or cancel a tag or property. The tagname is fossil-encoded.
949	** The first character of the name must be either "+" to create a
950	** singleton tag, "*" to create a propagating tag, or "-" to create
951	** anti-tag that undoes a prior "+" or blocks propagation of of
952	** a "*".
953	**
954	** The tag is applied to <uuid>. If <uuid> is "*" then the tag is
955	** applied to the current manifest. If <value> is provided then
956	** the tag is really a property with the given value.
957	**
958

	--- src/manifest.c
	+++ src/manifest.c
	@@ -946,12 +946,11 @@
946	** T (+\|*\|-)<tagname> <uuid> ?<value>?
947	**
948	** Create or cancel a tag or property. The tagname is fossil-encoded.
949	** The first character of the name must be either "+" to create a
950	** singleton tag, "*" to create a propagating tag, or "-" to create
951	** anti-tag that undoes a prior "+" or blocks propagation of a "*".

952	**
953	** The tag is applied to <uuid>. If <uuid> is "*" then the tag is
954	** applied to the current manifest. If <value> is provided then
955	** the tag is really a property with the given value.
956	**
957

M src/match.c

+1 -1

		--- src/match.c
		+++ src/match.c
		@@ -265,11 +265,11 @@
265	265	** checks for integer match against the tag ID which is looked up directly by
266	266	** this function. For the other modes, the returned SQL expression performs
267	267	** string comparisons against the tag names, so it is necessary to join against
268	268	** the tag table to access the "tagname" column.
269	269	**
270		-** Each pattern is adjusted to to start with "sym-" and be anchored at end.
	270	+** Each pattern is adjusted to start with "sym-" and be anchored at end.
271	271	**
272	272	** In MS_REGEXP mode, backslash can be used to protect delimiter characters.
273	273	** The backslashes are not removed from the regular expression.
274	274	**
275	275	** In addition to assembling and returning an SQL expression, this function
276	276

	--- src/match.c
	+++ src/match.c
	@@ -265,11 +265,11 @@
265	** checks for integer match against the tag ID which is looked up directly by
266	** this function. For the other modes, the returned SQL expression performs
267	** string comparisons against the tag names, so it is necessary to join against
268	** the tag table to access the "tagname" column.
269	**
270	** Each pattern is adjusted to to start with "sym-" and be anchored at end.
271	**
272	** In MS_REGEXP mode, backslash can be used to protect delimiter characters.
273	** The backslashes are not removed from the regular expression.
274	**
275	** In addition to assembling and returning an SQL expression, this function
276

	--- src/match.c
	+++ src/match.c
	@@ -265,11 +265,11 @@
265	** checks for integer match against the tag ID which is looked up directly by
266	** this function. For the other modes, the returned SQL expression performs
267	** string comparisons against the tag names, so it is necessary to join against
268	** the tag table to access the "tagname" column.
269	**
270	** Each pattern is adjusted to start with "sym-" and be anchored at end.
271	**
272	** In MS_REGEXP mode, backslash can be used to protect delimiter characters.
273	** The backslashes are not removed from the regular expression.
274	**
275	** In addition to assembling and returning an SQL expression, this function
276

M src/purge.c

+1 -1

		--- src/purge.c
		+++ src/purge.c
		@@ -120,11 +120,11 @@
120	120	return 0;
121	121	}
122	122
123	123	/* Make sure we are not removing a manifest that is the baseline of some
124	124	** manifest that is being left behind. This step is not strictly necessary.
125		- ** is is just a safety check. */
	125	+ ** It is just a safety check. */
126	126	if( purge_baseline_out_from_under_delta(zTab) ){
127	127	fossil_panic("attempt to purge a baseline manifest without also purging "
128	128	"all of its deltas");
129	129	}
130	130
131	131

	--- src/purge.c
	+++ src/purge.c
	@@ -120,11 +120,11 @@
120	return 0;
121	}
122
123	/* Make sure we are not removing a manifest that is the baseline of some
124	** manifest that is being left behind. This step is not strictly necessary.
125	** is is just a safety check. */
126	if( purge_baseline_out_from_under_delta(zTab) ){
127	fossil_panic("attempt to purge a baseline manifest without also purging "
128	"all of its deltas");
129	}
130
131

	--- src/purge.c
	+++ src/purge.c
	@@ -120,11 +120,11 @@
120	return 0;
121	}
122
123	/* Make sure we are not removing a manifest that is the baseline of some
124	** manifest that is being left behind. This step is not strictly necessary.
125	** It is just a safety check. */
126	if( purge_baseline_out_from_under_delta(zTab) ){
127	fossil_panic("attempt to purge a baseline manifest without also purging "
128	"all of its deltas");
129	}
130
131

M src/security_audit.c

+1 -1

		--- src/security_audit.c
		+++ src/security_audit.c
		@@ -351,11 +351,11 @@
351	351	*/
352	352	if( db_exists("SELECT 1 FROM config WHERE name GLOB 'xfer-*-script'"
353	353	" AND length(value)>0") ){
354	354	@ <li><p><b>WARNING:</b>
355	355	@ TH1 scripts might be configured to run on any sync, push, pull, or
356		- @ clone operation. See the the <a href="%R/xfersetup">/xfersetup</a>
	356	+ @ clone operation. See the <a href="%R/xfersetup">/xfersetup</a>
357	357	@ page for more information. These TH1 scripts are a potential
358	358	@ security concern and so should be carefully audited by a human.
359	359	}
360	360
361	361	/* The strict-manifest-syntax setting should be on. */
362	362

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -351,11 +351,11 @@
351	*/
352	if( db_exists("SELECT 1 FROM config WHERE name GLOB 'xfer-*-script'"
353	" AND length(value)>0") ){
354	@ <li><p><b>WARNING:</b>
355	@ TH1 scripts might be configured to run on any sync, push, pull, or
356	@ clone operation. See the the <a href="%R/xfersetup">/xfersetup</a>
357	@ page for more information. These TH1 scripts are a potential
358	@ security concern and so should be carefully audited by a human.
359	}
360
361	/* The strict-manifest-syntax setting should be on. */
362

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -351,11 +351,11 @@
351	*/
352	if( db_exists("SELECT 1 FROM config WHERE name GLOB 'xfer-*-script'"
353	" AND length(value)>0") ){
354	@ <li><p><b>WARNING:</b>
355	@ TH1 scripts might be configured to run on any sync, push, pull, or
356	@ clone operation. See the <a href="%R/xfersetup">/xfersetup</a>
357	@ page for more information. These TH1 scripts are a potential
358	@ security concern and so should be carefully audited by a human.
359	}
360
361	/* The strict-manifest-syntax setting should be on. */
362

M src/setup.c

+1 -1

		--- src/setup.c
		+++ src/setup.c
		@@ -485,11 +485,11 @@
485	485	@ <hr>
486	486	@ <p><b>Do not allow robots access to these pages.</b><br>
487	487	@ If the page name matches the GLOB pattern of this setting, and the
488	488	@ users is "nobody", and the client has not previously passed a captcha
489	489	@ test to show that it is not a robot, then the page is not displayed.
490		- @ A captcha test is is rendered instead.
	490	+ @ A captcha test is rendered instead.
491	491	@ The default value for this setting is:
492	492	@ <p>
493	493	@ &emsp;&emsp;&emsp;<tt>%h(robot_restrict_default())</tt>
494	494	@ <p>
495	495	@ Usually the tag should exactly match the page name. Exceptions:
496	496

	--- src/setup.c
	+++ src/setup.c
	@@ -485,11 +485,11 @@
485	@ <hr>
486	@ <p><b>Do not allow robots access to these pages.</b><br>
487	@ If the page name matches the GLOB pattern of this setting, and the
488	@ users is "nobody", and the client has not previously passed a captcha
489	@ test to show that it is not a robot, then the page is not displayed.
490	@ A captcha test is is rendered instead.
491	@ The default value for this setting is:
492	@ <p>
493	@ &emsp;&emsp;&emsp;<tt>%h(robot_restrict_default())</tt>
494	@ <p>
495	@ Usually the tag should exactly match the page name. Exceptions:
496

	--- src/setup.c
	+++ src/setup.c
	@@ -485,11 +485,11 @@
485	@ <hr>
486	@ <p><b>Do not allow robots access to these pages.</b><br>
487	@ If the page name matches the GLOB pattern of this setting, and the
488	@ users is "nobody", and the client has not previously passed a captcha
489	@ test to show that it is not a robot, then the page is not displayed.
490	@ A captcha test is rendered instead.
491	@ The default value for this setting is:
492	@ <p>
493	@ &emsp;&emsp;&emsp;<tt>%h(robot_restrict_default())</tt>
494	@ <p>
495	@ Usually the tag should exactly match the page name. Exceptions:
496

M src/tag.c

+1 -1

		--- src/tag.c
		+++ src/tag.c
		@@ -422,11 +422,11 @@
422	422	**
423	423	** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID
424	424	**
425	425	** Remove the tag TAGNAME from the artifact referenced by
426	426	** ARTIFACT-ID, and also remove the propagation of the tag to
427		-** any descendants. Use the the -n\|--dry-run option to see
	427	+** any descendants. Use the -n\|--dry-run option to see
428	428	** what would have happened. Certain tag name prefixes are
429	429	** forbidden, as documented for the 'add' subcommand.
430	430	**
431	431	** Options:
432	432	** --date-override DATETIME Set date and time deleted
433	433

	--- src/tag.c
	+++ src/tag.c
	@@ -422,11 +422,11 @@
422	**
423	** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID
424	**
425	** Remove the tag TAGNAME from the artifact referenced by
426	** ARTIFACT-ID, and also remove the propagation of the tag to
427	** any descendants. Use the the -n\|--dry-run option to see
428	** what would have happened. Certain tag name prefixes are
429	** forbidden, as documented for the 'add' subcommand.
430	**
431	** Options:
432	** --date-override DATETIME Set date and time deleted
433

	--- src/tag.c
	+++ src/tag.c
	@@ -422,11 +422,11 @@
422	**
423	** > fossil tag cancel ?--raw? TAGNAME ARTIFACT-ID
424	**
425	** Remove the tag TAGNAME from the artifact referenced by
426	** ARTIFACT-ID, and also remove the propagation of the tag to
427	** any descendants. Use the -n\|--dry-run option to see
428	** what would have happened. Certain tag name prefixes are
429	** forbidden, as documented for the 'add' subcommand.
430	**
431	** Options:
432	** --date-override DATETIME Set date and time deleted
433

M src/tar.c

+1 -1

		--- src/tar.c
		+++ src/tar.c
		@@ -915,11 +915,11 @@
915	915	** part of the name= value after the / is the download
916	916	** filename. If no check-in is specified by either
917	917	** name= or r=, then the name of the main branch
918	918	** (usually "trunk") is used.
919	919	**
920		-** in=PATTERN Only include files that match the comma-separate
	920	+** in=PATTERN Only include files that match the comma-separated
921	921	** list of GLOB patterns in PATTERN, as with ex=
922	922	**
923	923	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
924	924	** comma-separated list of GLOB patterns, where each
925	925	** pattern can optionally be quoted using ".." or '..'.
926	926

	--- src/tar.c
	+++ src/tar.c
	@@ -915,11 +915,11 @@
915	** part of the name= value after the / is the download
916	** filename. If no check-in is specified by either
917	** name= or r=, then the name of the main branch
918	** (usually "trunk") is used.
919	**
920	** in=PATTERN Only include files that match the comma-separate
921	** list of GLOB patterns in PATTERN, as with ex=
922	**
923	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
924	** comma-separated list of GLOB patterns, where each
925	** pattern can optionally be quoted using ".." or '..'.
926

	--- src/tar.c
	+++ src/tar.c
	@@ -915,11 +915,11 @@
915	** part of the name= value after the / is the download
916	** filename. If no check-in is specified by either
917	** name= or r=, then the name of the main branch
918	** (usually "trunk") is used.
919	**
920	** in=PATTERN Only include files that match the comma-separated
921	** list of GLOB patterns in PATTERN, as with ex=
922	**
923	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
924	** comma-separated list of GLOB patterns, where each
925	** pattern can optionally be quoted using ".." or '..'.
926

M src/timeline.c

+2 -2

		--- src/timeline.c
		+++ src/timeline.c
		@@ -1726,11 +1726,11 @@
1726	1726	** rel ... also show related checkins
1727	1727	** uf=FILE_HASH Show only check-ins that contain the given file version
1728	1728	** All qualifying check-ins are shown unless there is
1729	1729	** also an n= or n1= query parameter.
1730	1730	** chng=GLOBLIST Show only check-ins that involve changes to a file whose
1731		-** name matches one of the comma-separate GLOBLIST
	1731	+** name matches one of the comma-separated GLOBLIST
1732	1732	** brbg Background color determined by branch name
1733	1733	** ubg Background color determined by user
1734	1734	** deltabg Background color red for delta manifests or green
1735	1735	** for baseline manifests
1736	1736	** namechng Show only check-ins that have filename changes
		@@ -3728,11 +3728,11 @@
3728	3728	** -n\|--limit N If N is positive, output the first N entries. If
3729	3729	** N is negative, output the first -N lines. If N is
3730	3730	** zero, no limit. Default is -20 meaning 20 lines.
3731	3731	** --offset P Skip P changes
3732	3732	** -p\|--path PATH Output items affecting PATH only.
3733		-** PATH can be a file or a sub directory.
	3733	+** PATH can be a file or a subdirectory.
3734	3734	** -r\|--reverse Show items in chronological order.
3735	3735	** -R REPO_FILE Specifies the repository db to use. Default is
3736	3736	** the current check-out's repository.
3737	3737	** --sql Show the SQL used to generate the timeline
3738	3738	** -t\|--type TYPE Output items from the given types only, such as:
3739	3739

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1726,11 +1726,11 @@
1726	** rel ... also show related checkins
1727	** uf=FILE_HASH Show only check-ins that contain the given file version
1728	** All qualifying check-ins are shown unless there is
1729	** also an n= or n1= query parameter.
1730	** chng=GLOBLIST Show only check-ins that involve changes to a file whose
1731	** name matches one of the comma-separate GLOBLIST
1732	** brbg Background color determined by branch name
1733	** ubg Background color determined by user
1734	** deltabg Background color red for delta manifests or green
1735	** for baseline manifests
1736	** namechng Show only check-ins that have filename changes
	@@ -3728,11 +3728,11 @@
3728	** -n\|--limit N If N is positive, output the first N entries. If
3729	** N is negative, output the first -N lines. If N is
3730	** zero, no limit. Default is -20 meaning 20 lines.
3731	** --offset P Skip P changes
3732	** -p\|--path PATH Output items affecting PATH only.
3733	** PATH can be a file or a sub directory.
3734	** -r\|--reverse Show items in chronological order.
3735	** -R REPO_FILE Specifies the repository db to use. Default is
3736	** the current check-out's repository.
3737	** --sql Show the SQL used to generate the timeline
3738	** -t\|--type TYPE Output items from the given types only, such as:
3739

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1726,11 +1726,11 @@
1726	** rel ... also show related checkins
1727	** uf=FILE_HASH Show only check-ins that contain the given file version
1728	** All qualifying check-ins are shown unless there is
1729	** also an n= or n1= query parameter.
1730	** chng=GLOBLIST Show only check-ins that involve changes to a file whose
1731	** name matches one of the comma-separated GLOBLIST
1732	** brbg Background color determined by branch name
1733	** ubg Background color determined by user
1734	** deltabg Background color red for delta manifests or green
1735	** for baseline manifests
1736	** namechng Show only check-ins that have filename changes
	@@ -3728,11 +3728,11 @@
3728	** -n\|--limit N If N is positive, output the first N entries. If
3729	** N is negative, output the first -N lines. If N is
3730	** zero, no limit. Default is -20 meaning 20 lines.
3731	** --offset P Skip P changes
3732	** -p\|--path PATH Output items affecting PATH only.
3733	** PATH can be a file or a subdirectory.
3734	** -r\|--reverse Show items in chronological order.
3735	** -R REPO_FILE Specifies the repository db to use. Default is
3736	** the current check-out's repository.
3737	** --sql Show the SQL used to generate the timeline
3738	** -t\|--type TYPE Output items from the given types only, such as:
3739

M src/update.c

+1 -1

		--- src/update.c
		+++ src/update.c
		@@ -88,11 +88,11 @@
88	88	** The -n or --dry-run option causes this command to do a "dry run".
89	89	** It prints out what would have happened but does not actually make
90	90	** any changes to the current check-out or the repository.
91	91	**
92	92	** The -v or --verbose option prints status information about
93		-** unchanged files in addition to those file that actually do change.
	93	+** unchanged files in addition to those files that actually do change.
94	94	**
95	95	** Options:
96	96	** --case-sensitive BOOL Override case-sensitive setting
97	97	** --debug Print debug information on stdout
98	98	** -n\|--dry-run If given, display instead of run actions
99	99

	--- src/update.c
	+++ src/update.c
	@@ -88,11 +88,11 @@
88	** The -n or --dry-run option causes this command to do a "dry run".
89	** It prints out what would have happened but does not actually make
90	** any changes to the current check-out or the repository.
91	**
92	** The -v or --verbose option prints status information about
93	** unchanged files in addition to those file that actually do change.
94	**
95	** Options:
96	** --case-sensitive BOOL Override case-sensitive setting
97	** --debug Print debug information on stdout
98	** -n\|--dry-run If given, display instead of run actions
99

	--- src/update.c
	+++ src/update.c
	@@ -88,11 +88,11 @@
88	** The -n or --dry-run option causes this command to do a "dry run".
89	** It prints out what would have happened but does not actually make
90	** any changes to the current check-out or the repository.
91	**
92	** The -v or --verbose option prints status information about
93	** unchanged files in addition to those files that actually do change.
94	**
95	** Options:
96	** --case-sensitive BOOL Override case-sensitive setting
97	** --debug Print debug information on stdout
98	** -n\|--dry-run If given, display instead of run actions
99

M src/xfer.c

+1 -1

		--- src/xfer.c
		+++ src/xfer.c
		@@ -2384,11 +2384,11 @@
2384	2384	zCkinLock = 0;
2385	2385	}else if( zClientId ){
2386	2386	blob_appendf(&send, "pragma ci-unlock %s\n", zClientId);
2387	2387	}
2388	2388	/* Append randomness to the end of the uplink message. This makes all
2389		- ** messages unique so that that the login-card nonce will always
	2389	+ ** messages unique so that the login-card nonce will always
2390	2390	** be unique.
2391	2391	*/
2392	2392	zRandomness = db_text(0, "SELECT hex(randomblob(20))");
2393	2393	blob_appendf(&send, "# %s\n", zRandomness);
2394	2394	fossil_free(zRandomness);
2395	2395

	--- src/xfer.c
	+++ src/xfer.c
	@@ -2384,11 +2384,11 @@
2384	zCkinLock = 0;
2385	}else if( zClientId ){
2386	blob_appendf(&send, "pragma ci-unlock %s\n", zClientId);
2387	}
2388	/* Append randomness to the end of the uplink message. This makes all
2389	** messages unique so that that the login-card nonce will always
2390	** be unique.
2391	*/
2392	zRandomness = db_text(0, "SELECT hex(randomblob(20))");
2393	blob_appendf(&send, "# %s\n", zRandomness);
2394	fossil_free(zRandomness);
2395

	--- src/xfer.c
	+++ src/xfer.c
	@@ -2384,11 +2384,11 @@
2384	zCkinLock = 0;
2385	}else if( zClientId ){
2386	blob_appendf(&send, "pragma ci-unlock %s\n", zClientId);
2387	}
2388	/* Append randomness to the end of the uplink message. This makes all
2389	** messages unique so that the login-card nonce will always
2390	** be unique.
2391	*/
2392	zRandomness = db_text(0, "SELECT hex(randomblob(20))");
2393	blob_appendf(&send, "# %s\n", zRandomness);
2394	fossil_free(zRandomness);
2395

M src/zip.c

+1 -1

		--- src/zip.c
		+++ src/zip.c
		@@ -984,11 +984,11 @@
984	984	** part of the name= value after the / is the download
985	985	** filename. If no check-in is specified by either
986	986	** name= or r=, then the name of the main branch
987	987	** (usually "trunk") is used.
988	988	**
989		-** in=PATTERN Only include files that match the comma-separate
	989	+** in=PATTERN Only include files that match the comma-separated
990	990	** list of GLOB patterns in PATTERN, as with ex=
991	991	**
992	992	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
993	993	** comma-separated list of GLOB patterns, where each
994	994	** pattern can optionally be quoted using ".." or '..'.
995	995

	--- src/zip.c
	+++ src/zip.c
	@@ -984,11 +984,11 @@
984	** part of the name= value after the / is the download
985	** filename. If no check-in is specified by either
986	** name= or r=, then the name of the main branch
987	** (usually "trunk") is used.
988	**
989	** in=PATTERN Only include files that match the comma-separate
990	** list of GLOB patterns in PATTERN, as with ex=
991	**
992	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
993	** comma-separated list of GLOB patterns, where each
994	** pattern can optionally be quoted using ".." or '..'.
995

	--- src/zip.c
	+++ src/zip.c
	@@ -984,11 +984,11 @@
984	** part of the name= value after the / is the download
985	** filename. If no check-in is specified by either
986	** name= or r=, then the name of the main branch
987	** (usually "trunk") is used.
988	**
989	** in=PATTERN Only include files that match the comma-separated
990	** list of GLOB patterns in PATTERN, as with ex=
991	**
992	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
993	** comma-separated list of GLOB patterns, where each
994	** pattern can optionally be quoted using ".." or '..'.
995

Fossil SCM

Keyboard Shortcuts