Merge branch '2.7' into 2.8

fabpot · fabpot · commit 1dfbeb8df54d · 2016-06-29T07:29:29.000+02:00
* 2.7: removed dots at the end of @param and @return fixed typo
diff --git a/CssSelector.php b/CssSelector.php
@@ -68,8 +68,8 @@ class CssSelector
      * Optionally, a prefix can be added to the resulting XPath
      * expression with the $prefix parameter.
      *
-     * @param mixed  $cssExpr The CSS expression.
-     * @param string $prefix  An optional prefix for the XPath expression.
+     * @param mixed  $cssExpr The CSS expression
+     * @param string $prefix  An optional prefix for the XPath expression
      *
      * @return string
      */

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ class CssSelector`
`68`	`68`	`* Optionally, a prefix can be added to the resulting XPath`
`69`	`69`	`* expression with the $prefix parameter.`
`70`	`70`	`*`
`71`		`- * @param mixed $cssExpr The CSS expression.`
`72`		`- * @param string $prefix An optional prefix for the XPath expression.`
	`71`	`+ * @param mixed $cssExpr The CSS expression`
	`72`	`+ * @param string $prefix An optional prefix for the XPath expression`
`73`	`73`	`*`
`74`	`74`	`* @return string`
`75`	`75`	`*/`