From e6acfe2ddff74715b097684bebf2d4ee50ff3f11 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <>
Date: Tue, 24 Jul 2007 23:22:01 +0000
Subject: Bug 345970 Avoid using the string 'the web' patch by
 jhulten@tragicallyleet.com r=timeless I've updated it to trunk r=lpsolit
 a=lpsolit

---
 Bugzilla/Attachment.pm          |  2 +-
 Bugzilla/CGI.pm                 |  2 +-
 Bugzilla/Constants.pm           |  2 +-
 Bugzilla/Install/Filesystem.pm  | 10 +++++-----
 Bugzilla/Install/Localconfig.pm |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 5f669deb3..893c46682 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -815,7 +815,7 @@ sub insert_attachment_for_bug {
     $sth->bind_param(1, $data, $dbh->BLOB_TYPE);
     $sth->execute();
 
-    # If the file is to be stored locally, stream the file from the webserver
+    # If the file is to be stored locally, stream the file from the web server
     # to the local file without reading it into a local variable.
     if ($cgi->param('bigfile')) {
         my $attachdir = bz_locations()->{'attachdir'};
diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index b4e2aca6c..ef2cb70f5 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -45,7 +45,7 @@ use Bugzilla::Util;
 $| = 1;
 
 # Ignore SIGTERM and SIGPIPE - this prevents DB corruption. If the user closes
-# their browser window while a script is running, the webserver sends these
+# their browser window while a script is running, the web server sends these
 # signals, and we don't want to die half way through a write.
 $::SIG{TERM} = 'IGNORE';
 $::SIG{PIPE} = 'IGNORE';
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index d811796d0..b7d0908ec 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -436,7 +436,7 @@ sub bz_locations {
         'datadir'     => "$libpath/$datadir",
         'attachdir'   => "$libpath/$datadir/attachments",
         'skinsdir'    => "$libpath/skins",
-        # $webdotdir must be in the webtree somewhere. Even if you use a 
+        # $webdotdir must be in the web server's tree somewhere. Even if you use a 
         # local dot, we output images to there. Also, if $webdotdir is 
         # not relative to the bugzilla root directory, you'll need to 
         # change showdependencygraph.cgi to set image_url to the correct 
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 348f197b6..05da26336 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -86,7 +86,7 @@ sub FILESYSTEM {
     my $owner_dir_readable = 0700;
     # Writeable by the web server.
     my $ws_dir_writeable = $ws_group ? 0770 : 01777;
-    # The webserver can overwrite files owned by other users, 
+    # The web server can overwrite files owned by other users, 
     # in this directory.
     my $ws_dir_full_control = $ws_group ? 0770 : 0777;
 
@@ -275,13 +275,13 @@ Deny from all
 EOT
         },
 
-        # Even though $datadir may not (and should not) be in the webtree,
-        # we can't know for sure, so create the .htaccess anyway. It's harmless
-        # if it's not accessible...
+        # Even though $datadir may not (and should not) be accessible from the 
+        # web server, we can't know for sure, so create the .htaccess anyway. 
+        # It's harmless if it isn't accessible...
         "$datadir/.htaccess" => { perms    => $ws_readable, contents => <<EOT
 # Nothing in this directory is retrievable unless overridden by an .htaccess
 # in a subdirectory; the only exception is duplicates.rdf, which is used by
-# duplicates.xul and must be loadable over the web
+# duplicates.xul and must be accessible from the web server
 deny from all
 <Files duplicates.rdf>
   allow from all
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index ed502d8a7..bfdb0ce94 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -50,7 +50,7 @@ use constant LOCALCONFIG_VARS => (
         desc    => <<EOT
 # If you are using Apache as your web server, Bugzilla can create .htaccess
 # files for you that will instruct Apache not to serve files that shouldn't
-# be accessed from the web (like your local configuration data and non-cgi
+# be accessed from the web browser (like your local configuration data and non-cgi
 # executable files).  For this to work, the directory your Bugzilla
 # installation is in must be within the jurisdiction of a <Directory> block
 # in the httpd.conf file that has 'AllowOverride Limit' in it.  If it has
-- 
cgit v1.2.3-24-g4f1b