Fossil SCM

Work in progress on spell-check and proof-reading sweep over the help text.

rberteig 2016-04-01 20:21 trunk
Commit 2a4e31bd8dfeea42acaf7a947ac588723b6308f7
+2 -2
--- src/attach.c
+++ src/attach.c
@@ -30,12 +30,12 @@
3030
**
3131
** At most one of technote=, tkt= or page= are supplied.
3232
** If none is given, all attachments are listed. If one is given,
3333
** only attachments for the designated technote, ticket or wiki page
3434
** 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.
3737
*/
3838
void attachlist_page(void){
3939
const char *zPage = P("page");
4040
const char *zTkt = P("tkt");
4141
const char *zTechNote = P("technote");
4242
--- 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
+1 -1
--- src/browse.c
+++ src/browse.c
@@ -999,11 +999,11 @@
999999
}
10001000
db_finalize(&q);
10011001
}
10021002
10031003
/*
1004
-** WEBPAGE: fileage
1004
+** WEBPAGE: fileage
10051005
**
10061006
** Show all files in a single check-in (identified by the name= query
10071007
** parameter) in order of increasing age.
10081008
**
10091009
** Parameters:
10101010
--- 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
+4 -4
--- src/content.c
+++ src/content.c
@@ -334,11 +334,11 @@
334334
content_get(rid, &content);
335335
blob_write_to_file(&content, zFile);
336336
}
337337
338338
/*
339
-** COMMAND: test-content-rawget
339
+** COMMAND: test-content-rawget
340340
**
341341
** Extract a blob from the database and write it into a file. This
342342
** version does not expand the delta.
343343
*/
344344
void test_content_rawget_cmd(void){
@@ -663,11 +663,11 @@
663663
return rid;
664664
}
665665
666666
667667
/*
668
-** COMMAND: test-content-put
668
+** COMMAND: test-content-put
669669
**
670670
** Usage: %fossil test-content-put FILE
671671
**
672672
** Read the content of FILE and add it to the Blob table as a new
673673
** artifact using a direct call to content_put().
@@ -703,11 +703,11 @@
703703
}
704704
}
705705
}
706706
707707
/*
708
-** COMMAND: test-content-undelta
708
+** COMMAND: test-content-undelta
709709
**
710710
** Make sure the content at RECORDID is not a delta
711711
*/
712712
void test_content_undelta_cmd(void){
713713
int rid;
@@ -814,11 +814,11 @@
814814
blob_reset(&delta);
815815
return rc;
816816
}
817817
818818
/*
819
-** COMMAND: test-content-deltify
819
+** COMMAND: test-content-deltify
820820
**
821821
** Convert the content at RID into a delta from SRCID.
822822
*/
823823
void test_content_deltify_cmd(void){
824824
if( g.argc!=5 ) usage("RID SRCID FORCE");
825825
--- 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
+4 -4
--- src/deltacmd.c
+++ src/deltacmd.c
@@ -41,11 +41,11 @@
4141
blob_resize(pDelta, len);
4242
return 0;
4343
}
4444
4545
/*
46
-** COMMAND: test-delta-create
46
+** COMMAND: test-delta-create
4747
**
4848
** Usage: %fossil test-delta-create FILE1 FILE2 DELTA
4949
**
5050
** Create and output a delta that carries FILE1 into FILE2.
5151
** Store the result in DELTA.
@@ -69,11 +69,11 @@
6969
blob_reset(&target);
7070
blob_reset(&delta);
7171
}
7272
7373
/*
74
-** COMMAND: test-delta-analyze
74
+** COMMAND: test-delta-analyze
7575
**
7676
** Usage: %fossil test-delta-analyze FILE1 FILE2
7777
**
7878
** Create and a delta that carries FILE1 into FILE2. Print the
7979
** number bytes copied and the number of bytes inserted.
@@ -141,11 +141,11 @@
141141
*pTarget = out;
142142
return len;
143143
}
144144
145145
/*
146
-** COMMAND: test-delta-apply
146
+** COMMAND: test-delta-apply
147147
**
148148
** Usage: %fossil test-delta-apply FILE1 DELTA
149149
**
150150
** Apply DELTA to FILE1 and output the result.
151151
*/
@@ -169,11 +169,11 @@
169169
blob_reset(&delta);
170170
}
171171
172172
173173
/*
174
-** COMMAND: test-delta
174
+** COMMAND: test-delta
175175
**
176176
** Usage: %fossil test-delta FILE1 FILE2
177177
**
178178
** Read two files named on the command-line. Create and apply deltas
179179
** going in both directions. Verify that the original files are
180180
--- 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
--- src/descendants.c
+++ src/descendants.c
@@ -431,11 +431,11 @@
431431
fossil_free(zLastBr);
432432
db_finalize(&q);
433433
}
434434
435435
/*
436
-** WEBPAGE: leaves
436
+** WEBPAGE: leaves
437437
**
438438
** Show leaf check-ins in a timeline. By default only open leaves
439439
** are listed.
440440
**
441441
** A "leaf" is a check-in with no children in the same branch. A
442442
--- 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
+5 -5
--- src/doc.c
+++ src/doc.c
@@ -346,11 +346,11 @@
346346
}
347347
return "application/x-fossil-artifact";
348348
}
349349
350350
/*
351
-** COMMAND: test-mimetype
351
+** COMMAND: test-mimetype
352352
**
353353
** Usage: %fossil test-mimetype FILENAME...
354354
**
355355
** Return the deduced mimetype for each file listed.
356356
**
@@ -551,14 +551,14 @@
551551
** with TH1 embedded documentation support and the "th1-docs" setting is
552552
** enabled, the name "FILE/index.th1" is also tried. If none of those are
553553
** found, then FILE is completely replaced by "404.md" and tried. If that
554554
** is not found, then a default 404 screen is generated.
555555
**
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:
560560
**
561561
** <div class='fossil-doc' data-title='TEXT'>
562562
**
563563
** then headers and footers are supplied. The optional data-title field
564564
** specifies the title of the document in that case.
565565
--- 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
+9 -7
--- src/event.c
+++ src/event.c
@@ -49,19 +49,21 @@
4949
5050
/*
5151
** WEBPAGE: technote
5252
** WEBPAGE: event
5353
**
54
-** Display a "technical note" or "tech-note" (formerly called an "event").
54
+** Display a technical note (formerly called an "event").
5555
**
5656
** PARAMETERS:
5757
**
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.
6162
**
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.
6365
*/
6466
void event_page(void){
6567
int rid = 0; /* rid of the event artifact */
6668
char *zUuid; /* UUID corresponding to rid */
6769
const char *zId; /* Event identifier */
@@ -340,15 +342,15 @@
340342
341343
/*
342344
** WEBPAGE: technoteedit
343345
** WEBPAGE: eventedit
344346
**
345
-** Revise or create a technical note (formerly called an 'event').
347
+** Revise or create a technical note (formerly called an "event").
346348
**
347349
** Parameters:
348350
**
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
350352
** tech-note is created.
351353
*/
352354
void eventedit_page(void){
353355
char *zTag;
354356
int rid = 0;
355357
--- 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
+3 -3
--- src/file.c
+++ src/file.c
@@ -922,11 +922,11 @@
922922
blob_resize(pOut, file_simplify_name(blob_buffer(pOut),
923923
blob_size(pOut), slash));
924924
}
925925
926926
/*
927
-** COMMAND: test-canonical-name
927
+** COMMAND: test-canonical-name
928928
** Usage: %fossil test-canonical-name FILENAME...
929929
**
930930
** Test the operation of the canonical name generator.
931931
** Also test Fossil's ability to measure attributes of a file.
932932
*/
@@ -1059,11 +1059,11 @@
10591059
memcpy(pOut, &tmp, sizeof(tmp));
10601060
}
10611061
}
10621062
10631063
/*
1064
-** COMMAND: test-relative-name
1064
+** COMMAND: test-relative-name
10651065
**
10661066
** Test the operation of the relative name generator.
10671067
*/
10681068
void cmd_test_relative_name(void){
10691069
int i;
@@ -1173,11 +1173,11 @@
11731173
blob_reset(&full);
11741174
return 1;
11751175
}
11761176
11771177
/*
1178
-** COMMAND: test-tree-name
1178
+** COMMAND: test-tree-name
11791179
**
11801180
** Test the operation of the tree name generator.
11811181
**
11821182
** Options:
11831183
** --absolute Return an absolute path instead of a relative one.
11841184
--- 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
+3 -2
--- src/info.c
+++ src/info.c
@@ -1427,11 +1427,12 @@
14271427
** WEBPAGE: fdiff
14281428
** URL: fdiff?v1=UUID&v2=UUID&patch&sbs=BOOLEAN&regex=REGEX
14291429
**
14301430
** Two arguments, v1 and v2, identify the files to be diffed. Show the
14311431
** 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.
14331434
**
14341435
** Additional parameters:
14351436
**
14361437
** verbose Show more detail when describing artifacts
14371438
** dc=N Show N lines of context around each diff
@@ -1815,11 +1816,11 @@
18151816
** Additional query parameters:
18161817
**
18171818
** ln - show line numbers
18181819
** ln=N - highlight line number N
18191820
** 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)
18211822
** verbose - show more detail in the description
18221823
** download - redirect to the download (artifact page only)
18231824
**
18241825
** The /artifact page show the complete content of a file
18251826
** identified by SHA1HASH as preformatted text. The
18261827
--- 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
+1 -1
--- src/main.c
+++ src/main.c
@@ -2619,11 +2619,11 @@
26192619
}
26202620
#endif
26212621
}
26222622
26232623
/*
2624
-** COMMAND: test-echo
2624
+** COMMAND: test-echo
26252625
**
26262626
** Usage: %fossil test-echo [--hex] ARGS...
26272627
**
26282628
** Echo all command-line arguments (enclosed in [...]) to the screen so that
26292629
** wildcard expansion behavior of the host shell can be investigated.
26302630
--- src/main.c
+++ src/main.c
@@ -2619,11 +2619,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
@@ -2619,11 +2619,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
+1 -1
--- src/merge3.c
+++ src/merge3.c
@@ -340,11 +340,11 @@
340340
blob_reset(&file);
341341
return rc;
342342
}
343343
344344
/*
345
-** COMMAND: 3-way-merge*
345
+** COMMAND: 3-way-merge*
346346
**
347347
** Usage: %fossil 3-way-merge BASELINE V1 V2 MERGED
348348
**
349349
** Inputs are files BASELINE, V1, and V2. The file MERGED is generated
350350
** as output.
351351
--- 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
+1 -1
--- src/name.c
+++ src/name.c
@@ -371,11 +371,11 @@
371371
}
372372
return c;
373373
}
374374
375375
/*
376
-** COMMAND: test-name-to-id
376
+** COMMAND: test-name-to-id
377377
**
378378
** Convert a name to a full artifact ID.
379379
*/
380380
void test_name_to_id(void){
381381
int i;
382382
--- 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
+2 -2
--- src/path.c
+++ src/path.c
@@ -195,11 +195,11 @@
195195
for(p=path.pEnd, i=0; p && i<path.nStep/2; p=p->pFrom, i++){}
196196
return p;
197197
}
198198
199199
/*
200
-** COMMAND: test-shortest-path
200
+** COMMAND: test-shortest-path
201201
**
202202
** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
203203
**
204204
** Report the shortest path between two check-ins. If the --no-merge flag
205205
** is used, follow only direct parent-child paths and omit merge links.
@@ -301,11 +301,11 @@
301301
path_reset();
302302
return 0;
303303
}
304304
305305
/*
306
-** COMMAND: test-ancestor-path
306
+** COMMAND: test-ancestor-path
307307
**
308308
** Usage: %fossil test-ancestor-path VERSION1 VERSION2
309309
**
310310
** Report the path from VERSION1 to VERSION2 through their most recent
311311
** common ancestor.
312312
--- 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
+1 -1
--- src/pivot.c
+++ src/pivot.c
@@ -147,11 +147,11 @@
147147
db_finalize(&u1);
148148
return rid;
149149
}
150150
151151
/*
152
-** COMMAND: test-find-pivot
152
+** COMMAND: test-find-pivot
153153
**
154154
** Test the pivot_find() procedure.
155155
*/
156156
void test_find_pivot(void){
157157
int i, rid;
158158
--- 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
+2 -2
--- src/rebuild.c
+++ src/rebuild.c
@@ -682,11 +682,11 @@
682682
fossil_print("%-15s %6d\n", "Other:", g.parseCnt[CFTYPE_ANY] - subtotal);
683683
}
684684
}
685685
686686
/*
687
-** COMMAND: test-detach ?REPOSITORY?
687
+** COMMAND: test-detach ?REPOSITORY?
688688
**
689689
** Change the project-code and make other changes in order to prevent
690690
** the repository from ever again pushing or pulling to other
691691
** repositories. Used to create a "test" repository for development
692692
** testing by cloning a working project repository.
@@ -703,11 +703,11 @@
703703
);
704704
db_end_transaction(0);
705705
}
706706
707707
/*
708
-** COMMAND: test-create-clusters
708
+** COMMAND: test-create-clusters
709709
**
710710
** Create clusters for all unclustered artifacts if the number of unclustered
711711
** artifacts exceeds the current clustering threshold.
712712
*/
713713
void test_createcluster_cmd(void){
714714
--- 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
+1 -1
--- src/setup.c
+++ src/setup.c
@@ -1433,11 +1433,11 @@
14331433
}
14341434
14351435
/*
14361436
** WEBPAGE: setup_settings
14371437
**
1438
-** Change or view miscellanous settings. Part of the
1438
+** Change or view miscellaneous settings. Part of the
14391439
** Admin pages requiring Admin privileges.
14401440
*/
14411441
void setup_settings(void){
14421442
Setting const *pSet;
14431443
14441444
--- 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
+2 -2
--- src/sitemap.c
+++ src/sitemap.c
@@ -20,14 +20,14 @@
2020
#include "config.h"
2121
#include "sitemap.h"
2222
#include <assert.h>
2323
2424
/*
25
-** WEBPAGE: sitemap
25
+** WEBPAGE: sitemap
2626
**
2727
** 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.
2929
** That is, this page is designed to hold links that are omitted from
3030
** the main menu due to lack of space.
3131
*/
3232
void sitemap_page(void){
3333
int srchFlags;
3434
--- 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
+2 -2
--- src/timeline.c
+++ src/timeline.c
@@ -139,11 +139,11 @@
139139
sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b);
140140
return zColor;
141141
}
142142
143143
/*
144
-** COMMAND: test-hash-color
144
+** COMMAND: test-hash-color
145145
**
146146
** Usage: %fossil test-hash-color TAG ...
147147
**
148148
** Print out the color names associated with each tag. Used for
149149
** testing the hash_color() function.
@@ -154,11 +154,11 @@
154154
fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i]));
155155
}
156156
}
157157
158158
/*
159
-** WEBPAGE: hash-color-test
159
+** WEBPAGE: hash-color-test
160160
**
161161
** Print out the color names associated with each tag. Used for
162162
** testing the hash_color() function.
163163
*/
164164
void test_hash_color_page(void){
165165
--- 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){
165
--- 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){
165
+1 -1
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -277,11 +277,11 @@
277277
return db_get("ticket-change", zDefaultTicketChange);
278278
}
279279
280280
/*
281281
** 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
283283
** that shows ticket changes.
284284
*/
285285
void tktsetup_change_page(void){
286286
static const char zDesc[] =
287287
@ Enter TH1 script that runs after processing the ticket editing
288288
--- 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

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button