Merge "Documentation improvements in includes/actions"

diff --combined includes/actions/CreditsAction.php
index a63e992,7369755..4d3c41b
--- 1/includes/actions/CreditsAction.php
--- 2/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@@ -23,6 -23,9 +23,9 @@@
   * @author <evan@wikitravel.org>
   */
  
+ /**
+  * @ingroup Actions
+  */
  class CreditsAction extends FormlessAction {
  
        public function getName() {
@@@ -55,8 -58,8 +58,8 @@@
        /**
         * Get a list of contributors
         *
 -       * @param $cnt Int: maximum list of contributors to show
 -       * @param $showIfMax Bool: whether to contributors if there more than $cnt
 +       * @param int $cnt maximum list of contributors to show
 +       * @param bool $showIfMax whether to contributors if there more than $cnt
         * @return String: html
         */
        public function getCredits( $cnt, $showIfMax = true ) {
@@@ -97,8 -100,8 +100,8 @@@
  
        /**
         * Get a list of contributors of $article
 -       * @param $cnt Int: maximum list of contributors to show
 -       * @param $showIfMax Bool: whether to contributors if there more than $cnt
 +       * @param int $cnt maximum list of contributors to show
 +       * @param bool $showIfMax whether to contributors if there more than $cnt
         * @return String: html
         */
        protected function getContributors( $cnt, $showIfMax ) {

diff --combined includes/actions/HistoryAction.php
index 1dd8645,23855ae..2312550
--- 1/includes/actions/HistoryAction.php
--- 2/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@@ -20,6 -20,7 +20,7 @@@
   * http://www.gnu.org/copyleft/gpl.html
   *
   * @file
+  * @ingroup Actions
   */
  
  /**
@@@ -30,6 -31,7 +31,7 @@@
   * Construct it by passing in an Article, and call $h->history() to print the
   * history.
   *
+  * @ingroup Actions
   */
  class HistoryAction extends FormlessAction {
        const DIR_PREV = 0;
@@@ -145,9 -147,9 +147,9 @@@
                /**
                 * Add date selector to quickly get to a certain time
                 */
 -              $year        = $request->getInt( 'year' );
 -              $month       = $request->getInt( 'month' );
 -              $tagFilter   = $request->getVal( 'tagfilter' );
 +              $year = $request->getInt( 'year' );
 +              $month = $request->getInt( 'month' );
 +              $tagFilter = $request->getVal( 'tagfilter' );
                $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
  
                /**
@@@ -241,7 -243,7 +243,7 @@@
        /**
         * Output a subscription feed listing recent edits to this page.
         *
 -       * @param $type String: feed type
 +       * @param string $type feed type
         */
        function feed( $type ) {
                global $wgFeedClasses, $wgFeedLimit;
@@@ -331,6 -333,7 +333,7 @@@
  
  /**
   * @ingroup Pager
+  * @ingroup Actions
   */
  class HistoryPager extends ReverseChronologicalPager {
        public $lastRow = false, $counter, $historyPage, $buttons, $conds;
@@@ -508,8 -511,8 +511,8 @@@
        /**
         * Creates a submit button
         *
 -       * @param $message String: text of the submit button, will be escaped
 -       * @param $attributes Array: attributes
 +       * @param string $message text of the submit button, will be escaped
 +       * @param array $attributes attributes
         * @return String: HTML output for the submit button
         */
        function submitButton( $message, $attributes = array() ) {

diff --combined includes/actions/InfoAction.php
index 317e59d,d943f99..1e312d7
--- 1/includes/actions/InfoAction.php
--- 2/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@@ -22,6 -22,11 +22,11 @@@
   * @ingroup Actions
   */
  
+ /**
+  * Displays information about a page.
+  *
+  * @ingroup Actions
+  */
  class InfoAction extends FormlessAction {
        /**
         * Returns the name of the action this object responds to.
@@@ -132,9 -137,9 +137,9 @@@
        /**
         * Adds a row to a table that will be added to the content.
         *
 -       * @param $table string The table that will be added to the content
 -       * @param $name string The name of the row
 -       * @param $value string The value of the row
 +       * @param string $table The table that will be added to the content
 +       * @param string $name The name of the row
 +       * @param string $value The value of the row
         * @return string The table with the row added
         */
        protected function addRow( $table, $name, $value ) {
@@@ -147,8 -152,8 +152,8 @@@
        /**
         * Adds a table to the content that will be added to the output.
         *
 -       * @param $content string The content that will be added to the output
 -       * @param $table string The table
 +       * @param string $content The content that will be added to the output
 +       * @param string $table The table
         * @return string The content with the table added
         */
        protected function addTable( $content, $table ) {