From: klemens <ka7@la-evento.com>
Date: Tue, 9 Jan 2018 19:13:37 +0000 (-0500)
Subject: Bug 1428580 - Various spelling fixes. r=mcote
X-Git-Tag: release-5.1.2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08a36175baba18d37a733caa17a450ebe9364113;p=thirdparty%2Fbugzilla.git

Bug 1428580 - Various spelling fixes. r=mcote
---

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 5a57dbab2a..ea15aafca4 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -758,7 +758,7 @@ Note that items accessible via this object are demand-loaded when requested.
 
 For something to be added to this object, it should either be able to benefit
 from persistence when run under mod_perl (such as the a C<template> object),
-or should be something which is globally required by a large ammount of code
+or should be something which is globally required by a large amount of code
 (such as the current C<user> object).
 
 =head1 METHODS
diff --git a/Bugzilla/API/1_0/Resource/Bug.pm b/Bugzilla/API/1_0/Resource/Bug.pm
index b0182a5e3d..2c62139a40 100644
--- a/Bugzilla/API/1_0/Resource/Bug.pm
+++ b/Bugzilla/API/1_0/Resource/Bug.pm
@@ -1083,7 +1083,7 @@ sub update_attachment {
             $attachment->set_flags($update_flags, $new_flags) if $flags;
         }
         elsif (scalar @$update_flags && !scalar(@$new_flags) && !scalar keys %$params) {
-            # Requestees can set flags targetted to them, even if they cannot
+            # Requestees can set flags targeted to them, even if they cannot
             # edit the attachment. Flag setters can edit their own flags too.
             my %flag_list = map { $_->{id} => $_ } @$update_flags;
             my $flag_objs = Bugzilla::Flag->new_from_list([ keys %flag_list ]);
@@ -1653,7 +1653,7 @@ for each field.
 
 =item B<REST>
 
-You have several options for retreiving information about fields. The first
+You have several options for retrieving information about fields. The first
 part is the request method and the rest is the related path needed.
 
 To get information about all fields:
@@ -4262,7 +4262,7 @@ the default for the product, when you move a bug to a new product.
 You may also wish to add or remove groups, as which groups are
 valid on a bug depends on the product. Groups that are not valid
 in the new product will be automatically removed, and groups which
-are mandatory in the new product will be automaticaly added, but no
+are mandatory in the new product will be automatically added, but no
 other automatic group changes will be done.
 
 Note that users can only move a bug into a product if they would
@@ -4756,7 +4756,7 @@ GET /rest/bug/comment/tags/<query>
 
 =item C<query>
 
-B<Required> C<string> Only tags containg this substring will be returned.
+B<Required> C<string> Only tags containing this substring will be returned.
 
 =item C<limit>
 
diff --git a/Bugzilla/API/1_0/Resource/FlagType.pm b/Bugzilla/API/1_0/Resource/FlagType.pm
index febce6f717..acc408bacb 100644
--- a/Bugzilla/API/1_0/Resource/FlagType.pm
+++ b/Bugzilla/API/1_0/Resource/FlagType.pm
@@ -389,7 +389,7 @@ Get information about valid flag types that can be set for bugs and attachments.
 
 =item B<REST>
 
-You have several options for retreiving information about flag types. The first
+You have several options for retrieving information about flag types. The first
 part is the request method and the rest is the related path needed.
 
 To get information about all flag types for a product:
diff --git a/Bugzilla/API/1_0/Resource/User.pm b/Bugzilla/API/1_0/Resource/User.pm
index e049f7f38b..e8e4a73798 100644
--- a/Bugzilla/API/1_0/Resource/User.pm
+++ b/Bugzilla/API/1_0/Resource/User.pm
@@ -1179,7 +1179,7 @@ in Bugzilla B<4.4>.
 =item B<Description>
 
 Allows for validating a user's API key, token, or username and password.
-If sucessfully authenticated, it returns simple information about the
+If successfully authenticated, it returns simple information about the
 logged in user.
 
 =item B<Params> (none)
diff --git a/Bugzilla/API/Server.pm b/Bugzilla/API/Server.pm
index a423f2f424..185d084308 100644
--- a/Bugzilla/API/Server.pm
+++ b/Bugzilla/API/Server.pm
@@ -281,7 +281,7 @@ sub _check_version {
         return DEFAULT_API_VERSION;
     }
 
-    # If we using an extension API, we need to determing which version of
+    # If we using an extension API, we need to determining which version of
     # the Core API it was written for.
     if (lc($namespace) ne 'core') {
         my $core_api_version;
diff --git a/Bugzilla/Auth.pm b/Bugzilla/Auth.pm
index d693bf12d3..9322be24bb 100644
--- a/Bugzilla/Auth.pm
+++ b/Bugzilla/Auth.pm
@@ -153,7 +153,7 @@ sub _handle_login_result {
 
     if (!$fail_code) {
         # We don't persist logins over GET requests in the WebService,
-        # because the persistance information can't be re-used again.
+        # because the persistence information can't be re-used again.
         # (See Bugzilla::WebService::Server::JSONRPC for more info.)
         if ($self->{_info_getter}->{successful}->requires_persistence
             and !Bugzilla->request_cache->{auth_no_automatic_login}) 
diff --git a/Bugzilla/Auth/Verify/LDAP.pm b/Bugzilla/Auth/Verify/LDAP.pm
index 2ff38a2179..0e6b0ddfe1 100644
--- a/Bugzilla/Auth/Verify/LDAP.pm
+++ b/Bugzilla/Auth/Verify/LDAP.pm
@@ -102,7 +102,7 @@ sub check_credentials {
         $params->{email} = $emails[0];
 
         if (@emails > 1) {
-            # Cycle through the adresses and check if they're Bugzilla logins.
+            # Cycle through the addresses and check if they're Bugzilla logins.
             # Use the first one that returns a valid id. 
             foreach my $email (@emails) {
                 if ( email_to_id($email) ) {
diff --git a/Bugzilla/BugUserLastVisit.pm b/Bugzilla/BugUserLastVisit.pm
index 1b4f90abf1..0e1c006b7d 100644
--- a/Bugzilla/BugUserLastVisit.pm
+++ b/Bugzilla/BugUserLastVisit.pm
@@ -14,7 +14,7 @@ use warnings;
 use parent qw(Bugzilla::Object);
 
 #####################################################################
-# Overriden Constants that are used as methods
+# Overridden Constants that are used as methods
 #####################################################################
 
 use constant DB_TABLE       => 'bug_user_last_visit';
diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index edfc7ba70f..766dabc802 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -479,7 +479,7 @@ sub redirect_search_url {
     # If there is no parameter, there is nothing to do.
     return unless $self->param;
 
-    # If we're retreiving an old list, we never need to redirect or
+    # If we're retrieving an old list, we never need to redirect or
     # do anything related to Bugzilla::Search::Recent.
     return if $self->param('regetlastlist');
 
@@ -650,7 +650,7 @@ Bugzilla::CGI - CGI handling for Bugzilla
 
 This package inherits from the standard CGI module, to provide additional
 Bugzilla-specific functionality. In general, see L<the CGI.pm docs|CGI> for
-documention.
+documentation.
 
 =head1 CHANGES FROM L<CGI.PM|CGI>
 
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index 8bd774b709..0f13240805 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -35,7 +35,7 @@ use File::Basename;
   );
 Exporter::export_ok_tags('admin');
 
-# new installs get these set of defaults (unless overriden by the answers file)
+# new installs get these set of defaults (unless overridden by the answers file)
 my %NEW_INSTALL_DEFAULT = (
     or_groups          => 1,
     use_email_as_login => 0,
diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index e6e0d4a233..633325291a 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -472,7 +472,7 @@ in the relevant F<Bugzilla::Config::*> package.
 =item C<check_multi>
 
 Checks that a multi-valued parameter (ie types C<s>, C<o> or C<m>) satisfies
-its contraints.
+its constraints.
 
 =item C<check_numeric>
 
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 51d736f273..ec5d1ed96d 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -1868,7 +1868,7 @@ Formatted SQL for negative regular expression search (e.g. NOT REGEXP)
 =item B<Description>
 
 Returns SQL syntax for limiting results to some number of rows
-with optional offset if not starting from the begining.
+with optional offset if not starting from the beginning.
 
 Abstract method, should be overridden by database specific code.
 
@@ -2012,7 +2012,7 @@ Formatted SQL for adding or subtracting a date and some amount of time (scalar)
 =item B<Description>
 
 Outputs proper SQL syntax determining position of a substring
-(fragment) withing a string (text). Note: if the substring or
+(fragment) within a string (text). Note: if the substring or
 text are string constants, they must be properly quoted (e.g. "'pattern'").
 
 It searches for the string in a case-sensitive manner. If you want to do
@@ -2101,7 +2101,7 @@ This is a case insensitive search.
 
 =item B<Returns>
 
-Formated sql to return results from columns that do not contain the fragment
+Formatted sql to return results from columns that do not contain the fragment
 
 =back
 
@@ -2190,7 +2190,7 @@ specified text on a given column.
 
 If one value is returned, it is a numeric expression that indicates
 a match with a positive value and a non-match with zero. In this case,
-the DB must support casting numeric expresions to booleans.
+the DB must support casting numeric expressions to booleans.
 
 If two values are returned, then the first value is a boolean expression
 that indicates the presence of a match, and the second value is a numeric
@@ -2762,7 +2762,7 @@ Returns nothing and takes no parameters.
 
 =item C<bz_commit_transaction>
 
-Ends a transaction, commiting all changes. Returns nothing and takes
+Ends a transaction, committing all changes. Returns nothing and takes
 no parameters.
 
 =item C<bz_rollback_transaction>
diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index 28b6e8c745..981f1dbf17 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -54,7 +54,7 @@ sub new {
     # and there is no default DB.
     $dbname ||= Bugzilla->localconfig->{db_name};
 
-    # Set the language enviroment
+    # Set the language environment
     $ENV{'NLS_LANG'} = '.AL32UTF8';
 
     # construct the DSN from the parameters we got
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 062dd73f4a..0a31c8d1af 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -1971,7 +1971,7 @@ sub get_type_ddl {
 
 Public method to convert abstract (database-generic) field specifiers to
 database-specific data types suitable for use in a C<CREATE TABLE> or 
-C<ALTER TABLE> SQL statment. If no database-specific field type has been
+C<ALTER TABLE> SQL statement. If no database-specific field type has been
 defined for the given field type, then it will just return the same field type.
 
 =item B<Parameters>
diff --git a/Bugzilla/DB/Sqlite.pm b/Bugzilla/DB/Sqlite.pm
index 0ba3bd9c86..cd31065be5 100644
--- a/Bugzilla/DB/Sqlite.pm
+++ b/Bugzilla/DB/Sqlite.pm
@@ -73,7 +73,7 @@ sub new {
     my ($class, $params) = @_;
     my $db_name = $params->{db_name};
     
-    # Let people specify paths intead of data/ for the DB.
+    # Let people specify paths instead of data/ for the DB.
     if ($db_name and $db_name !~ m{[\\/]}) {
         # When the DB is first created, there's a chance that the
         # data directory doesn't exist at all, because the Install::Filesystem
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index e9f9e1b2d3..a43fb55e58 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -987,7 +987,7 @@ sub remove_from_db {
 
     my $type = $self->type;
 
-    # the values for multi-select are stored in a seperate table
+    # the values for multi-select are stored in a separate table
     if ($type != FIELD_TYPE_MULTI_SELECT) {
         $dbh->bz_drop_column('bugs', $name);
     }
diff --git a/Bugzilla/Hook.pm b/Bugzilla/Hook.pm
index 3f902cab07..82a342767c 100644
--- a/Bugzilla/Hook.pm
+++ b/Bugzilla/Hook.pm
@@ -1757,7 +1757,7 @@ they have been obtained from the URL or body of the request.
 =head2 webservice_rest_request
 
 This hook allows for altering any of the parameters provided by the client
-after authentication has occured. You are able to change things like renaming
+after authentication has occurred. You are able to change things like renaming
 of keys, removing values, or adding additional information.
 
 Params:
diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index fe5776175d..80820dcc68 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -431,7 +431,7 @@ sub _template_base_directories {
     # that Bugzilla templates are localized.
     #
     # We use extension_requirement_packages instead of Bugzilla->extensions
-    # because this fucntion is called during the requirements phase of 
+    # because this function is called during the requirements phase of 
     # installation (so Bugzilla->extensions isn't available).
     my $extensions = extension_requirement_packages();
     my @template_dirs;
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index c1e3adee32..b932a23c8e 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -2766,7 +2766,7 @@ containing the user's recent searches.
 =item C<recent_search_containing(bug_id)>
 
 Returns a L<Bugzilla::Search::Recent> object that contains the most recent
-search by the user for the specified bug id. Retuns undef if no match is found.
+search by the user for the specified bug id. Returns undef if no match is found.
 
 =item C<recent_search_for(bug)>
 
diff --git a/Bugzilla/User/APIKey.pm b/Bugzilla/User/APIKey.pm
index 6a5124a3ce..41a091193e 100644
--- a/Bugzilla/User/APIKey.pm
+++ b/Bugzilla/User/APIKey.pm
@@ -17,7 +17,7 @@ use Bugzilla::User;
 use Bugzilla::Util qw(generate_random_password trim);
 
 #####################################################################
-# Overriden Constants that are used as methods
+# Overridden Constants that are used as methods
 #####################################################################
 
 use constant DB_TABLE       => 'user_api_keys';
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index d137000a9f..82676b0b62 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -958,7 +958,7 @@ sub update_attachment {
             $attachment->set_flags($update_flags, $new_flags) if $flags;
         }
         elsif (scalar @$update_flags && !scalar(@$new_flags) && !scalar keys %$params) {
-            # Requestees can set flags targetted to them, even if they cannot
+            # Requestees can set flags targeted to them, even if they cannot
             # edit the attachment. Flag setters can edit their own flags too.
             my %flag_list = map { $_->{id} => $_ } @$update_flags;
             my $flag_objs = Bugzilla::Flag->new_from_list([ keys %flag_list ]);
@@ -1546,7 +1546,7 @@ for each field.
 
 =item B<REST>
 
-You have several options for retreiving information about fields. The first
+You have several options for retrieving information about fields. The first
 part is the request method and the rest is the related path needed.
 
 To get information about all fields:
@@ -4194,7 +4194,7 @@ the default for the product, when you move a bug to a new product.
 You may also wish to add or remove groups, as which groups are
 valid on a bug depends on the product. Groups that are not valid
 in the new product will be automatically removed, and groups which
-are mandatory in the new product will be automaticaly added, but no
+are mandatory in the new product will be automatically added, but no
 other automatic group changes will be done.
 
 Note that users can only move a bug into a product if they would
@@ -4694,7 +4694,7 @@ GET /rest/bug/comment/tags/<query>
 
 =item C<query>
 
-B<Required> C<string> Only tags containg this substring will be returned.
+B<Required> C<string> Only tags containing this substring will be returned.
 
 =item C<limit>
 
diff --git a/Bugzilla/WebService/FlagType.pm b/Bugzilla/WebService/FlagType.pm
index 8fa29b8d0b..4c626914fa 100644
--- a/Bugzilla/WebService/FlagType.pm
+++ b/Bugzilla/WebService/FlagType.pm
@@ -339,7 +339,7 @@ Get information about valid flag types that can be set for bugs and attachments.
 
 =item B<REST>
 
-You have several options for retreiving information about flag types. The first
+You have several options for retrieving information about flag types. The first
 part is the request method and the rest is the related path needed.
 
 To get information about all flag types for a product:
diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index 602e7e2cc3..98323d4e18 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -1149,7 +1149,7 @@ in Bugzilla B<4.4>.
 =item B<Description>
 
 Allows for validating a user's API key, token, or username and password.
-If sucessfully authenticated, it returns simple information about the
+If successfully authenticated, it returns simple information about the
 logged in user.
 
 =item B<Params> (none)
diff --git a/Makefile.PL b/Makefile.PL
index 1d78e5e784..3f8cbc9452 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -32,7 +32,7 @@ BEGIN {
 
 # META.json and META.yml exist only for the benefit of older
 # installs where cpanm can't get the optional features out of Makefile.PL
-# Unfortunately having META.json and META.yml commited to the repo is weird
+# Unfortunately having META.json and META.yml committed to the repo is weird
 # and MakeMaker always prefers their content to the internal data (unless CPAN::META
 # is not installed).
 # Since we (Bugzilla) require this cludge, we hide the files from MakeMaker.
diff --git a/docs/en/rst/api/core/v1/attachment.rst b/docs/en/rst/api/core/v1/attachment.rst
index 08bbaa088a..65f862ff0a 100644
--- a/docs/en/rst/api/core/v1/attachment.rst
+++ b/docs/en/rst/api/core/v1/attachment.rst
@@ -94,7 +94,7 @@ creator           string    The login name of the user that created the
                             attachment.
 flags             array     Array of objects, each containing the information
                             about the flag currently set for each attachment.
-                            Each flag object contains items descibed in the
+                            Each flag object contains items described in the
                             Flag object below.
 ================  ========  =====================================================
 
diff --git a/docs/en/rst/api/core/v1/bug.rst b/docs/en/rst/api/core/v1/bug.rst
index b842557797..9c62802b65 100644
--- a/docs/en/rst/api/core/v1/bug.rst
+++ b/docs/en/rst/api/core/v1/bug.rst
@@ -915,7 +915,7 @@ product                string   The name of the product that the bug is in. If
                                 valid on a bug depends on the product. Groups
                                 that are not valid in the new product will be
                                 automatically removed, and groups which are
-                                mandatory in the new product will be automaticaly
+                                mandatory in the new product will be automatically
                                 added, but no other automatic group changes will
                                 be done.
 
diff --git a/docs/en/rst/api/core/v1/comment.rst b/docs/en/rst/api/core/v1/comment.rst
index f015491b43..5160495eaf 100644
--- a/docs/en/rst/api/core/v1/comment.rst
+++ b/docs/en/rst/api/core/v1/comment.rst
@@ -221,7 +221,7 @@ Example:
 =========  ======  ====================================================
 name       type    description
 =========  ======  ====================================================
-**query**  string  Only tags containg this substring will be returned.
+**query**  string  Only tags containing this substring will be returned.
 limit      int     If provided will return no more than ``limit`` tags.
                    Defaults to ``10``.
 =========  ======  ====================================================
diff --git a/docs/en/rst/api/core/v1/user.rst b/docs/en/rst/api/core/v1/user.rst
index 3e3f64bd6a..3942e50740 100644
--- a/docs/en/rst/api/core/v1/user.rst
+++ b/docs/en/rst/api/core/v1/user.rst
@@ -436,7 +436,7 @@ Who Am I
 --------
 
 Allows for validating a user's API key, token, or username and password.
-If sucessfully authenticated, it returns simple information about the
+If successfully authenticated, it returns simple information about the
 logged in user.
 
 **Request**
diff --git a/docs/en/rst/integrating/faq.rst b/docs/en/rst/integrating/faq.rst
index 19f8b59ffa..1b33e9623b 100644
--- a/docs/en/rst/integrating/faq.rst
+++ b/docs/en/rst/integrating/faq.rst
@@ -8,7 +8,7 @@ How do I...
 
 ...add a new field on a bug?
   Use :ref:`custom-fields` or, if you just want new form fields on bug entry
-  but don't need Bugzilla to track the field seperately thereafter, you can
+  but don't need Bugzilla to track the field separately thereafter, you can
   use a :ref:`custom bug entry form <custom-bug-entry>`.
 
 ...change the name of a built-in bug field?
diff --git a/extensions/Example/Config.pm b/extensions/Example/Config.pm
index 02ed01e77a..5f95d0b8bd 100644
--- a/extensions/Example/Config.pm
+++ b/extensions/Example/Config.pm
@@ -29,7 +29,7 @@ use constant OPTIONAL_MODULES => [
     },
 ];
 
-# The map determines which verion of
+# The map determines which version of
 # the Core API an extension's API modules
 # were written to work with.
 use constant API_VERSION_MAP => {
diff --git a/migrate.pl b/migrate.pl
index 25b39b4141..0ce82f2a3f 100755
--- a/migrate.pl
+++ b/migrate.pl
@@ -95,5 +95,5 @@ the size of all attachments in your current bug-tracker.
 
 You may also need to increase the number of file handles a process is allowed
 to hold open (as the migrator will create a file handle for each attachment
-in your database). On Linux and simliar systems, you can do this as root
+in your database). On Linux and similar systems, you can do this as root
 by typing C<ulimit -n 65535> before running your script.
diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl
index 7e6617a848..4151b2e465 100644
--- a/template/en/default/admin/keywords/edit.html.tmpl
+++ b/template/en/default/admin/keywords/edit.html.tmpl
@@ -27,7 +27,7 @@
       <td><input id="is_active" name="is_active" type="checkbox" [% "checked" IF keyword.is_active %]></td>
     </tr>
     <tr>
-      <th><label for="decription">Description:</label></th>
+      <th><label for="description">Description:</label></th>
       <td>
         [% INCLUDE global/textarea.html.tmpl
           id             = 'description'
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index 79fa8123be..5f8de90087 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -132,7 +132,7 @@
     "If set, $terms.Bugzilla will check that the password meets the current " _
     "complexity rules and minimum length requirements  when the user logs " _
     "into the $terms.Bugzilla web interface. If it doesn't, the user would " _
-    "not be able to log in, and recieve a message to reset their password.",
+    "not be able to log in, and receive a message to reset their password.",
 
    auth_delegation =>
     "If set, $terms.Bugzilla will allow third party applications " _
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 4aec94f16f..13b31e3e68 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -326,7 +326,7 @@
 
   [% ELSIF message_tag == "flag_creation_failed" %]
     [% title = "Flag Creation Failure" %]
-    An error occured while validating flags:
+    An error occurred while validating flags:
     [%+ flag_creation_error FILTER none %]
 
   [% ELSIF message_tag == "get_field_desc" %]
@@ -520,7 +520,7 @@
     [% title = "Milestone Deleted" %]
     The milestone <em>[% milestone.name FILTER html %]</em> has been deleted.
     [% IF milestone.bug_count %]
-      [%+ terms.Bugs %] targetted to this milestone have been retargetted to
+      [%+ terms.Bugs %] targeted to this milestone have been retargetted to
       the default milestone <em>[% product.default_milestone FILTER html %]</em>.
     [% END %]
 
diff --git a/template/en/default/pages/markdown.html.tmpl b/template/en/default/pages/markdown.html.tmpl
index 5b01ed43de..04d81711a6 100644
--- a/template/en/default/pages/markdown.html.tmpl
+++ b/template/en/default/pages/markdown.html.tmpl
@@ -224,7 +224,7 @@
   you can define links with link texts and titles. You may define your links
   either as inline or as a reference. To define a link as inline, put your link
   text in square bracket immediately followed by a pair of parentheses which
-  containts the URL that you want your link to point to and an <em>optional</em>
+  contains the URL that you want your link to point to and an <em>optional</em>
   link title surrounded by quotes.
 
   <p>
diff --git a/xt/rest/bugzilla.t b/xt/rest/bugzilla.t
index 9878c1ce87..7fcfff2d51 100644
--- a/xt/rest/bugzilla.t
+++ b/xt/rest/bugzilla.t
@@ -33,7 +33,7 @@ ok(scalar(@ext_names), scalar(@ext_names) . ' extension(s) found: ' . join(', ',
 ok($extensions->{QA}, 'The QA extension is enabled, with version ' . $extensions->{QA}->{version});
 
 my $timezone = $rest->call('timezone')->{timezone};
-ok($timezone, "GET /rest/timezone retuns $timezone");
+ok($timezone, "GET /rest/timezone returns $timezone");
 
 my $time = $rest->call('time');
 foreach my $type (qw(db_time web_time)) {
diff --git a/xt/selenium/user_matching.t b/xt/selenium/user_matching.t
index 26b9e009ef..63f57820ac 100644
--- a/xt/selenium/user_matching.t
+++ b/xt/selenium/user_matching.t
@@ -178,7 +178,7 @@ ok(!grep($_ =~ /$config->{canconfirm_user_login}/, @cc), "$config->{canconfirm_u
 ok(grep($_ =~ /$config->{admin_user_login}/, @cc), "$config->{admin_user_login} is visible");
 ok(grep($_ =~ /$config->{tweakparams_user_login}/, @cc), "$config->{tweakparams_user_login} is visible");
 
-# Reset paramters.
+# Reset parameters.
 
 set_parameters($sel, { "User Matching"  => {"usemenuforusers-off" => undef,
                                             "maxusermatches"      => {type => 'text', value => '0'},
diff --git a/xt/webservice/bugzilla.t b/xt/webservice/bugzilla.t
index 594d5e66b7..00c4fc27ac 100644
--- a/xt/webservice/bugzilla.t
+++ b/xt/webservice/bugzilla.t
@@ -27,7 +27,7 @@ foreach my $rpc (@clients) {
 
     my $tz_call = $rpc->bz_call_success('Bugzilla.timezone');
     my $tz = $tz_call->result->{timezone};
-    ok($tz, "Bugzilla.timezone retuns $tz");
+    ok($tz, "Bugzilla.timezone returns $tz");
 
     my $ext_call = $rpc->bz_call_success('Bugzilla.extensions');
     my $extensions = $ext_call->result->{extensions};