svn commit: r183721 - user

[Peter Wemm]

Author: peter
Date: Thu Oct  9 10:13:33 2008
New Revision: 183721
URL: http://svn.freebsd.org/changeset/base/183721

Log:
  Update typos.  clarify some failed attempts at humour at 3am.  Note that
  merge --reintegrate gets confused by the complexity of our tree.

Modified:
  user/GUIDELINES.txt

Modified: user/GUIDELINES.txt
==============================================================================
--- user/GUIDELINES.txt	Thu Oct  9 10:02:16 2008	(r183720)
+++ user/GUIDELINES.txt	Thu Oct  9 10:13:33 2008	(r183721)
@@ -5,7 +5,7 @@ Rule #1:  TAKE IT EASY! DON'T RUSH AND M
 Rule #2:  See rule #1, repeat as needed
 
 Peril sensitive sunglasses advisory:
-This is in flux.  Expect refinement.
+This is in flux.  Expect refinement.  Expect typos.
 
 Guidelines for what can go in /user and /projects
 -------------------------------------------------
@@ -56,7 +56,7 @@ Creation and merging:
 
 Merging is in flux.  The procedure as understood right now:
 
-Assue projects/ia65/sys.   $BASE="svn+ssh://svn.freebsd.org/base"
+Assume projects/ia65/sys.   $BASE="svn+ssh://svn.freebsd.org/base"
 
 Initial creation:
   $ svn cp --parents $BASE/head/sys $BASE/projects/ia65/sys
@@ -73,11 +73,14 @@ To integrate changes from head into your
 
 To merge your changes into head/sys.
   $ mail -s 'Is it ok to merge projects/ia65 to head?' peter at freebsd.org
-  $ wait_for_reply
+  $ wait_for_reply (the point is to have somebody on hand for the first
+    timeto help rescue you if things go horribly wrong.)
   (set up a clean checkout of head/sys and projects/ia65/sys.  MUST BE CLEAN!!)
   $ cd work
   $ svn co $BASE/head/sys
   $ svn co $BASE/projects/ia65/sys
+  (If you've already got clean checkouts handy, replace with appropriate
+   svn update commands)
   $ svn info head  - NOTE CHANGE NUMBER!!!  assume 12345 for this example.
   (now, bring projects/ia65 up to date with head, AS YOU JUST CHECKED IT OUT)
   $ svn merge $BASE/head/sys at 12345 projects/ia65/sys
@@ -89,6 +92,8 @@ To merge your changes into head/sys.
   (resolve conflicts)
   $ svn commit head/sys
   $ profit!
+  (regular svn users might wonder about merge --reintegrate.  Our tree breaks
+   it, sorry.  We can't use it.)
 
 Tags:
   Place tags in your /user area if possible, even if the origin is a project.