From a8f2cd5865bc922c54c49b2069f94f436e3f674e Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Sat, 29 Jan 2005 00:43:41 +0000
Subject: [PATCH] Assorted spelling and typo fixes

---
 CODING_STANDARD            | 4 ++--
 admin/adminAppQueue.php    | 4 ++--
 admin/adminCommentView.php | 2 +-
 admin/editAppFamily.php    | 2 +-
 help/appdb_faq.help        | 2 +-
 help/generic.help          | 2 +-
 help/privacy.help          | 2 +-
 help/ratings.help          | 2 +-
 include/config.php.sample  | 2 +-
 include/incl.php           | 4 ++--
 include/user.php           | 8 ++++----
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/CODING_STANDARD b/CODING_STANDARD
index e9f102e..b65d33d 100644
--- a/CODING_STANDARD
+++ b/CODING_STANDARD
@@ -72,8 +72,8 @@ if(!isset($appId))
  3) it makes it easier to understand where your vars are comming from (forms, session, etc.)
 
 - variables naming
-variables that don't come from outside your script (i.e. that arent fetched from superglobals) should be named this way 
-(a.k.a hungariant notation):
+variables that don't come from outside your script (i.e. that aren't fetched from superglobals) should be named this way 
+(a.k.a hungarian notation):
 prefix + var_name
 
 Where prefix is one of:
diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php
index e901d5c..7bed61b 100644
--- a/admin/adminAppQueue.php
+++ b/admin/adminAppQueue.php
@@ -58,8 +58,8 @@ if ($_REQUEST['sub'])
             echo "an email will be sent to the author of the submission.<p>\n";
 
             echo "      <b>App Version</b> This type of application will be nested under the selected application parent.\n";
-            echo "<p>Click delete to remove the selected item from the queue. An email will automatically be sent to the\n";
-            echo "submitter to let them know the item was deleted.</p>\n\n";        
+            echo "<p>Click delete to remove the selected item from the queue an email will automatically be sent to the\n";
+            echo "submitter to let him know the item was deleted.</p>\n\n";        
             echo "</td></tr></table></div>\n\n";    
 
             echo '<input type=hidden name=type value="ver">',"\n"; 
diff --git a/admin/adminCommentView.php b/admin/adminCommentView.php
index e9c4d4b..776ab7a 100644
--- a/admin/adminCommentView.php
+++ b/admin/adminCommentView.php
@@ -70,7 +70,7 @@ display_range($currentPage, $pageRange, $totalPages, $commentsPerPage);
 echo "<br />";
 echo "<br />";
 
-/* display the option to choose how many comments per-page to disable */
+/* display the option to choose how many comments per-page to display */
 echo "<form method=\"get\" name=\"message\" action=\"".$_SERVER['PHP_SELF']."\">";
 echo "<b>Number of comments per page:</b>";
 echo "<select name='commentsPerPage'>";
diff --git a/admin/editAppFamily.php b/admin/editAppFamily.php
index 882c1c1..2a73dff 100644
--- a/admin/editAppFamily.php
+++ b/admin/editAppFamily.php
@@ -136,7 +136,7 @@ if(isset($_REQUEST['submit']))
             }
         }
         
