Differences From:

File www/quickstart.wiki part of check-in [c8893c69ac] - Documentation updates. by drh on 2008-10-05 01:03:25. [view]

To:

File www/quickstart.wiki part of check-in [e8c4f69c50] - Change all mentions of "UUID" in the documentation and help screens into either "artifact ID" or "baseline ID" or "ticket ID" as appropriate. "UUID" has a widely recognized meaning that is different from its meaning in fossil. "UUID" is still used in code comments and in variable names. by drh on 2008-10-24 13:27:53. [view]

@@ -160,16 +160,17 @@
     not into your checked-out local tree.  To get the changes into your
     local tree, use <b>update</b>:</p>
 
     <blockquote>
-    <b>fossil update</b> <i>UUID</i>
+    <b>fossil update</b> <i>AID</i>
     </blockquote>
 
-    <p>The <i>UUID</i> is some unique abbreviation to the 40-character
-    version ID.  If you omit the <i>UUID</i> fossil moves you to the
+    <p>The <i>AID</i> is some unique abbreviation to the 40-character
+    artifact identifier (AID) for a particular baseline.  If you omit
+    the <i>AID</i> fossil moves you to the
     leaf version of the branch your are currently on.  If your branch
     has multiple leaves, you get an error - you'll have to specify the
-    leaf you want using a <i>UUID</i> argument.</p>
+    leaf you want using a <i>AID</i> argument.</p>
 
 </blockquote><h2>Branching And Merging</h2><blockquote>
 
     <p>You can create branches by doing multiple commits off of the
@@ -177,9 +178,9 @@
     <b>update</b> to the leaf of one branch.  Then do a <b>merge</b>
     of the leaf of the other branch:</p>
 
     <blockquote>
-    <b>fossil merge</b> <i>UUID</i>
+    <b>fossil merge</b> <i>AID</i>
     </blockquote>
 
     <p>Test to make sure your merge didn't mess up the code, then
     <b>commit</b> and possibly also <b>push</b> your changes.   Remember