From 3a6ac5a3c3c59c15d7034b914f9549ce60fb7712 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 28 Mar 2007 14:16:43 +0000 Subject: [PATCH] Revert r20769: we don't use PHPDocumentor anymore, we use doxygen. If making mass changes to tweak to its preferences, probably better to do it for the tool we actually generate docs with. :) --- includes/AjaxDispatcher.php | 3 --- includes/AjaxResponse.php | 4 +-- includes/Article.php | 6 ++--- includes/Categoryfinder.php | 42 ++++++++++++++--------------- includes/ChangesList.php | 10 ++++--- includes/Database.php | 15 +++++------ includes/DatabaseOracle.php | 5 ++-- includes/DateFormatter.php | 6 ++++- includes/DefaultSettings.php | 2 +- includes/DifferenceEngine.php | 4 +-- includes/DjVuImage.php | 14 +++++----- includes/EditPage.php | 6 +++-- includes/Exif.php | 3 +-- includes/Feed.php | 11 +++++--- includes/FileStore.php | 7 ++--- includes/GlobalFunctions.php | 16 +++++------ includes/HTMLCacheUpdate.php | 3 --- includes/HistoryBlob.php | 16 +++++------ includes/IP.php | 7 +++-- includes/JobQueue.php | 7 ----- includes/Licenses.php | 5 +--- includes/LinkCache.php | 5 +++- includes/LinksUpdate.php | 12 +++++---- includes/LogPage.php | 2 +- includes/OutputPage.php | 16 +++++------ includes/Parser.php | 15 +++-------- includes/ParserCache.php | 2 +- includes/ProfilerSimple.php | 10 ++++--- includes/ProfilerSimpleUDP.php | 7 +++-- includes/ProtectionForm.php | 3 --- includes/Sanitizer.php | 2 ++ includes/SkinTemplate.php | 2 +- includes/SpecialAncientpages.php | 2 +- includes/SpecialBlockip.php | 2 +- includes/SpecialEmailuser.php | 6 ++--- includes/SpecialImport.php | 6 ----- includes/SpecialIpblocklist.php | 5 +--- includes/SpecialListredirects.php | 2 +- includes/SpecialLockdb.php | 2 +- includes/SpecialLog.php | 4 +-- includes/SpecialMIMEsearch.php | 4 +-- includes/SpecialMovepage.php | 2 +- includes/SpecialProtectedpages.php | 5 ++-- includes/SpecialRandomredirect.php | 2 +- includes/SpecialUndelete.php | 7 +++-- includes/SpecialUserlogin.php | 2 +- includes/SpecialVersion.php | 4 +++ includes/Title.php | 7 +++-- includes/User.php | 13 +++++---- includes/UserMailer.php | 11 +++----- includes/WebRequest.php | 18 ++++++------- includes/api/ApiBase.php | 3 --- includes/api/ApiFormatYaml_spyc.php | 6 +++-- 53 files changed, 176 insertions(+), 205 deletions(-) diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php index bb4709bb40..4a84ea2261 100644 --- a/includes/AjaxDispatcher.php +++ b/includes/AjaxDispatcher.php @@ -9,9 +9,6 @@ if ( ! $wgUseAjax ) { require_once( 'AjaxFunctions.php' ); -/** - * @todo Document - e.g. Provide top-level description of this class. - */ class AjaxDispatcher { var $mode; var $func_name; diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php index a814e57d4d..c3c15ad3af 100644 --- a/includes/AjaxResponse.php +++ b/includes/AjaxResponse.php @@ -3,9 +3,7 @@ if( !defined( 'MEDIAWIKI' ) ) { die( 1 ); } -/** - * @todo document - */ +/** @todo document */ class AjaxResponse { var $mCacheDuration; var $mVary; diff --git a/includes/Article.php b/includes/Article.php index bef53e44bc..3dd47a01b0 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -12,7 +12,7 @@ * */ class Article { - /** + /**@{{ * @private */ var $mComment; //!< @@ -34,7 +34,7 @@ class Article { var $mTouched; //!< var $mUser; //!< var $mUserText; //!< - /** end private properties */ + /**@}}*/ /** * Constructor and clear the article @@ -2348,7 +2348,7 @@ class Article { * * @param Revision $rev * - * @todo This is a shitty interface function. Kill it and replace the + * @fixme This is a shitty interface function. Kill it and replace the * other shitty functions like editUpdates and such so it's not needed * anymore. */ diff --git a/includes/Categoryfinder.php b/includes/Categoryfinder.php index fd75d77a31..773c6b2837 100644 --- a/includes/Categoryfinder.php +++ b/includes/Categoryfinder.php @@ -1,26 +1,26 @@ seed ( + array ( 12345 ) , + array ( "Category 1","Category 2" ) , + "AND" + ) ; + $a = $cf->run() ; + print implode ( "," , $a ) ; + +*/ + -/** - * The "Categoryfinder" class takes a list of articles, creates an internal representation of all their parent - * categories (as well as parents of parents etc.). From this representation, it determines which of these articles - * are in one or all of a given subset of categories. - * - * Example use : - * - * # Determines wether the article with the page_id 12345 is in both - * # "Category 1" and "Category 2" or their subcategories, respectively - * - * $cf = new Categoryfinder ; - * $cf->seed ( - * array ( 12345 ) , - * array ( "Category 1","Category 2" ) , - * "AND" - * ) ; - * $a = $cf->run() ; - * print implode ( "," , $a ) ; - * - * - */ class Categoryfinder { var $articles = array () ; # The original article IDs passed to the seed function diff --git a/includes/ChangesList.php b/includes/ChangesList.php index bc141579a3..43fd543703 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -1,4 +1,10 @@ mData; } -} +}; -/** +/* * The oci8 extension is fairly weak and doesn't support oci_num_rows, among * other things. We use a wrapper class to handle that and other * Oracle-specific bits, like converting column names back to lowercase. diff --git a/includes/DateFormatter.php b/includes/DateFormatter.php index 88a64453c9..643da7b935 100644 --- a/includes/DateFormatter.php +++ b/includes/DateFormatter.php @@ -1,7 +1,11 @@ * http://www.mediawiki.org/ @@ -22,13 +27,6 @@ * */ -/** - * Support for detecting/validating DjVu image files and getting - * some basic file metadata (resolution etc) - * - * File format docs are available in source package for DjVuLibre: - * http://djvulibre.djvuzone.org/ - */ class DjVuImage { function __construct( $filename ) { $this->mFilename = $filename; diff --git a/includes/EditPage.php b/includes/EditPage.php index 74983ee188..424695583b 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1,14 +1,16 @@ # http://www.mediawiki.org/ # @@ -19,13 +20,13 @@ # http://www.gnu.org/copyleft/gpl.html /** - * Basic support for outputting syndication feeds in RSS, other formats. * Contain a feed class as well as classes to build rss / atom ... feeds * Available feeds are defined in Defines.php */ + /** - * @todo document (needs one-sentence top-level class description + function descriptions). + * @todo document */ class FeedItem { /**#@+ @@ -74,7 +75,7 @@ class FeedItem { } /** - * @todo document (needs one-sentence top-level class description). + * @todo document */ class ChannelFeed extends FeedItem { /**#@+ @@ -156,6 +157,7 @@ class ChannelFeed extends FeedItem { /** * Generate a RSS feed + * @todo document */ class RSSFeed extends ChannelFeed { @@ -215,6 +217,7 @@ class RSSFeed extends ChannelFeed { /** * Generate an Atom feed + * @todo document */ class AtomFeed extends ChannelFeed { /** diff --git a/includes/FileStore.php b/includes/FileStore.php index 3d02bfa613..1fd35b01f6 100644 --- a/includes/FileStore.php +++ b/includes/FileStore.php @@ -1,8 +1,5 @@ parse: parses wikitext to html - * parseinline: parses wikitext to html and removes the surrounding p's added by parser or tidy - * escape: filters message trough htmlspecialchars - * replaceafter: parameters are substituted after parsing or escaping - * parsemag: transform the message using magic phrases + * parse: parses wikitext to html + * parseinline: parses wikitext to html and removes the surrounding p's added by parser or tidy + * escape: filters message trough htmlspecialchars + * replaceafter: parameters are substituted after parsing or escaping + * parsemag: transform the message using magic phrases */ function wfMsgExt( $key, $options ) { global $wgOut, $wgParser; @@ -612,7 +612,7 @@ function wfMsgExt( $key, $options ) { * Just like exit() but makes a note of it. * Commits open transactions except if the error parameter is set * - * @deprecated Please return control to the caller or throw an exception + * @obsolete Please return control to the caller or throw an exception */ function wfAbruptExit( $error = false ){ global $wgLoadBalancer; @@ -642,7 +642,7 @@ function wfAbruptExit( $error = false ){ } /** - * @deprecated Please return control the caller or throw an exception + * @obsolete Please return control the caller or throw an exception */ function wfErrorExit() { wfAbruptExit( true ); @@ -1401,7 +1401,7 @@ define('TS_ISO_8601', 4); /** * An Exif timestamp (YYYY:MM:DD HH:MM:SS) * - * @link http://exif.org/Exif2-2.PDF The Exif 2.2 spec, see page 28 for the + * @url http://exif.org/Exif2-2.PDF The Exif 2.2 spec, see page 28 for the * DateTime tag and page 36 for the DateTimeOriginal and * DateTimeDigitized tags. */ diff --git a/includes/HTMLCacheUpdate.php b/includes/HTMLCacheUpdate.php index 9a0b6a0846..cc392d9609 100644 --- a/includes/HTMLCacheUpdate.php +++ b/includes/HTMLCacheUpdate.php @@ -184,9 +184,6 @@ class HTMLCacheUpdate } } -/** - * @todo document (e.g. one-sentence top-level class description). - */ class HTMLCacheUpdateJob extends Job { var $table, $start, $end; diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php index 282a7f5393..3ce4ffd94d 100644 --- a/includes/HistoryBlob.php +++ b/includes/HistoryBlob.php @@ -5,7 +5,6 @@ /** * Pure virtual parent - * @todo document (needs a one-sentence top-level class description, that answers the question: "what is a HistoryBlob?") */ class HistoryBlob { @@ -49,7 +48,6 @@ class HistoryBlob /** * The real object - * @todo document (needs one-sentence top-level class description + function descriptions). */ class ConcatenatedGzipHistoryBlob extends HistoryBlob { @@ -178,7 +176,6 @@ $wgBlobCache = array(); /** - * @todo document (needs one-sentence top-level class description + some function descriptions). */ class HistoryBlobStub { var $mOldId, $mHash, $mRef; @@ -196,16 +193,16 @@ class HistoryBlobStub { $this->mOldId = $id; } - /** - * Sets the location (old_id) of the referring object - */ + /** + * Sets the location (old_id) of the referring object + */ function setReferrer( $id ) { $this->mRef = $id; } - /** - * Gets the location of the referring object - */ + /** + * Gets the location of the referring object + */ function getReferrer() { return $this->mRef; } @@ -272,6 +269,7 @@ class HistoryBlobStub { * * Serialized HistoryBlobCurStub objects will be inserted into the text table * on conversion if $wgFastSchemaUpgrades is set to true. + * */ class HistoryBlobCurStub { var $mCurId; diff --git a/includes/IP.php b/includes/IP.php index d9906c5343..748a1f0b15 100644 --- a/includes/IP.php +++ b/includes/IP.php @@ -1,5 +1,8 @@ * @License GPL v2 or later */ @@ -24,10 +27,6 @@ define( 'RE_IPV6_BLOCK', RE_IPV6_ADD . '\/' . RE_IPV6_PREFIX ); // This might be useful for regexps used elsewhere, matches any IPv6 or IPv6 address or network define( 'IP_ADDRESS_STRING', RE_IP_ADD . '(\/' . RE_IP_PREFIX . '|)|' . RE_IPV6_ADD . '(\/' . RE_IPV6_PREFIX . '|)'); -/** - * A collection of public static functions to play with IP address - * and IP blocks. - */ class IP { /** * Given a string, determine if it as valid IP diff --git a/includes/JobQueue.php b/includes/JobQueue.php index b6ed6c32dd..54af5e73a7 100644 --- a/includes/JobQueue.php +++ b/includes/JobQueue.php @@ -4,9 +4,6 @@ if ( !defined( 'MEDIAWIKI' ) ) { die( "This file is part of MediaWiki, it is not a valid entry point\n" ); } -/** - * @todo document (e.g. one-sentence top-level class description). - */ abstract class Job { var $command, $title, @@ -241,10 +238,6 @@ abstract class Job { } } - -/** - * @todo document (e.g. one-sentence top-level class description). - */ class RefreshLinksJob extends Job { function __construct( $title, $params = '', $id = 0 ) { parent::__construct( 'refreshLinks', $title, $params, $id ); diff --git a/includes/Licenses.php b/includes/Licenses.php index f4586ae5e5..bd7494a3f3 100644 --- a/includes/Licenses.php +++ b/includes/Licenses.php @@ -1,7 +1,7 @@ @@ -146,9 +146,6 @@ class Licenses { function getHtml() { return $this->html; } } -/** - * A License class for use on Special:Upload (represents a single type of license). - */ class License { /** * @var string diff --git a/includes/LinkCache.php b/includes/LinkCache.php index 53fb640a8f..14072c56ea 100644 --- a/includes/LinkCache.php +++ b/includes/LinkCache.php @@ -1,7 +1,10 @@ returnToMain( false ); } - /** @deprecated */ + /** @obsolete */ public function errorpage( $title, $msg ) { throw new ErrorPageError( $title, $msg ); } @@ -876,7 +876,7 @@ class OutputPage { $this->returnToMain( true, $mainPage ); } - /** @deprecated */ + /** @obsolete */ public function databaseError( $fname, $sql, $error, $errno ) { throw new MWException( "OutputPage::databaseError is obsolete\n" ); } @@ -940,32 +940,32 @@ class OutputPage { $this->returnToMain( false ); } - /** @deprecated */ + /** @obsolete */ public function fatalError( $message ) { throw new FatalError( $message ); } - /** @deprecated */ + /** @obsolete */ public function unexpectedValueError( $name, $val ) { throw new FatalError( wfMsg( 'unexpected', $name, $val ) ); } - /** @deprecated */ + /** @obsolete */ public function fileCopyError( $old, $new ) { throw new FatalError( wfMsg( 'filecopyerror', $old, $new ) ); } - /** @deprecated */ + /** @obsolete */ public function fileRenameError( $old, $new ) { throw new FatalError( wfMsg( 'filerenameerror', $old, $new ) ); } - /** @deprecated */ + /** @obsolete */ public function fileDeleteError( $name ) { throw new FatalError( wfMsg( 'filedeleteerror', $name ) ); } - /** @deprecated */ + /** @obsolete */ public function fileNotFoundError( $name ) { throw new FatalError( wfMsg( 'filenotfound', $name ) ); } diff --git a/includes/Parser.php b/includes/Parser.php index ece25fbd07..f5fbaa2a81 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -56,10 +56,9 @@ define( 'MW_COLON_STATE_COMMENTDASH', 6 ); define( 'MW_COLON_STATE_COMMENTDASHDASH', 7 ); /** - * PHP Parser - Processes wiki markup (which uses a more user-friendly - * syntax, such as "[[link]]" for making links), and provides a one-way - * transformation of that wiki markup it into XHTML output / markup - * (which in turn the browser understands, and can display). + * PHP Parser + * + * Processes wiki markup * * 
  * There are four main entry points into the Parser class:
@@ -1469,7 +1468,7 @@ class Parser
 	 * @param string
 	 * @return string
 	 * @static
-	 * @todo  This can merge genuinely required bits in the path or query string,
+	 * @fixme This can merge genuinely required bits in the path or query string,
 	 *        breaking legit URLs. A proper fix would treat the various parts of
 	 *        the URL differently; as a workaround, just use the output for
 	 *        statistical records, not for actual linking/output.
@@ -4703,9 +4702,6 @@ class Parser
 
 }
 
