diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-11-14 17:25:01 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-11-14 17:25:01 +0100 |
| commit | e4e3c1b860c47976dc7314ec26d336caa59bebd0 (patch) | |
| tree | 5161f7edb5d9b9046d7b98af3d000f37880f389b /docs/en/xml/customization.xml | |
| parent | 38fa3fab5ae996c6116b55fe87e60ea6b53b2923 (diff) | |
| parent | 442d6df4683b7219738bb799a3650dd8b9c8431f (diff) | |
| download | bugzilla-e4e3c1b860c47976dc7314ec26d336caa59bebd0.tar.gz bugzilla-e4e3c1b860c47976dc7314ec26d336caa59bebd0.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'docs/en/xml/customization.xml')
| -rw-r--r-- | docs/en/xml/customization.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/en/xml/customization.xml b/docs/en/xml/customization.xml index 9b62b1d0b..c1524e07d 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 |