[svnbook commit] r1324 - trunk/src/en/book

[maxb]

Author: maxb
Date: Mon May 23 11:10:40 2005
New Revision: 1324

Modified:
   trunk/src/en/book/ch05.xml
   trunk/src/en/book/ch06.xml
Log:
Standardize on "/usr/bin" as the example location of Subversion binaries.

* en/book/ch05.xml (txn-info.sh): This example script is intended for
    interactive use, so just remove the absolute paths to svnadmin and svnlook,
    and let $PATH do its thing.

* en/book/ch06.xml: Change existing example binary locations to "/usr/bin".


Modified: trunk/src/en/book/ch05.xml
==============================================================================
--- trunk/src/en/book/ch05.xml	(original)
+++ trunk/src/en/book/ch05.xml	Mon May 23 11:10:40 2005
@@ -1915,18 +1915,15 @@
 ### Generate informational output for all outstanding transactions in
 ### a Subversion repository.
 
-SVNADMIN=/usr/local/bin/svnadmin
-SVNLOOK=/usr/local/bin/svnlook
-
 REPOS="${1}"
 if [ "x$REPOS" = x ] ; then
   echo "usage: $0 REPOS_PATH"
   exit
 fi
 
-for TXN in `${SVNADMIN} lstxns ${REPOS}`; do 
+for TXN in `svnadmin lstxns ${REPOS}`; do 
   echo "---[ Transaction ${TXN} ]-------------------------------------------"
-  ${SVNLOOK} info "${REPOS}" --transaction "${TXN}"
+  svnlook info "${REPOS}" --transaction "${TXN}"
 done
 </programlisting>
       </example>

Modified: trunk/src/en/book/ch06.xml
==============================================================================
--- trunk/src/en/book/ch06.xml	(original)
+++ trunk/src/en/book/ch06.xml	Mon May 23 11:10:40 2005
@@ -426,7 +426,7 @@
         <filename>/etc/inetd.conf</filename>:</para>
 
 <screen>
-svn stream tcp nowait svnowner /usr/local/bin/svnserve svnserve -i
+svn stream tcp nowait svnowner /usr/bin/svnserve svnserve -i
 </screen>
 
       <para>Make sure <quote>svnowner</quote> is a user which has
@@ -2188,12 +2188,12 @@
       <filename>apachectl</filename>.  For example:</para>
 
     <screen>
-$ cat /usr/local/bin/svn
+$ cat /usr/bin/svn
 
 #!/bin/sh
 
 umask 002
-/usr/local/subversion/bin/svn "$@"
+/usr/bin/svn-real "$@"
 
 </screen>
 
@@ -2248,7 +2248,7 @@
         <listitem>
           <para>Your users need to use a sane umask when accessing the
             repository.  Make sure that <command>svnserve</command>
-            (<filename>/usr/local/bin/svnserve</filename>, or wherever
+            (<filename>/usr/bin/svnserve</filename>, or wherever
             it lives in <literal>$PATH</literal>) is actually a
             wrapper script which sets <command>umask 002</command> and
             executes the real <command>svnserve</command>