summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--defparams.pl10
-rwxr-xr-xsanitycheck.cgi2
2 files changed, 6 insertions, 6 deletions
diff --git a/defparams.pl b/defparams.pl
index 47edf8a1a..5b26ef4f9 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -607,7 +607,7 @@ sub find_languages {
<dl>
<dt>DB</dt>
<dd>
- Bugzilla\'s builtin authentication. This is the most common
+ Bugzilla\'s built-in authentication. This is the most common
choice.
</dd>
<dt>LDAP</dt>
@@ -736,7 +736,7 @@ To use the wonders of Bugzilla, you can use the following:
name => 'newchangedmail',
desc => 'The email that gets sent to people when a bug changes. Within ' .
'this text, %to% gets replaced with the e-mail address of the ' .
- 'person recieving the mail. %bugid% gets replaced by the bug ' .
+ 'person receiving the mail. %bugid% gets replaced by the bug ' .
'number. %diffs% gets replaced with what\'s changed. ' .
'%neworchanged% is "New:" if this mail is reporting a new bug or ' .
'empty if changes were made to an existing one. %summary% gets ' .
@@ -966,7 +966,7 @@ You will get this message once a day until you\'ve dealt with these bugs!
package</a> will generate the graphs remotely.</li>
<li>A blank value will disable dependency graphing.</li>
</ul>
- The default value is a publically-accessible webdot server. If you change
+ The default value is a publicly-accessible webdot server. If you change
this value, make certain that the webdot server can read files from your
webdot directory. On Apache you do this by editing the .htaccess file,
for other systems the needed measures may vary. You can run checksetup.pl
@@ -989,7 +989,7 @@ You will get this message once a day until you\'ve dealt with these bugs!
{
name => 'emailregexpdesc',
- desc => 'This describes in english words what kinds of legal addresses ' .
+ desc => 'This describes in English words what kinds of legal addresses ' .
'are allowed by the <tt>emailregexp</tt> param.',
type => 'l',
default => 'A legal address must contain exactly one \'@\', and at least ' .
@@ -1028,7 +1028,7 @@ You will get this message once a day until you\'ve dealt with these bugs!
'why the vote(s) were removed. %votesremoved%, %votesold% and ' .
'%votesnew% is the number of votes removed, before and after ' .
'respectively. %votesremovedtext%, %votesoldtext% and ' .
- '%votesnewtext% are these as sentences, eg "You had 2 votes on ' .
+ '%votesnewtext% are these as sentences, e.g. "You had 2 votes on ' .
'this bug." %count% is also supported for backwards ' .
'compatibility. %<i>anythingelse</i>% gets replaced by the ' .
'definition of that parameter (as defined on this page).',
diff --git a/sanitycheck.cgi b/sanitycheck.cgi
index ae202dfe9..c091e1041 100755
--- a/sanitycheck.cgi
+++ b/sanitycheck.cgi
@@ -777,7 +777,7 @@ BugCheck("bugs WHERE bug_status = 'UNCONFIRMED' AND everconfirmed = 1",
"Bugs that are UNCONFIRMED but have everconfirmed set");
# The below list of resolutions is hardcoded because we don't know if future
# resolutions will be confirmed, unconfirmed or maybeconfirmed. I suspect
-# they will be maybeconfirmed, eg ASLEEP and REMIND. This hardcoding should
+# they will be maybeconfirmed, e.g. ASLEEP and REMIND. This hardcoding should
# disappear when we have customised statuses.
BugCheck("bugs WHERE bug_status IN ('NEW', 'ASSIGNED', 'REOPENED') AND everconfirmed = 0",
"Bugs with confirmed status but don't have everconfirmed set");