Merge branch 'master' of git://git.zendframework.com/zf

zendframework · Sep 20, 2011 · 2df5656 · 2df5656
commit 2df5656
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Query.php b/src/Query.php
@@ -159,7 +159,7 @@ public function getDocumentType()
 
     /**
      * Get any DOMDocument errors found
-     * 
+     *
      * @return false|array
      */
     public function getDocumentErrors()
@@ -183,7 +183,7 @@ public function execute($query)
      * Perform an XPath query
      *
      * @param  string|array $xpathQuery
-     * @param  string $query CSS selector query
+     * @param  string|null  $query      CSS selector query
      * @return \Zend\Dom\NodeList
      */
     public function queryXpath($xpathQuery, $query = null)