Fossil SCM

fixed more typos and grammatical errors in WWW-docs as specified by ML-posted patches

michai 2015-02-26 21:33 ml-jb-doc-typos
Commit bf1b99723e32418ad5bd0fe5fcd07c789d13f73e
+3 -3
--- www/build.wiki
+++ www/build.wiki
@@ -78,11 +78,11 @@
7878
<ol>
7979
<li value="5">
8080
<p>Unpack the ZIP or tarball you downloaded then
8181
<b>cd</b> into the directory created.</p></li>
8282
83
-<li><i>(Optional, unix only)</i>
83
+<li><i>(Optional, Unix only)</i>
8484
Run <b>./configure</b> to construct a makefile.
8585
8686
<ol type="a">
8787
<li><p>
8888
If you do not have the OpenSSL library installed on your system, then
@@ -100,11 +100,11 @@
100100
<li><p>Run "<b>make</b>" to build the "fossil" or "fossil.exe" executable.
101101
The details depend on your platform and compiler.
102102
103103
<ol type="a">
104104
<li><p><i>Unix</i> → the configure-generated Makefile should work on
105
-all unix and unix-like systems. Simply type "<b>make</b>".
105
+all Unix and Unix-like systems. Simply type "<b>make</b>".
106106
107107
<li><p><i>Unix without running "configure"</i> → if you prefer to avoid running configure, you
108108
can also use: <b>make -f Makefile.classic</b>. You may want to make minor
109109
edits to Makefile.classic to configure the build for your system.
110110
@@ -132,11 +132,11 @@
132132
</pre></blockquote>
133133
<blockquote><pre>
134134
buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135135
</pre></blockquote>
136136
137
-<li><p><i>Cygwin</i> → The same as other unix-like systems. It is
137
+<li><p><i>Cygwin</i> → The same as other Unix-like systems. It is
138138
recommended to configure using: "<b>configure --disable-internal-sqlite</b>",
139139
making sure you have the "libsqlite3-devel" , "zlib-devel" and
140140
"openssl-devel" packages installed first.
141141
</ol>
142142
</ol>
143143
--- www/build.wiki
+++ www/build.wiki
@@ -78,11 +78,11 @@
78 <ol>
79 <li value="5">
80 <p>Unpack the ZIP or tarball you downloaded then
81 <b>cd</b> into the directory created.</p></li>
82
83 <li><i>(Optional, unix only)</i>
84 Run <b>./configure</b> to construct a makefile.
85
86 <ol type="a">
87 <li><p>
88 If you do not have the OpenSSL library installed on your system, then
@@ -100,11 +100,11 @@
100 <li><p>Run "<b>make</b>" to build the "fossil" or "fossil.exe" executable.
101 The details depend on your platform and compiler.
102
103 <ol type="a">
104 <li><p><i>Unix</i> → the configure-generated Makefile should work on
105 all unix and unix-like systems. Simply type "<b>make</b>".
106
107 <li><p><i>Unix without running "configure"</i> → if you prefer to avoid running configure, you
108 can also use: <b>make -f Makefile.classic</b>. You may want to make minor
109 edits to Makefile.classic to configure the build for your system.
110
@@ -132,11 +132,11 @@
132 </pre></blockquote>
133 <blockquote><pre>
134 buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135 </pre></blockquote>
136
137 <li><p><i>Cygwin</i> → The same as other unix-like systems. It is
138 recommended to configure using: "<b>configure --disable-internal-sqlite</b>",
139 making sure you have the "libsqlite3-devel" , "zlib-devel" and
140 "openssl-devel" packages installed first.
141 </ol>
142 </ol>
143
--- www/build.wiki
+++ www/build.wiki
@@ -78,11 +78,11 @@
78 <ol>
79 <li value="5">
80 <p>Unpack the ZIP or tarball you downloaded then
81 <b>cd</b> into the directory created.</p></li>
82
83 <li><i>(Optional, Unix only)</i>
84 Run <b>./configure</b> to construct a makefile.
85
86 <ol type="a">
87 <li><p>
88 If you do not have the OpenSSL library installed on your system, then
@@ -100,11 +100,11 @@
100 <li><p>Run "<b>make</b>" to build the "fossil" or "fossil.exe" executable.
101 The details depend on your platform and compiler.
102
103 <ol type="a">
104 <li><p><i>Unix</i> → the configure-generated Makefile should work on
105 all Unix and Unix-like systems. Simply type "<b>make</b>".
106
107 <li><p><i>Unix without running "configure"</i> → if you prefer to avoid running configure, you
108 can also use: <b>make -f Makefile.classic</b>. You may want to make minor
109 edits to Makefile.classic to configure the build for your system.
110
@@ -132,11 +132,11 @@
132 </pre></blockquote>
133 <blockquote><pre>
134 buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135 </pre></blockquote>
136
137 <li><p><i>Cygwin</i> → The same as other Unix-like systems. It is
138 recommended to configure using: "<b>configure --disable-internal-sqlite</b>",
139 making sure you have the "libsqlite3-devel" , "zlib-devel" and
140 "openssl-devel" packages installed first.
141 </ol>
142 </ol>
143
--- www/changes.wiki
+++ www/changes.wiki
@@ -246,11 +246,11 @@
246246
* Renamed <tt>/stats_report</tt> page to [/reports]. Graph width is now
247247
relative, not absolute.
248248
* Added <tt>yw=YYYY-WW</tt> (year-week) filter to timeline to limit the results
249249
to a specific year and calendar week number, e.g. [/timeline?yw=2013-01].
250250
* Updates to SQLite to prevent opening a repository file using file descriptors
251
- 1 or 2 on unix. This fixes a bug under which an assertion failure could
251
+ 1 or 2 on Unix. This fixes a bug under which an assertion failure could
252252
overwrite part of a repository database file, corrupting it.
253253
* Added support for unlimited line lengths in side-by-side diffs.
254254
* New --close option to [/help?cmd=commit | fossil commit], which
255255
immediately closes the branch being committed.
256256
* Added <tt>chart</tt> option to [/help?cmd=bisect | fossil bisect].
@@ -269,11 +269,11 @@
269269
[/help?cmd=server | fossil server] commands can take an IP address in addition
270270
to the port number, causing Fossil to bind to just that one IP address.
271271
* After prompting for a password, also ask if that password should be
272272
remembered.
273273
* Performance improvements to the diff engine.
274
- * Fix the side-by-side diff engine to work better with multi-byte unicode text.
274
+ * Fix the side-by-side diff engine to work better with multi-byte Unicode text.
275275
* Color-coding in the web-based annotation (blame) display. Fix the annotation
276276
engine so that it is no longer confused by time-warps.
277277
* The markdown formatter is now available by default and can be used for
278278
tickets, wiki, and embedded documentation.
279279
* Add subcommands "fossil bisect log" and "fossil bisect status" to the
@@ -466,11 +466,11 @@
466466
* Merge the latest SQLite changes from upstream.
467467
* Lots of minor bug fixes.
468468
469469
<h2>Changes For Version 1.23 (2012-08-08)</h2>
470470
* The default checkout database name is now ".fslckout" instead of
471
- "_FOSSIL_" on unix. Both names continue to work.
471
+ "_FOSSIL_" on Unix. Both names continue to work.
472472
* Added the "fossil all changes" command
473473
* Added the --ckout option to the "fossil all list" command
474474
* Added the "public-pages" glob pattern that can be configured to allow
475475
anonymous users to see embedded documentation on sites where source
476476
code should not be accessible to anonymous users.
@@ -606,11 +606,11 @@
606606
* Added support for client-side SSL certificates with "ssl-identity"
607607
setting and --ssl-identity option.
608608
* Added "ssl-ca-location" setting to specify trusted root
609609
SSL certificates.
610610
* Added the --case-sensitive BOOLEAN command-line option to many commands.
611
- Default to true for unix and false for windows.
611
+ Default to true for Unix and false for windows.
612612
* Added the "Color-Test" submenu button on the branch list web page.
613613
* Compatibility improvements to the git-export feature.
614614
* Performance improvements on SHA1 checksums
615615
* Update to the latest SQLite version 3.7.8 alpha.
616616
* Fix the tarball generator to work with very log pathnames
617617
--- www/changes.wiki
+++ www/changes.wiki
@@ -246,11 +246,11 @@
246 * Renamed <tt>/stats_report</tt> page to [/reports]. Graph width is now
247 relative, not absolute.
248 * Added <tt>yw=YYYY-WW</tt> (year-week) filter to timeline to limit the results
249 to a specific year and calendar week number, e.g. [/timeline?yw=2013-01].
250 * Updates to SQLite to prevent opening a repository file using file descriptors
251 1 or 2 on unix. This fixes a bug under which an assertion failure could
252 overwrite part of a repository database file, corrupting it.
253 * Added support for unlimited line lengths in side-by-side diffs.
254 * New --close option to [/help?cmd=commit | fossil commit], which
255 immediately closes the branch being committed.
256 * Added <tt>chart</tt> option to [/help?cmd=bisect | fossil bisect].
@@ -269,11 +269,11 @@
269 [/help?cmd=server | fossil server] commands can take an IP address in addition
270 to the port number, causing Fossil to bind to just that one IP address.
271 * After prompting for a password, also ask if that password should be
272 remembered.
273 * Performance improvements to the diff engine.
274 * Fix the side-by-side diff engine to work better with multi-byte unicode text.
275 * Color-coding in the web-based annotation (blame) display. Fix the annotation
276 engine so that it is no longer confused by time-warps.
277 * The markdown formatter is now available by default and can be used for
278 tickets, wiki, and embedded documentation.
279 * Add subcommands "fossil bisect log" and "fossil bisect status" to the
@@ -466,11 +466,11 @@
466 * Merge the latest SQLite changes from upstream.
467 * Lots of minor bug fixes.
468
469 <h2>Changes For Version 1.23 (2012-08-08)</h2>
470 * The default checkout database name is now ".fslckout" instead of
471 "_FOSSIL_" on unix. Both names continue to work.
472 * Added the "fossil all changes" command
473 * Added the --ckout option to the "fossil all list" command
474 * Added the "public-pages" glob pattern that can be configured to allow
475 anonymous users to see embedded documentation on sites where source
476 code should not be accessible to anonymous users.
@@ -606,11 +606,11 @@
606 * Added support for client-side SSL certificates with "ssl-identity"
607 setting and --ssl-identity option.
608 * Added "ssl-ca-location" setting to specify trusted root
609 SSL certificates.
610 * Added the --case-sensitive BOOLEAN command-line option to many commands.
611 Default to true for unix and false for windows.
612 * Added the "Color-Test" submenu button on the branch list web page.
613 * Compatibility improvements to the git-export feature.
614 * Performance improvements on SHA1 checksums
615 * Update to the latest SQLite version 3.7.8 alpha.
616 * Fix the tarball generator to work with very log pathnames
617
--- www/changes.wiki
+++ www/changes.wiki
@@ -246,11 +246,11 @@
246 * Renamed <tt>/stats_report</tt> page to [/reports]. Graph width is now
247 relative, not absolute.
248 * Added <tt>yw=YYYY-WW</tt> (year-week) filter to timeline to limit the results
249 to a specific year and calendar week number, e.g. [/timeline?yw=2013-01].
250 * Updates to SQLite to prevent opening a repository file using file descriptors
251 1 or 2 on Unix. This fixes a bug under which an assertion failure could
252 overwrite part of a repository database file, corrupting it.
253 * Added support for unlimited line lengths in side-by-side diffs.
254 * New --close option to [/help?cmd=commit | fossil commit], which
255 immediately closes the branch being committed.
256 * Added <tt>chart</tt> option to [/help?cmd=bisect | fossil bisect].
@@ -269,11 +269,11 @@
269 [/help?cmd=server | fossil server] commands can take an IP address in addition
270 to the port number, causing Fossil to bind to just that one IP address.
271 * After prompting for a password, also ask if that password should be
272 remembered.
273 * Performance improvements to the diff engine.
274 * Fix the side-by-side diff engine to work better with multi-byte Unicode text.
275 * Color-coding in the web-based annotation (blame) display. Fix the annotation
276 engine so that it is no longer confused by time-warps.
277 * The markdown formatter is now available by default and can be used for
278 tickets, wiki, and embedded documentation.
279 * Add subcommands "fossil bisect log" and "fossil bisect status" to the
@@ -466,11 +466,11 @@
466 * Merge the latest SQLite changes from upstream.
467 * Lots of minor bug fixes.
468
469 <h2>Changes For Version 1.23 (2012-08-08)</h2>
470 * The default checkout database name is now ".fslckout" instead of
471 "_FOSSIL_" on Unix. Both names continue to work.
472 * Added the "fossil all changes" command
473 * Added the --ckout option to the "fossil all list" command
474 * Added the "public-pages" glob pattern that can be configured to allow
475 anonymous users to see embedded documentation on sites where source
476 code should not be accessible to anonymous users.
@@ -606,11 +606,11 @@
606 * Added support for client-side SSL certificates with "ssl-identity"
607 setting and --ssl-identity option.
608 * Added "ssl-ca-location" setting to specify trusted root
609 SSL certificates.
610 * Added the --case-sensitive BOOLEAN command-line option to many commands.
611 Default to true for Unix and false for windows.
612 * Added the "Color-Test" submenu button on the branch list web page.
613 * Compatibility improvements to the git-export feature.
614 * Performance improvements on SHA1 checksums
615 * Update to the latest SQLite version 3.7.8 alpha.
616 * Fix the tarball generator to work with very log pathnames
617
--- www/contribute.wiki
+++ www/contribute.wiki
@@ -15,11 +15,11 @@
1515
and other lawyer-rich organizations require this as a precondition to using
1616
Fossil.
1717
1818
If you do not wish to submit a Contributor Agreement, we would still
1919
welcome your suggestions and example code, but we will not use your code
20
-directly - we will be forced to reimplement your changes from scratch which
20
+directly - we will be forced to re-implement your changes from scratch which
2121
might take longer.
2222
2323
<h2>2.0 Submitting Patches</h2>
2424
2525
Suggested changes or bug fixes can be submitted by creating a patch
2626
--- www/contribute.wiki
+++ www/contribute.wiki
@@ -15,11 +15,11 @@
15 and other lawyer-rich organizations require this as a precondition to using
16 Fossil.
17
18 If you do not wish to submit a Contributor Agreement, we would still
19 welcome your suggestions and example code, but we will not use your code
20 directly - we will be forced to reimplement your changes from scratch which
21 might take longer.
22
23 <h2>2.0 Submitting Patches</h2>
24
25 Suggested changes or bug fixes can be submitted by creating a patch
26
--- www/contribute.wiki
+++ www/contribute.wiki
@@ -15,11 +15,11 @@
15 and other lawyer-rich organizations require this as a precondition to using
16 Fossil.
17
18 If you do not wish to submit a Contributor Agreement, we would still
19 welcome your suggestions and example code, but we will not use your code
20 directly - we will be forced to re-implement your changes from scratch which
21 might take longer.
22
23 <h2>2.0 Submitting Patches</h2>
24
25 Suggested changes or bug fixes can be submitted by creating a patch
26
--- www/fileformat.wiki
+++ www/fileformat.wiki
@@ -317,11 +317,11 @@
317317
The "*" character means the tag should be added to the artifact
318318
and all direct descendants (but not descendants through a merge) down
319319
to but not including the first descendant that contains a
320320
more recent "-", "*", or "+" tag with the same name.
321321
The optional third argument is the value of the tag. A tag
322
-without a value is a boolean.
322
+without a value is a Boolean.
323323
324324
When two or more tags with the same name are applied to the
325325
same artifact, the tag with the latest (most recent) date is
326326
used.
327327
328328
--- www/fileformat.wiki
+++ www/fileformat.wiki
@@ -317,11 +317,11 @@
317 The "*" character means the tag should be added to the artifact
318 and all direct descendants (but not descendants 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
326 used.
327
328
--- www/fileformat.wiki
+++ www/fileformat.wiki
@@ -317,11 +317,11 @@
317 The "*" character means the tag should be added to the artifact
318 and all direct descendants (but not descendants 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
326 used.
327
328
--- www/fiveminutes.wiki
+++ www/fiveminutes.wiki
@@ -5,18 +5,18 @@
55
</i></b>
66
</p><hr>
77
88
<h1>Up and running in 5 minutes as a single user</h1>
99
<p>This short document explains the main basic Fossil commands for a single
10
-user, ie. with no additional users, with no need to synchronize with some remote
10
+user, i.e. with no additional users, with no need to synchronize with some remote
1111
repository, and no need for branching/forking.</p>
1212
1313
<h2>Create a new repository</h2>
1414
<p>fossil new c:\test.repo</p>
15
-<p>This will create the new SQLite binary file that holds the repository, ie.
15
+<p>This will create the new SQLite binary file that holds the repository, i.e.
1616
files, tickets, wiki, etc. It can be located anywhere, although it's considered
17
-best practise to keep it outside the work directory where you will work on files
17
+best practice to keep it outside the work directory where you will work on files
1818
after they've been checked out of the repository.</p>
1919
2020
<h2>Open the repository</h2>
2121
<p>cd c:\temp\test.fossil</p>
2222
<p>fossil open c:\test.repo</p>
@@ -27,11 +27,11 @@
2727
2828
<h2>Add new files</h2>
2929
<p>fossil add .</p>
3030
<p>To tell Fossil to add new files to the repository. The files aren't actually
3131
added until you run &quot;commit&quot;. When using &quot;.&quot;, it tells Fossil
32
-to add all the files in the current directory recursively, ie. including all
32
+to add all the files in the current directory recursively, i.e. including all
3333
the files in all the subdirectories.</p>
3434
<p>Note: To tell Fossil to ignore some extensions:</p>
3535
<p>fossil settings ignore-glob &quot;*.o,*.obj,*.exe&quot; --global</p>
3636
3737
<h2>Remove files that haven't been committed yet</h2>
@@ -44,11 +44,11 @@
4444
<p>This shows the list of changes that have been done and will be committed the
4545
next time you run &quot;fossil commit&quot;. It's a useful command to run before
4646
running &quot;fossil commit&quot; just to check that things are OK before proceeding.</p>
4747
4848
<h2>Commit changes</h2>
49
-<p>To actually apply the pending changes to the repository, eg. new files marked
49
+<p>To actually apply the pending changes to the repository, e.g. new files marked
5050
for addition, checked-out files that have been edited and must be checked-in,
5151
etc.</p>
5252
5353
<p>fossil commit -m "Added stuff"</p>
5454
5555
--- www/fiveminutes.wiki
+++ www/fiveminutes.wiki
@@ -5,18 +5,18 @@
5 </i></b>
6 </p><hr>
7
8 <h1>Up and running in 5 minutes as a single user</h1>
9 <p>This short document explains the main basic Fossil commands for a single
10 user, ie. with no additional users, with no need to synchronize with some remote
11 repository, and no need for branching/forking.</p>
12
13 <h2>Create a new repository</h2>
14 <p>fossil new c:\test.repo</p>
15 <p>This will create the new SQLite binary file that holds the repository, ie.
16 files, tickets, wiki, etc. It can be located anywhere, although it's considered
17 best practise to keep it outside the work directory where you will work on files
18 after they've been checked out of the repository.</p>
19
20 <h2>Open the repository</h2>
21 <p>cd c:\temp\test.fossil</p>
22 <p>fossil open c:\test.repo</p>
@@ -27,11 +27,11 @@
27
28 <h2>Add new files</h2>
29 <p>fossil add .</p>
30 <p>To tell Fossil to add new files to the repository. The files aren't actually
31 added until you run &quot;commit&quot;. When using &quot;.&quot;, it tells Fossil
32 to add all the files in the current directory recursively, ie. including all
33 the files in all the subdirectories.</p>
34 <p>Note: To tell Fossil to ignore some extensions:</p>
35 <p>fossil settings ignore-glob &quot;*.o,*.obj,*.exe&quot; --global</p>
36
37 <h2>Remove files that haven't been committed yet</h2>
@@ -44,11 +44,11 @@
44 <p>This shows the list of changes that have been done and will be committed the
45 next time you run &quot;fossil commit&quot;. It's a useful command to run before
46 running &quot;fossil commit&quot; just to check that things are OK before proceeding.</p>
47
48 <h2>Commit changes</h2>
49 <p>To actually apply the pending changes to the repository, eg. new files marked
50 for addition, checked-out files that have been edited and must be checked-in,
51 etc.</p>
52
53 <p>fossil commit -m "Added stuff"</p>
54
55
--- www/fiveminutes.wiki
+++ www/fiveminutes.wiki
@@ -5,18 +5,18 @@
5 </i></b>
6 </p><hr>
7
8 <h1>Up and running in 5 minutes as a single user</h1>
9 <p>This short document explains the main basic Fossil commands for a single
10 user, i.e. with no additional users, with no need to synchronize with some remote
11 repository, and no need for branching/forking.</p>
12
13 <h2>Create a new repository</h2>
14 <p>fossil new c:\test.repo</p>
15 <p>This will create the new SQLite binary file that holds the repository, i.e.
16 files, tickets, wiki, etc. It can be located anywhere, although it's considered
17 best practice to keep it outside the work directory where you will work on files
18 after they've been checked out of the repository.</p>
19
20 <h2>Open the repository</h2>
21 <p>cd c:\temp\test.fossil</p>
22 <p>fossil open c:\test.repo</p>
@@ -27,11 +27,11 @@
27
28 <h2>Add new files</h2>
29 <p>fossil add .</p>
30 <p>To tell Fossil to add new files to the repository. The files aren't actually
31 added until you run &quot;commit&quot;. When using &quot;.&quot;, it tells Fossil
32 to add all the files in the current directory recursively, i.e. including all
33 the files in all the subdirectories.</p>
34 <p>Note: To tell Fossil to ignore some extensions:</p>
35 <p>fossil settings ignore-glob &quot;*.o,*.obj,*.exe&quot; --global</p>
36
37 <h2>Remove files that haven't been committed yet</h2>
@@ -44,11 +44,11 @@
44 <p>This shows the list of changes that have been done and will be committed the
45 next time you run &quot;fossil commit&quot;. It's a useful command to run before
46 running &quot;fossil commit&quot; just to check that things are OK before proceeding.</p>
47
48 <h2>Commit changes</h2>
49 <p>To actually apply the pending changes to the repository, e.g. new files marked
50 for addition, checked-out files that have been edited and must be checked-in,
51 etc.</p>
52
53 <p>fossil commit -m "Added stuff"</p>
54
55
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -57,11 +57,11 @@
5757
of integrators merge changes from individual developers into collaborative
5858
branches, until all the changes are merged together at the top-level master
5959
branch. And all of this can be accomplished without having to have all the
6060
code in any one repository. Developers or groups of developers can share
6161
only those branches that they want to share and keep other branches of the
62
-project private. This is analogous to sharding an a distributed database.
62
+project private. This is analogous to sharding a distributed database.
6363
6464
Fossil allows private branches, but its default mode is to share everything.
6565
And so in a Fossil project, all repositories tend to contain all of the
6666
content at all times. This is analogous to replication in a
6767
distributed database.
@@ -76,11 +76,11 @@
7676
works in his or her own branch and then merges changes up the hierarchy
7777
until they reach the master branch.
7878
7979
Fossil is designed for smaller and non-hierarchical teams where all
8080
developers are operating directly on the master branch, or at most
81
-a small number of well defined branches.
81
+a small number of well-defined branches.
8282
The [./concepts.wiki#workflow | autosync] mode of Fossil makes it easy
8383
for multiple developers to work on a single branch and maintain
8484
linear development on that branch and avoid needless forking
8585
and merging.
8686
@@ -115,11 +115,11 @@
115115
So to a first approximation, branches in Git are developer-centric whereas
116116
branches in Fossil are feature-centric.
117117
118118
The Git approach scales much better for large projects like the Linux
119119
kernel with thousands of contributors who in many cases don't even know
120
-each others names. The integrators serve a gatekeeper role to help keep
120
+each other's names. The integrators serve a gatekeeper role to help keep
121121
undesirable code out of the official Linux source tree. On the other hand,
122122
not many projects are as big or as loosely organized as the Linux kernel.
123123
Most projects have a small team of developers who all know each other
124124
well and trust each other, and who enjoy working together collaboratively
125125
without the overhead and hierarchy of integrators.
126126
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -57,11 +57,11 @@
57 of integrators merge changes from individual developers into collaborative
58 branches, until all the changes are merged together at the top-level master
59 branch. And all of this can be accomplished without having to have all the
60 code in any one repository. Developers or groups of developers can share
61 only those branches that they want to share and keep other branches of the
62 project private. This is analogous to sharding an a distributed database.
63
64 Fossil allows private branches, but its default mode is to share everything.
65 And so in a Fossil project, all repositories tend to contain all of the
66 content at all times. This is analogous to replication in a
67 distributed database.
@@ -76,11 +76,11 @@
76 works in his or her own branch and then merges changes up the hierarchy
77 until they reach the master branch.
78
79 Fossil is designed for smaller and non-hierarchical teams where all
80 developers are operating directly on the master branch, or at most
81 a small number of well defined branches.
82 The [./concepts.wiki#workflow | autosync] mode of Fossil makes it easy
83 for multiple developers to work on a single branch and maintain
84 linear development on that branch and avoid needless forking
85 and merging.
86
@@ -115,11 +115,11 @@
115 So to a first approximation, branches in Git are developer-centric whereas
116 branches in Fossil are feature-centric.
117
118 The Git approach scales much better for large projects like the Linux
119 kernel with thousands of contributors who in many cases don't even know
120 each others names. The integrators serve a gatekeeper role to help keep
121 undesirable code out of the official Linux source tree. On the other hand,
122 not many projects are as big or as loosely organized as the Linux kernel.
123 Most projects have a small team of developers who all know each other
124 well and trust each other, and who enjoy working together collaboratively
125 without the overhead and hierarchy of integrators.
126
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -57,11 +57,11 @@
57 of integrators merge changes from individual developers into collaborative
58 branches, until all the changes are merged together at the top-level master
59 branch. And all of this can be accomplished without having to have all the
60 code in any one repository. Developers or groups of developers can share
61 only those branches that they want to share and keep other branches of the
62 project private. This is analogous to sharding a distributed database.
63
64 Fossil allows private branches, but its default mode is to share everything.
65 And so in a Fossil project, all repositories tend to contain all of the
66 content at all times. This is analogous to replication in a
67 distributed database.
@@ -76,11 +76,11 @@
76 works in his or her own branch and then merges changes up the hierarchy
77 until they reach the master branch.
78
79 Fossil is designed for smaller and non-hierarchical teams where all
80 developers are operating directly on the master branch, or at most
81 a small number of well-defined branches.
82 The [./concepts.wiki#workflow | autosync] mode of Fossil makes it easy
83 for multiple developers to work on a single branch and maintain
84 linear development on that branch and avoid needless forking
85 and merging.
86
@@ -115,11 +115,11 @@
115 So to a first approximation, branches in Git are developer-centric whereas
116 branches in Fossil are feature-centric.
117
118 The Git approach scales much better for large projects like the Linux
119 kernel with thousands of contributors who in many cases don't even know
120 each other's names. The integrators serve a gatekeeper role to help keep
121 undesirable code out of the official Linux source tree. On the other hand,
122 not many projects are as big or as loosely organized as the Linux kernel.
123 Most projects have a small team of developers who all know each other
124 well and trust each other, and who enjoy working together collaboratively
125 without the overhead and hierarchy of integrators.
126
--- www/private.wiki
+++ www/private.wiki
@@ -45,11 +45,11 @@
4545
with another repository. For example, you might be building a cross-platform
4646
application and have separate repositories on your Windows laptop,
4747
your Linux desktop, and your iMac. You can transfer private branches
4848
between these machines by using the --private option on the "sync",
4949
"push", "pull", and "clone" commands. For example, if you are running
50
-"fossil server" on your linux box and you want to clone that repository
50
+"fossil server" on your Linux box and you want to clone that repository
5151
to your Mac, including all private branches, use:
5252
5353
<blockquote><pre>
5454
fossil clone --private http://[email protected]:8080/ mac-clone.fossil
5555
</pre></blockquote>
5656
--- www/private.wiki
+++ www/private.wiki
@@ -45,11 +45,11 @@
45 with another repository. For example, you might be building a cross-platform
46 application and have separate repositories on your Windows laptop,
47 your Linux desktop, and your iMac. You can transfer private branches
48 between these machines by using the --private option on the "sync",
49 "push", "pull", and "clone" commands. For example, if you are running
50 "fossil server" on your linux box and you want to clone that repository
51 to your Mac, including all private branches, use:
52
53 <blockquote><pre>
54 fossil clone --private http://[email protected]:8080/ mac-clone.fossil
55 </pre></blockquote>
56
--- www/private.wiki
+++ www/private.wiki
@@ -45,11 +45,11 @@
45 with another repository. For example, you might be building a cross-platform
46 application and have separate repositories on your Windows laptop,
47 your Linux desktop, and your iMac. You can transfer private branches
48 between these machines by using the --private option on the "sync",
49 "push", "pull", and "clone" commands. For example, if you are running
50 "fossil server" on your Linux box and you want to clone that repository
51 to your Mac, including all private branches, use:
52
53 <blockquote><pre>
54 fossil clone --private http://[email protected]:8080/ mac-clone.fossil
55 </pre></blockquote>
56
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -76,11 +76,11 @@
7676
7777
<p>A Fossil repository is a single disk file. Instead of cloning,
7878
you can just make a copy of the repository file (for example, using
7979
"scp"). Note, however, that the repository file contains auxiliary
8080
information above and beyond the versioned files, including some
81
- sensitive information such as password hashs and email addresses. If you
81
+ sensitive information such as password hashes and email addresses. If you
8282
want to share Fossil repositories directly, consider running the
8383
[/help/scrub|fossil scrub] command to remove sensitive information
8484
before transmitting the file.
8585
8686
<h2>Importing From Another Version Control System</h2>
@@ -336,11 +336,11 @@
336336
<li>[./server.wiki#inetd|inetd/xinetd]
337337
<li>[./server.wiki#cgi|CGI]
338338
<li>[./server.wiki#scgi|SCGI]
339339
</ul>
340340
341
- <p>The the [./selfhost.wiki | self-hosting fossil repositories] use
341
+ <p>The [./selfhost.wiki | self-hosting fossil repositories] use
342342
CGI.
343343
344344
<a name="proxy"></a>
345345
<h2>HTTP Proxies</h2>
346346
347347
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -76,11 +76,11 @@
76
77 <p>A Fossil repository is a single disk file. Instead of cloning,
78 you can just make a copy of the repository file (for example, using
79 "scp"). Note, however, that the repository file contains auxiliary
80 information above and beyond the versioned files, including some
81 sensitive information such as password hashs and email addresses. If you
82 want to share Fossil repositories directly, consider running the
83 [/help/scrub|fossil scrub] command to remove sensitive information
84 before transmitting the file.
85
86 <h2>Importing From Another Version Control System</h2>
@@ -336,11 +336,11 @@
336 <li>[./server.wiki#inetd|inetd/xinetd]
337 <li>[./server.wiki#cgi|CGI]
338 <li>[./server.wiki#scgi|SCGI]
339 </ul>
340
341 <p>The the [./selfhost.wiki | self-hosting fossil repositories] use
342 CGI.
343
344 <a name="proxy"></a>
345 <h2>HTTP Proxies</h2>
346
347
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -76,11 +76,11 @@
76
77 <p>A Fossil repository is a single disk file. Instead of cloning,
78 you can just make a copy of the repository file (for example, using
79 "scp"). Note, however, that the repository file contains auxiliary
80 information above and beyond the versioned files, including some
81 sensitive information such as password hashes and email addresses. If you
82 want to share Fossil repositories directly, consider running the
83 [/help/scrub|fossil scrub] command to remove sensitive information
84 before transmitting the file.
85
86 <h2>Importing From Another Version Control System</h2>
@@ -336,11 +336,11 @@
336 <li>[./server.wiki#inetd|inetd/xinetd]
337 <li>[./server.wiki#cgi|CGI]
338 <li>[./server.wiki#scgi|SCGI]
339 </ul>
340
341 <p>The [./selfhost.wiki | self-hosting fossil repositories] use
342 CGI.
343
344 <a name="proxy"></a>
345 <h2>HTTP Proxies</h2>
346
347
+2 -2
--- www/server.wiki
+++ www/server.wiki
@@ -111,11 +111,11 @@
111111
accept = www.ubercool-project.org:443
112112
TIMEOUTclose = 0
113113
exec = /usr/bin/fossil
114114
execargs = /usr/bin/fossil http /home/fossil/ubercool.fossil --https
115115
</nowiki></pre></blockquote>
116
-See the stunnel4 documentation for further details bout the /etc/stunnel/stunnel.conf
116
+See the stunnel4 documentation for further details about the /etc/stunnel/stunnel.conf
117117
configuration file. Note that the [/help/http|fossil http] command should include
118118
the --https option to let Fossil know to use "https" instead of "http" as the scheme
119119
on generated hyperlinks.
120120
<p>
121121
Using inetd or xinetd or stunnel is a more complex setup
@@ -313,11 +313,11 @@
313313
</pre></blockquote>
314314
The second form is especially useful for changing the maximum load average
315315
simultaneously on a large number of repositories.
316316
<p>
317317
Note that this load-average limiting feature is only available on operating
318
-systems that support the "getloadavg()" API. Most modern unix systems have
318
+systems that support the "getloadavg()" API. Most modern Unix systems have
319319
this interface, but Windows does not, so the feature will not work on Windows.
320320
Note also that Linux implements "getloadavg()" by accessing the "/proc/loadavg"
321321
file in the "proc" virtual filesystem. If you are running a Fossil instance
322322
inside a chroot() jail on Linux, you will need to make the "/proc" file
323323
system available inside that jail in order for this feature to work. On
324324
--- www/server.wiki
+++ www/server.wiki
@@ -111,11 +111,11 @@
111 accept = www.ubercool-project.org:443
112 TIMEOUTclose = 0
113 exec = /usr/bin/fossil
114 execargs = /usr/bin/fossil http /home/fossil/ubercool.fossil --https
115 </nowiki></pre></blockquote>
116 See the stunnel4 documentation for further details bout the /etc/stunnel/stunnel.conf
117 configuration file. Note that the [/help/http|fossil http] command should include
118 the --https option to let Fossil know to use "https" instead of "http" as the scheme
119 on generated hyperlinks.
120 <p>
121 Using inetd or xinetd or stunnel is a more complex setup
@@ -313,11 +313,11 @@
313 </pre></blockquote>
314 The second form is especially useful for changing the maximum load average
315 simultaneously on a large number of repositories.
316 <p>
317 Note that this load-average limiting feature is only available on operating
318 systems that support the "getloadavg()" API. Most modern unix systems have
319 this interface, but Windows does not, so the feature will not work on Windows.
320 Note also that Linux implements "getloadavg()" by accessing the "/proc/loadavg"
321 file in the "proc" virtual filesystem. If you are running a Fossil instance
322 inside a chroot() jail on Linux, you will need to make the "/proc" file
323 system available inside that jail in order for this feature to work. On
324
--- www/server.wiki
+++ www/server.wiki
@@ -111,11 +111,11 @@
111 accept = www.ubercool-project.org:443
112 TIMEOUTclose = 0
113 exec = /usr/bin/fossil
114 execargs = /usr/bin/fossil http /home/fossil/ubercool.fossil --https
115 </nowiki></pre></blockquote>
116 See the stunnel4 documentation for further details about the /etc/stunnel/stunnel.conf
117 configuration file. Note that the [/help/http|fossil http] command should include
118 the --https option to let Fossil know to use "https" instead of "http" as the scheme
119 on generated hyperlinks.
120 <p>
121 Using inetd or xinetd or stunnel is a more complex setup
@@ -313,11 +313,11 @@
313 </pre></blockquote>
314 The second form is especially useful for changing the maximum load average
315 simultaneously on a large number of repositories.
316 <p>
317 Note that this load-average limiting feature is only available on operating
318 systems that support the "getloadavg()" API. Most modern Unix systems have
319 this interface, but Windows does not, so the feature will not work on Windows.
320 Note also that Linux implements "getloadavg()" by accessing the "/proc/loadavg"
321 file in the "proc" virtual filesystem. If you are running a Fossil instance
322 inside a chroot() jail on Linux, you will need to make the "/proc" file
323 system available inside that jail in order for this feature to work. On
324
+1 -1
--- www/stats.wiki
+++ www/stats.wiki
@@ -152,8 +152,8 @@
152152
fossil using only about 23.2MB of network traffic. (This 23.2MB includes
153153
all the changes to SQLite that have been made since the conversion from
154154
CVS. Of those changes are omitted, the clone bandwidth drops to 13MB.)
155155
The "sync" protocol
156156
used by fossil has turned out to be surprisingly efficient. A typical
157
-check-in on SQLite might use 3 or 4KB of network bandwidth total. Hardly
157
+check-in on SQLite might use 3 or 4KB of network bandwidth total, hardly
158158
worth measuring. The sync protocol is efficient enough that, once cloned,
159159
Fossil could easily be used over a dial-up connection.
160160
--- www/stats.wiki
+++ www/stats.wiki
@@ -152,8 +152,8 @@
152 fossil using only about 23.2MB of network traffic. (This 23.2MB includes
153 all the changes to SQLite that have been made since the conversion from
154 CVS. Of those changes are omitted, the clone bandwidth drops to 13MB.)
155 The "sync" protocol
156 used by fossil has turned out to be surprisingly efficient. A typical
157 check-in on SQLite might use 3 or 4KB of network bandwidth total. Hardly
158 worth measuring. The sync protocol is efficient enough that, once cloned,
159 Fossil could easily be used over a dial-up connection.
160
--- www/stats.wiki
+++ www/stats.wiki
@@ -152,8 +152,8 @@
152 fossil using only about 23.2MB of network traffic. (This 23.2MB includes
153 all the changes to SQLite that have been made since the conversion from
154 CVS. Of those changes are omitted, the clone bandwidth drops to 13MB.)
155 The "sync" protocol
156 used by fossil has turned out to be surprisingly efficient. A typical
157 check-in on SQLite might use 3 or 4KB of network bandwidth total, hardly
158 worth measuring. The sync protocol is efficient enough that, once cloned,
159 Fossil could easily be used over a dial-up connection.
160
+1 -1
--- www/style.wiki
+++ www/style.wiki
@@ -46,11 +46,11 @@
4646
4747
30. Every function has a header comment describing the purpose and use
4848
of the function.
4949
5050
31. Function header comment defines the behavior of the function in
51
- sufficient detail to allow the function to be reimplemented from
51
+ sufficient detail to allow the function to be re-implemented from
5252
scratch without reference to the original code.
5353
5454
32. Functions that perform dynamic memory allocation (either directly
5555
or indirectly via subfunctions) say so in their header comments.
5656
5757
--- www/style.wiki
+++ www/style.wiki
@@ -46,11 +46,11 @@
46
47 30. Every function has a header comment describing the purpose and use
48 of the function.
49
50 31. Function header comment defines the behavior of the function in
51 sufficient detail to allow the function to be reimplemented from
52 scratch without reference to the original code.
53
54 32. Functions that perform dynamic memory allocation (either directly
55 or indirectly via subfunctions) say so in their header comments.
56
57
--- www/style.wiki
+++ www/style.wiki
@@ -46,11 +46,11 @@
46
47 30. Every function has a header comment describing the purpose and use
48 of the function.
49
50 31. Function header comment defines the behavior of the function in
51 sufficient detail to allow the function to be re-implemented from
52 scratch without reference to the original code.
53
54 32. Functions that perform dynamic memory allocation (either directly
55 or indirectly via subfunctions) say so in their header comments.
56
57
--- www/tech_overview.wiki
+++ www/tech_overview.wiki
@@ -124,11 +124,11 @@
124124
125125
The configuration database also maintains a list of repositories. This
126126
list is used by the [/help/all | fossil all] command in order to run various
127127
operations such as "sync" or "rebuild" on all repositories managed by a user.
128128
129
-On unix systems, the configuration database is named ".fossil" and is
129
+On Unix systems, the configuration database is named ".fossil" and is
130130
located in the user's home directory. On windows, the configuration
131131
database is named "_fossil" (using an underscore as the first character
132132
instead of a dot) and is located in the directory specified by the
133133
LOCALAPPDATA, APPDATA, or HOMEPATH environment variables, in that order.
134134
135135
--- www/tech_overview.wiki
+++ www/tech_overview.wiki
@@ -124,11 +124,11 @@
124
125 The configuration database also maintains a list of repositories. This
126 list is used by the [/help/all | fossil all] command in order to run various
127 operations such as "sync" or "rebuild" on all repositories managed by a user.
128
129 On unix systems, the configuration database is named ".fossil" and is
130 located in the user's home directory. On windows, the configuration
131 database is named "_fossil" (using an underscore as the first character
132 instead of a dot) and is located in the directory specified by the
133 LOCALAPPDATA, APPDATA, or HOMEPATH environment variables, in that order.
134
135
--- www/tech_overview.wiki
+++ www/tech_overview.wiki
@@ -124,11 +124,11 @@
124
125 The configuration database also maintains a list of repositories. This
126 list is used by the [/help/all | fossil all] command in order to run various
127 operations such as "sync" or "rebuild" on all repositories managed by a user.
128
129 On Unix systems, the configuration database is named ".fossil" and is
130 located in the user's home directory. On windows, the configuration
131 database is named "_fossil" (using an underscore as the first character
132 instead of a dot) and is located in the directory specified by the
133 LOCALAPPDATA, APPDATA, or HOMEPATH environment variables, in that order.
134
135
+3 -3
--- www/th1.md
+++ www/th1.md
@@ -5,11 +5,11 @@
55
content in Fossil.
66
77
Origins
88
-------
99
10
-TH1 began as a minimalist reimplementation of the TCL scripting language.
10
+TH1 began as a minimalist re-implementation of the TCL scripting language.
1111
There was a need to test the SQLite library on Symbian phones, but at that
1212
time all of the test cases for SQLite were written in Tcl and Tcl could not
1313
be easily compiled on the SymbianOS. So TH1 was developed as a cut-down
1414
version of TCL that would facilitate running the SQLite test scripts on
1515
SymbianOS.
@@ -157,10 +157,10 @@
157157
158158
Each of the commands above is documented by a block comment above their
159159
implementation in the th_main.c source file.
160160
161161
**To Do:** We would like to have a community volunteer go through and
162
-copy the documentation for each of these command (with appropriate
162
+copy the documentation for each of these commands (with appropriate
163163
format changes and spelling and grammar corrections) into subsequent
164164
sections of this document. It is suggested that the list of extension
165165
commands be left intact - as a quick reference. But it would be really
166
-nice to also have the details of each each command does.
166
+nice to also have the details of what each command does.
167167
--- www/th1.md
+++ www/th1.md
@@ -5,11 +5,11 @@
5 content in Fossil.
6
7 Origins
8 -------
9
10 TH1 began as a minimalist reimplementation of the TCL scripting language.
11 There was a need to test the SQLite library on Symbian phones, but at that
12 time all of the test cases for SQLite were written in Tcl and Tcl could not
13 be easily compiled on the SymbianOS. So TH1 was developed as a cut-down
14 version of TCL that would facilitate running the SQLite test scripts on
15 SymbianOS.
@@ -157,10 +157,10 @@
157
158 Each of the commands above is documented by a block comment above their
159 implementation in the th_main.c source file.
160
161 **To Do:** We would like to have a community volunteer go through and
162 copy the documentation for each of these command (with appropriate
163 format changes and spelling and grammar corrections) into subsequent
164 sections of this document. It is suggested that the list of extension
165 commands be left intact - as a quick reference. But it would be really
166 nice to also have the details of each each command does.
167
--- www/th1.md
+++ www/th1.md
@@ -5,11 +5,11 @@
5 content in Fossil.
6
7 Origins
8 -------
9
10 TH1 began as a minimalist re-implementation of the TCL scripting language.
11 There was a need to test the SQLite library on Symbian phones, but at that
12 time all of the test cases for SQLite were written in Tcl and Tcl could not
13 be easily compiled on the SymbianOS. So TH1 was developed as a cut-down
14 version of TCL that would facilitate running the SQLite test scripts on
15 SymbianOS.
@@ -157,10 +157,10 @@
157
158 Each of the commands above is documented by a block comment above their
159 implementation in the th_main.c source file.
160
161 **To Do:** We would like to have a community volunteer go through and
162 copy the documentation for each of these commands (with appropriate
163 format changes and spelling and grammar corrections) into subsequent
164 sections of this document. It is suggested that the list of extension
165 commands be left intact - as a quick reference. But it would be really
166 nice to also have the details of what each command does.
167
+1 -1
--- www/webui.wiki
+++ www/webui.wiki
@@ -109,11 +109,11 @@
109109
check-in graph by visiting the "Branches" link on the
110110
menu bar. From those pages you can follow hyperlinks to get additional
111111
details. These screens allow you to easily keep track of what is going
112112
on with separate subteams within your project team.
113113
114
-The "Files" link on the menu allows you to browse though the <b>file
114
+The "Files" link on the menu allows you to browse through the <b>file
115115
hierarchy</b> of the project and to view complete changes histories on
116116
individual files, with hyperlinks to the check-ins that made those
117117
changes, and with diffs and annotated diffs between versions.
118118
119119
The web interface supports [./embeddeddoc.wiki | embedded documentation].
120120
--- www/webui.wiki
+++ www/webui.wiki
@@ -109,11 +109,11 @@
109 check-in graph by visiting the "Branches" link on the
110 menu bar. From those pages you can follow hyperlinks to get additional
111 details. These screens allow you to easily keep track of what is going
112 on with separate subteams within your project team.
113
114 The "Files" link on the menu allows you to browse though the <b>file
115 hierarchy</b> of the project and to view complete changes histories on
116 individual files, with hyperlinks to the check-ins that made those
117 changes, and with diffs and annotated diffs between versions.
118
119 The web interface supports [./embeddeddoc.wiki | embedded documentation].
120
--- www/webui.wiki
+++ www/webui.wiki
@@ -109,11 +109,11 @@
109 check-in graph by visiting the "Branches" link on the
110 menu bar. From those pages you can follow hyperlinks to get additional
111 details. These screens allow you to easily keep track of what is going
112 on with separate subteams within your project team.
113
114 The "Files" link on the menu allows you to browse through the <b>file
115 hierarchy</b> of the project and to view complete changes histories on
116 individual files, with hyperlinks to the check-ins that made those
117 changes, and with diffs and annotated diffs between versions.
118
119 The web interface supports [./embeddeddoc.wiki | embedded documentation].
120

Keyboard Shortcuts

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