spelling in comments and private method name

git-svn-id: http://svn.php.net/repository/pear/packages/HTTP_WebDAV_Server/trunk@258287 c90b9560-bf6c-de11-be94-00142212c4b1

Server.php

@@ -721,7 +721,7 @@ function http_PROPFIND()
             /* TODO right now the user implementation has to make sure
              collections end in a slash, this should be done in here
              by checking the resource attribute */
-            $href = $this->_mergePathes($this->_SERVER['SCRIPT_NAME'], $path);
+            $href = $this->_mergePaths($this->_SERVER['SCRIPT_NAME'], $path);
 
             /* minimal urlencoding is needed for the resource path */
             $href = $this->_urlencode($href);
@@ -869,7 +869,7 @@ function http_PROPPATCH()
 
             echo "<D:multistatus xmlns:D=\"DAV:\">\n";
             echo " <D:response>\n";
-            echo "  <D:href>".$this->_urlencode($this->_mergePathes($this->_SERVER["SCRIPT_NAME"], $this->path))."</D:href>\n";
+            echo "  <D:href>".$this->_urlencode($this->_mergePaths($this->_SERVER["SCRIPT_NAME"], $this->path))."</D:href>\n";
 
             foreach ($options["props"] as $prop) {
                 echo "   <D:propstat>\n";
@@ -1033,7 +1033,7 @@ function http_GET()
             if (false === $status) {
                 $this->http_status("404 not found");
             } else {
-                // TODO: check setting of headers in various code pathes above
+                // TODO: check setting of headers in various code paths above
                 $this->http_status("$status");
             }
         }
@@ -2096,13 +2096,13 @@ function _unslashify($path)
     }
 
     /**
-     * Merge two pathes, make sure there is exactly one slash between them
+     * Merge two paths, make sure there is exactly one slash between them
      *
      * @param  string  parent path
      * @param  string  child path
      * @return string  merged path
      */
-    function _mergePathes($parent, $child) 
+    function _mergePaths($parent, $child) 
     {
         if ($child{0} == '/') {
             return $this->_unslashify($parent).$child;