6f3ec1bef6b… — Fossil SCM

M www/index.wiki

+3 -2

		--- www/index.wiki
		+++ www/index.wiki
		@@ -32,12 +32,12 @@
32	32	Fossil also supports [./bugtheory.wiki \| bug tracking],
33	33	[./wikitheory.wiki \| wiki], and [./event.wiki \| technotes].
34	34
35	35	2. <b>Built-in Web Interface</b> -
36	36	Fossil has a built-in and intuitive [./webui.wiki \| web interface]
37		- with a rich assortment of information pages
38		- ([./webpage-ex.md\|examples]) that promote situational awareness.
	37	+ with a rich variety of information pages
	38	+ ([./webpage-ex.md\|examples]) promoting situational awareness.
39	39
40	40	This entire website is just a running instance of Fossil.
41	41	The pages you see here are all [./wikitheory.wiki \| wiki] or
42	42	[./embeddeddoc.wiki \| embedded documentation] or (in the case of
43	43	the [/uv/download.html\|download] page)
		@@ -88,10 +88,11 @@
88	88	* [./permutedindex.html \| Documentation index] with [/search?c=d \| full text search].
89	89	* [./reviews.wiki \| Testimonials] from satisfied Fossil users and
90	90	[./quotes.wiki \| Quotes] about Fossil and other DVCSes.
91	91	* [./faq.wiki \| Frequently Asked Questions]
92	92	* The [./concepts.wiki \| concepts] behind Fossil.
	93	+ [./whyusefossil.wiki#definitions \| Another viewpoint].
93	94	* [./quickstart.wiki \| Quick Start] guide to using Fossil.
94	95	* [./qandc.wiki \| Questions & Criticisms] directed at Fossil.
95	96	* [./build.wiki \| Compiling and Installing]
96	97	* "Fuel" is cross-platform GUI front-end for Fossil
97	98	written in Qt. [http://fuelscm.org/].
98	99

	--- www/index.wiki
	+++ www/index.wiki
	@@ -32,12 +32,12 @@
32	Fossil also supports [./bugtheory.wiki \| bug tracking],
33	[./wikitheory.wiki \| wiki], and [./event.wiki \| technotes].
34
35	2. <b>Built-in Web Interface</b> -
36	Fossil has a built-in and intuitive [./webui.wiki \| web interface]
37	with a rich assortment of information pages
38	([./webpage-ex.md\|examples]) that promote situational awareness.
39
40	This entire website is just a running instance of Fossil.
41	The pages you see here are all [./wikitheory.wiki \| wiki] or
42	[./embeddeddoc.wiki \| embedded documentation] or (in the case of
43	the [/uv/download.html\|download] page)
	@@ -88,10 +88,11 @@
88	* [./permutedindex.html \| Documentation index] with [/search?c=d \| full text search].
89	* [./reviews.wiki \| Testimonials] from satisfied Fossil users and
90	[./quotes.wiki \| Quotes] about Fossil and other DVCSes.
91	* [./faq.wiki \| Frequently Asked Questions]
92	* The [./concepts.wiki \| concepts] behind Fossil.

93	* [./quickstart.wiki \| Quick Start] guide to using Fossil.
94	* [./qandc.wiki \| Questions & Criticisms] directed at Fossil.
95	* [./build.wiki \| Compiling and Installing]
96	* "Fuel" is cross-platform GUI front-end for Fossil
97	written in Qt. [http://fuelscm.org/].
98

	--- www/index.wiki
	+++ www/index.wiki
	@@ -32,12 +32,12 @@
32	Fossil also supports [./bugtheory.wiki \| bug tracking],
33	[./wikitheory.wiki \| wiki], and [./event.wiki \| technotes].
34
35	2. <b>Built-in Web Interface</b> -
36	Fossil has a built-in and intuitive [./webui.wiki \| web interface]
37	with a rich variety of information pages
38	([./webpage-ex.md\|examples]) promoting situational awareness.
39
40	This entire website is just a running instance of Fossil.
41	The pages you see here are all [./wikitheory.wiki \| wiki] or
42	[./embeddeddoc.wiki \| embedded documentation] or (in the case of
43	the [/uv/download.html\|download] page)
	@@ -88,10 +88,11 @@
88	* [./permutedindex.html \| Documentation index] with [/search?c=d \| full text search].
89	* [./reviews.wiki \| Testimonials] from satisfied Fossil users and
90	[./quotes.wiki \| Quotes] about Fossil and other DVCSes.
91	* [./faq.wiki \| Frequently Asked Questions]
92	* The [./concepts.wiki \| concepts] behind Fossil.
93	[./whyusefossil.wiki#definitions \| Another viewpoint].
94	* [./quickstart.wiki \| Quick Start] guide to using Fossil.
95	* [./qandc.wiki \| Questions & Criticisms] directed at Fossil.
96	* [./build.wiki \| Compiling and Installing]
97	* "Fuel" is cross-platform GUI front-end for Fossil
98	written in Qt. [http://fuelscm.org/].
99

M www/quickstart.wiki

+1

		--- www/quickstart.wiki
		+++ www/quickstart.wiki
		@@ -17,10 +17,11 @@
17	17	<h2>General Work Flow</h2>
18	18
19	19	<p>Fossil works with repository files (a database with the project's
20	20	complete history) and with checked-out local trees (the working directory
21	21	you use to do your work).
	22	+ (See [./whyusefossil.wiki#definitions \| definitions] for more background.)
22	23	The workflow looks like this:</p>
23	24
24	25	<ul>
25	26	<li>Create or clone a repository file. ([/help/init\|fossil init] or
26	27	[/help/clone \| fossil clone])
27	28

	--- www/quickstart.wiki
	+++ www/quickstart.wiki
	@@ -17,10 +17,11 @@
17	<h2>General Work Flow</h2>
18
19	<p>Fossil works with repository files (a database with the project's
20	complete history) and with checked-out local trees (the working directory
21	you use to do your work).

22	The workflow looks like this:</p>
23
24	<ul>
25	<li>Create or clone a repository file. ([/help/init\|fossil init] or
26	[/help/clone \| fossil clone])
27

	--- www/quickstart.wiki
	+++ www/quickstart.wiki
	@@ -17,10 +17,11 @@
17	<h2>General Work Flow</h2>
18
19	<p>Fossil works with repository files (a database with the project's
20	complete history) and with checked-out local trees (the working directory
21	you use to do your work).
22	(See [./whyusefossil.wiki#definitions \| definitions] for more background.)
23	The workflow looks like this:</p>
24
25	<ul>
26	<li>Create or clone a repository file. ([/help/init\|fossil init] or
27	[/help/clone \| fossil clone])
28

M www/whyusefossil.wiki

+3

		--- www/whyusefossil.wiki
		+++ www/whyusefossil.wiki
		@@ -212,10 +212,13 @@
212	212	into the main line.
213	213	<li><p>The "direct children" of a check-in X are all children that
214	214	have X as their primary parent.
215	215	<li><p>A check-in node with no direct children is sometimes called
216	216	a "leaf".
	217	+ <li><p>The "merge" command changes only the check-out.
	218	+ The "commit" command must be run subsequently to make the merge
	219	+ a permanent part of project.
217	220	</ul>
218	221	<li><p>Definition: <b>branch</b> →
219	222	a sequence of check-ins that are all linked
220	223	together in the DAG through the primary parent.
221	224	<ul>
222	225

	--- www/whyusefossil.wiki
	+++ www/whyusefossil.wiki
	@@ -212,10 +212,13 @@
212	into the main line.
213	<li><p>The "direct children" of a check-in X are all children that
214	have X as their primary parent.
215	<li><p>A check-in node with no direct children is sometimes called
216	a "leaf".



217	</ul>
218	<li><p>Definition: <b>branch</b> →
219	a sequence of check-ins that are all linked
220	together in the DAG through the primary parent.
221	<ul>
222

	--- www/whyusefossil.wiki
	+++ www/whyusefossil.wiki
	@@ -212,10 +212,13 @@
212	into the main line.
213	<li><p>The "direct children" of a check-in X are all children that
214	have X as their primary parent.
215	<li><p>A check-in node with no direct children is sometimes called
216	a "leaf".
217	<li><p>The "merge" command changes only the check-out.
218	The "commit" command must be run subsequently to make the merge
219	a permanent part of project.
220	</ul>
221	<li><p>Definition: <b>branch</b> →
222	a sequence of check-ins that are all linked
223	together in the DAG through the primary parent.
224	<ul>
225

Fossil SCM