# 
# patch "ChangeLog"
#  from [2cfb1a752c660dc7b11ae9274cb3d3b40dc6b555]
#    to [9dcbe4e861ed3436560161fb779f303b2fa3a15e]
# 
# patch "monotone.texi"
#  from [12c4a6e9c616d8f73f567ac172bc4fd92e143f5c]
#    to [13afae574548710dd1067c2b525b3f76b2e9da44]
# 
========================================================================
--- ChangeLog	2cfb1a752c660dc7b11ae9274cb3d3b40dc6b555
+++ ChangeLog	9dcbe4e861ed3436560161fb779f303b2fa3a15e
@@ -1,3 +1,8 @@
+2005-08-19  Nathaniel Smith  <address@hidden>
+
+	* monotone.texi (Tutorial): Tweak wording, use --db at more
+	appropriate places.
+
 2005-08-19  Matthew Gregan  <address@hidden>
 
 	* tests/t_crlf.at: Adjust expected line count to accomodate diff
========================================================================
--- monotone.texi	12c4a6e9c616d8f73f567ac172bc4fd92e143f5c
+++ monotone.texi	13afae574548710dd1067c2b525b3f76b2e9da44
@@ -1250,7 +1250,7 @@
 
 @smallexample
 @group
-/home/jim$ monotone setup juice
+/home/jim$ monotone --db=jim.db setup juice
 /home/jim$ cd juice
 /home/jim/juice$
 @end group
@@ -1321,7 +1321,7 @@
 
 @smallexample
 @group
-$ monotone --db=~/jim.db add include/jb.h src
+$ monotone add include/jb.h src
 monotone: adding include/jb.h to working copy add set
 monotone: adding src/apple.c to working copy add set
 monotone: adding src/banana.c to working copy add set
@@ -1348,7 +1348,7 @@
 
 @smallexample
 @group
-$ monotone --db=jim.db status
+$ monotone status
 
 new_manifest [2098eddbe833046174de28172a813150a6cbda7b]
 
@@ -1389,7 +1389,7 @@
 
 @smallexample
 @group
-$ monotone --db=jim.db diff
+$ monotone diff
 # 
 # add_file "include/jb.h"
 # 
@@ -1457,11 +1457,13 @@
 Conventions} for more information about appropriate branch names.) He
 then commits his working copy, which causes monotone to process the
 @file{MT/work} file and record the file contents, manifest, and revision
-into the database.
+into the database.  Since he didn't give a branch when he ran
address@hidden, he has to do so now; monotone will remember the branch
+and re-use it for future commits automatically.
 
 @smallexample
 @group
-$ monotone --db=jim.db --branch=jp.co.juicebot.jb7 commit --message="initial checkin of project"
+$ monotone --branch=jp.co.juicebot.jb7 commit --message="initial checkin of project"
 monotone: beginning commit on branch 'jp.co.juicebot.jb7'
 monotone: committed revision 2e24d49a48adf9acf3a1b6391a080008cbef9c21
 @end group