Check-in [7879c250fb]
Not logged in
Overview

SHA1 Hash:7879c250fb79c6c383751b7ac68cbe672afa09ab
Date: 2009-09-12 20:42:01
User: drh
Comment:More documentation clarifications.
Timelines: ancestors | descendants | both | trunk
Other Links: files | ZIP archive | manifest

Tags And Properties
Changes
[hide diffs]

Modified www/concepts.wiki from [44bd9b89f6] to [846a2562a2].

@@ -251,21 +251,21 @@
 to start a new project, or the <b>clone</b> command to make a clone
 of a repository for an existing project.
 </li>
 
 <li>
-Establish one or more source trees by changing your working directory
-to where you want the root of the source tree to be, then issuing
+Establish one or more source trees using
 the <b>open</b> command with the name of the repository file as its
 argument.
 </li>
 
 <li>
 The <b>open</b> command in the previous step populates your local source
 tree with a copy of the latest check-in.  Usually this is what you want.
 In the rare cases where it is not, use the <b>update</b> command to
-switch to a new check-in.  Use the <b>timeline</b> or <b>leaves</b> commands
+switch to a different check-in.
+Use the <b>timeline</b> or <b>leaves</b> commands
 to identify alternative check-ins to switch to.
 </li>
 
 <li>
 Edit the code.  Add new files to the source tree using the <b>add</b>
@@ -326,11 +326,12 @@
 
 <li>
 The <b>open</b> command in the previous step populates your local source
 tree with a copy of the latest check-in.  Usually this is what you want.
 In the rare cases where it is not, use the <b>update</b> command to
-switch to a new check-in.  Use the <b>timeline</b> or <b>leaves</b> commands
+switch to a different check-in.
+Use the <b>timeline</b> or <b>leaves</b> commands
 to identify alternative check-ins to switch to.
 </li>
 
 <li>
 Edit the code.  Add new files to the source tree using the <b>add</b>
@@ -365,11 +366,11 @@
 or are not to your liking, you can back out the changes using the
 <b>undo</b> command.
 </li>
 
 <li>
-If two or more people ran "commit" against the same baseline, this will
+If two or more people ran "commit" against the same check-in, this will
 result in a [./branching.wiki | fork] which you may want to resolve by
 running <b>merge</b> followed by another <b>commit</b>.
 </li>
 
 <li>