Bug 806012: Installation docs need to be updated with instructions for bzr

r=dkl a=LpSolit

diff --git a/docs/en/xml/customization.xml b/docs/en/xml/customization.xml
index ce549b8ea021298cbc4c48e1fb62ab8a20b6da77..c140acf7712de8fa8cf45d399c79ca00a64ec479 100644 (file)
--- a/docs/en/xml/customization.xml
+++ b/docs/en/xml/customization.xml
@@ -123,14 +123,14 @@
         The first method of making customizations is to directly edit the
         templates found in <filename>template/en/default</filename>.
         This is probably the best way to go about it if you are going to
-        be upgrading Bugzilla through CVS, because if you then execute
-        a <command>cvs update</command>, any changes you have made will
+        be upgrading Bugzilla through Bzr, because if you then execute
+        a <command>bzr update</command>, any changes you have made will
         be merged automagically with the updated versions.
       </para>
 
       <note>
         <para>
-          If you use this method, and CVS conflicts occur during an
+          If you use this method, and Bzr conflicts occur during an
           update, the conflicted templates (and possibly other parts
           of your installation) will not work until they are resolved.
         </para>
@@ -156,7 +156,7 @@
         The second method of customization should be used if you 
         use the overwriting method of upgrade, because otherwise 
         your changes will be lost.  This method may also be better if
-        you are using the CVS method of upgrading and are going to make major
+        you are using the Bzr method of upgrading and are going to make major
         changes, because it is guaranteed that the contents of this directory
         will not be touched during an upgrade, and you can then decide whether
         to continue using your own templates, or make the effort to merge your

diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 9744154261895b54adaf351843e5c0d97fef0947..d26ebbae317eb07e5e95a5ed29011996bdf9d5d6 100644 (file)
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -205,8 +205,8 @@
 
       <para>
         <ulink url="http://www.bugzilla.org/download/">Download a Bugzilla tarball</ulink>
-        (or check it out from CVS) and place
-        it in a suitable directory, accessible by the default web server user 
+        (or <ulink url="https://wiki.mozilla.org/Bugzilla:Bzr">check it out from Bzr</ulink>)
+        and place it in a suitable directory, accessible by the default web server user
         (probably <quote>apache</quote> or <quote>www</quote>). 
         Good locations are either directly in the web server's document directories or
         in <filename>/usr/local</filename> with a symbolic link to the web server's