Bug 770073 - Hardcode "Bugzilla" in templates when it's not related to a specific Bugzilla installation

r=dkl,a=justdave

5 files changed, 13 insertions, 13 deletions

diff --git a/template/en/default/extensions/config.pm.tmpl b/template/en/default/extensions/config.pm.tmpl
index 07ac83a41..79fbb995c 100644
--- a/template/en/default/extensions/config.pm.tmpl
+++ b/template/en/default/extensions/config.pm.tmpl
@@ -12,7 +12,7 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %];
+package Bugzilla::Extension::[% name %];
 
 use 5.10.1;
 use strict;
diff --git a/template/en/default/extensions/extension.pm.tmpl b/template/en/default/extensions/extension.pm.tmpl
index ebeb73719..637dfdd28 100644
--- a/template/en/default/extensions/extension.pm.tmpl
+++ b/template/en/default/extensions/extension.pm.tmpl
@@ -12,18 +12,18 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %];
+package Bugzilla::Extension::[% name %];
 
 use 5.10.1;
 use strict;
-use parent qw(B[% %]ugzilla::Extension);
+use parent qw(Bugzilla::Extension);
 
 # This code for this is in [% path %]/lib/Util.pm
-use B[% %]ugzilla::Extension::[% name %]::Util;
+use Bugzilla::Extension::[% name %]::Util;
 
 our $VERSION = '0.01';
 
-# See the documentation of B[% %]ugzilla::Hook ("perldoc B[% %]ugzilla::Hook" 
+# See the documentation of Bugzilla::Hook ("perldoc Bugzilla::Hook" 
 # in the bugzilla directory) for a list of all available hooks.
 sub install_update_db {
     my ($self, $args) = @_;
diff --git a/template/en/default/extensions/hook-readme.txt.tmpl b/template/en/default/extensions/hook-readme.txt.tmpl
index 63e09e419..86ace3f51 100644
--- a/template/en/default/extensions/hook-readme.txt.tmpl
+++ b/template/en/default/extensions/hook-readme.txt.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 Template hooks go in this directory. Template hooks are called in normal
-[%+ terms.Bugzilla %] templates like [[% '%' %] Hook.process('some-hook') %].
+Bugzilla templates like [[% '%' %] Hook.process('some-hook') %].
 More information about them can be found in the documentation of 
-B[% %]ugzilla::Extension. (Do "perldoc B[% %]ugzilla::Extension" from the main
-[%+ terms.Bugzilla %] directory to see that documentation.)
+Bugzilla::Extension. (Do "perldoc Bugzilla::Extension" from the main
+Bugzilla directory to see that documentation.)
diff --git a/template/en/default/extensions/name-readme.txt.tmpl b/template/en/default/extensions/name-readme.txt.tmpl
index 5403bab7f..e09f86c96 100644
--- a/template/en/default/extensions/name-readme.txt.tmpl
+++ b/template/en/default/extensions/name-readme.txt.tmpl
@@ -9,8 +9,8 @@
 Normal templates go in this directory. You can load them in your
 code like this:
 
-use B[% %]ugzilla::Error;
-my $template = B[% %]ugzilla->template;
+use Bugzilla::Error;
+my $template = Bugzilla->template;
 $template->process('[% name FILTER lower %]/some-template.html.tmpl')
   or ThrowTemplateError($template->error());
 
@@ -18,7 +18,7 @@ That would be how to load a file called some-template.html.tmpl that
 was in this directory.
 
 Note that you have to be careful that the full path of your template
-never conflicts with a template that exists in [% terms.Bugzilla %] or in 
+never conflicts with a template that exists in Bugzilla or in 
 another extension, or your template might override that template. That's why
 we created this directory called '[% name FILTER lower %]' for you, so you
 can put your templates in here to help avoid conflicts.
diff --git a/template/en/default/extensions/util.pm.tmpl b/template/en/default/extensions/util.pm.tmpl
index 3493007f4..a5fbde04d 100644
--- a/template/en/default/extensions/util.pm.tmpl
+++ b/template/en/default/extensions/util.pm.tmpl
@@ -12,7 +12,7 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %]::Util;
+package Bugzilla::Extension::[% name %]::Util;
 
 use 5.10.1;
 use strict;
@@ -22,7 +22,7 @@ our @EXPORT = qw(
 );
 
 # This file can be loaded by your extension via 
-# "use B[% %]ugzilla::Extension::[% name %]::Util". You can put functions
+# "use Bugzilla::Extension::[% name %]::Util". You can put functions
 # used by your extension in here. (Make sure you also list them in
 # @EXPORT.)