Fossil SCM
Fix typos in the file-format documentation.
Commit
f7d7ce35cd6c5c70ccbaae5f132708197bd39719
Parent
54d53deb1650212…
1 file changed
+5
-5
+5
-5
| --- www/fileformat.wiki | ||
| +++ www/fileformat.wiki | ||
| @@ -49,11 +49,11 @@ | ||
| 49 | 49 | </ul> |
| 50 | 50 | |
| 51 | 51 | These seven artifact types are described in the following sections. |
| 52 | 52 | |
| 53 | 53 | In the current implementation (as of 2009-01-25) the artifacts that |
| 54 | -make up a fossil repository are stored in in as delta- and zlib-compressed | |
| 54 | +make up a fossil repository are stored as delta- and zlib-compressed | |
| 55 | 55 | blobs in an <a href="http://www.sqlite.org/">SQLite</a> database. This |
| 56 | 56 | is an implementation detail and might change in a future release. For |
| 57 | 57 | the purpose of this article "file format" means the format of the artifacts, |
| 58 | 58 | not how the artifacts are stored on disk. It is the artifact format that |
| 59 | 59 | is intended to be enduring. The specifics of how artifacts are stored on |
| @@ -184,11 +184,11 @@ | ||
| 184 | 184 | ancestor, the Q-card is used to identify a single check-in or a small |
| 185 | 185 | range of check-ins which were cherry-picked for inclusion in or |
| 186 | 186 | exclusion from the current manifest. The first argument of |
| 187 | 187 | the Q-card is the artifact ID of another manifest (the "target") |
| 188 | 188 | which has had its changes included or excluded in the current manifest. |
| 189 | -The target is preceeded by "+" or "-" to show inclusion or | |
| 189 | +The target is preceded by "+" or "-" to show inclusion or | |
| 190 | 190 | exclusion, respectively. The optional second argument to the |
| 191 | 191 | Q-card is another manifest artifact ID which is the "baseline" |
| 192 | 192 | for the cherry-pick. If omitted, the baseline is the primary |
| 193 | 193 | parent of the target. The |
| 194 | 194 | changes included or excluded consist of all changes moving from |
| @@ -315,11 +315,11 @@ | ||
| 315 | 315 | is either "+", "-", or "*". The "+" means the tag should be added |
| 316 | 316 | to the artifact. The "-" means the tag should be removed. |
| 317 | 317 | The "*" character means the tag should be added to the artifact |
| 318 | 318 | and all direct descendants (but not descendents through a merge) down |
| 319 | 319 | to but not including the first descendant that contains a |
| 320 | -more recent "-" or "+" tag with the same name. | |
| 320 | +more recent "-", "*", or "+" tag with the same name. | |
| 321 | 321 | The optional third argument is the value of the tag. A tag |
| 322 | 322 | without a value is a boolean. |
| 323 | 323 | |
| 324 | 324 | When two or more tags with the same name are applied to the |
| 325 | 325 | same artifact, the tag with the latest (most recent) date is |
| @@ -362,11 +362,11 @@ | ||
| 362 | 362 | gives the name of the wiki page. The optional N card specifies |
| 363 | 363 | the mimetype of the wiki text. If the N card is omitted, the |
| 364 | 364 | mimetype is assumed to be text/x-fossil-wiki. |
| 365 | 365 | The U card specifies the login |
| 366 | 366 | of the user who made this edit to the wiki page. The Z card is |
| 367 | -the usual checksum over the either artifact and is required. | |
| 367 | +the usual checksum over the entire artifact and is required. | |
| 368 | 368 | |
| 369 | 369 | The W card is used to specify the text of the wiki page. The |
| 370 | 370 | argument to the W card is an integer which is the number of bytes |
| 371 | 371 | of text in the wiki page. That text follows the newline character |
| 372 | 372 | that terminates the W card. The wiki text is always followed by one |
| @@ -453,11 +453,11 @@ | ||
| 453 | 453 | |
| 454 | 454 | There may be zero or one N cards. The N card specifies the mimetype of the |
| 455 | 455 | comment text provided in the C card. If the N card is omitted, the C card |
| 456 | 456 | mimetype is taken to be text/plain. |
| 457 | 457 | |
| 458 | -A single U card gives the name of the user to added the attachment. | |
| 458 | +A single U card gives the name of the user who added the attachment. | |
| 459 | 459 | If an attachment is added anonymously, then the U card may be omitted. |
| 460 | 460 | |
| 461 | 461 | The Z card is the usual checksum over the rest of the attachment artifact. |
| 462 | 462 | The Z card is required. |
| 463 | 463 | |
| 464 | 464 |
| --- www/fileformat.wiki | |
| +++ www/fileformat.wiki | |
| @@ -49,11 +49,11 @@ | |
| 49 | </ul> |
| 50 | |
| 51 | These seven artifact types are described in the following sections. |
| 52 | |
| 53 | In the current implementation (as of 2009-01-25) the artifacts that |
| 54 | make up a fossil repository are stored in in as delta- and zlib-compressed |
| 55 | blobs in an <a href="http://www.sqlite.org/">SQLite</a> database. This |
| 56 | is an implementation detail and might change in a future release. For |
| 57 | the purpose of this article "file format" means the format of the artifacts, |
| 58 | not how the artifacts are stored on disk. It is the artifact format that |
| 59 | is intended to be enduring. The specifics of how artifacts are stored on |
| @@ -184,11 +184,11 @@ | |
| 184 | ancestor, the Q-card is used to identify a single check-in or a small |
| 185 | range of check-ins which were cherry-picked for inclusion in or |
| 186 | exclusion from the current manifest. The first argument of |
| 187 | the Q-card is the artifact ID of another manifest (the "target") |
| 188 | which has had its changes included or excluded in the current manifest. |
| 189 | The target is preceeded by "+" or "-" to show inclusion or |
| 190 | exclusion, respectively. The optional second argument to the |
| 191 | Q-card is another manifest artifact ID which is the "baseline" |
| 192 | for the cherry-pick. If omitted, the baseline is the primary |
| 193 | parent of the target. The |
| 194 | changes included or excluded consist of all changes moving from |
| @@ -315,11 +315,11 @@ | |
| 315 | is either "+", "-", or "*". The "+" means the tag should be added |
| 316 | to the artifact. The "-" means the tag should be removed. |
| 317 | The "*" character means the tag should be added to the artifact |
| 318 | and all direct descendants (but not descendents through a merge) down |
| 319 | to but not including the first descendant that contains a |
| 320 | more recent "-" or "+" tag with the same name. |
| 321 | The optional third argument is the value of the tag. A tag |
| 322 | without a value is a boolean. |
| 323 | |
| 324 | When two or more tags with the same name are applied to the |
| 325 | same artifact, the tag with the latest (most recent) date is |
| @@ -362,11 +362,11 @@ | |
| 362 | gives the name of the wiki page. The optional N card specifies |
| 363 | the mimetype of the wiki text. If the N card is omitted, the |
| 364 | mimetype is assumed to be text/x-fossil-wiki. |
| 365 | The U card specifies the login |
| 366 | of the user who made this edit to the wiki page. The Z card is |
| 367 | the usual checksum over the either artifact and is required. |
| 368 | |
| 369 | The W card is used to specify the text of the wiki page. The |
| 370 | argument to the W card is an integer which is the number of bytes |
| 371 | of text in the wiki page. That text follows the newline character |
| 372 | that terminates the W card. The wiki text is always followed by one |
| @@ -453,11 +453,11 @@ | |
| 453 | |
| 454 | There may be zero or one N cards. The N card specifies the mimetype of the |
| 455 | comment text provided in the C card. If the N card is omitted, the C card |
| 456 | mimetype is taken to be text/plain. |
| 457 | |
| 458 | A single U card gives the name of the user to added the attachment. |
| 459 | If an attachment is added anonymously, then the U card may be omitted. |
| 460 | |
| 461 | The Z card is the usual checksum over the rest of the attachment artifact. |
| 462 | The Z card is required. |
| 463 | |
| 464 |
| --- www/fileformat.wiki | |
| +++ www/fileformat.wiki | |
| @@ -49,11 +49,11 @@ | |
| 49 | </ul> |
| 50 | |
| 51 | These seven artifact types are described in the following sections. |
| 52 | |
| 53 | In the current implementation (as of 2009-01-25) the artifacts that |
| 54 | make up a fossil repository are stored as delta- and zlib-compressed |
| 55 | blobs in an <a href="http://www.sqlite.org/">SQLite</a> database. This |
| 56 | is an implementation detail and might change in a future release. For |
| 57 | the purpose of this article "file format" means the format of the artifacts, |
| 58 | not how the artifacts are stored on disk. It is the artifact format that |
| 59 | is intended to be enduring. The specifics of how artifacts are stored on |
| @@ -184,11 +184,11 @@ | |
| 184 | ancestor, the Q-card is used to identify a single check-in or a small |
| 185 | range of check-ins which were cherry-picked for inclusion in or |
| 186 | exclusion from the current manifest. The first argument of |
| 187 | the Q-card is the artifact ID of another manifest (the "target") |
| 188 | which has had its changes included or excluded in the current manifest. |
| 189 | The target is preceded by "+" or "-" to show inclusion or |
| 190 | exclusion, respectively. The optional second argument to the |
| 191 | Q-card is another manifest artifact ID which is the "baseline" |
| 192 | for the cherry-pick. If omitted, the baseline is the primary |
| 193 | parent of the target. The |
| 194 | changes included or excluded consist of all changes moving from |
| @@ -315,11 +315,11 @@ | |
| 315 | is either "+", "-", or "*". The "+" means the tag should be added |
| 316 | to the artifact. The "-" means the tag should be removed. |
| 317 | The "*" character means the tag should be added to the artifact |
| 318 | and all direct descendants (but not descendents through a merge) down |
| 319 | to but not including the first descendant that contains a |
| 320 | more recent "-", "*", or "+" tag with the same name. |
| 321 | The optional third argument is the value of the tag. A tag |
| 322 | without a value is a boolean. |
| 323 | |
| 324 | When two or more tags with the same name are applied to the |
| 325 | same artifact, the tag with the latest (most recent) date is |
| @@ -362,11 +362,11 @@ | |
| 362 | gives the name of the wiki page. The optional N card specifies |
| 363 | the mimetype of the wiki text. If the N card is omitted, the |
| 364 | mimetype is assumed to be text/x-fossil-wiki. |
| 365 | The U card specifies the login |
| 366 | of the user who made this edit to the wiki page. The Z card is |
| 367 | the usual checksum over the entire artifact and is required. |
| 368 | |
| 369 | The W card is used to specify the text of the wiki page. The |
| 370 | argument to the W card is an integer which is the number of bytes |
| 371 | of text in the wiki page. That text follows the newline character |
| 372 | that terminates the W card. The wiki text is always followed by one |
| @@ -453,11 +453,11 @@ | |
| 453 | |
| 454 | There may be zero or one N cards. The N card specifies the mimetype of the |
| 455 | comment text provided in the C card. If the N card is omitted, the C card |
| 456 | mimetype is taken to be text/plain. |
| 457 | |
| 458 | A single U card gives the name of the user who added the attachment. |
| 459 | If an attachment is added anonymously, then the U card may be omitted. |
| 460 | |
| 461 | The Z card is the usual checksum over the rest of the attachment artifact. |
| 462 | The Z card is required. |
| 463 | |
| 464 |