SHA1 Hash:	24c045f37374f7a1b3ca6595a5ec53605e6293a5
Date:	2009-01-29 23:04:47
User:	drh
Comment:	Merge in kkinnell's documentation updates.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified www/reference.wiki from [d59782964d] to [1c1a126ca1].

@@ -21,17 +21,22 @@
   entered to make the intent unambiguous.  'clo' is a proper prefix of
   both the 'clone' and 'close' commands, for instance, but 'clon' is
   enough to make the intent—the 'clone'
   command—unambiguous.
 
-  * Pragmatically, a <u>version</u> in <b>fossil</b> is a
+  * Pragmatically, a [ | <u>version</u>] in <b>fossil</b> is a
   40-character long string of hexadecimal.  <b>fossil</b> will be
   able to figure out which version you want with any
   <i>distinct</i> prefix of that string which is at least four
   characters long.  <em>Commands which require a version are
   looking for the string, a distinct prefix of the string, or a
   <code>tag</code>.</em>
+
+  * SCM in a distributed environment can be a bit confusing with
+  regard to branching, merging, and versions in general.  See the
+  [./branching.wiki | explanation of branching] and it will all make
+  much more sense.
 
   You should probably start interacting with fossil at the command
   line by asking it what it can
   do:&nbsp;&nbsp;&nbsp;&nbsp;<a name="tof">&#710;</a>
 
@@ -39,11 +44,11 @@
 Usage: fossil help COMMAND.
 Available COMMANDs:</pre><table width="80%"
                           style="font-family: fixed, courier, monospace;">
       <tr>
 	<td><a href="#add">add</a>*</td>
-	<td><a href="#configure">configuration</a></td>
+	<td><a href="#configuration">configuration</a></td>
 	<td><a href="#leaves">leaves</a></td>
 	<td><a href="#redo">redo</a></td>
 	<td><a href="#timeline">timeline</a></td>
       </tr>
       <tr>
@@ -201,11 +206,11 @@
     The opposite of "open".  Close the current database connection.
     Require a -f or --force flag if there are unsaved changed in the
     current check-out.
 
 <hr><a href="#tof">&#710;</a>
-    <a name="configure">Usage: </a><a href="cmd_configure.wiki">fossil configure</a> METHOD ...
+    <a name="configuration">Usage: </a><a href="cmd_configure.wiki">fossil configuration</a> METHOD ...
     Where METHOD is one of: export import merge pull push reset.  All methods
     accept the -R or --repository option to specific a repository.
 
     fossil configuration export AREA FILENAME