# 
# patch "ChangeLog"
#  from [9e0ee021f2b1d81700e96ab1f2705ee47ab7723f]
#    to [8d3cbb0457a6d0781d5e80827ea8c62916264a5f]
# 
# patch "monotone.texi"
#  from [6fb3fe1d81b2cc330e4dc04e54df634721817965]
#    to [28008d0dc7e6abd7e2e40cab143add9c4faecbca]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2005-06-15  Matt Johnston  <address@hidden>
+
+	* monotone.texi: clarify some netsync parts of the tutorial
+
 2005-06-15  Richard Levitte  <address@hidden>
 
 	* netsync.cc (struct session): Add a pattern regex cache.
--- monotone.texi
+++ monotone.texi
@@ -1634,19 +1634,19 @@
 @smallexample
 @group
 $ cat >>~/.monotone/monotonerc
-function get_netsync_read_permitted (regex, identity)
+function get_netsync_read_permitted (branch, identity)
   if (identity == "abe@@juicebot.co.jp") then return true end
   if (identity == "beth@@juicebot.co.jp") then return true end
   return false
 end
 
-function get_netsync_write_permitted (regex, identity)
+function get_netsync_write_permitted (branch, identity)
   if (identity == "abe@@juicebot.co.jp") then return true end
   if (identity == "beth@@juicebot.co.jp") then return true end
   return false
 end
 
-function get_netsync_anonymous_read_permitted (regex)
+function get_netsync_anonymous_read_permitted (branch)
   return false
 end
 ^D
@@ -1659,7 +1659,7 @@
 
 @smallexample
 @group
-$ monotone --db=jim.db serve jim-laptop.juicebot.co.jp jp.co.juicebot.jb7.*
+$ monotone --db=jim.db serve jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7.*"
 @end group
 @end smallexample
 
@@ -1673,7 +1673,7 @@
 
 @smallexample
 @group
-monotone --db=abe.db sync jim-laptop.juicebot.co.jp jp.co.juicebot.jb7.*
+monotone --db=abe.db sync jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7.*"
 monotone: rebuilding merkle trees for pattern jp.co.juicebot.jb7.*
 monotone: connecting to jim-laptop.juicebot.co.jp
 monotone: [bytes in: 3200] [bytes out: 673] 
@@ -1819,7 +1819,7 @@
 
 @smallexample
 @group
-$ monotone sync jim-laptop.juicebot.co.jp jp.co.juicebot.jb7.*
+$ monotone sync jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7.*"
 monotone: rebuilding merkle trees for pattern jp.co.juicebot.jb7.*
 monotone: including branch jp.co.juicebot.jb7
 monotone: [keys: 2] [rcerts: 8] 
@@ -1834,7 +1834,7 @@
 
 @smallexample
 @group
-monotone --db=beth.db sync jim-laptop.juicebot.co.jp jp.co.juicebot.jb7.*
+$ monotone --db=beth.db sync jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7.*"
 monotone: rebuilding merkle trees for pattern jp.co.juicebot.jb7.*
 monotone: connecting to jim-laptop.juicebot.co.jp
 monotone: [bytes in: 3200] [bytes out: 673] 
@@ -1886,7 +1886,7 @@
 
 @smallexample
 @group
-$ monotone sync jim-laptop.juicebot.co.jp jp.co.juicebot.jb7.*
+$ monotone sync jim-laptop.juicebot.co.jp "jp.co.juicebot.jb7.*"
 monotone: rebuilding merkle trees for pattern jp.co.juicebot.jb7.*
 monotone: including branch jp.co.juicebot.jb7
 monotone: [keys: 3] [rcerts: 12] 
@@ -3683,7 +3683,7 @@
 
 @smallexample
 @group
-$ monotone serve alice.someisp.com net.venge.monotone.*
+$ monotone serve alice.someisp.com "net.venge.monotone.*"
 @end group
 @end smallexample
 
@@ -3691,7 +3691,7 @@
 
 @smallexample
 @group
-$ monotone sync alice.someisp.com net.venge.monotone.*
+$ monotone sync alice.someisp.com "net.venge.monotone.*"
 @end group
 @end smallexample