-/**
- * @todo document, briefly.
- */
 class OnlyIncludeReplacer {
 	var $output = '';
 
@@ -4718,9 +4714,6 @@ class OnlyIncludeReplacer {
 	}
 }
 
-/**
- * @todo document, briefly.
- */
 class StripState {
 	var $general, $nowiki;
 
diff --git a/includes/ParserCache.php b/includes/ParserCache.php
index 752aa545f1..d31f7efe1d 100644
--- a/includes/ParserCache.php
+++ b/includes/ParserCache.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * @todo document
+ *
  */
 class ParserCache {
 	/**
diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
index a52af257d5..a118c85431 100644
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -1,11 +1,13 @@
 mString = $string;
@@ -794,9 +791,6 @@ class ImportStringSource {
 	}
 }
 
-/**
- * @todo document (e.g. one-sentence class description).
- */
 class ImportStreamSource {
 	function ImportStreamSource( $handle ) {
 		$this->mHandle = $handle;
diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index e5c285c0c2..6ba3e55688 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -45,7 +45,7 @@ function wfSpecialIpblocklist() {
 }
 
 /**
- * @todo document
+ *
  * @addtogroup SpecialPage
  */
 class IPUnblockForm {
@@ -319,9 +319,6 @@ class IPUnblockForm {
 	}
 }
 
-/**
- * @todo document
- */
 class IPBlocklistPager extends ReverseChronologicalPager {
 	public $mForm, $mConds;
 
diff --git a/includes/SpecialListredirects.php b/includes/SpecialListredirects.php
index 09dc2b392e..bc3969275d 100644
--- a/includes/SpecialListredirects.php
+++ b/includes/SpecialListredirects.php
@@ -8,9 +8,9 @@
  */
 
 /**
- * Special:Listredirects - Lists all the redirects on the wiki.
  * @addtogroup SpecialPage
  */
+
 class ListredirectsPage extends QueryPage {
 
 	function getName() { return( 'Listredirects' ); }
diff --git a/includes/SpecialLockdb.php b/includes/SpecialLockdb.php
index 929e028f6f..57c20b76c9 100644
--- a/includes/SpecialLockdb.php
+++ b/includes/SpecialLockdb.php
@@ -36,7 +36,7 @@ function wfSpecialLockdb() {
 }
 
 /**
- * @todo document - e.g. a one-sentence top-level class description.
+ *
  * @addtogroup SpecialPage
  */
 class DBLockForm {
diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php
index fcce6df3da..d258d5934e 100644
--- a/includes/SpecialLog.php
+++ b/includes/SpecialLog.php
@@ -36,7 +36,7 @@ function wfSpecialLog( $par = '' ) {
 }
 
 /**
- * @todo document (needs one-sentence top-level class description)
+ *
  * @addtogroup SpecialPage
  */
 class LogReader {
@@ -218,7 +218,7 @@ class LogReader {
 }
 
 /**
- * @todo document (needs one-sentence top-level class description)
+ *
  * @addtogroup SpecialPage
  */
 class LogViewer {
diff --git a/includes/SpecialMIMEsearch.php b/includes/SpecialMIMEsearch.php
index d50efc0261..1e69b23eb6 100644
--- a/includes/SpecialMIMEsearch.php
+++ b/includes/SpecialMIMEsearch.php
@@ -10,8 +10,6 @@
  */
 
 /**
- * Searches the database for files of the requested MIME type, comparing this with the
- * 'img_major_mime' and 'img_minor_mime' fields in the image table.
  * @addtogroup SpecialPage
  */
 class MIMEsearchPage extends QueryPage {
@@ -79,7 +77,7 @@ class MIMEsearchPage extends QueryPage {
 }
 
 /**
- * Output the HTML search form, and constructs the MIMEsearchPage object.
+ * constructor
  */
 function wfSpecialMIMEsearch( $par = null ) {
 	global $wgRequest, $wgTitle, $wgOut;
diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 062a68aea8..6a3e03e329 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -41,7 +41,7 @@ function wfSpecialMovepage( $par = null ) {
 }
 
 /**
- * HTML form for Special:Movepage
+ *
  * @addtogroup SpecialPage
  */
 class MovePageForm {
diff --git a/includes/SpecialProtectedpages.php b/includes/SpecialProtectedpages.php
index b214822da2..26c421248b 100644
--- a/includes/SpecialProtectedpages.php
+++ b/includes/SpecialProtectedpages.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * @todo document
+ *
  * @addtogroup SpecialPage
  */
 class ProtectedPagesForm {
@@ -185,7 +185,8 @@ class ProtectedPagesForm {
 }
 
 /**
- * @todo document
+ *
+ *
  */
 class ProtectedPagesPager extends ReverseChronologicalPager {
 	public $mForm, $mConds;
diff --git a/includes/SpecialRandomredirect.php b/includes/SpecialRandomredirect.php
index 60e9d6531b..40df984055 100644
--- a/includes/SpecialRandomredirect.php
+++ b/includes/SpecialRandomredirect.php
@@ -5,7 +5,7 @@
  *
  * @addtogroup Special pages
  * @author Rob Church 
- * @license GNU General Public Licence 2.0 or later
+ * @licence GNU General Public Licence 2.0 or later
  */
 
 /**
diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index 36d36690af..e450884924 100644
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -18,7 +18,7 @@ function wfSpecialUndelete( $par ) {
 }
 
 /**
- * @todo document (just needs one-sentence top-level class description)
+ *
  * @addtogroup SpecialPage
  */
 class PageArchive {
@@ -114,7 +114,7 @@ class PageArchive {
 	 * if not a file page.
 	 *
 	 * @return ResultWrapper
-	 * @todo Does this belong in Image for fuller encapsulation?
+	 * @fixme Does this belong in Image for fuller encapsulation?
 	 */
 	function listFiles() {
 		if( $this->title->getNamespace() == NS_IMAGE ) {
@@ -456,8 +456,7 @@ class PageArchive {
 }
 
 /**
- * The HTML form for Special:Undelete, which allows users with the appropriate
- * permissions to view and restore deleted content.
+ *
  * @addtogroup SpecialPage
  */
 class UndeleteForm {
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 879886cd65..a34558f0f8 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -19,7 +19,7 @@ function wfSpecialUserlogin() {
 }
 
 /**
- * @todo document, briefly.
+ *
  * @addtogroup SpecialPage
  */
 
diff --git a/includes/SpecialVersion.php b/includes/SpecialVersion.php
index 1aee8cdce7..5bc13186de 100644
--- a/includes/SpecialVersion.php
+++ b/includes/SpecialVersion.php
@@ -4,6 +4,8 @@
  *
  * @addtogroup SpecialPage
  *
+ * @bug 2019, 4531
+ *
  * @author Ævar Arnfjörð Bjarmason 
  * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
@@ -261,6 +263,8 @@ class SpecialVersion {
 	/**
 	 * Retrieve the revision number of a Subversion working directory.
 	 *
+	 * @bug 7335
+	 *
 	 * @param string $dir
 	 * @return mixed revision number as int, or false if not a SVN checkout
 	 */
diff --git a/includes/Title.php b/includes/Title.php
index 8705dd0c23..070cd2422f 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1229,7 +1229,7 @@ class Title {
 	/**
 	 * Can $wgUser read this page?
 	 * @return boolean
-	 * @todo fold these checks into userCan()
+	 * @fixme fold these checks into userCan()
 	 */
 	public function userCanRead() {
 		global $wgUser;
@@ -1354,7 +1354,7 @@ class Title {
 	 * Cascading protection: Return true if cascading restrictions apply to this page, false if not.
 	 *
 	 * @return bool If the page is subject to cascading restrictions.
-	 * @access public
+	 * @access public.
 	 */
 	function isCascadeProtected() {
 		list( $sources, $restrictions ) = $this->getCascadeProtectionSources( false );
@@ -1902,8 +1902,7 @@ class Title {
 	 * members directly, which is what Linker::formatComment was doing previously.
 	 *
 	 * @param string $fragment text
-	 * @access public
-	 * @todo clarify whether access is supposed to be public (was marked as "kind of public")
+	 * @access kind of public
 	 */
 	function setFragment( $fragment ) {
 		$this->mFragment = str_replace( '_', ' ', substr( $fragment, 1 ) );
diff --git a/includes/User.php b/includes/User.php
index 8cdad6cf16..a4630b84e2 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -350,6 +350,8 @@ class User {
 	 * addresses like this, if we allowed accounts like this to be created
 	 * new users could get the old edits of these anonymous users.
 	 *
+	 * @bug 3631
+	 *
 	 * @static
 	 * @param string $name Nickname of a user
 	 * @return bool
@@ -497,7 +499,8 @@ class User {
 	 * rejected valid addresses. Actually just check if there is '@' somewhere
 	 * in the given address.
 	 *
-	 * @todo Check for RFC 2822 compilance (bug 959)
+	 * @todo Check for RFC 2822 compilance
+	 * @bug 959
 	 *
 	 * @param string $addr email address
 	 * @static
@@ -599,7 +602,7 @@ class User {
 
 	/**
 	 * Return a random password. Sourced from mt_rand, so it's not particularly secure.
-	 * @todo hash random numbers to improve security, like generateToken()
+	 * @todo: hash random numbers to improve security, like generateToken()
 	 *
 	 * @return string
 	 * @static
@@ -1648,7 +1651,7 @@ class User {
 	/**
 	 * Add the user to the given group.
 	 * This takes immediate effect.
-	 * @param string $group
+	 * @string $group
 	 */
 	function addGroup( $group ) {
 		$this->load();
@@ -1672,7 +1675,7 @@ class User {
 	/**
 	 * Remove the user from the given group.
 	 * This takes immediate effect.
-	 * @param string $group
+	 * @string $group
 	 */
 	function removeGroup( $group ) {
 		$this->load();
@@ -1943,7 +1946,7 @@ class User {
 
 	/**
 	 * Save object settings into database
-	 * @todo Only rarely do all these fields need to be set!
+	 * @fixme Only rarely do all these fields need to be set!
 	 */
 	function saveSettings() {
 		$this->load();
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index f3524f5782..b2d1a4f423 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -32,11 +32,6 @@ function wfRFC822Phrase( $phrase ) {
 	return '"' . $phrase . '"';
 }
 
-/**
- * Stores a single person's name and email address.
- * These are passed in via the constructor, and will be returned in SMTP
- * header format when requested.
- */
 class MailAddress {
 	/**
 	 * @param mixed $address String with an email address, or a User object
@@ -196,12 +191,14 @@ function mailErrorHandler( $code, $string ) {
  *
  */
 class EmailNotification {
-	/**
-	 * @private member variables:
+	/**@{{
+	 * @private
 	 */
 	var $to, $subject, $body, $replyto, $from;
 	var $user, $title, $timestamp, $summary, $minorEdit, $oldid;
 
+	/**@}}*/
+
 	/**
 	 * @todo document
 	 * @param $title Title object
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 1962ce9421..6c058af0c9 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -21,15 +21,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
-
-/**
- * Some entry points may use this file without first enabling the 
- * autoloader.
- */
-if ( !function_exists( '__autoload' ) ) {
-	require_once( dirname(__FILE__) . '/normal/UtfNormal.php' );
-}
-
 /**
  * The WebRequest class encapsulates getting at data passed in the
  * URL or via a POSTed form, handling remove of "magic quotes" slashes,
@@ -41,6 +32,15 @@ if ( !function_exists( '__autoload' ) ) {
  * input.
  *
  */
+
+/**
+ * Some entry points may use this file without first enabling the 
+ * autoloader.
+ */
+if ( !function_exists( '__autoload' ) ) {
+	require_once( dirname(__FILE__) . '/normal/UtfNormal.php' );
+}
+
 class WebRequest {
 	function __construct() {
 		$this->checkMagicQuotes();
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index a29e3360cc..c2dd93b09c 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -24,9 +24,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/**
- * @todo Document - e.g. Provide top-level description of this class.
- */
 abstract class ApiBase {
 
 	// These constants allow modules to specify exactly how to treat incomming parameters.
diff --git a/includes/api/ApiFormatYaml_spyc.php b/includes/api/ApiFormatYaml_spyc.php
index fa049cffa4..579fa5c1e5 100644
--- a/includes/api/ApiFormatYaml_spyc.php
+++ b/includes/api/ApiFormatYaml_spyc.php
@@ -14,12 +14,13 @@
    * @addtogroup Spyc
    */
   class YAMLNode {
-    /**
+    /**#@+
      * @access public
      * @var string
      */ 
     var $parent;
     var $id;
+    /**#@+*/
     /** 
      * @access public
      * @var mixed
@@ -327,7 +328,7 @@
   
     /**** Private Properties ****/
     
-    /**
+    /**#@+
      * @access private
      * @var mixed
      */ 
@@ -339,6 +340,7 @@
     var $_isInline;
     var $_dumpIndent;
     var $_dumpWordWrap;
+    /**#@+*/
 
     /**** Private Methods ****/
     
-- 
2.20.1