Fossil SCM
Merge typo fixes by brickviking.
Commit
285430acdfa4406a5c421a76ea46d782e013222b4a385f70aea7d7ea411739a1
Parent
efd79f87f55bcfa…
13 files changed
+3
-3
+1
-1
+3
-3
+6
-6
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+3
-3
| --- www/env-opts.md | ||
| +++ www/env-opts.md | ||
| @@ -468,21 +468,21 @@ | ||
| 468 | 468 | obviously as part of the `fossil ui` command. In that specific case, |
| 469 | 469 | the browser is launched pointing at the web server started by `fossil |
| 470 | 470 | ui` listening on a private TCP port. |
| 471 | 471 | |
| 472 | 472 | On all platforms, if the local or global settings `web-browser` is |
| 473 | -set, that is the command used to open an URL. | |
| 473 | +set, that is the command used to open a URL. | |
| 474 | 474 | |
| 475 | 475 | Otherwise, the specific actions vary by platform. |
| 476 | 476 | |
| 477 | 477 | On Unix-like platforms other than Apple's, it looks for the first |
| 478 | 478 | program from the list `xdg-open`, `gnome-open`, `firefox`, and |
| 479 | 479 | `google-chrome` that it can find on the `PATH`. |
| 480 | 480 | |
| 481 | -On Apple platforms, it assumes that `open` is the command to open an | |
| 481 | +On Apple platforms, it assumes that `open` is the command to open a | |
| 482 | 482 | URL in the user's configured default browser. |
| 483 | 483 | |
| 484 | 484 | On Windows platforms, it assumes that `start` is the command to open |
| 485 | -an URL in the user's configured default browser. | |
| 485 | +a URL in the user's configured default browser. | |
| 486 | 486 | |
| 487 | 487 | [configdb]: ./tech_overview.wiki#configdb |
| 488 | 488 | [configloc]: ./tech_overview.wiki#configloc |
| 489 | 489 |
| --- www/env-opts.md | |
| +++ www/env-opts.md | |
| @@ -468,21 +468,21 @@ | |
| 468 | obviously as part of the `fossil ui` command. In that specific case, |
| 469 | the browser is launched pointing at the web server started by `fossil |
| 470 | ui` listening on a private TCP port. |
| 471 | |
| 472 | On all platforms, if the local or global settings `web-browser` is |
| 473 | set, that is the command used to open an URL. |
| 474 | |
| 475 | Otherwise, the specific actions vary by platform. |
| 476 | |
| 477 | On Unix-like platforms other than Apple's, it looks for the first |
| 478 | program from the list `xdg-open`, `gnome-open`, `firefox`, and |
| 479 | `google-chrome` that it can find on the `PATH`. |
| 480 | |
| 481 | On Apple platforms, it assumes that `open` is the command to open an |
| 482 | URL in the user's configured default browser. |
| 483 | |
| 484 | On Windows platforms, it assumes that `start` is the command to open |
| 485 | an URL in the user's configured default browser. |
| 486 | |
| 487 | [configdb]: ./tech_overview.wiki#configdb |
| 488 | [configloc]: ./tech_overview.wiki#configloc |
| 489 |
| --- www/env-opts.md | |
| +++ www/env-opts.md | |
| @@ -468,21 +468,21 @@ | |
| 468 | obviously as part of the `fossil ui` command. In that specific case, |
| 469 | the browser is launched pointing at the web server started by `fossil |
| 470 | ui` listening on a private TCP port. |
| 471 | |
| 472 | On all platforms, if the local or global settings `web-browser` is |
| 473 | set, that is the command used to open a URL. |
| 474 | |
| 475 | Otherwise, the specific actions vary by platform. |
| 476 | |
| 477 | On Unix-like platforms other than Apple's, it looks for the first |
| 478 | program from the list `xdg-open`, `gnome-open`, `firefox`, and |
| 479 | `google-chrome` that it can find on the `PATH`. |
| 480 | |
| 481 | On Apple platforms, it assumes that `open` is the command to open a |
| 482 | URL in the user's configured default browser. |
| 483 | |
| 484 | On Windows platforms, it assumes that `start` is the command to open |
| 485 | a URL in the user's configured default browser. |
| 486 | |
| 487 | [configdb]: ./tech_overview.wiki#configdb |
| 488 | [configloc]: ./tech_overview.wiki#configloc |
| 489 |
+1
-1
| --- www/event.wiki | ||
| +++ www/event.wiki | ||
| @@ -115,6 +115,6 @@ | ||
| 115 | 115 | create or edit technotes. In addition, users must have create-wiki |
| 116 | 116 | privilege (permission "f") to create new technotes and edit-wiki |
| 117 | 117 | privilege (permission "k") in order to edit existing technotes. |
| 118 | 118 | |
| 119 | 119 | Technote content may be formatted as [/wiki_rules | Fossil wiki], |
| 120 | -[/md_rules | Markdown], or a plain text. | |
| 120 | +[/md_rules | Markdown], or plain text. | |
| 121 | 121 |
| --- www/event.wiki | |
| +++ www/event.wiki | |
| @@ -115,6 +115,6 @@ | |
| 115 | create or edit technotes. In addition, users must have create-wiki |
| 116 | privilege (permission "f") to create new technotes and edit-wiki |
| 117 | privilege (permission "k") in order to edit existing technotes. |
| 118 | |
| 119 | Technote content may be formatted as [/wiki_rules | Fossil wiki], |
| 120 | [/md_rules | Markdown], or a plain text. |
| 121 |
| --- www/event.wiki | |
| +++ www/event.wiki | |
| @@ -115,6 +115,6 @@ | |
| 115 | create or edit technotes. In addition, users must have create-wiki |
| 116 | privilege (permission "f") to create new technotes and edit-wiki |
| 117 | privilege (permission "k") in order to edit existing technotes. |
| 118 | |
| 119 | Technote content may be formatted as [/wiki_rules | Fossil wiki], |
| 120 | [/md_rules | Markdown], or plain text. |
| 121 |
+3
-3
| --- www/fileedit-page.md | ||
| +++ www/fileedit-page.md | ||
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | # The fileedit Page |
| 2 | 2 | |
| 3 | 3 | This document describes the limitations of, caveats for, and |
| 4 | 4 | disclaimers for the [](/fileedit) page, which provides users with |
| 5 | -[checkin privileges](./caps/index.md) basic editing features for files | |
| 6 | -via the web interface. | |
| 5 | + basic editing features for files via the web interface when they | |
| 6 | + have [checkin privileges](./caps/index.md). | |
| 7 | 7 | |
| 8 | 8 | # Important Caveats and Disclaimers |
| 9 | 9 | |
| 10 | 10 | Predictably, the ability to edit files in a repository from a web |
| 11 | 11 | browser halfway around the world comes with several obligatory caveats |
| @@ -219,11 +219,11 @@ | ||
| 219 | 219 | - `element`: the DOM element in which the preview is rendered. |
| 220 | 220 | - `mimetype`: the mimetype of the being-previewed content, as determined |
| 221 | 221 | by Fossil (by its file extension). |
| 222 | 222 | |
| 223 | 223 | The event listener callback shown above doesn't use the `mimetype`, |
| 224 | -but makes used of the other two. It fishes all `code` blocks out of | |
| 224 | +but makes use of the other two. It fishes all `code` blocks out of | |
| 225 | 225 | the preview which explicitly have a CSS class named |
| 226 | 226 | `language-`something, and then asks highlightjs to highlight them. |
| 227 | 227 | |
| 228 | 228 | ## <a id="editor"></a> Integrating a Custom Editor Widget |
| 229 | 229 | |
| 230 | 230 |
| --- www/fileedit-page.md | |
| +++ www/fileedit-page.md | |
| @@ -1,11 +1,11 @@ | |
| 1 | # The fileedit Page |
| 2 | |
| 3 | This document describes the limitations of, caveats for, and |
| 4 | disclaimers for the [](/fileedit) page, which provides users with |
| 5 | [checkin privileges](./caps/index.md) basic editing features for files |
| 6 | via the web interface. |
| 7 | |
| 8 | # Important Caveats and Disclaimers |
| 9 | |
| 10 | Predictably, the ability to edit files in a repository from a web |
| 11 | browser halfway around the world comes with several obligatory caveats |
| @@ -219,11 +219,11 @@ | |
| 219 | - `element`: the DOM element in which the preview is rendered. |
| 220 | - `mimetype`: the mimetype of the being-previewed content, as determined |
| 221 | by Fossil (by its file extension). |
| 222 | |
| 223 | The event listener callback shown above doesn't use the `mimetype`, |
| 224 | but makes used of the other two. It fishes all `code` blocks out of |
| 225 | the preview which explicitly have a CSS class named |
| 226 | `language-`something, and then asks highlightjs to highlight them. |
| 227 | |
| 228 | ## <a id="editor"></a> Integrating a Custom Editor Widget |
| 229 | |
| 230 |
| --- www/fileedit-page.md | |
| +++ www/fileedit-page.md | |
| @@ -1,11 +1,11 @@ | |
| 1 | # The fileedit Page |
| 2 | |
| 3 | This document describes the limitations of, caveats for, and |
| 4 | disclaimers for the [](/fileedit) page, which provides users with |
| 5 | basic editing features for files via the web interface when they |
| 6 | have [checkin privileges](./caps/index.md). |
| 7 | |
| 8 | # Important Caveats and Disclaimers |
| 9 | |
| 10 | Predictably, the ability to edit files in a repository from a web |
| 11 | browser halfway around the world comes with several obligatory caveats |
| @@ -219,11 +219,11 @@ | |
| 219 | - `element`: the DOM element in which the preview is rendered. |
| 220 | - `mimetype`: the mimetype of the being-previewed content, as determined |
| 221 | by Fossil (by its file extension). |
| 222 | |
| 223 | The event listener callback shown above doesn't use the `mimetype`, |
| 224 | but makes use of the other two. It fishes all `code` blocks out of |
| 225 | the preview which explicitly have a CSS class named |
| 226 | `language-`something, and then asks highlightjs to highlight them. |
| 227 | |
| 228 | ## <a id="editor"></a> Integrating a Custom Editor Widget |
| 229 | |
| 230 |
+6
-6
| --- www/fileformat.wiki | ||
| +++ www/fileformat.wiki | ||
| @@ -360,11 +360,11 @@ | ||
| 360 | 360 | of text in the wiki page. That text follows the newline character |
| 361 | 361 | that terminates the <b>W</b> card. The wiki text is always followed by one |
| 362 | 362 | extra newline. |
| 363 | 363 | |
| 364 | 364 | The <b>C</b> card on a wiki page is optional. The argument is a comment |
| 365 | -that explains why the changes was made. The ability to have a <b>C</b> | |
| 365 | +that explains why the changes were made. The ability to have a <b>C</b> | |
| 366 | 366 | card on a wiki page artifact was added on 2019-12-02 at the suggestion |
| 367 | 367 | of user George Krivov and is not currently used or generated by the |
| 368 | 368 | implementation. Older versions of Fossil will reject a wiki-page |
| 369 | 369 | artifact that includes a <b>C</b> card. |
| 370 | 370 | |
| @@ -396,14 +396,14 @@ | ||
| 396 | 396 | ticket into existence. |
| 397 | 397 | |
| 398 | 398 | <b>J</b> cards specify changes to the "value" of "fields" in the ticket. |
| 399 | 399 | If the <i>value</i> parameter of the <b>J</b> card is omitted, then the |
| 400 | 400 | field is set to an empty string. |
| 401 | -Each fossil server has a ticket configuration which specifies the fields its | |
| 401 | +Each fossil server has a ticket configuration which specifies the fields it | |
| 402 | 402 | understands. The ticket configuration is part of the local state for |
| 403 | 403 | the repository and thus can vary from one repository to another. |
| 404 | -Hence a <b>J</b> card might specify a <i>field</i> that do not exist in the | |
| 404 | +Hence a <b>J</b> card might specify a <i>field</i> that does not exist in the | |
| 405 | 405 | local ticket configuration. If a <b>J</b> card specifies a <i>field</i> that |
| 406 | 406 | is not in the local configuration, then that <b>J</b> card |
| 407 | 407 | is simply ignored. |
| 408 | 408 | |
| 409 | 409 | The first argument of the <b>J</b> card is the field name. The second |
| @@ -462,11 +462,11 @@ | ||
| 462 | 462 | A technical note or "technote" artifact (formerly known as an "event" artifact) |
| 463 | 463 | associates a timeline comment and a page of text |
| 464 | 464 | (similar to a wiki page) with a point in time. Technotes can be used |
| 465 | 465 | to record project milestones, release notes, blog entries, process |
| 466 | 466 | checkpoints, or news articles. |
| 467 | -The following cards are allowed on an technote artifact: | |
| 467 | +The following cards are allowed on a technote artifact: | |
| 468 | 468 | |
| 469 | 469 | <div class="indent"> |
| 470 | 470 | <b>C</b> <i>comment</i><br> |
| 471 | 471 | <b>D</b> <i>time-and-date-stamp</i><br /> |
| 472 | 472 | <b>E</b> <i>technote-time</i> <i>technote-id</i><br /> |
| @@ -510,15 +510,15 @@ | ||
| 510 | 510 | The <b>*</b> in place of the artifact ID indicates that |
| 511 | 511 | the tag or property applies to the current artifact. It is not |
| 512 | 512 | possible to encode the current artifact ID as part of an artifact, |
| 513 | 513 | since the act of inserting the artifact ID would change the artifact ID, |
| 514 | 514 | hence a <b>*</b> is used to represent "self". The "<b>+</b>" on the |
| 515 | -name means that tags can only be add and they can only be non-propagating | |
| 515 | +name means that tags can only be "add" and they can only be non-propagating | |
| 516 | 516 | tags. In a technote, <b>T</b> cards are normally used to set the background |
| 517 | 517 | display color for timelines. |
| 518 | 518 | |
| 519 | -The optional <b>U</b> card gives name of the user who entered the technote. | |
| 519 | +The optional <b>U</b> card gives the name of the user who entered the technote. | |
| 520 | 520 | |
| 521 | 521 | A single <b>W</b> card provides wiki text for the document associated with the |
| 522 | 522 | technote. The format of the <b>W</b> card is exactly the same as for a |
| 523 | 523 | [#wikichng | wiki artifact]. |
| 524 | 524 | |
| 525 | 525 |
| --- www/fileformat.wiki | |
| +++ www/fileformat.wiki | |
| @@ -360,11 +360,11 @@ | |
| 360 | of text in the wiki page. That text follows the newline character |
| 361 | that terminates the <b>W</b> card. The wiki text is always followed by one |
| 362 | extra newline. |
| 363 | |
| 364 | The <b>C</b> card on a wiki page is optional. The argument is a comment |
| 365 | that explains why the changes was made. The ability to have a <b>C</b> |
| 366 | card on a wiki page artifact was added on 2019-12-02 at the suggestion |
| 367 | of user George Krivov and is not currently used or generated by the |
| 368 | implementation. Older versions of Fossil will reject a wiki-page |
| 369 | artifact that includes a <b>C</b> card. |
| 370 | |
| @@ -396,14 +396,14 @@ | |
| 396 | ticket into existence. |
| 397 | |
| 398 | <b>J</b> cards specify changes to the "value" of "fields" in the ticket. |
| 399 | If the <i>value</i> parameter of the <b>J</b> card is omitted, then the |
| 400 | field is set to an empty string. |
| 401 | Each fossil server has a ticket configuration which specifies the fields its |
| 402 | understands. The ticket configuration is part of the local state for |
| 403 | the repository and thus can vary from one repository to another. |
| 404 | Hence a <b>J</b> card might specify a <i>field</i> that do not exist in the |
| 405 | local ticket configuration. If a <b>J</b> card specifies a <i>field</i> that |
| 406 | is not in the local configuration, then that <b>J</b> card |
| 407 | is simply ignored. |
| 408 | |
| 409 | The first argument of the <b>J</b> card is the field name. The second |
| @@ -462,11 +462,11 @@ | |
| 462 | A technical note or "technote" artifact (formerly known as an "event" artifact) |
| 463 | associates a timeline comment and a page of text |
| 464 | (similar to a wiki page) with a point in time. Technotes can be used |
| 465 | to record project milestones, release notes, blog entries, process |
| 466 | checkpoints, or news articles. |
| 467 | The following cards are allowed on an technote artifact: |
| 468 | |
| 469 | <div class="indent"> |
| 470 | <b>C</b> <i>comment</i><br> |
| 471 | <b>D</b> <i>time-and-date-stamp</i><br /> |
| 472 | <b>E</b> <i>technote-time</i> <i>technote-id</i><br /> |
| @@ -510,15 +510,15 @@ | |
| 510 | The <b>*</b> in place of the artifact ID indicates that |
| 511 | the tag or property applies to the current artifact. It is not |
| 512 | possible to encode the current artifact ID as part of an artifact, |
| 513 | since the act of inserting the artifact ID would change the artifact ID, |
| 514 | hence a <b>*</b> is used to represent "self". The "<b>+</b>" on the |
| 515 | name means that tags can only be add and they can only be non-propagating |
| 516 | tags. In a technote, <b>T</b> cards are normally used to set the background |
| 517 | display color for timelines. |
| 518 | |
| 519 | The optional <b>U</b> card gives name of the user who entered the technote. |
| 520 | |
| 521 | A single <b>W</b> card provides wiki text for the document associated with the |
| 522 | technote. The format of the <b>W</b> card is exactly the same as for a |
| 523 | [#wikichng | wiki artifact]. |
| 524 | |
| 525 |
| --- www/fileformat.wiki | |
| +++ www/fileformat.wiki | |
| @@ -360,11 +360,11 @@ | |
| 360 | of text in the wiki page. That text follows the newline character |
| 361 | that terminates the <b>W</b> card. The wiki text is always followed by one |
| 362 | extra newline. |
| 363 | |
| 364 | The <b>C</b> card on a wiki page is optional. The argument is a comment |
| 365 | that explains why the changes were made. The ability to have a <b>C</b> |
| 366 | card on a wiki page artifact was added on 2019-12-02 at the suggestion |
| 367 | of user George Krivov and is not currently used or generated by the |
| 368 | implementation. Older versions of Fossil will reject a wiki-page |
| 369 | artifact that includes a <b>C</b> card. |
| 370 | |
| @@ -396,14 +396,14 @@ | |
| 396 | ticket into existence. |
| 397 | |
| 398 | <b>J</b> cards specify changes to the "value" of "fields" in the ticket. |
| 399 | If the <i>value</i> parameter of the <b>J</b> card is omitted, then the |
| 400 | field is set to an empty string. |
| 401 | Each fossil server has a ticket configuration which specifies the fields it |
| 402 | understands. The ticket configuration is part of the local state for |
| 403 | the repository and thus can vary from one repository to another. |
| 404 | Hence a <b>J</b> card might specify a <i>field</i> that does not exist in the |
| 405 | local ticket configuration. If a <b>J</b> card specifies a <i>field</i> that |
| 406 | is not in the local configuration, then that <b>J</b> card |
| 407 | is simply ignored. |
| 408 | |
| 409 | The first argument of the <b>J</b> card is the field name. The second |
| @@ -462,11 +462,11 @@ | |
| 462 | A technical note or "technote" artifact (formerly known as an "event" artifact) |
| 463 | associates a timeline comment and a page of text |
| 464 | (similar to a wiki page) with a point in time. Technotes can be used |
| 465 | to record project milestones, release notes, blog entries, process |
| 466 | checkpoints, or news articles. |
| 467 | The following cards are allowed on a technote artifact: |
| 468 | |
| 469 | <div class="indent"> |
| 470 | <b>C</b> <i>comment</i><br> |
| 471 | <b>D</b> <i>time-and-date-stamp</i><br /> |
| 472 | <b>E</b> <i>technote-time</i> <i>technote-id</i><br /> |
| @@ -510,15 +510,15 @@ | |
| 510 | The <b>*</b> in place of the artifact ID indicates that |
| 511 | the tag or property applies to the current artifact. It is not |
| 512 | possible to encode the current artifact ID as part of an artifact, |
| 513 | since the act of inserting the artifact ID would change the artifact ID, |
| 514 | hence a <b>*</b> is used to represent "self". The "<b>+</b>" on the |
| 515 | name means that tags can only be "add" and they can only be non-propagating |
| 516 | tags. In a technote, <b>T</b> cards are normally used to set the background |
| 517 | display color for timelines. |
| 518 | |
| 519 | The optional <b>U</b> card gives the name of the user who entered the technote. |
| 520 | |
| 521 | A single <b>W</b> card provides wiki text for the document associated with the |
| 522 | technote. The format of the <b>W</b> card is exactly the same as for a |
| 523 | [#wikichng | wiki artifact]. |
| 524 | |
| 525 |
+1
-1
| --- www/forum.wiki | ||
| +++ www/forum.wiki | ||
| @@ -405,7 +405,7 @@ | ||
| 405 | 405 | |
| 406 | 406 | Though forum users are permitted to delete their own posts, they are |
| 407 | 407 | not permitted, without appropriate permissions, to close their own |
| 408 | 408 | posts. This is intentional, as closing one's own post can be used to |
| 409 | 409 | antagonize other forum users. For example, by posting something |
| 410 | -trollish or highly contraversial in nature and closing the post to | |
| 410 | +trollish or highly controversial in nature and closing the post to | |
| 411 | 411 | further responses. |
| 412 | 412 |
| --- www/forum.wiki | |
| +++ www/forum.wiki | |
| @@ -405,7 +405,7 @@ | |
| 405 | |
| 406 | Though forum users are permitted to delete their own posts, they are |
| 407 | not permitted, without appropriate permissions, to close their own |
| 408 | posts. This is intentional, as closing one's own post can be used to |
| 409 | antagonize other forum users. For example, by posting something |
| 410 | trollish or highly contraversial in nature and closing the post to |
| 411 | further responses. |
| 412 |
| --- www/forum.wiki | |
| +++ www/forum.wiki | |
| @@ -405,7 +405,7 @@ | |
| 405 | |
| 406 | Though forum users are permitted to delete their own posts, they are |
| 407 | not permitted, without appropriate permissions, to close their own |
| 408 | posts. This is intentional, as closing one's own post can be used to |
| 409 | antagonize other forum users. For example, by posting something |
| 410 | trollish or highly controversial in nature and closing the post to |
| 411 | further responses. |
| 412 |
+1
-1
| --- www/fossil-is-not-relational.md | ||
| +++ www/fossil-is-not-relational.md | ||
| @@ -131,11 +131,11 @@ | ||
| 131 | 131 | metadata. |
| 132 | 132 | |
| 133 | 133 | - Raw file content of versioned files. These data are external to |
| 134 | 134 | artifacts, which refer to them by their hashes. How they are stored |
| 135 | 135 | is not the concern of the data model, but (spoiler alert!) Fossil |
| 136 | - stores in them an sqlite database, one record per distinct hash, in | |
| 136 | + stores them in an sqlite database, one record per distinct hash, in | |
| 137 | 137 | its `blob` table (which we will cover more very soon). |
| 138 | 138 | |
| 139 | 139 | Non-SCM-relevant state includes: |
| 140 | 140 | |
| 141 | 141 | - Fossil's list of users and their metadata (permissions, email |
| 142 | 142 |
| --- www/fossil-is-not-relational.md | |
| +++ www/fossil-is-not-relational.md | |
| @@ -131,11 +131,11 @@ | |
| 131 | metadata. |
| 132 | |
| 133 | - Raw file content of versioned files. These data are external to |
| 134 | artifacts, which refer to them by their hashes. How they are stored |
| 135 | is not the concern of the data model, but (spoiler alert!) Fossil |
| 136 | stores in them an sqlite database, one record per distinct hash, in |
| 137 | its `blob` table (which we will cover more very soon). |
| 138 | |
| 139 | Non-SCM-relevant state includes: |
| 140 | |
| 141 | - Fossil's list of users and their metadata (permissions, email |
| 142 |
| --- www/fossil-is-not-relational.md | |
| +++ www/fossil-is-not-relational.md | |
| @@ -131,11 +131,11 @@ | |
| 131 | metadata. |
| 132 | |
| 133 | - Raw file content of versioned files. These data are external to |
| 134 | artifacts, which refer to them by their hashes. How they are stored |
| 135 | is not the concern of the data model, but (spoiler alert!) Fossil |
| 136 | stores them in an sqlite database, one record per distinct hash, in |
| 137 | its `blob` table (which we will cover more very soon). |
| 138 | |
| 139 | Non-SCM-relevant state includes: |
| 140 | |
| 141 | - Fossil's list of users and their metadata (permissions, email |
| 142 |
+1
-1
| --- www/fossil-v-git.wiki | ||
| +++ www/fossil-v-git.wiki | ||
| @@ -861,11 +861,11 @@ | ||
| 861 | 861 | as this author is aware, but there is now |
| 862 | 862 | [https://lwn.net/ml/git/[email protected]/ |
| 863 | 863 | | a competing SHA-256 based plan] which requires complete repository |
| 864 | 864 | conversion from SHA-1 to SHA-256, breaking all public hashes in the |
| 865 | 865 | repo. One way to characterize such a massive upheaval in Git terms is a |
| 866 | -whole-project rebase, which violates | |
| 866 | +whole-project rebase, which violates the | |
| 867 | 867 | [https://www.atlassian.com/git/tutorials/merging-vs-rebasing#the-golden-rule-of-rebasing|Golden Rule of Rebasing]. |
| 868 | 868 | |
| 869 | 869 | Regardless of the eventual implementation details, we fully expect Git |
| 870 | 870 | to move off SHA-1 eventually and for the changes to take years more to |
| 871 | 871 | percolate through the community. |
| 872 | 872 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -861,11 +861,11 @@ | |
| 861 | as this author is aware, but there is now |
| 862 | [https://lwn.net/ml/git/[email protected]/ |
| 863 | | a competing SHA-256 based plan] which requires complete repository |
| 864 | conversion from SHA-1 to SHA-256, breaking all public hashes in the |
| 865 | repo. One way to characterize such a massive upheaval in Git terms is a |
| 866 | whole-project rebase, which violates |
| 867 | [https://www.atlassian.com/git/tutorials/merging-vs-rebasing#the-golden-rule-of-rebasing|Golden Rule of Rebasing]. |
| 868 | |
| 869 | Regardless of the eventual implementation details, we fully expect Git |
| 870 | to move off SHA-1 eventually and for the changes to take years more to |
| 871 | percolate through the community. |
| 872 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -861,11 +861,11 @@ | |
| 861 | as this author is aware, but there is now |
| 862 | [https://lwn.net/ml/git/[email protected]/ |
| 863 | | a competing SHA-256 based plan] which requires complete repository |
| 864 | conversion from SHA-1 to SHA-256, breaking all public hashes in the |
| 865 | repo. One way to characterize such a massive upheaval in Git terms is a |
| 866 | whole-project rebase, which violates the |
| 867 | [https://www.atlassian.com/git/tutorials/merging-vs-rebasing#the-golden-rule-of-rebasing|Golden Rule of Rebasing]. |
| 868 | |
| 869 | Regardless of the eventual implementation details, we fully expect Git |
| 870 | to move off SHA-1 eventually and for the changes to take years more to |
| 871 | percolate through the community. |
| 872 |
+1
-1
| --- www/fossil_prompt.wiki | ||
| +++ www/fossil_prompt.wiki | ||
| @@ -17,6 +17,6 @@ | ||
| 17 | 17 | |
| 18 | 18 | For a permanent installation, you can graft the code into your |
| 19 | 19 | <tt>.bashrc</tt> file in your home directory. |
| 20 | 20 | |
| 21 | 21 | The code is very simple (only 32 non-comment lines, as of this writing) |
| 22 | -and hence easy to customized. | |
| 22 | +and hence easy to customize. | |
| 23 | 23 |
| --- www/fossil_prompt.wiki | |
| +++ www/fossil_prompt.wiki | |
| @@ -17,6 +17,6 @@ | |
| 17 | |
| 18 | For a permanent installation, you can graft the code into your |
| 19 | <tt>.bashrc</tt> file in your home directory. |
| 20 | |
| 21 | The code is very simple (only 32 non-comment lines, as of this writing) |
| 22 | and hence easy to customized. |
| 23 |
| --- www/fossil_prompt.wiki | |
| +++ www/fossil_prompt.wiki | |
| @@ -17,6 +17,6 @@ | |
| 17 | |
| 18 | For a permanent installation, you can graft the code into your |
| 19 | <tt>.bashrc</tt> file in your home directory. |
| 20 | |
| 21 | The code is very simple (only 32 non-comment lines, as of this writing) |
| 22 | and hence easy to customize. |
| 23 |
+1
-1
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -773,11 +773,11 @@ | ||
| 773 | 773 | hashes.) |
| 774 | 774 | |
| 775 | 775 | In this scheme, Alice then needs to say “`fossil update trunk`” in order |
| 776 | 776 | to return her check-out’s parent commit to the previous version lest her |
| 777 | 777 | next attempted commit land atop this mistake branch. The fact that Bob |
| 778 | -marked the branch as closed will prevent that from going thru, cluing | |
| 778 | +marked the branch as closed will prevent that from going through, cluing | |
| 779 | 779 | Alice into what she needs to do to remedy the situation, but that merely |
| 780 | 780 | shows why it’s a better workflow if Alice makes the amendment herself: |
| 781 | 781 | |
| 782 | 782 | ``` |
| 783 | 783 | fossil amend --branch MISTAKE --hide --close \ |
| 784 | 784 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -773,11 +773,11 @@ | |
| 773 | hashes.) |
| 774 | |
| 775 | In this scheme, Alice then needs to say “`fossil update trunk`” in order |
| 776 | to return her check-out’s parent commit to the previous version lest her |
| 777 | next attempted commit land atop this mistake branch. The fact that Bob |
| 778 | marked the branch as closed will prevent that from going thru, cluing |
| 779 | Alice into what she needs to do to remedy the situation, but that merely |
| 780 | shows why it’s a better workflow if Alice makes the amendment herself: |
| 781 | |
| 782 | ``` |
| 783 | fossil amend --branch MISTAKE --hide --close \ |
| 784 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -773,11 +773,11 @@ | |
| 773 | hashes.) |
| 774 | |
| 775 | In this scheme, Alice then needs to say “`fossil update trunk`” in order |
| 776 | to return her check-out’s parent commit to the previous version lest her |
| 777 | next attempted commit land atop this mistake branch. The fact that Bob |
| 778 | marked the branch as closed will prevent that from going through, cluing |
| 779 | Alice into what she needs to do to remedy the situation, but that merely |
| 780 | shows why it’s a better workflow if Alice makes the amendment herself: |
| 781 | |
| 782 | ``` |
| 783 | fossil amend --branch MISTAKE --hide --close \ |
| 784 |
+1
-1
| --- www/glossary.md | ||
| +++ www/glossary.md | ||
| @@ -73,11 +73,11 @@ | ||
| 73 | 73 | because you’ll have all of your OS’s *other* files intermixed. |
| 74 | 74 | Worse, Fossil doesn’t track OS permissions, so even if you were to |
| 75 | 75 | try to use Fossil as a system deployment tool by archiving versions |
| 76 | 76 | of the OS configuration files and then unpacking them on a new |
| 77 | 77 | system, the extracted project files would have read/write access by |
| 78 | - the user who did the extraction, which probably isn’t want you were | |
| 78 | + the user who did the extraction, which probably isn’t what you were | |
| 79 | 79 | wanting. |
| 80 | 80 | |
| 81 | 81 | Even with these problems aside, do you really want a `.fslckout` |
| 82 | 82 | SQLite database at the root of your filesystem? Are you prepared for |
| 83 | 83 | the consequences of saying `fossil clean --verily` on such a system? |
| 84 | 84 |
| --- www/glossary.md | |
| +++ www/glossary.md | |
| @@ -73,11 +73,11 @@ | |
| 73 | because you’ll have all of your OS’s *other* files intermixed. |
| 74 | Worse, Fossil doesn’t track OS permissions, so even if you were to |
| 75 | try to use Fossil as a system deployment tool by archiving versions |
| 76 | of the OS configuration files and then unpacking them on a new |
| 77 | system, the extracted project files would have read/write access by |
| 78 | the user who did the extraction, which probably isn’t want you were |
| 79 | wanting. |
| 80 | |
| 81 | Even with these problems aside, do you really want a `.fslckout` |
| 82 | SQLite database at the root of your filesystem? Are you prepared for |
| 83 | the consequences of saying `fossil clean --verily` on such a system? |
| 84 |
| --- www/glossary.md | |
| +++ www/glossary.md | |
| @@ -73,11 +73,11 @@ | |
| 73 | because you’ll have all of your OS’s *other* files intermixed. |
| 74 | Worse, Fossil doesn’t track OS permissions, so even if you were to |
| 75 | try to use Fossil as a system deployment tool by archiving versions |
| 76 | of the OS configuration files and then unpacking them on a new |
| 77 | system, the extracted project files would have read/write access by |
| 78 | the user who did the extraction, which probably isn’t what you were |
| 79 | wanting. |
| 80 | |
| 81 | Even with these problems aside, do you really want a `.fslckout` |
| 82 | SQLite database at the root of your filesystem? Are you prepared for |
| 83 | the consequences of saying `fossil clean --verily` on such a system? |
| 84 |
+1
-1
| --- www/grep.md | ||
| +++ www/grep.md | ||
| @@ -49,11 +49,11 @@ | ||
| 49 | 49 | |
| 50 | 50 | $ fossil grep COMMAND: $(fossil ls src) |
| 51 | 51 | |
| 52 | 52 | If you run that in a check-out of the [Fossil self-hosting source |
| 53 | 53 | repository][fshsr], that returns the first line of the built-in |
| 54 | -documentation for each Fossil command, across all historical verisons. | |
| 54 | +documentation for each Fossil command, across all historical versions. | |
| 55 | 55 | |
| 56 | 56 | Fossil `grep` has extensions relative to these other `grep` standards, |
| 57 | 57 | such as `--verbose` to print each checkin ID considered, regardless of |
| 58 | 58 | whether it matches. This one is noteworthy here because the behavior |
| 59 | 59 | used to be under `-v` before we reassigned it to give POSIX-like `grep |
| 60 | 60 |
| --- www/grep.md | |
| +++ www/grep.md | |
| @@ -49,11 +49,11 @@ | |
| 49 | |
| 50 | $ fossil grep COMMAND: $(fossil ls src) |
| 51 | |
| 52 | If you run that in a check-out of the [Fossil self-hosting source |
| 53 | repository][fshsr], that returns the first line of the built-in |
| 54 | documentation for each Fossil command, across all historical verisons. |
| 55 | |
| 56 | Fossil `grep` has extensions relative to these other `grep` standards, |
| 57 | such as `--verbose` to print each checkin ID considered, regardless of |
| 58 | whether it matches. This one is noteworthy here because the behavior |
| 59 | used to be under `-v` before we reassigned it to give POSIX-like `grep |
| 60 |
| --- www/grep.md | |
| +++ www/grep.md | |
| @@ -49,11 +49,11 @@ | |
| 49 | |
| 50 | $ fossil grep COMMAND: $(fossil ls src) |
| 51 | |
| 52 | If you run that in a check-out of the [Fossil self-hosting source |
| 53 | repository][fshsr], that returns the first line of the built-in |
| 54 | documentation for each Fossil command, across all historical versions. |
| 55 | |
| 56 | Fossil `grep` has extensions relative to these other `grep` standards, |
| 57 | such as `--verbose` to print each checkin ID considered, regardless of |
| 58 | whether it matches. This one is noteworthy here because the behavior |
| 59 | used to be under `-v` before we reassigned it to give POSIX-like `grep |
| 60 |
+1
-1
| --- www/hashpolicy.wiki | ||
| +++ www/hashpolicy.wiki | ||
| @@ -78,11 +78,11 @@ | ||
| 78 | 78 | Version 2.0 extended the [./fileformat.wiki|Fossil file format] |
| 79 | 79 | to allow artifacts to be named by either SHA1 or SHA3-256 hashes. |
| 80 | 80 | (SHA3-256 is the only variant of SHA3 that |
| 81 | 81 | Fossil uses for artifact naming, so for the remainder of this article |
| 82 | 82 | it will be called simply "SHA3". Similarly, "Hardened SHA1" will |
| 83 | -shortened to "SHA1" in the remaining text.) | |
| 83 | +be shortened to "SHA1" in the remaining text.) | |
| 84 | 84 | |
| 85 | 85 | To be clear: Fossil (version 2.0 and later) |
| 86 | 86 | allows the SHA1 and SHA3 hashes to be mixed within |
| 87 | 87 | the same repository. Older check-ins, created years ago, |
| 88 | 88 | continue to be named using their legacy SHA1 hashes while |
| 89 | 89 |
| --- www/hashpolicy.wiki | |
| +++ www/hashpolicy.wiki | |
| @@ -78,11 +78,11 @@ | |
| 78 | Version 2.0 extended the [./fileformat.wiki|Fossil file format] |
| 79 | to allow artifacts to be named by either SHA1 or SHA3-256 hashes. |
| 80 | (SHA3-256 is the only variant of SHA3 that |
| 81 | Fossil uses for artifact naming, so for the remainder of this article |
| 82 | it will be called simply "SHA3". Similarly, "Hardened SHA1" will |
| 83 | shortened to "SHA1" in the remaining text.) |
| 84 | |
| 85 | To be clear: Fossil (version 2.0 and later) |
| 86 | allows the SHA1 and SHA3 hashes to be mixed within |
| 87 | the same repository. Older check-ins, created years ago, |
| 88 | continue to be named using their legacy SHA1 hashes while |
| 89 |
| --- www/hashpolicy.wiki | |
| +++ www/hashpolicy.wiki | |
| @@ -78,11 +78,11 @@ | |
| 78 | Version 2.0 extended the [./fileformat.wiki|Fossil file format] |
| 79 | to allow artifacts to be named by either SHA1 or SHA3-256 hashes. |
| 80 | (SHA3-256 is the only variant of SHA3 that |
| 81 | Fossil uses for artifact naming, so for the remainder of this article |
| 82 | it will be called simply "SHA3". Similarly, "Hardened SHA1" will |
| 83 | be shortened to "SHA1" in the remaining text.) |
| 84 | |
| 85 | To be clear: Fossil (version 2.0 and later) |
| 86 | allows the SHA1 and SHA3 hashes to be mixed within |
| 87 | the same repository. Older check-ins, created years ago, |
| 88 | continue to be named using their legacy SHA1 hashes while |
| 89 |
+1
-1
| --- www/hints.wiki | ||
| +++ www/hints.wiki | ||
| @@ -8,11 +8,11 @@ | ||
| 8 | 8 | 2. Add the "--tk" option to "[/help?cmd=diff | fossil diff]" commands |
| 9 | 9 | to get a pop-up |
| 10 | 10 | window containing a complete side-by-side diff. (NB: The pop-up |
| 11 | 11 | window is run as a separate Tcl/Tk process, so you will need to |
| 12 | 12 | have Tcl/Tk installed on your machine for this to work. Visit |
| 13 | - [http://www.activestate.com/activetcl] to for a quick download of | |
| 13 | + [http://www.activestate.com/activetcl] for a quick download of | |
| 14 | 14 | Tcl/Tk if you do not already have it on your system.) |
| 15 | 15 | |
| 16 | 16 | 3. The "[/help/clean | fossil clean -x]" command is a great |
| 17 | 17 | alternative to "make clean". You can use "[/help/clean | fossil clean -f]" |
| 18 | 18 | as a slightly safer alternative if the "ignore-glob" setting is |
| 19 | 19 |
| --- www/hints.wiki | |
| +++ www/hints.wiki | |
| @@ -8,11 +8,11 @@ | |
| 8 | 2. Add the "--tk" option to "[/help?cmd=diff | fossil diff]" commands |
| 9 | to get a pop-up |
| 10 | window containing a complete side-by-side diff. (NB: The pop-up |
| 11 | window is run as a separate Tcl/Tk process, so you will need to |
| 12 | have Tcl/Tk installed on your machine for this to work. Visit |
| 13 | [http://www.activestate.com/activetcl] to for a quick download of |
| 14 | Tcl/Tk if you do not already have it on your system.) |
| 15 | |
| 16 | 3. The "[/help/clean | fossil clean -x]" command is a great |
| 17 | alternative to "make clean". You can use "[/help/clean | fossil clean -f]" |
| 18 | as a slightly safer alternative if the "ignore-glob" setting is |
| 19 |
| --- www/hints.wiki | |
| +++ www/hints.wiki | |
| @@ -8,11 +8,11 @@ | |
| 8 | 2. Add the "--tk" option to "[/help?cmd=diff | fossil diff]" commands |
| 9 | to get a pop-up |
| 10 | window containing a complete side-by-side diff. (NB: The pop-up |
| 11 | window is run as a separate Tcl/Tk process, so you will need to |
| 12 | have Tcl/Tk installed on your machine for this to work. Visit |
| 13 | [http://www.activestate.com/activetcl] for a quick download of |
| 14 | Tcl/Tk if you do not already have it on your system.) |
| 15 | |
| 16 | 3. The "[/help/clean | fossil clean -x]" command is a great |
| 17 | alternative to "make clean". You can use "[/help/clean | fossil clean -f]" |
| 18 | as a slightly safer alternative if the "ignore-glob" setting is |
| 19 |