From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 2 Nov 2012 17:35:38 +0000 (+0100)
Subject: Bug 806012: Installation docs need to be updated with instructions for bzr
X-Git-Tag: bugzilla-4.2.4~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa7fbd9b8f7264d131aa53ae2b3f867b4e7b8fc7;p=thirdparty%2Fbugzilla.git

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 9b62b1d0b4..c1524e07d4 100644
--- a/docs/en/xml/customization.xml
+++ b/docs/en/xml/customization.xml
@@ -110,14 +110,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>
@@ -143,7 +143,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 e9830e29ca..2da3a8e79a 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -191,8 +191,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