Fossil SCM

Changed a number of "a" articles followed by vowels in docs and comments to "an", per [forum:/forumpost/3e6e40293f03f089 | a forum post].

wyoung 2022-07-17 23:48 trunk
Commit 99a319bdbfae2ed5e7ab5b74b056f29e45de464ddc5dee323fca1f14397ae97e
+1 -1
--- src/alerts.c
+++ src/alerts.c
@@ -299,11 +299,11 @@
299299
@ <hr>
300300
301301
entry_attribute("Subscription Renewal Interval In Days", 8,
302302
"email-renew-interval", "eri", "", 0);
303303
@ <p>
304
- @ If this value is a integer N greater than or equal to 14, then email
304
+ @ If this value is an integer N greater than or equal to 14, then email
305305
@ notification subscriptions will be suspended N days after the last known
306306
@ interaction with the user. This prevents sending notifications
307307
@ to abandoned accounts. If a subscription comes within 7 days of expiring,
308308
@ a separate email goes out with the daily digest that prompts the
309309
@ subscriber to click on a link to the "/renew" webpage in order to
310310
--- src/alerts.c
+++ src/alerts.c
@@ -299,11 +299,11 @@
299 @ <hr>
300
301 entry_attribute("Subscription Renewal Interval In Days", 8,
302 "email-renew-interval", "eri", "", 0);
303 @ <p>
304 @ If this value is a integer N greater than or equal to 14, then email
305 @ notification subscriptions will be suspended N days after the last known
306 @ interaction with the user. This prevents sending notifications
307 @ to abandoned accounts. If a subscription comes within 7 days of expiring,
308 @ a separate email goes out with the daily digest that prompts the
309 @ subscriber to click on a link to the "/renew" webpage in order to
310
--- src/alerts.c
+++ src/alerts.c
@@ -299,11 +299,11 @@
299 @ <hr>
300
301 entry_attribute("Subscription Renewal Interval In Days", 8,
302 "email-renew-interval", "eri", "", 0);
303 @ <p>
304 @ If this value is an integer N greater than or equal to 14, then email
305 @ notification subscriptions will be suspended N days after the last known
306 @ interaction with the user. This prevents sending notifications
307 @ to abandoned accounts. If a subscription comes within 7 days of expiring,
308 @ a separate email goes out with the daily digest that prompts the
309 @ subscriber to click on a link to the "/renew" webpage in order to
310
+1 -1
--- src/backlink.c
+++ src/backlink.c
@@ -365,11 +365,11 @@
365365
if( g.argc!=5 ){
366366
usage("SRCTYPE SRCID INPUTFILE");
367367
}
368368
srctype = atoi(g.argv[2]);
369369
if( srctype<0 || srctype>2 ){
370
- fossil_fatal("SRCTYPE should be a integer 0, 1, or 2");
370
+ fossil_fatal("SRCTYPE should be an integer 0, 1, or 2");
371371
}
372372
srcid = atoi(g.argv[3]);
373373
blob_read_from_file(&in, g.argv[4], ExtFILE);
374374
sqlite3_open(":memory:",&g.db);
375375
if( zMTime==0 ) zMTime = "now";
376376
--- src/backlink.c
+++ src/backlink.c
@@ -365,11 +365,11 @@
365 if( g.argc!=5 ){
366 usage("SRCTYPE SRCID INPUTFILE");
367 }
368 srctype = atoi(g.argv[2]);
369 if( srctype<0 || srctype>2 ){
370 fossil_fatal("SRCTYPE should be a integer 0, 1, or 2");
371 }
372 srcid = atoi(g.argv[3]);
373 blob_read_from_file(&in, g.argv[4], ExtFILE);
374 sqlite3_open(":memory:",&g.db);
375 if( zMTime==0 ) zMTime = "now";
376
--- src/backlink.c
+++ src/backlink.c
@@ -365,11 +365,11 @@
365 if( g.argc!=5 ){
366 usage("SRCTYPE SRCID INPUTFILE");
367 }
368 srctype = atoi(g.argv[2]);
369 if( srctype<0 || srctype>2 ){
370 fossil_fatal("SRCTYPE should be an integer 0, 1, or 2");
371 }
372 srcid = atoi(g.argv[3]);
373 blob_read_from_file(&in, g.argv[4], ExtFILE);
374 sqlite3_open(":memory:",&g.db);
375 if( zMTime==0 ) zMTime = "now";
376
--- src/backoffice.c
+++ src/backoffice.c
@@ -472,11 +472,11 @@
472472
** without doing any work.
473473
**
474474
** If no backoffice processes are running at all, this routine becomes
475475
** the main backoffice.
476476
**
477
-** If a primary backoffice is running, but a on-deck backoffice is
477
+** If a primary backoffice is running, but an on-deck backoffice is
478478
** needed, this routine becomes that on-deck backoffice.
479479
*/
480480
static void backoffice_thread(void){
481481
Lease x;
482482
sqlite3_uint64 tmNow;
483483
--- src/backoffice.c
+++ src/backoffice.c
@@ -472,11 +472,11 @@
472 ** without doing any work.
473 **
474 ** If no backoffice processes are running at all, this routine becomes
475 ** the main backoffice.
476 **
477 ** If a primary backoffice is running, but a on-deck backoffice is
478 ** needed, this routine becomes that on-deck backoffice.
479 */
480 static void backoffice_thread(void){
481 Lease x;
482 sqlite3_uint64 tmNow;
483
--- src/backoffice.c
+++ src/backoffice.c
@@ -472,11 +472,11 @@
472 ** without doing any work.
473 **
474 ** If no backoffice processes are running at all, this routine becomes
475 ** the main backoffice.
476 **
477 ** If a primary backoffice is running, but an on-deck backoffice is
478 ** needed, this routine becomes that on-deck backoffice.
479 */
480 static void backoffice_thread(void){
481 Lease x;
482 sqlite3_uint64 tmNow;
483
+1 -1
--- src/db.c
+++ src/db.c
@@ -3047,11 +3047,11 @@
30473047
sqlite3_result_int(context, file_is_win_reserved(zName)!=0);
30483048
}
30493049
}
30503050
30513051
/*
3052
-** Convert the input string into a artifact hash. Make a notation in the
3052
+** Convert the input string into an artifact hash. Make a notation in the
30533053
** CONCEALED table so that the hash can be undo using the db_reveal()
30543054
** function at some later time.
30553055
**
30563056
** The value returned is stored in static space and will be overwritten
30573057
** on subsequent calls.
30583058
--- src/db.c
+++ src/db.c
@@ -3047,11 +3047,11 @@
3047 sqlite3_result_int(context, file_is_win_reserved(zName)!=0);
3048 }
3049 }
3050
3051 /*
3052 ** Convert the input string into a artifact hash. Make a notation in the
3053 ** CONCEALED table so that the hash can be undo using the db_reveal()
3054 ** function at some later time.
3055 **
3056 ** The value returned is stored in static space and will be overwritten
3057 ** on subsequent calls.
3058
--- src/db.c
+++ src/db.c
@@ -3047,11 +3047,11 @@
3047 sqlite3_result_int(context, file_is_win_reserved(zName)!=0);
3048 }
3049 }
3050
3051 /*
3052 ** Convert the input string into an artifact hash. Make a notation in the
3053 ** CONCEALED table so that the hash can be undo using the db_reveal()
3054 ** function at some later time.
3055 **
3056 ** The value returned is stored in static space and will be overwritten
3057 ** on subsequent calls.
3058
+1 -1
--- src/file.c
+++ src/file.c
@@ -38,11 +38,11 @@
3838
# include <sys/time.h>
3939
#endif
4040
4141
#if INTERFACE
4242
43
-/* Many APIs take a eFType argument which must be one of ExtFILE, RepoFILE,
43
+/* Many APIs take an eFType argument which must be one of ExtFILE, RepoFILE,
4444
** or SymFILE.
4545
**
4646
** The difference is in the handling of symbolic links. RepoFILE should be
4747
** used for files that are under management by a Fossil repository. ExtFILE
4848
** should be used for files that are not under management. SymFILE is for
4949
--- src/file.c
+++ src/file.c
@@ -38,11 +38,11 @@
38 # include <sys/time.h>
39 #endif
40
41 #if INTERFACE
42
43 /* Many APIs take a eFType argument which must be one of ExtFILE, RepoFILE,
44 ** or SymFILE.
45 **
46 ** The difference is in the handling of symbolic links. RepoFILE should be
47 ** used for files that are under management by a Fossil repository. ExtFILE
48 ** should be used for files that are not under management. SymFILE is for
49
--- src/file.c
+++ src/file.c
@@ -38,11 +38,11 @@
38 # include <sys/time.h>
39 #endif
40
41 #if INTERFACE
42
43 /* Many APIs take an eFType argument which must be one of ExtFILE, RepoFILE,
44 ** or SymFILE.
45 **
46 ** The difference is in the handling of symbolic links. RepoFILE should be
47 ** used for files that are under management by a Fossil repository. ExtFILE
48 ** should be used for files that are not under management. SymFILE is for
49
+1 -1
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -622,11 +622,11 @@
622622
X509_free(cert);
623623
return 0;
624624
}
625625
626626
/*
627
-** Remember that the cert with the given hash is a acceptable for
627
+** Remember that the cert with the given hash is acceptable for
628628
** use with pUrlData->name.
629629
*/
630630
LOCAL void ssl_remember_certificate_exception(
631631
UrlData *pUrlData,
632632
const char *zHash
633633
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -622,11 +622,11 @@
622 X509_free(cert);
623 return 0;
624 }
625
626 /*
627 ** Remember that the cert with the given hash is a acceptable for
628 ** use with pUrlData->name.
629 */
630 LOCAL void ssl_remember_certificate_exception(
631 UrlData *pUrlData,
632 const char *zHash
633
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -622,11 +622,11 @@
622 X509_free(cert);
623 return 0;
624 }
625
626 /*
627 ** Remember that the cert with the given hash is acceptable for
628 ** use with pUrlData->name.
629 */
630 LOCAL void ssl_remember_certificate_exception(
631 UrlData *pUrlData,
632 const char *zHash
633
+1 -1
--- src/info.c
+++ src/info.c
@@ -181,11 +181,11 @@
181181
** information about that repository.
182182
**
183183
** If the argument is a repository name, then the --verbose option shows
184184
** all known check-out locations for that repository and all URLs used
185185
** to access the repository. The --verbose is (currently) a no-op if
186
-** the argument is the name of a object within the repository.
186
+** the argument is the name of an object within the repository.
187187
**
188188
** Use the "finfo" command to get information about a specific
189189
** file in a checkout.
190190
**
191191
** Options:
192192
--- src/info.c
+++ src/info.c
@@ -181,11 +181,11 @@
181 ** information about that repository.
182 **
183 ** If the argument is a repository name, then the --verbose option shows
184 ** all known check-out locations for that repository and all URLs used
185 ** to access the repository. The --verbose is (currently) a no-op if
186 ** the argument is the name of a object within the repository.
187 **
188 ** Use the "finfo" command to get information about a specific
189 ** file in a checkout.
190 **
191 ** Options:
192
--- src/info.c
+++ src/info.c
@@ -181,11 +181,11 @@
181 ** information about that repository.
182 **
183 ** If the argument is a repository name, then the --verbose option shows
184 ** all known check-out locations for that repository and all URLs used
185 ** to access the repository. The --verbose is (currently) a no-op if
186 ** the argument is the name of an object within the repository.
187 **
188 ** Use the "finfo" command to get information about a specific
189 ** file in a checkout.
190 **
191 ** Options:
192
+1 -1
--- src/interwiki.c
+++ src/interwiki.c
@@ -167,11 +167,11 @@
167167
**
168168
** Delete one or more interwiki maps.
169169
**
170170
** > fossil interwiki edit TAG --base URL --hash PATH --wiki PATH
171171
**
172
-** Create a interwiki referenced call TAG. The base URL is
172
+** Create an interwiki referenced call TAG. The base URL is
173173
** the --base option, which is required. The --hash and --wiki
174174
** paths are optional. The TAG must be lower-case alphanumeric
175175
** and must be unique. A new entry is created if it does not
176176
** already exit.
177177
**
178178
--- src/interwiki.c
+++ src/interwiki.c
@@ -167,11 +167,11 @@
167 **
168 ** Delete one or more interwiki maps.
169 **
170 ** > fossil interwiki edit TAG --base URL --hash PATH --wiki PATH
171 **
172 ** Create a interwiki referenced call TAG. The base URL is
173 ** the --base option, which is required. The --hash and --wiki
174 ** paths are optional. The TAG must be lower-case alphanumeric
175 ** and must be unique. A new entry is created if it does not
176 ** already exit.
177 **
178
--- src/interwiki.c
+++ src/interwiki.c
@@ -167,11 +167,11 @@
167 **
168 ** Delete one or more interwiki maps.
169 **
170 ** > fossil interwiki edit TAG --base URL --hash PATH --wiki PATH
171 **
172 ** Create an interwiki referenced call TAG. The base URL is
173 ** the --base option, which is required. The --hash and --wiki
174 ** paths are optional. The TAG must be lower-case alphanumeric
175 ** and must be unique. A new entry is created if it does not
176 ** already exit.
177 **
178
+1 -1
--- src/md5.c
+++ src/md5.c
@@ -303,11 +303,11 @@
303303
}
304304
zBuf[j] = 0;
305305
}
306306
307307
/*
308
-** The state of a incremental MD5 checksum computation. Only one
308
+** The state of an incremental MD5 checksum computation. Only one
309309
** such computation can be underway at a time, of course.
310310
*/
311311
static MD5Context incrCtx;
312312
static int incrInit = 0;
313313
314314
--- src/md5.c
+++ src/md5.c
@@ -303,11 +303,11 @@
303 }
304 zBuf[j] = 0;
305 }
306
307 /*
308 ** The state of a incremental MD5 checksum computation. Only one
309 ** such computation can be underway at a time, of course.
310 */
311 static MD5Context incrCtx;
312 static int incrInit = 0;
313
314
--- src/md5.c
+++ src/md5.c
@@ -303,11 +303,11 @@
303 }
304 zBuf[j] = 0;
305 }
306
307 /*
308 ** The state of an incremental MD5 checksum computation. Only one
309 ** such computation can be underway at a time, of course.
310 */
311 static MD5Context incrCtx;
312 static int incrInit = 0;
313
314
+1 -1
--- src/name.c
+++ src/name.c
@@ -244,11 +244,11 @@
244244
245245
/*
246246
** Convert a symbolic name into a RID. Acceptable forms:
247247
**
248248
** * artifact hash (optionally enclosed in [...])
249
-** * 4-character or larger prefix of a artifact
249
+** * 4-character or larger prefix of an artifact
250250
** * Symbolic Name
251251
** * "tag:" + symbolic name
252252
** * Date or date-time
253253
** * "date:" + Date or date-time
254254
** * symbolic-name ":" date-time
255255
--- src/name.c
+++ src/name.c
@@ -244,11 +244,11 @@
244
245 /*
246 ** Convert a symbolic name into a RID. Acceptable forms:
247 **
248 ** * artifact hash (optionally enclosed in [...])
249 ** * 4-character or larger prefix of a artifact
250 ** * Symbolic Name
251 ** * "tag:" + symbolic name
252 ** * Date or date-time
253 ** * "date:" + Date or date-time
254 ** * symbolic-name ":" date-time
255
--- src/name.c
+++ src/name.c
@@ -244,11 +244,11 @@
244
245 /*
246 ** Convert a symbolic name into a RID. Acceptable forms:
247 **
248 ** * artifact hash (optionally enclosed in [...])
249 ** * 4-character or larger prefix of an artifact
250 ** * Symbolic Name
251 ** * "tag:" + symbolic name
252 ** * Date or date-time
253 ** * "date:" + Date or date-time
254 ** * symbolic-name ":" date-time
255
+1 -1
--- src/printf.c
+++ src/printf.c
@@ -281,11 +281,11 @@
281281
** ap This is a pointer to a list of arguments. Same as in
282282
** vfprint.
283283
**
284284
** OUTPUTS:
285285
** The return value is the total number of characters sent to
286
-** the function "func". Returns -1 on a error.
286
+** the function "func". Returns -1 on error.
287287
**
288288
** Note that the order in which automatic variables are declared below
289289
** seems to make a big difference in determining how fast this beast
290290
** will run.
291291
*/
292292
--- src/printf.c
+++ src/printf.c
@@ -281,11 +281,11 @@
281 ** ap This is a pointer to a list of arguments. Same as in
282 ** vfprint.
283 **
284 ** OUTPUTS:
285 ** The return value is the total number of characters sent to
286 ** the function "func". Returns -1 on a error.
287 **
288 ** Note that the order in which automatic variables are declared below
289 ** seems to make a big difference in determining how fast this beast
290 ** will run.
291 */
292
--- src/printf.c
+++ src/printf.c
@@ -281,11 +281,11 @@
281 ** ap This is a pointer to a list of arguments. Same as in
282 ** vfprint.
283 **
284 ** OUTPUTS:
285 ** The return value is the total number of characters sent to
286 ** the function "func". Returns -1 on error.
287 **
288 ** Note that the order in which automatic variables are declared below
289 ** seems to make a big difference in determining how fast this beast
290 ** will run.
291 */
292
+1 -1
--- src/schema.c
+++ src/schema.c
@@ -584,11 +584,11 @@
584584
@ -- file tree. If a VFILE entry with id has merged with another
585585
@ -- record, there is an entry in this table with (id,merge) where
586586
@ -- merge is the RECORD table entry that the file merged against.
587587
@ -- An id of 0 or <-3 here means the version record itself. When
588588
@ -- id==(-1) that is a cherrypick merge, id==(-2) that is a
589
-@ -- backout merge and id==(-4) is a integrate merge.
589
+@ -- backout merge and id==(-4) is an integrate merge.
590590
@ --
591591
@
592592
@ CREATE TABLE vmerge(
593593
@ id INTEGER REFERENCES vfile, -- VFILE entry that has been merged
594594
@ merge INTEGER, -- Merged with this record
595595
--- src/schema.c
+++ src/schema.c
@@ -584,11 +584,11 @@
584 @ -- file tree. If a VFILE entry with id has merged with another
585 @ -- record, there is an entry in this table with (id,merge) where
586 @ -- merge is the RECORD table entry that the file merged against.
587 @ -- An id of 0 or <-3 here means the version record itself. When
588 @ -- id==(-1) that is a cherrypick merge, id==(-2) that is a
589 @ -- backout merge and id==(-4) is a integrate merge.
590 @ --
591 @
592 @ CREATE TABLE vmerge(
593 @ id INTEGER REFERENCES vfile, -- VFILE entry that has been merged
594 @ merge INTEGER, -- Merged with this record
595
--- src/schema.c
+++ src/schema.c
@@ -584,11 +584,11 @@
584 @ -- file tree. If a VFILE entry with id has merged with another
585 @ -- record, there is an entry in this table with (id,merge) where
586 @ -- merge is the RECORD table entry that the file merged against.
587 @ -- An id of 0 or <-3 here means the version record itself. When
588 @ -- id==(-1) that is a cherrypick merge, id==(-2) that is a
589 @ -- backout merge and id==(-4) is an integrate merge.
590 @ --
591 @
592 @ CREATE TABLE vmerge(
593 @ id INTEGER REFERENCES vfile, -- VFILE entry that has been merged
594 @ merge INTEGER, -- Merged with this record
595
+1 -1
--- src/search.c
+++ src/search.c
@@ -19,11 +19,11 @@
1919
** against timeline comments, check-in content, wiki pages, tickets,
2020
** and/or forum posts.
2121
**
2222
** The search can be either a per-query "grep"-like search that scans
2323
** the entire corpus. Or it can use the FTS4 search engine of SQLite.
24
-** The choice is a administrator configuration option.
24
+** The choice is an administrator configuration option.
2525
**
2626
** The first option is referred to as "full-scan search". The second
2727
** option is called "indexed search".
2828
**
2929
** The code in this file is ordered approximately as follows:
3030
--- src/search.c
+++ src/search.c
@@ -19,11 +19,11 @@
19 ** against timeline comments, check-in content, wiki pages, tickets,
20 ** and/or forum posts.
21 **
22 ** The search can be either a per-query "grep"-like search that scans
23 ** the entire corpus. Or it can use the FTS4 search engine of SQLite.
24 ** The choice is a administrator configuration option.
25 **
26 ** The first option is referred to as "full-scan search". The second
27 ** option is called "indexed search".
28 **
29 ** The code in this file is ordered approximately as follows:
30
--- src/search.c
+++ src/search.c
@@ -19,11 +19,11 @@
19 ** against timeline comments, check-in content, wiki pages, tickets,
20 ** and/or forum posts.
21 **
22 ** The search can be either a per-query "grep"-like search that scans
23 ** the entire corpus. Or it can use the FTS4 search engine of SQLite.
24 ** The choice is an administrator configuration option.
25 **
26 ** The first option is referred to as "full-scan search". The second
27 ** option is called "indexed search".
28 **
29 ** The code in this file is ordered approximately as follows:
30
+1 -1
--- src/sha1.c
+++ src/sha1.c
@@ -276,11 +276,11 @@
276276
}
277277
*zBuf = '\0';
278278
}
279279
280280
/*
281
-** The state of a incremental SHA1 checksum computation. Only one
281
+** The state of an incremental SHA1 checksum computation. Only one
282282
** such computation can be underway at a time, of course.
283283
*/
284284
static SHA1Context incrCtx;
285285
static int incrInit = 0;
286286
287287
--- src/sha1.c
+++ src/sha1.c
@@ -276,11 +276,11 @@
276 }
277 *zBuf = '\0';
278 }
279
280 /*
281 ** The state of a incremental SHA1 checksum computation. Only one
282 ** such computation can be underway at a time, of course.
283 */
284 static SHA1Context incrCtx;
285 static int incrInit = 0;
286
287
--- src/sha1.c
+++ src/sha1.c
@@ -276,11 +276,11 @@
276 }
277 *zBuf = '\0';
278 }
279
280 /*
281 ** The state of an incremental SHA1 checksum computation. Only one
282 ** such computation can be underway at a time, of course.
283 */
284 static SHA1Context incrCtx;
285 static int incrInit = 0;
286
287
+1 -1
--- src/sha3.c
+++ src/sha3.c
@@ -484,11 +484,11 @@
484484
}
485485
*zBuf = '\0';
486486
}
487487
488488
/*
489
-** The state of a incremental SHA3 checksum computation. Only one
489
+** The state of an incremental SHA3 checksum computation. Only one
490490
** such computation can be underway at a time, of course.
491491
*/
492492
static SHA3Context incrCtx;
493493
static int incrInit = 0;
494494
495495
--- src/sha3.c
+++ src/sha3.c
@@ -484,11 +484,11 @@
484 }
485 *zBuf = '\0';
486 }
487
488 /*
489 ** The state of a incremental SHA3 checksum computation. Only one
490 ** such computation can be underway at a time, of course.
491 */
492 static SHA3Context incrCtx;
493 static int incrInit = 0;
494
495
--- src/sha3.c
+++ src/sha3.c
@@ -484,11 +484,11 @@
484 }
485 *zBuf = '\0';
486 }
487
488 /*
489 ** The state of an incremental SHA3 checksum computation. Only one
490 ** such computation can be underway at a time, of course.
491 */
492 static SHA3Context incrCtx;
493 static int incrInit = 0;
494
495
+1 -1
--- src/style.c
+++ src/style.c
@@ -101,11 +101,11 @@
101101
** Extra JS added to the end of the file.
102102
*/
103103
static Blob blobOnLoad = BLOB_INITIALIZER;
104104
105105
/*
106
-** Generate and return a anchor tag like this:
106
+** Generate and return an anchor tag like this:
107107
**
108108
** <a href="URL">
109109
** or <a id="ID">
110110
**
111111
** The form of the anchor tag is determined by the g.jsHref
112112
--- src/style.c
+++ src/style.c
@@ -101,11 +101,11 @@
101 ** Extra JS added to the end of the file.
102 */
103 static Blob blobOnLoad = BLOB_INITIALIZER;
104
105 /*
106 ** Generate and return a anchor tag like this:
107 **
108 ** <a href="URL">
109 ** or <a id="ID">
110 **
111 ** The form of the anchor tag is determined by the g.jsHref
112
--- src/style.c
+++ src/style.c
@@ -101,11 +101,11 @@
101 ** Extra JS added to the end of the file.
102 */
103 static Blob blobOnLoad = BLOB_INITIALIZER;
104
105 /*
106 ** Generate and return an anchor tag like this:
107 **
108 ** <a href="URL">
109 ** or <a id="ID">
110 **
111 ** The form of the anchor tag is determined by the g.jsHref
112
--- src/unversioned.c
+++ src/unversioned.c
@@ -161,11 +161,11 @@
161161
** time of last change and hash of a copy of this file on a remote
162162
** server. Return an integer status code as follows:
163163
**
164164
** 0: zName does not exist in the unversioned table.
165165
** 1: zName exists and should be replaced by the mtime/zHash remote.
166
-** 2: zName exists and is the same as zHash but has a older mtime
166
+** 2: zName exists and is the same as zHash but has an older mtime
167167
** 3: zName exists and is identical to mtime/zHash in all respects.
168168
** 4: zName exists and is the same as zHash but has a newer mtime.
169169
** 5: zName exists and should override the mtime/zHash remote.
170170
*/
171171
int unversioned_status(
172172
--- src/unversioned.c
+++ src/unversioned.c
@@ -161,11 +161,11 @@
161 ** time of last change and hash of a copy of this file on a remote
162 ** server. Return an integer status code as follows:
163 **
164 ** 0: zName does not exist in the unversioned table.
165 ** 1: zName exists and should be replaced by the mtime/zHash remote.
166 ** 2: zName exists and is the same as zHash but has a older mtime
167 ** 3: zName exists and is identical to mtime/zHash in all respects.
168 ** 4: zName exists and is the same as zHash but has a newer mtime.
169 ** 5: zName exists and should override the mtime/zHash remote.
170 */
171 int unversioned_status(
172
--- src/unversioned.c
+++ src/unversioned.c
@@ -161,11 +161,11 @@
161 ** time of last change and hash of a copy of this file on a remote
162 ** server. Return an integer status code as follows:
163 **
164 ** 0: zName does not exist in the unversioned table.
165 ** 1: zName exists and should be replaced by the mtime/zHash remote.
166 ** 2: zName exists and is the same as zHash but has an older mtime
167 ** 3: zName exists and is identical to mtime/zHash in all respects.
168 ** 4: zName exists and is the same as zHash but has a newer mtime.
169 ** 5: zName exists and should override the mtime/zHash remote.
170 */
171 int unversioned_status(
172
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -597,11 +597,11 @@
597597
if( i<2 || fossil_isspace(z[n]) ) return 0;
598598
return n;
599599
}
600600
601601
/*
602
-** Check to see if the z[] string is the beginning of a enumeration value.
602
+** Check to see if the z[] string is the beginning of an enumeration value.
603603
** If it is, return the length of the bullet text. Otherwise return 0.
604604
**
605605
** Syntax:
606606
** * a tab or two or more spaces
607607
** * one or more digits
608608
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -597,11 +597,11 @@
597 if( i<2 || fossil_isspace(z[n]) ) return 0;
598 return n;
599 }
600
601 /*
602 ** Check to see if the z[] string is the beginning of a enumeration value.
603 ** If it is, return the length of the bullet text. Otherwise return 0.
604 **
605 ** Syntax:
606 ** * a tab or two or more spaces
607 ** * one or more digits
608
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -597,11 +597,11 @@
597 if( i<2 || fossil_isspace(z[n]) ) return 0;
598 return n;
599 }
600
601 /*
602 ** Check to see if the z[] string is the beginning of an enumeration value.
603 ** If it is, return the length of the bullet text. Otherwise return 0.
604 **
605 ** Syntax:
606 ** * a tab or two or more spaces
607 ** * one or more digits
608
+1 -1
--- src/winhttp.c
+++ src/winhttp.c
@@ -931,11 +931,11 @@
931931
}
932932
}
933933
934934
/*
935935
** Try to start the http server as a windows service. If we are running in
936
-** a interactive console session, this routine fails and returns a non zero
936
+** an interactive console session, this routine fails and returns a non zero
937937
** integer value. When running as service, this routine does not return until
938938
** the service is stopped. In this case, the return value is zero.
939939
*/
940940
int win32_http_service(
941941
int nPort, /* TCP port number */
942942
--- src/winhttp.c
+++ src/winhttp.c
@@ -931,11 +931,11 @@
931 }
932 }
933
934 /*
935 ** Try to start the http server as a windows service. If we are running in
936 ** a interactive console session, this routine fails and returns a non zero
937 ** integer value. When running as service, this routine does not return until
938 ** the service is stopped. In this case, the return value is zero.
939 */
940 int win32_http_service(
941 int nPort, /* TCP port number */
942
--- src/winhttp.c
+++ src/winhttp.c
@@ -931,11 +931,11 @@
931 }
932 }
933
934 /*
935 ** Try to start the http server as a windows service. If we are running in
936 ** an interactive console session, this routine fails and returns a non zero
937 ** integer value. When running as service, this routine does not return until
938 ** the service is stopped. In this case, the return value is zero.
939 */
940 int win32_http_service(
941 int nPort, /* TCP port number */
942
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1543,11 +1543,11 @@
15431543
}else
15441544
15451545
15461546
/* cookie TEXT
15471547
**
1548
- ** A cookie contains a arbitrary-length argument that is server-defined.
1548
+ ** A cookie contains an arbitrary-length argument that is server-defined.
15491549
** The argument must be encoded so as not to contain any whitespace.
15501550
** The server can optionally send a cookie to the client. The client
15511551
** might then return the same cookie back to the server on its next
15521552
** communication. The cookie might record information that helps
15531553
** the server optimize a push or pull.
15541554
--- src/xfer.c
+++ src/xfer.c
@@ -1543,11 +1543,11 @@
1543 }else
1544
1545
1546 /* cookie TEXT
1547 **
1548 ** A cookie contains a arbitrary-length argument that is server-defined.
1549 ** The argument must be encoded so as not to contain any whitespace.
1550 ** The server can optionally send a cookie to the client. The client
1551 ** might then return the same cookie back to the server on its next
1552 ** communication. The cookie might record information that helps
1553 ** the server optimize a push or pull.
1554
--- src/xfer.c
+++ src/xfer.c
@@ -1543,11 +1543,11 @@
1543 }else
1544
1545
1546 /* cookie TEXT
1547 **
1548 ** A cookie contains an arbitrary-length argument that is server-defined.
1549 ** The argument must be encoded so as not to contain any whitespace.
1550 ** The server can optionally send a cookie to the client. The client
1551 ** might then return the same cookie back to the server on its next
1552 ** communication. The cookie might record information that helps
1553 ** the server optimize a push or pull.
1554
+1 -1
--- www/alerts.md
+++ www/alerts.md
@@ -676,11 +676,11 @@
676676
Contrast a password which may be shared with other services, which
677677
then compromises those other services.
678678
679679
* No PII other than the subscriber's email address is available to an
680680
attacker with the `subscriberCode`. Nor can knowledge of the
681
- `subscriberCode` lead to a email flood or other annoyance attack, as
681
+ `subscriberCode` lead to an email flood or other annoyance attack, as
682682
far as I can see.
683683
684684
If the `subscriberCodes` for a Fossil repository are ever compromised,
685685
new ones can be generated as follows:
686686
687687
--- www/alerts.md
+++ www/alerts.md
@@ -676,11 +676,11 @@
676 Contrast a password which may be shared with other services, which
677 then compromises those other services.
678
679 * No PII other than the subscriber's email address is available to an
680 attacker with the `subscriberCode`. Nor can knowledge of the
681 `subscriberCode` lead to a email flood or other annoyance attack, as
682 far as I can see.
683
684 If the `subscriberCodes` for a Fossil repository are ever compromised,
685 new ones can be generated as follows:
686
687
--- www/alerts.md
+++ www/alerts.md
@@ -676,11 +676,11 @@
676 Contrast a password which may be shared with other services, which
677 then compromises those other services.
678
679 * No PII other than the subscriber's email address is available to an
680 attacker with the `subscriberCode`. Nor can knowledge of the
681 `subscriberCode` lead to an email flood or other annoyance attack, as
682 far as I can see.
683
684 If the `subscriberCodes` for a Fossil repository are ever compromised,
685 new ones can be generated as follows:
686
687
--- www/changes.wiki
+++ www/changes.wiki
@@ -1730,11 +1730,11 @@
17301730
* Fix the tarball generator to work with very log pathnames
17311731
17321732
<h2>Changes For Version 1.18 (2011-07-14)</h2>
17331733
* Added this Change Log
17341734
* Added sequential version numbering
1735
- * Added a optional configure script - the Makefile still works for most
1735
+ * Added an optional configure script - the Makefile still works for most
17361736
systems.
17371737
* Improvements to the "annotate" algorithm: only search primary
17381738
ancestors and ignore branches.
17391739
* Update the "scrub" command to remove traces of login-groups and
17401740
subrepositories.
17411741
--- www/changes.wiki
+++ www/changes.wiki
@@ -1730,11 +1730,11 @@
1730 * Fix the tarball generator to work with very log pathnames
1731
1732 <h2>Changes For Version 1.18 (2011-07-14)</h2>
1733 * Added this Change Log
1734 * Added sequential version numbering
1735 * Added a optional configure script - the Makefile still works for most
1736 systems.
1737 * Improvements to the "annotate" algorithm: only search primary
1738 ancestors and ignore branches.
1739 * Update the "scrub" command to remove traces of login-groups and
1740 subrepositories.
1741
--- www/changes.wiki
+++ www/changes.wiki
@@ -1730,11 +1730,11 @@
1730 * Fix the tarball generator to work with very log pathnames
1731
1732 <h2>Changes For Version 1.18 (2011-07-14)</h2>
1733 * Added this Change Log
1734 * Added sequential version numbering
1735 * Added an optional configure script - the Makefile still works for most
1736 systems.
1737 * Improvements to the "annotate" algorithm: only search primary
1738 ancestors and ignore branches.
1739 * Update the "scrub" command to remove traces of login-groups and
1740 subrepositories.
1741
+1 -1
--- www/sync.wiki
+++ www/sync.wiki
@@ -1042,11 +1042,11 @@
10421042
<ul>
10431043
<li> <tt>http-request-</tt><i>N</i><tt>.txt</tt>
10441044
<li> <tt>http-reply-</tt><i>N</i><tt>.txt</tt>
10451045
</ul>
10461046
1047
-<p>In the above, <i>N</i> is a integer that increments with each
1047
+<p>In the above, <i>N</i> is an integer that increments with each
10481048
round-trip. If you are having trouble on the server side,
10491049
you can run the "[/help?cmd=test-http|fossil test-http]" command in a
10501050
debugger using one the "http-request-N.txt" files as input and
10511051
single step through the processing performed by the server.
10521052
10531053
--- www/sync.wiki
+++ www/sync.wiki
@@ -1042,11 +1042,11 @@
1042 <ul>
1043 <li> <tt>http-request-</tt><i>N</i><tt>.txt</tt>
1044 <li> <tt>http-reply-</tt><i>N</i><tt>.txt</tt>
1045 </ul>
1046
1047 <p>In the above, <i>N</i> is a integer that increments with each
1048 round-trip. If you are having trouble on the server side,
1049 you can run the "[/help?cmd=test-http|fossil test-http]" command in a
1050 debugger using one the "http-request-N.txt" files as input and
1051 single step through the processing performed by the server.
1052
1053
--- www/sync.wiki
+++ www/sync.wiki
@@ -1042,11 +1042,11 @@
1042 <ul>
1043 <li> <tt>http-request-</tt><i>N</i><tt>.txt</tt>
1044 <li> <tt>http-reply-</tt><i>N</i><tt>.txt</tt>
1045 </ul>
1046
1047 <p>In the above, <i>N</i> is an integer that increments with each
1048 round-trip. If you are having trouble on the server side,
1049 you can run the "[/help?cmd=test-http|fossil test-http]" command in a
1050 debugger using one the "http-request-N.txt" files as input and
1051 single step through the processing performed by the server.
1052
1053

Keyboard Shortcuts

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