Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 4 insertions, 3 deletions

diff --git a/includes/api/ApiQueryPagePropNames.php b/includes/api/ApiQueryPagePropNames.php
index 08c883d8..8cd9c6cf 100644
--- a/includes/api/ApiQueryPagePropNames.php
+++ b/includes/api/ApiQueryPagePropNames.php
@@ -32,7 +32,7 @@
  */
 class ApiQueryPagePropNames extends ApiQueryBase {
 
-	public function __construct( $query, $moduleName ) {
+	public function __construct( ApiQuery $query, $moduleName ) {
 		parent::__construct( $query, $moduleName, 'ppn' );
 	}
 
@@ -63,7 +63,8 @@ class ApiQueryPagePropNames extends ApiQueryBase {
 		$count = 0;
 		foreach ( $this->select( __METHOD__ ) as $row ) {
 			if ( ++$count > $limit ) {
-				// We've reached the one extra which shows that there are additional pages to be had. Stop here...
+				// We've reached the one extra which shows that there are
+				// additional pages to be had. Stop here...
 				$this->setContinueEnumParameter( 'continue', $row->pp_propname );
 				break;
 			}
@@ -101,7 +102,7 @@ class ApiQueryPagePropNames extends ApiQueryBase {
 	}
 
 	public function getDescription() {
-		return 'List all page prop names in use on the wiki';
+		return 'List all page prop names in use on the wiki.';
 	}
 
 	public function getExamples() {