Fossil SCM
Merge typo fixes by brickviking into trunk.
Commit
af1456ba3496d6b7261d255d36b8b997d21c84516f5b85753689146cdf8bede2
Parent
c45d34f846025e9…
7 files changed
+5
-1
+2
-3
+2
-2
+2
-2
+6
-5
+33
-13
+1
-1
+5
-1
| --- www/password.wiki | ||
| +++ www/password.wiki | ||
| @@ -63,17 +63,21 @@ | ||
| 63 | 63 | for "anonymous" uses one-time captchas not persistent passwords. |
| 64 | 64 | |
| 65 | 65 | <h2>Web Interface Authentication</h2> |
| 66 | 66 | |
| 67 | 67 | When a user logs into Fossil using the web interface, the login name |
| 68 | -and password are sent in the clear to the server. The server then | |
| 68 | +and password are sent in the clear to the server. For most modern fossil | |
| 69 | +server setups with [/help?cmd=redirect-to-https|redirect-to-https] enabled, | |
| 70 | +this will be protected by the | |
| 71 | +SSL connection over HTTPS so it cannot be easily viewed. The server then | |
| 69 | 72 | hashes the password and compares it against the value stored in USER.PW. |
| 70 | 73 | If they match, the server sets a cookie on the client to record the |
| 71 | 74 | login. This cookie contains a large amount of high-quality randomness |
| 72 | 75 | and is thus intractable to guess. The value of the cookie and the IP |
| 73 | 76 | address of the client is stored in the USER.COOKIE and USER.IPADDR fields |
| 74 | 77 | of the USER table on the server. |
| 78 | + | |
| 75 | 79 | The USER.CEXPIRE field holds an expiration date |
| 76 | 80 | for the cookie, encoded as a Julian day number. On all subsequent |
| 77 | 81 | HTTP requests, the cookie value is matched against the USER table to |
| 78 | 82 | enable access to the repository. |
| 79 | 83 | |
| 80 | 84 |
| --- www/password.wiki | |
| +++ www/password.wiki | |
| @@ -63,17 +63,21 @@ | |
| 63 | for "anonymous" uses one-time captchas not persistent passwords. |
| 64 | |
| 65 | <h2>Web Interface Authentication</h2> |
| 66 | |
| 67 | When a user logs into Fossil using the web interface, the login name |
| 68 | and password are sent in the clear to the server. The server then |
| 69 | hashes the password and compares it against the value stored in USER.PW. |
| 70 | If they match, the server sets a cookie on the client to record the |
| 71 | login. This cookie contains a large amount of high-quality randomness |
| 72 | and is thus intractable to guess. The value of the cookie and the IP |
| 73 | address of the client is stored in the USER.COOKIE and USER.IPADDR fields |
| 74 | of the USER table on the server. |
| 75 | The USER.CEXPIRE field holds an expiration date |
| 76 | for the cookie, encoded as a Julian day number. On all subsequent |
| 77 | HTTP requests, the cookie value is matched against the USER table to |
| 78 | enable access to the repository. |
| 79 | |
| 80 |
| --- www/password.wiki | |
| +++ www/password.wiki | |
| @@ -63,17 +63,21 @@ | |
| 63 | for "anonymous" uses one-time captchas not persistent passwords. |
| 64 | |
| 65 | <h2>Web Interface Authentication</h2> |
| 66 | |
| 67 | When a user logs into Fossil using the web interface, the login name |
| 68 | and password are sent in the clear to the server. For most modern fossil |
| 69 | server setups with [/help?cmd=redirect-to-https|redirect-to-https] enabled, |
| 70 | this will be protected by the |
| 71 | SSL connection over HTTPS so it cannot be easily viewed. The server then |
| 72 | hashes the password and compares it against the value stored in USER.PW. |
| 73 | If they match, the server sets a cookie on the client to record the |
| 74 | login. This cookie contains a large amount of high-quality randomness |
| 75 | and is thus intractable to guess. The value of the cookie and the IP |
| 76 | address of the client is stored in the USER.COOKIE and USER.IPADDR fields |
| 77 | of the USER table on the server. |
| 78 | |
| 79 | The USER.CEXPIRE field holds an expiration date |
| 80 | for the cookie, encoded as a Julian day number. On all subsequent |
| 81 | HTTP requests, the cookie value is matched against the USER table to |
| 82 | enable access to the repository. |
| 83 | |
| 84 |
+2
-3
| --- www/settings.wiki | ||
| +++ www/settings.wiki | ||
| @@ -44,13 +44,12 @@ | ||
| 44 | 44 | Because these options can change over time, and the inconvenience of |
| 45 | 45 | replicating changes, these settings are "versionable". As well as being |
| 46 | 46 | able to be set using the <tt>settings</tt> command or the web interface, |
| 47 | 47 | you can create versioned files in the <tt>.fossil-settings</tt> |
| 48 | 48 | subdirectory of the check-out root, named with the setting name. |
| 49 | -The contents of the file is the | |
| 50 | -value of the setting, and these files are checked in, committed, merged, | |
| 51 | -and so on, as with any other file. | |
| 49 | +Each file holds the value of a setting, and these files are checked in, | |
| 50 | +committed, merged, and so on, as with any other file. | |
| 52 | 51 | |
| 53 | 52 | Where a setting is a list of values, such as <tt>ignore-glob</tt>, you |
| 54 | 53 | can use a newline as a separator as well as a comma. |
| 55 | 54 | |
| 56 | 55 | For example, to set the list of ignored files, create a |
| 57 | 56 |
| --- www/settings.wiki | |
| +++ www/settings.wiki | |
| @@ -44,13 +44,12 @@ | |
| 44 | Because these options can change over time, and the inconvenience of |
| 45 | replicating changes, these settings are "versionable". As well as being |
| 46 | able to be set using the <tt>settings</tt> command or the web interface, |
| 47 | you can create versioned files in the <tt>.fossil-settings</tt> |
| 48 | subdirectory of the check-out root, named with the setting name. |
| 49 | The contents of the file is the |
| 50 | value of the setting, and these files are checked in, committed, merged, |
| 51 | and so on, as with any other file. |
| 52 | |
| 53 | Where a setting is a list of values, such as <tt>ignore-glob</tt>, you |
| 54 | can use a newline as a separator as well as a comma. |
| 55 | |
| 56 | For example, to set the list of ignored files, create a |
| 57 |
| --- www/settings.wiki | |
| +++ www/settings.wiki | |
| @@ -44,13 +44,12 @@ | |
| 44 | Because these options can change over time, and the inconvenience of |
| 45 | replicating changes, these settings are "versionable". As well as being |
| 46 | able to be set using the <tt>settings</tt> command or the web interface, |
| 47 | you can create versioned files in the <tt>.fossil-settings</tt> |
| 48 | subdirectory of the check-out root, named with the setting name. |
| 49 | Each file holds the value of a setting, and these files are checked in, |
| 50 | committed, merged, and so on, as with any other file. |
| 51 | |
| 52 | Where a setting is a list of values, such as <tt>ignore-glob</tt>, you |
| 53 | can use a newline as a separator as well as a comma. |
| 54 | |
| 55 | For example, to set the list of ignored files, create a |
| 56 |
+2
-2
| --- www/shunning.wiki | ||
| +++ www/shunning.wiki | ||
| @@ -33,11 +33,11 @@ | ||
| 33 | 33 | |
| 34 | 34 | All of these are rare cases: Fossil is [./antibot.wiki | designed to |
| 35 | 35 | foil spammers up front], legally problematic check-ins should range from |
| 36 | 36 | rare to nonexistent, and you have to go way out of your way to force |
| 37 | 37 | Fossil to insert bad control artifacts. Therefore, before we get to |
| 38 | -methods of permanently deleting content from a Fossil repos, let's give | |
| 38 | +methods of permanently deleting content from a Fossil repo, let's give | |
| 39 | 39 | some alternatives that usually suffice, which don't damage the project's |
| 40 | 40 | fossil record: |
| 41 | 41 | |
| 42 | 42 | * When a forum post or wiki article is "deleted," what actually |
| 43 | 43 | happens is that a new empty version is added to the Fossil repository. |
| @@ -133,11 +133,11 @@ | ||
| 133 | 133 | using the "configuration" command: |
| 134 | 134 | |
| 135 | 135 | <b>fossil configuration pull shun</b> <i>remote-url</i><br> |
| 136 | 136 | <b>fossil configuration push shun</b> <i>remote-url</i> |
| 137 | 137 | |
| 138 | -The two command above will pull or push shunning lists from or to | |
| 138 | +The two commands above will pull or push shunning lists from or to | |
| 139 | 139 | the <i>remote-url</i> indicated and merge the lists on the receiving |
| 140 | 140 | end. "Admin" privilege on the remote server is required in order to |
| 141 | 141 | push a shun list. In contrast, the shunning list will be automatically |
| 142 | 142 | received by default as part of a normal client "pull" operation unless |
| 143 | 143 | disabled by the "<tt>auto-shun</tt>" setting. |
| 144 | 144 |
| --- www/shunning.wiki | |
| +++ www/shunning.wiki | |
| @@ -33,11 +33,11 @@ | |
| 33 | |
| 34 | All of these are rare cases: Fossil is [./antibot.wiki | designed to |
| 35 | foil spammers up front], legally problematic check-ins should range from |
| 36 | rare to nonexistent, and you have to go way out of your way to force |
| 37 | Fossil to insert bad control artifacts. Therefore, before we get to |
| 38 | methods of permanently deleting content from a Fossil repos, let's give |
| 39 | some alternatives that usually suffice, which don't damage the project's |
| 40 | fossil record: |
| 41 | |
| 42 | * When a forum post or wiki article is "deleted," what actually |
| 43 | happens is that a new empty version is added to the Fossil repository. |
| @@ -133,11 +133,11 @@ | |
| 133 | using the "configuration" command: |
| 134 | |
| 135 | <b>fossil configuration pull shun</b> <i>remote-url</i><br> |
| 136 | <b>fossil configuration push shun</b> <i>remote-url</i> |
| 137 | |
| 138 | The two command above will pull or push shunning lists from or to |
| 139 | the <i>remote-url</i> indicated and merge the lists on the receiving |
| 140 | end. "Admin" privilege on the remote server is required in order to |
| 141 | push a shun list. In contrast, the shunning list will be automatically |
| 142 | received by default as part of a normal client "pull" operation unless |
| 143 | disabled by the "<tt>auto-shun</tt>" setting. |
| 144 |
| --- www/shunning.wiki | |
| +++ www/shunning.wiki | |
| @@ -33,11 +33,11 @@ | |
| 33 | |
| 34 | All of these are rare cases: Fossil is [./antibot.wiki | designed to |
| 35 | foil spammers up front], legally problematic check-ins should range from |
| 36 | rare to nonexistent, and you have to go way out of your way to force |
| 37 | Fossil to insert bad control artifacts. Therefore, before we get to |
| 38 | methods of permanently deleting content from a Fossil repo, let's give |
| 39 | some alternatives that usually suffice, which don't damage the project's |
| 40 | fossil record: |
| 41 | |
| 42 | * When a forum post or wiki article is "deleted," what actually |
| 43 | happens is that a new empty version is added to the Fossil repository. |
| @@ -133,11 +133,11 @@ | |
| 133 | using the "configuration" command: |
| 134 | |
| 135 | <b>fossil configuration pull shun</b> <i>remote-url</i><br> |
| 136 | <b>fossil configuration push shun</b> <i>remote-url</i> |
| 137 | |
| 138 | The two commands above will pull or push shunning lists from or to |
| 139 | the <i>remote-url</i> indicated and merge the lists on the receiving |
| 140 | end. "Admin" privilege on the remote server is required in order to |
| 141 | push a shun list. In contrast, the shunning list will be automatically |
| 142 | received by default as part of a normal client "pull" operation unless |
| 143 | disabled by the "<tt>auto-shun</tt>" setting. |
| 144 |
+2
-2
| --- www/stats.wiki | ||
| +++ www/stats.wiki | ||
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | <title>Fossil Performance</title> |
| 2 | 2 | |
| 3 | 3 | The questions will inevitably arise: How does Fossil perform? |
| 4 | 4 | Does it use a lot of disk space or bandwidth? Is it scalable? |
| 5 | 5 | |
| 6 | -In an attempt to answers these questions, this report looks at several | |
| 6 | +In an attempt to answer these questions, this report looks at several | |
| 7 | 7 | projects that use fossil for configuration management and examines how |
| 8 | 8 | well they are working. The following table is a summary of the results. |
| 9 | 9 | (Last updated on 2018-06-04.) |
| 10 | 10 | Explanation and analysis follows the table. |
| 11 | 11 | |
| @@ -100,11 +100,11 @@ | ||
| 100 | 100 | is the unordered collection of artifacts. In fact, one of the key |
| 101 | 101 | characteristics of Fossil is that the entire project history can be |
| 102 | 102 | reconstructed simply by scanning the artifacts in an arbitrary order. |
| 103 | 103 | |
| 104 | 104 | The number of check-ins is the number of times that the "commit" command |
| 105 | -has been run. A single check-in might change a 3 or 4 files, or it might | |
| 105 | +has been run. A single check-in might change 3 or 4 files, or it might | |
| 106 | 106 | change dozens or hundreds of files. Regardless of the number of files |
| 107 | 107 | changed, it still only counts as one check-in. |
| 108 | 108 | |
| 109 | 109 | The "Uncompressed Size" is the total size of all the artifacts within |
| 110 | 110 | the repository assuming they were all uncompressed and stored |
| 111 | 111 |
| --- www/stats.wiki | |
| +++ www/stats.wiki | |
| @@ -1,11 +1,11 @@ | |
| 1 | <title>Fossil Performance</title> |
| 2 | |
| 3 | The questions will inevitably arise: How does Fossil perform? |
| 4 | Does it use a lot of disk space or bandwidth? Is it scalable? |
| 5 | |
| 6 | In an attempt to answers these questions, this report looks at several |
| 7 | projects that use fossil for configuration management and examines how |
| 8 | well they are working. The following table is a summary of the results. |
| 9 | (Last updated on 2018-06-04.) |
| 10 | Explanation and analysis follows the table. |
| 11 | |
| @@ -100,11 +100,11 @@ | |
| 100 | is the unordered collection of artifacts. In fact, one of the key |
| 101 | characteristics of Fossil is that the entire project history can be |
| 102 | reconstructed simply by scanning the artifacts in an arbitrary order. |
| 103 | |
| 104 | The number of check-ins is the number of times that the "commit" command |
| 105 | has been run. A single check-in might change a 3 or 4 files, or it might |
| 106 | change dozens or hundreds of files. Regardless of the number of files |
| 107 | changed, it still only counts as one check-in. |
| 108 | |
| 109 | The "Uncompressed Size" is the total size of all the artifacts within |
| 110 | the repository assuming they were all uncompressed and stored |
| 111 |
| --- www/stats.wiki | |
| +++ www/stats.wiki | |
| @@ -1,11 +1,11 @@ | |
| 1 | <title>Fossil Performance</title> |
| 2 | |
| 3 | The questions will inevitably arise: How does Fossil perform? |
| 4 | Does it use a lot of disk space or bandwidth? Is it scalable? |
| 5 | |
| 6 | In an attempt to answer these questions, this report looks at several |
| 7 | projects that use fossil for configuration management and examines how |
| 8 | well they are working. The following table is a summary of the results. |
| 9 | (Last updated on 2018-06-04.) |
| 10 | Explanation and analysis follows the table. |
| 11 | |
| @@ -100,11 +100,11 @@ | |
| 100 | is the unordered collection of artifacts. In fact, one of the key |
| 101 | characteristics of Fossil is that the entire project history can be |
| 102 | reconstructed simply by scanning the artifacts in an arbitrary order. |
| 103 | |
| 104 | The number of check-ins is the number of times that the "commit" command |
| 105 | has been run. A single check-in might change 3 or 4 files, or it might |
| 106 | change dozens or hundreds of files. Regardless of the number of files |
| 107 | changed, it still only counts as one check-in. |
| 108 | |
| 109 | The "Uncompressed Size" is the total size of all the artifacts within |
| 110 | the repository assuming they were all uncompressed and stored |
| 111 |
+6
-5
| --- www/style.wiki | ||
| +++ www/style.wiki | ||
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | <title>Coding Style</title> |
| 2 | 2 | |
| 3 | -Fossil source code should following the style guidelines below. | |
| 3 | +Fossil source code should follow the style guidelines below. | |
| 4 | 4 | |
| 5 | 5 | <em> The Fossil source tree includes a few files taken from external |
| 6 | 6 | sources |
| 7 | 7 | (examples: [https://github.com/antirez/linenoise|linenoise] and |
| 8 | 8 | [http://zlib.net/|zLib]) |
| @@ -38,13 +38,14 @@ | ||
| 38 | 38 | |
| 39 | 39 | <li> -Wno-long-long: Fossil uses the 'long long' integer type, which is not strictly ANSI C-89 (defined in C99). |
| 40 | 40 | The use of 'long long' resolves many problems with 64-bit arithmetics, especially on 32-bit machines. |
| 41 | 41 | (http_ssl.c, sha3.c, shell.c, util.c) |
| 42 | 42 | |
| 43 | - <li> alloca(): By default, sqlite3.c is compiled with the -DSQLITE_USE_ALLOCA flag to use the alloca() function. | |
| 44 | - alloca() is not considered ANSI C, and normally not recommended due to portability issues, but | |
| 45 | - performance and/or memory consumption improvement may be a stronger argument in favor of its usage. | |
| 43 | + <li> alloca(): By default, sqlite3.c was compiled with the -DSQLITE_USE_ALLOCA flag to use the alloca() function. | |
| 44 | + This is no longer the case as of 20220119. alloca() is not considered ANSI C, and normally not | |
| 45 | + recommended due to portability issues, but performance and/or memory consumption | |
| 46 | + improvement may have been a stronger argument in favor of its usage. | |
| 46 | 47 | (sqlite3.c) |
| 47 | 48 | </ol> |
| 48 | 49 | |
| 49 | 50 | <li> All comments and identifiers are in English. |
| 50 | 51 | |
| @@ -75,11 +76,11 @@ | ||
| 75 | 76 | |
| 76 | 77 | <ol> |
| 77 | 78 | <li value=30> Every function has a header comment describing the purpose and use |
| 78 | 79 | of the function. |
| 79 | 80 | |
| 80 | - <li> Function header comment defines the behavior of the function in | |
| 81 | + <li> A function header comment defines the behavior of the function in | |
| 81 | 82 | sufficient detail to allow the function to be re-implemented from |
| 82 | 83 | scratch without reference to the original code. |
| 83 | 84 | |
| 84 | 85 | <li> Functions that perform dynamic memory allocation (either directly |
| 85 | 86 | or indirectly via subfunctions) say so in their header comments. |
| 86 | 87 |
| --- www/style.wiki | |
| +++ www/style.wiki | |
| @@ -1,8 +1,8 @@ | |
| 1 | <title>Coding Style</title> |
| 2 | |
| 3 | Fossil source code should following the style guidelines below. |
| 4 | |
| 5 | <em> The Fossil source tree includes a few files taken from external |
| 6 | sources |
| 7 | (examples: [https://github.com/antirez/linenoise|linenoise] and |
| 8 | [http://zlib.net/|zLib]) |
| @@ -38,13 +38,14 @@ | |
| 38 | |
| 39 | <li> -Wno-long-long: Fossil uses the 'long long' integer type, which is not strictly ANSI C-89 (defined in C99). |
| 40 | The use of 'long long' resolves many problems with 64-bit arithmetics, especially on 32-bit machines. |
| 41 | (http_ssl.c, sha3.c, shell.c, util.c) |
| 42 | |
| 43 | <li> alloca(): By default, sqlite3.c is compiled with the -DSQLITE_USE_ALLOCA flag to use the alloca() function. |
| 44 | alloca() is not considered ANSI C, and normally not recommended due to portability issues, but |
| 45 | performance and/or memory consumption improvement may be a stronger argument in favor of its usage. |
| 46 | (sqlite3.c) |
| 47 | </ol> |
| 48 | |
| 49 | <li> All comments and identifiers are in English. |
| 50 | |
| @@ -75,11 +76,11 @@ | |
| 75 | |
| 76 | <ol> |
| 77 | <li value=30> Every function has a header comment describing the purpose and use |
| 78 | of the function. |
| 79 | |
| 80 | <li> Function header comment defines the behavior of the function in |
| 81 | sufficient detail to allow the function to be re-implemented from |
| 82 | scratch without reference to the original code. |
| 83 | |
| 84 | <li> Functions that perform dynamic memory allocation (either directly |
| 85 | or indirectly via subfunctions) say so in their header comments. |
| 86 |
| --- www/style.wiki | |
| +++ www/style.wiki | |
| @@ -1,8 +1,8 @@ | |
| 1 | <title>Coding Style</title> |
| 2 | |
| 3 | Fossil source code should follow the style guidelines below. |
| 4 | |
| 5 | <em> The Fossil source tree includes a few files taken from external |
| 6 | sources |
| 7 | (examples: [https://github.com/antirez/linenoise|linenoise] and |
| 8 | [http://zlib.net/|zLib]) |
| @@ -38,13 +38,14 @@ | |
| 38 | |
| 39 | <li> -Wno-long-long: Fossil uses the 'long long' integer type, which is not strictly ANSI C-89 (defined in C99). |
| 40 | The use of 'long long' resolves many problems with 64-bit arithmetics, especially on 32-bit machines. |
| 41 | (http_ssl.c, sha3.c, shell.c, util.c) |
| 42 | |
| 43 | <li> alloca(): By default, sqlite3.c was compiled with the -DSQLITE_USE_ALLOCA flag to use the alloca() function. |
| 44 | This is no longer the case as of 20220119. alloca() is not considered ANSI C, and normally not |
| 45 | recommended due to portability issues, but performance and/or memory consumption |
| 46 | improvement may have been a stronger argument in favor of its usage. |
| 47 | (sqlite3.c) |
| 48 | </ol> |
| 49 | |
| 50 | <li> All comments and identifiers are in English. |
| 51 | |
| @@ -75,11 +76,11 @@ | |
| 76 | |
| 77 | <ol> |
| 78 | <li value=30> Every function has a header comment describing the purpose and use |
| 79 | of the function. |
| 80 | |
| 81 | <li> A function header comment defines the behavior of the function in |
| 82 | sufficient detail to allow the function to be re-implemented from |
| 83 | scratch without reference to the original code. |
| 84 | |
| 85 | <li> Functions that perform dynamic memory allocation (either directly |
| 86 | or indirectly via subfunctions) say so in their header comments. |
| 87 |
+33
-13
| --- www/sync.wiki | ||
| +++ www/sync.wiki | ||
| @@ -518,11 +518,11 @@ | ||
| 518 | 518 | pronounced as if it were a single word "gimme" in some dialects of |
| 519 | 519 | English (including the dialect spoken by the original author of Fossil). |
| 520 | 520 | |
| 521 | 521 | <h4>3.7.1 Unversioned Gimme Cards</h4> |
| 522 | 522 | |
| 523 | -Sync synchronizing unversioned content, the client may send "uvgimme" | |
| 523 | +When synchronizing unversioned content, the client may send "uvgimme" | |
| 524 | 524 | cards to the server. A uvgimme card requests that the server send |
| 525 | 525 | unversioned content to the client. The format of a uvgimme card is |
| 526 | 526 | as follows: |
| 527 | 527 | |
| 528 | 528 | <pre> |
| @@ -570,77 +570,97 @@ | ||
| 570 | 570 | |
| 571 | 571 | <pre> |
| 572 | 572 | <b>reqconfig</b> <i>configuration-name</i> |
| 573 | 573 | </pre> |
| 574 | 574 | |
| 575 | -As of 2018-06-04, the configuration-name must be one of the | |
| 575 | +As of 2024-10-22, the configuration-name must be one of the | |
| 576 | 576 | following values: |
| 577 | 577 | |
| 578 | 578 | <table border=0 align="center"> |
| 579 | 579 | <tr><td valign="top"> |
| 580 | 580 | <ul> |
| 581 | 581 | <li> css |
| 582 | 582 | <li> header |
| 583 | +<li> mainmenu | |
| 583 | 584 | <li> footer |
| 584 | 585 | <li> details |
| 586 | +<li> js | |
| 587 | +<li> default-skin | |
| 585 | 588 | <li> logo-mimetype |
| 586 | 589 | <li> logo-image |
| 587 | 590 | <li> background-mimetype |
| 588 | 591 | <li> background-image |
| 589 | -<li> index-page | |
| 592 | +<li> icon-mimetype | |
| 593 | +<li> icon-image | |
| 590 | 594 | <li> timeline-block-markup |
| 595 | +<li> timeline-date-format | |
| 596 | +<li> timeline-default-style | |
| 597 | +<ul></td><td valign="top"><ul> | |
| 598 | +<li> timeline-dwelltime | |
| 599 | +<li> timeline-closetime | |
| 600 | +<li> timeline-hard-newlines | |
| 591 | 601 | <li> timeline-max-comment |
| 592 | 602 | <li> timeline-plaintext |
| 603 | +<li> timeline-truncate-at-blank | |
| 604 | +<li> timeline-tslink-info | |
| 605 | +<li> timeline-utc | |
| 593 | 606 | <li> adunit |
| 594 | 607 | <li> adunit-omit-if-admin |
| 595 | 608 | <li> adunit-omit-if-user |
| 596 | -<ul></td><td valign="top"><ul> | |
| 597 | -<li> th1-docs | |
| 609 | +<li> default-csp | |
| 610 | +<li> sitemap-extra | |
| 611 | +<li> safe-html | |
| 598 | 612 | <li> th1-hooks |
| 599 | -<li> th1-setup | |
| 600 | -<li> tcl | |
| 601 | -<li> tcl-setup | |
| 613 | +<li> th1-uri-regexp | |
| 602 | 614 | <li> project-name |
| 615 | +<ul></td><td valign="top"><ul> | |
| 603 | 616 | <li> short-project-name |
| 604 | 617 | <li> project-description |
| 605 | 618 | <li> index-page |
| 606 | 619 | <li> manifest |
| 607 | 620 | <li> binary-glob |
| 608 | 621 | <li> clean-glob |
| 609 | 622 | <li> ignore-glob |
| 610 | 623 | <li> keep-glob |
| 611 | 624 | <li> crlf-glob |
| 612 | -<ul></td><td valign="top"><ul> | |
| 613 | 625 | <li> crnl-glob |
| 614 | 626 | <li> encoding-glob |
| 615 | 627 | <li> empty-dirs |
| 616 | 628 | <li> <s title="removed 2020-08, version 2.12.1">allow-symlinks</s> |
| 617 | 629 | <li> dotfiles |
| 618 | 630 | <li> parent-project-code |
| 619 | -<li> parent-projet-name | |
| 631 | +<li> parent-project-name | |
| 632 | +<ul></td><td valign="top"><ul> | |
| 620 | 633 | <li> hash-policy |
| 634 | +<li> comment-format | |
| 635 | +<li> mimetypes | |
| 636 | +<li> forbid-delta-manifests | |
| 621 | 637 | <li> mv-rm-files |
| 622 | 638 | <li> ticket-table |
| 623 | 639 | <li> ticket-common |
| 624 | 640 | <li> ticket-change |
| 625 | 641 | <li> ticket-newpage |
| 626 | 642 | <li> ticket-viewpage |
| 627 | 643 | <li> ticket-editpage |
| 628 | -<ul></td><td valign="top"><ul> | |
| 629 | 644 | <li> ticket-reportlist |
| 630 | 645 | <li> ticket-report-template |
| 631 | 646 | <li> ticket-key-template |
| 632 | 647 | <li> ticket-title-expr |
| 633 | 648 | <li> ticket-closed-expr |
| 649 | +<ul></td><td valign="top"><ul> | |
| 650 | +<li> user-color-map | |
| 634 | 651 | <li> xfer-common-script |
| 635 | 652 | <li> xfer-push-script |
| 636 | 653 | <li> xfer-commit-script |
| 637 | 654 | <li> xfer-ticket-script |
| 638 | 655 | <li> @reportfmt |
| 639 | 656 | <li> @user |
| 640 | 657 | <li> @concealed |
| 641 | 658 | <li> @shun |
| 659 | +<li> @alias | |
| 660 | +<li> @subscriber | |
| 661 | +<li> @interwiki | |
| 642 | 662 | </ul></td></tr> |
| 643 | 663 | </table> |
| 644 | 664 | |
| 645 | 665 | New configuration-names are likely to be added in future releases of |
| 646 | 666 | Fossil. If the server receives a configuration-name that it does not |
| @@ -861,11 +881,11 @@ | ||
| 861 | 881 | <h2 id="strategies">5.0 Synchronization Strategies</h2> |
| 862 | 882 | |
| 863 | 883 | <h3 id="pull-strategy">5.1 Pull</h3> |
| 864 | 884 | |
| 865 | 885 | A typical pull operation proceeds as shown below. Details |
| 866 | -of the actual implementation may very slightly but the gist of | |
| 886 | +of the actual implementation may vary slightly but the gist of | |
| 867 | 887 | a pull is captured in the following steps: |
| 868 | 888 | |
| 869 | 889 | <ol> |
| 870 | 890 | <li>The client sends login and pull cards. |
| 871 | 891 | <li>The client sends a cookie card if it has previously received a cookie. |
| @@ -1071,6 +1091,6 @@ | ||
| 1071 | 1091 | </ol> |
| 1072 | 1092 | |
| 1073 | 1093 | In a complex debugging situation, you can run the command |
| 1074 | 1094 | "fossil sync --transport-command ./debugging_script" where |
| 1075 | 1095 | "debugging_script" is some script of your own that invokes |
| 1076 | -the anomolous behavior your are trying to debug. | |
| 1096 | +the anomalous behavior you are trying to debug. | |
| 1077 | 1097 |
| --- www/sync.wiki | |
| +++ www/sync.wiki | |
| @@ -518,11 +518,11 @@ | |
| 518 | pronounced as if it were a single word "gimme" in some dialects of |
| 519 | English (including the dialect spoken by the original author of Fossil). |
| 520 | |
| 521 | <h4>3.7.1 Unversioned Gimme Cards</h4> |
| 522 | |
| 523 | Sync synchronizing unversioned content, the client may send "uvgimme" |
| 524 | cards to the server. A uvgimme card requests that the server send |
| 525 | unversioned content to the client. The format of a uvgimme card is |
| 526 | as follows: |
| 527 | |
| 528 | <pre> |
| @@ -570,77 +570,97 @@ | |
| 570 | |
| 571 | <pre> |
| 572 | <b>reqconfig</b> <i>configuration-name</i> |
| 573 | </pre> |
| 574 | |
| 575 | As of 2018-06-04, the configuration-name must be one of the |
| 576 | following values: |
| 577 | |
| 578 | <table border=0 align="center"> |
| 579 | <tr><td valign="top"> |
| 580 | <ul> |
| 581 | <li> css |
| 582 | <li> header |
| 583 | <li> footer |
| 584 | <li> details |
| 585 | <li> logo-mimetype |
| 586 | <li> logo-image |
| 587 | <li> background-mimetype |
| 588 | <li> background-image |
| 589 | <li> index-page |
| 590 | <li> timeline-block-markup |
| 591 | <li> timeline-max-comment |
| 592 | <li> timeline-plaintext |
| 593 | <li> adunit |
| 594 | <li> adunit-omit-if-admin |
| 595 | <li> adunit-omit-if-user |
| 596 | <ul></td><td valign="top"><ul> |
| 597 | <li> th1-docs |
| 598 | <li> th1-hooks |
| 599 | <li> th1-setup |
| 600 | <li> tcl |
| 601 | <li> tcl-setup |
| 602 | <li> project-name |
| 603 | <li> short-project-name |
| 604 | <li> project-description |
| 605 | <li> index-page |
| 606 | <li> manifest |
| 607 | <li> binary-glob |
| 608 | <li> clean-glob |
| 609 | <li> ignore-glob |
| 610 | <li> keep-glob |
| 611 | <li> crlf-glob |
| 612 | <ul></td><td valign="top"><ul> |
| 613 | <li> crnl-glob |
| 614 | <li> encoding-glob |
| 615 | <li> empty-dirs |
| 616 | <li> <s title="removed 2020-08, version 2.12.1">allow-symlinks</s> |
| 617 | <li> dotfiles |
| 618 | <li> parent-project-code |
| 619 | <li> parent-projet-name |
| 620 | <li> hash-policy |
| 621 | <li> mv-rm-files |
| 622 | <li> ticket-table |
| 623 | <li> ticket-common |
| 624 | <li> ticket-change |
| 625 | <li> ticket-newpage |
| 626 | <li> ticket-viewpage |
| 627 | <li> ticket-editpage |
| 628 | <ul></td><td valign="top"><ul> |
| 629 | <li> ticket-reportlist |
| 630 | <li> ticket-report-template |
| 631 | <li> ticket-key-template |
| 632 | <li> ticket-title-expr |
| 633 | <li> ticket-closed-expr |
| 634 | <li> xfer-common-script |
| 635 | <li> xfer-push-script |
| 636 | <li> xfer-commit-script |
| 637 | <li> xfer-ticket-script |
| 638 | <li> @reportfmt |
| 639 | <li> @user |
| 640 | <li> @concealed |
| 641 | <li> @shun |
| 642 | </ul></td></tr> |
| 643 | </table> |
| 644 | |
| 645 | New configuration-names are likely to be added in future releases of |
| 646 | Fossil. If the server receives a configuration-name that it does not |
| @@ -861,11 +881,11 @@ | |
| 861 | <h2 id="strategies">5.0 Synchronization Strategies</h2> |
| 862 | |
| 863 | <h3 id="pull-strategy">5.1 Pull</h3> |
| 864 | |
| 865 | A typical pull operation proceeds as shown below. Details |
| 866 | of the actual implementation may very slightly but the gist of |
| 867 | a pull is captured in the following steps: |
| 868 | |
| 869 | <ol> |
| 870 | <li>The client sends login and pull cards. |
| 871 | <li>The client sends a cookie card if it has previously received a cookie. |
| @@ -1071,6 +1091,6 @@ | |
| 1071 | </ol> |
| 1072 | |
| 1073 | In a complex debugging situation, you can run the command |
| 1074 | "fossil sync --transport-command ./debugging_script" where |
| 1075 | "debugging_script" is some script of your own that invokes |
| 1076 | the anomolous behavior your are trying to debug. |
| 1077 |
| --- www/sync.wiki | |
| +++ www/sync.wiki | |
| @@ -518,11 +518,11 @@ | |
| 518 | pronounced as if it were a single word "gimme" in some dialects of |
| 519 | English (including the dialect spoken by the original author of Fossil). |
| 520 | |
| 521 | <h4>3.7.1 Unversioned Gimme Cards</h4> |
| 522 | |
| 523 | When synchronizing unversioned content, the client may send "uvgimme" |
| 524 | cards to the server. A uvgimme card requests that the server send |
| 525 | unversioned content to the client. The format of a uvgimme card is |
| 526 | as follows: |
| 527 | |
| 528 | <pre> |
| @@ -570,77 +570,97 @@ | |
| 570 | |
| 571 | <pre> |
| 572 | <b>reqconfig</b> <i>configuration-name</i> |
| 573 | </pre> |
| 574 | |
| 575 | As of 2024-10-22, the configuration-name must be one of the |
| 576 | following values: |
| 577 | |
| 578 | <table border=0 align="center"> |
| 579 | <tr><td valign="top"> |
| 580 | <ul> |
| 581 | <li> css |
| 582 | <li> header |
| 583 | <li> mainmenu |
| 584 | <li> footer |
| 585 | <li> details |
| 586 | <li> js |
| 587 | <li> default-skin |
| 588 | <li> logo-mimetype |
| 589 | <li> logo-image |
| 590 | <li> background-mimetype |
| 591 | <li> background-image |
| 592 | <li> icon-mimetype |
| 593 | <li> icon-image |
| 594 | <li> timeline-block-markup |
| 595 | <li> timeline-date-format |
| 596 | <li> timeline-default-style |
| 597 | <ul></td><td valign="top"><ul> |
| 598 | <li> timeline-dwelltime |
| 599 | <li> timeline-closetime |
| 600 | <li> timeline-hard-newlines |
| 601 | <li> timeline-max-comment |
| 602 | <li> timeline-plaintext |
| 603 | <li> timeline-truncate-at-blank |
| 604 | <li> timeline-tslink-info |
| 605 | <li> timeline-utc |
| 606 | <li> adunit |
| 607 | <li> adunit-omit-if-admin |
| 608 | <li> adunit-omit-if-user |
| 609 | <li> default-csp |
| 610 | <li> sitemap-extra |
| 611 | <li> safe-html |
| 612 | <li> th1-hooks |
| 613 | <li> th1-uri-regexp |
| 614 | <li> project-name |
| 615 | <ul></td><td valign="top"><ul> |
| 616 | <li> short-project-name |
| 617 | <li> project-description |
| 618 | <li> index-page |
| 619 | <li> manifest |
| 620 | <li> binary-glob |
| 621 | <li> clean-glob |
| 622 | <li> ignore-glob |
| 623 | <li> keep-glob |
| 624 | <li> crlf-glob |
| 625 | <li> crnl-glob |
| 626 | <li> encoding-glob |
| 627 | <li> empty-dirs |
| 628 | <li> <s title="removed 2020-08, version 2.12.1">allow-symlinks</s> |
| 629 | <li> dotfiles |
| 630 | <li> parent-project-code |
| 631 | <li> parent-project-name |
| 632 | <ul></td><td valign="top"><ul> |
| 633 | <li> hash-policy |
| 634 | <li> comment-format |
| 635 | <li> mimetypes |
| 636 | <li> forbid-delta-manifests |
| 637 | <li> mv-rm-files |
| 638 | <li> ticket-table |
| 639 | <li> ticket-common |
| 640 | <li> ticket-change |
| 641 | <li> ticket-newpage |
| 642 | <li> ticket-viewpage |
| 643 | <li> ticket-editpage |
| 644 | <li> ticket-reportlist |
| 645 | <li> ticket-report-template |
| 646 | <li> ticket-key-template |
| 647 | <li> ticket-title-expr |
| 648 | <li> ticket-closed-expr |
| 649 | <ul></td><td valign="top"><ul> |
| 650 | <li> user-color-map |
| 651 | <li> xfer-common-script |
| 652 | <li> xfer-push-script |
| 653 | <li> xfer-commit-script |
| 654 | <li> xfer-ticket-script |
| 655 | <li> @reportfmt |
| 656 | <li> @user |
| 657 | <li> @concealed |
| 658 | <li> @shun |
| 659 | <li> @alias |
| 660 | <li> @subscriber |
| 661 | <li> @interwiki |
| 662 | </ul></td></tr> |
| 663 | </table> |
| 664 | |
| 665 | New configuration-names are likely to be added in future releases of |
| 666 | Fossil. If the server receives a configuration-name that it does not |
| @@ -861,11 +881,11 @@ | |
| 881 | <h2 id="strategies">5.0 Synchronization Strategies</h2> |
| 882 | |
| 883 | <h3 id="pull-strategy">5.1 Pull</h3> |
| 884 | |
| 885 | A typical pull operation proceeds as shown below. Details |
| 886 | of the actual implementation may vary slightly but the gist of |
| 887 | a pull is captured in the following steps: |
| 888 | |
| 889 | <ol> |
| 890 | <li>The client sends login and pull cards. |
| 891 | <li>The client sends a cookie card if it has previously received a cookie. |
| @@ -1071,6 +1091,6 @@ | |
| 1091 | </ol> |
| 1092 | |
| 1093 | In a complex debugging situation, you can run the command |
| 1094 | "fossil sync --transport-command ./debugging_script" where |
| 1095 | "debugging_script" is some script of your own that invokes |
| 1096 | the anomalous behavior you are trying to debug. |
| 1097 |
+1
-1
| --- www/tech_overview.wiki | ||
| +++ www/tech_overview.wiki | ||
| @@ -142,11 +142,11 @@ | ||
| 142 | 142 | if the ~/.fossil file does not already exist |
| 143 | 143 | * Otherwise, use the traditional unix name of "~/.fossil" |
| 144 | 144 | |
| 145 | 145 | This algorithm is complex due to the need for historical compatibility. |
| 146 | 146 | Originally, the database was always just "~/.fossil". Then support |
| 147 | -for the FOSSIL_HOME environment variable as added. Later, support for the | |
| 147 | +for the FOSSIL_HOME environment variable was added. Later, support for the | |
| 148 | 148 | [https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html|XDG-compatible configation filenames] |
| 149 | 149 | was added. Each of these changes needed to continue to support legacy |
| 150 | 150 | installations. |
| 151 | 151 | |
| 152 | 152 | On Windows, the configuration database is the first of the following |
| 153 | 153 |
| --- www/tech_overview.wiki | |
| +++ www/tech_overview.wiki | |
| @@ -142,11 +142,11 @@ | |
| 142 | if the ~/.fossil file does not already exist |
| 143 | * Otherwise, use the traditional unix name of "~/.fossil" |
| 144 | |
| 145 | This algorithm is complex due to the need for historical compatibility. |
| 146 | Originally, the database was always just "~/.fossil". Then support |
| 147 | for the FOSSIL_HOME environment variable as added. Later, support for the |
| 148 | [https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html|XDG-compatible configation filenames] |
| 149 | was added. Each of these changes needed to continue to support legacy |
| 150 | installations. |
| 151 | |
| 152 | On Windows, the configuration database is the first of the following |
| 153 |
| --- www/tech_overview.wiki | |
| +++ www/tech_overview.wiki | |
| @@ -142,11 +142,11 @@ | |
| 142 | if the ~/.fossil file does not already exist |
| 143 | * Otherwise, use the traditional unix name of "~/.fossil" |
| 144 | |
| 145 | This algorithm is complex due to the need for historical compatibility. |
| 146 | Originally, the database was always just "~/.fossil". Then support |
| 147 | for the FOSSIL_HOME environment variable was added. Later, support for the |
| 148 | [https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html|XDG-compatible configation filenames] |
| 149 | was added. Each of these changes needed to continue to support legacy |
| 150 | installations. |
| 151 | |
| 152 | On Windows, the configuration database is the first of the following |
| 153 |