-        // Process changed URL's
+        // Process changed URLs
         
         for($i = 0; $i < $_REQUEST['rows']; $i++)
         {
diff --git a/help/appdb_faq.help b/help/appdb_faq.help
index 97a5ce8..5a52b4c 100644
--- a/help/appdb_faq.help
+++ b/help/appdb_faq.help
@@ -51,7 +51,7 @@ reviewed and categorized by a maintainer.</p>
 
 <p><b>Q: How can I submit HowTo's and Screenshots?</b></p>
 <blockquote>
-<p><b>A:</b> We love to hear from our users. Send those helpful HowTo's and
+<p><b>A:</b> We love to hear from our users. Send those helpful HowTos and
 Screenshots right on over to <a href="mailto:appdb@winehq.org">appdb@winehq.org</a>.
 We'll be happy to post them, and give you proper credit for your great contribution.</p>
 </blockquote>
diff --git a/help/generic.help b/help/generic.help
index f787f1c..234f067 100644
--- a/help/generic.help
+++ b/help/generic.help
@@ -59,7 +59,7 @@ or <a href="http://pan.rebelbase.com/">Pan</a>. or via the web at
 
 <li><a href="http://www.freenode.net">Freenode.net</a> hosts a chat room for
 Wine. You can access the chat room using an IRC program such as
-<a href="http://www.xchat.org/">X-Chat</a>. Use the settings listed below.</li><p>
+<a href="http://www.xchat.org/">Xchat</a>. Use the settings listed below.</li><p>
 
 <blockquote>
     <b>Server:</b> irc.freenode.net<br>
diff --git a/help/privacy.help b/help/privacy.help
index 32941ca..b435c6f 100644
--- a/help/privacy.help
+++ b/help/privacy.help
@@ -3,7 +3,7 @@
 <h3>Application DB Privacy Policy</h3>
 
 <p>
-<b>WineHQ is decidated to the privacy of its users.</b><br>
+<b>WineHQ is dedicated to the privacy of its users.</b><br>
 <ul>
 	Whatever specific information you give to us will be used only to enable user
 	specific features of the Application Database. We will give your information
diff --git a/help/ratings.help b/help/ratings.help
index fcc7536..2b5c037 100644
--- a/help/ratings.help
+++ b/help/ratings.help
@@ -28,7 +28,7 @@ pessimistic.
         <li> <b>0</b> -- Unrated.
         <li> <b>1</b> -- Totally nonfunctional. Crashes on load.
         <li> <b>2</b> -- Partial functionality. Good enough for a carefully scripted demo.
-        <li> <b>3</b> -- Sufficient functionality for noncritical work. Occasional crashes okay,
+        <li> <b>3</b> -- Sufficient functionality for non critical work. Occasional crashes okay,
                          as are weird setup problems, required patches, or missing major functionality.
 			 Alpha quality.
         <li> <b>4</b> -- Substantially correct. Good enough for general use, with possible 
diff --git a/include/config.php.sample b/include/config.php.sample
index f8f57ad..701450a 100644
--- a/include/config.php.sample
+++ b/include/config.php.sample
@@ -14,7 +14,7 @@ define("APPDB_SCREENSHOT_MAXWIDTH","800"); // width of the screenshot's thumbnai
 define("APPDB_SCREENSHOT_MAXHEIGHT","600"); // height of the screenshot's thumbnails
 define("APPDB_ROOT", "http://appdb.winehq.org/");  // path to AppDB
 define("STANDARD_NOTIFY_FOOTER","------- You are receiving this mail because: -------\n".
-"You are an maintainer of this application or an AppDB administrator\n".
+"You are a maintainer of this application or an AppDB administrator\n".
 "to change your preferences go to: ".APPDB_ROOT."preferences.php\n");
 define("APPDB_OWNER","WineHQ"); // with what product/company is this AppDB related ?
 define("APPDB_OWNER_URL","http://www.winehq.org/"); // website of this product/company
diff --git a/include/incl.php b/include/incl.php
index 3f3e359..fc3698d 100644
--- a/include/incl.php
+++ b/include/incl.php
@@ -164,7 +164,7 @@ function redirect($url)
 }
 
 /**
- * redirect back to referer, or else to the main page
+ * redirect back to referrer, or else to the main page
  */
 function redirectref($url = null)
 {
@@ -190,7 +190,7 @@ function addmsg($text, $color = "black")
     $sQuery = "INSERT INTO sessionMessages VALUES (null, null, '".session_id()."', '$text')";
     if (!mysql_query($sQuery,$hAppdbLink))
     {
-        echo "An error has occured in addmsg(): ".mysql_error($hAppdbLink);
+        echo "An error has occurred in addmsg(): ".mysql_error($hAppdbLink);
         echo $text;
     }
 }
diff --git a/include/user.php b/include/user.php
index 4b340d1..63d2cd7 100644
--- a/include/user.php
+++ b/include/user.php
@@ -79,7 +79,7 @@ class User {
                               "email = '$sEmail' AND ".
                               "password = password('$sPassword')");
         if(!$result)
-            return "A database error occured";
+            return "A database error occurred";
 
         if(mysql_num_rows($result) == 0)
             return "Invalid e-mail or password";
@@ -171,7 +171,7 @@ class User {
             $sEmail = $this->email;
         $result = query_appdb("DELETE FROM user_list WHERE email = '".$sEmail."'");
         if(!$result)
-            return "A database error occured";
+            return "A database error occurred";
         return 0;
     }
 
@@ -222,7 +222,7 @@ class User {
 
 
     /**
-     * check if this user is an maintainer of a given appId/versionId
+     * check if this user is a maintainer of a given appId/versionId
      */
     function is_maintainer($appId, $versionId)
     {
@@ -245,7 +245,7 @@ class User {
 
 
     /*
-     * check if this user is an maintainer of a given appId/versionId
+     * check if this user is a maintainer of a given appId/versionId
      */
     function is_super_maintainer($appId)
     {