From 75c6696aa84712669d2cf82856e2af838ed877e0 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Tue, 17 May 2011 22:03:20 +0000
Subject: [PATCH] Use consistent notation for "@todo FIXME". Should update
 http://svn.wikimedia.org/doc/todo.html nicely.

---
 includes/Article.php                          | 19 +++++++--------
 includes/BacklinkCache.php                    |  4 ++--
 includes/Block.php                            |  4 ++--
 includes/CategoryPage.php                     |  4 ++--
 includes/Categoryfinder.php                   |  1 +
 includes/ConfEditor.php                       |  4 ++--
 includes/DjVuImage.php                        | 10 ++++----
 includes/EditPage.php                         |  2 +-
 includes/Feed.php                             |  2 +-
 includes/GlobalFunctions.php                  | 14 +++++------
 includes/HTMLForm.php                         |  8 ++++---
 includes/Html.php                             |  7 +++---
 includes/ImagePage.php                        |  8 +++----
 includes/Import.php                           | 14 +++++------
 includes/Linker.php                           | 12 +++++-----
 includes/Message.php                          |  5 ++--
 includes/MimeMagic.php                        |  7 +++---
 includes/OutputHandler.php                    |  2 +-
 includes/OutputPage.php                       | 10 ++++----
 includes/ProtectionForm.php                   |  4 ++--
 includes/RecentChange.php                     |  2 +-
 includes/Revision.php                         |  2 +-
 includes/Sanitizer.php                        |  2 +-
 includes/Skin.php                             |  2 +-
 includes/SkinTemplate.php                     | 10 ++++----
 includes/SpecialPage.php                      |  4 ++--
 includes/SpecialPageFactory.php               |  2 +-
 includes/Title.php                            | 14 ++++++-----
 includes/User.php                             |  8 +++----
 includes/UserMailer.php                       |  3 ++-
 includes/WebRequest.php                       |  2 +-
 includes/WebStart.php                         |  2 +-
 includes/Wiki.php                             |  2 +-
 includes/WikiMap.php                          |  2 +-
 includes/api/ApiEditPage.php                  |  2 +-
 includes/api/ApiLogin.php                     |  5 ++--
 includes/cache/SquidUpdate.php                |  2 +-
 includes/db/Database.php                      |  2 +-
 includes/db/DatabasePostgres.php              |  7 +++---
 includes/db/LoadBalancer.php                  |  2 +-
 includes/diff/DifferenceEngine.php            |  1 +
 includes/extauth/MediaWiki.php                |  4 ++--
 includes/filerepo/ForeignAPIFile.php          |  2 +-
 includes/filerepo/ForeignAPIRepo.php          |  4 ++--
 includes/installer/Installer.php              |  4 ++--
 includes/installer/SqliteInstaller.php        |  2 +-
 includes/json/FormatJson.php                  |  2 +-
 includes/media/Bitmap.php                     |  2 +-
 includes/media/Exif.php                       |  2 +-
 includes/media/FormatMetadata.php             |  8 +++----
 includes/media/Generic.php                    |  2 +-
 includes/media/PNGMetadataExtractor.php       |  2 +-
 includes/media/XMP.php                        |  2 +-
 includes/parser/CoreParserFunctions.php       |  4 ++--
 includes/parser/LinkHolderArray.php           |  6 ++---
 includes/parser/Parser.php                    | 23 ++++++++++---------
 includes/parser/ParserOptions.php             |  2 +-
 includes/revisiondelete/RevisionDelete.php    |  2 +-
 includes/revisiondelete/RevisionDeleter.php   |  2 +-
 includes/search/SearchEngine.php              |  8 +++----
 includes/search/SearchIBM_DB2.php             |  2 +-
 includes/search/SearchMssql.php               |  2 +-
 includes/search/SearchMySQL.php               |  2 +-
 includes/search/SearchOracle.php              |  2 +-
 includes/specials/SpecialBlock.php            |  2 +-
 includes/specials/SpecialContributions.php    |  4 ++--
 .../specials/SpecialDeletedContributions.php  |  2 +-
 includes/specials/SpecialDisambiguations.php  |  4 ++--
 includes/specials/SpecialExport.php           |  4 ++--
 includes/specials/SpecialImport.php           |  4 ++--
 includes/specials/SpecialMovepage.php         | 10 ++++----
 includes/specials/SpecialNewpages.php         |  2 +-
 includes/specials/SpecialPasswordReset.php    |  2 +-
 includes/specials/SpecialPrefixindex.php      |  4 ++--
 includes/specials/SpecialRevisiondelete.php   |  2 +-
 .../specials/SpecialUncategorizedimages.php   |  2 +-
 .../specials/SpecialUncategorizedpages.php    |  2 +-
 includes/specials/SpecialUndelete.php         |  4 ++--
 includes/specials/SpecialUpload.php           |  2 +-
 includes/specials/SpecialUserrights.php       |  2 +-
 includes/specials/SpecialWantedpages.php      |  2 +-
 includes/upload/UploadBase.php                |  2 +-
 languages/LanguageConverter.php               |  2 +-
 languages/classes/LanguageAr.php              |  2 +-
 languages/classes/LanguageBe.php              |  2 +-
 languages/classes/LanguageBe_tarask.php       |  2 +-
 languages/classes/LanguageBs.php              |  2 +-
 languages/classes/LanguageCy.php              |  2 +-
 languages/classes/LanguageHr.php              |  2 +-
 languages/classes/LanguageLv.php              |  2 +-
 languages/classes/LanguageMl.php              |  2 +-
 languages/classes/LanguageRu.php              |  2 +-
 languages/classes/LanguageSh.php              |  2 +-
 languages/classes/LanguageSr.php              |  2 +-
 languages/classes/LanguageUk.php              |  2 +-
 languages/classes/LanguageYue.php             |  2 +-
 languages/classes/LanguageZh_hans.php         |  2 +-
 languages/messages/MessagesKs.php             |  2 +-
 maintenance/cleanupImages.php                 |  2 +-
 maintenance/doMaintenance.php                 |  4 ++--
 maintenance/fixDoubleRedirects.php            |  2 +-
 maintenance/fuzz-tester.php                   | 10 ++++----
 maintenance/importUseModWiki.php              |  2 +-
 maintenance/mwdocgen.php                      |  3 ++-
 maintenance/populateSha1.php                  |  2 +-
 tests/phpunit/includes/GlobalTest.php         |  8 ++++---
 tests/phpunit/includes/IPTest.php             |  4 ++--
 tests/phpunit/includes/MWNamespaceTest.php    |  4 ++--
 tests/phpunit/includes/TitleTest.php          |  4 ++--
 tests/phpunit/includes/XmlTest.php            |  2 +-
 .../includes/parser/MagicVariableTest.php     |  2 +-
 .../specials/SpecialRecentchanges.php         |  2 +-
 tests/selenium/SeleniumServerManager.php      |  2 +-
 113 files changed, 233 insertions(+), 218 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index d310c4081d..ff8546f074 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -80,7 +80,7 @@ class Article {
 	 * @param $oldId Integer revision ID, null to fetch from request, zero for current
 	 */
 	public function __construct( Title $title, $oldId = null ) {
-		// FIXME: does the reference play any role here?
+		// @todo FIXME: Does the reference play any role here?
 		$this->mTitle =& $title;
 		$this->mOldId = $oldId;
 	}
@@ -91,7 +91,7 @@ class Article {
 	 */
 	public static function newFromID( $id ) {
 		$t = Title::newFromID( $id );
-		# FIXME: doesn't inherit right
+		# @todo FIXME: Doesn't inherit right
 		return $t == null ? null : new self( $t );
 		# return $t == null ? null : new static( $t ); // PHP 5.3
 	}
@@ -246,7 +246,7 @@ class Article {
 
 	/**
 	 * Clear the object
-	 * FIXME: shouldn't this be public?
+	 * @todo FIXME: Shouldn't this be public?
 	 * @private
 	 */
 	public function clear() {
@@ -564,7 +564,7 @@ class Article {
 			}
 		}
 
-		// FIXME: Horrible, horrible! This content-loading interface just plain sucks.
+		// @todo FIXME: Horrible, horrible! This content-loading interface just plain sucks.
 		// We should instead work with the Revision object when we need it...
 		$this->mContent   = $revision->getText( Revision::FOR_THIS_USER ); // Loads if user is allowed
 
@@ -833,7 +833,7 @@ class Article {
 	 * @return UserArray
 	 */
 	public function getContributors() {
-		# FIXME: this is expensive; cache this info somewhere.
+		# @todo FIXME: This is expensive; cache this info somewhere.
 
 		$dbr = wfGetDB( DB_SLAVE );
 		$userTable = $dbr->tableName( 'user' );
@@ -2213,7 +2213,8 @@ class Article {
 			$revisionId = $revision->insertOn( $dbw );
 
 			$this->mTitle->resetArticleID( $newid );
-			# Update the LinkCache. Resetting the Title ArticleID means it will rely on having that already cached (FIXME?)
+			# Update the LinkCache. Resetting the Title ArticleID means it will rely on having that already cached
+			# @todo FIXME?
 			LinkCache::singleton()->addGoodLinkObj( $newid, $this->mTitle, strlen( $text ), (bool)Title::newFromRedirect( $text ), $revisionId );
 
 			# Update the page record with revision data
@@ -2437,7 +2438,7 @@ class Article {
 		// Take this opportunity to purge out expired restrictions
 		Title::purgeExpiredRestrictions();
 
-		# FIXME: Same limitations as described in ProtectionForm.php (line 37);
+		# @todo FIXME: Same limitations as described in ProtectionForm.php (line 37);
 		# we expect a single selection, but the schema allows otherwise.
 		$current = array();
 		$updated = Article::flattenRestrictions( $limit );
@@ -2802,7 +2803,7 @@ class Article {
 			global $wgLang;
 
 			$revisions = $this->estimateRevisionCount();
-			//FIXME: lego
+			// @todo FIXME: i18n issue/patchwork message
 			$wgOut->addHTML( '<strong class="mw-delete-warning-revisions">' .
 				wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) .
 				wfMsgHtml( 'word-separator' ) . Linker::link( $this->mTitle,
@@ -2904,7 +2905,7 @@ class Article {
 
 	/**
 	 * Output deletion confirmation dialog
-	 * FIXME: Move to another file?
+	 * @todo FIXME: Move to another file?
 	 * @param $reason String: prefilled reason
 	 */
 	public function confirmDelete( $reason ) {
diff --git a/includes/BacklinkCache.php b/includes/BacklinkCache.php
index 6715d256e2..4677ef1c87 100644
--- a/includes/BacklinkCache.php
+++ b/includes/BacklinkCache.php
@@ -151,7 +151,7 @@ class BacklinkCache {
 			return $ta;
 		}
 
-		// FIXME : make this a function?
+		// @todo FIXME: Make this a function?
 		if ( !isset( $this->fullResultCache[$table] ) ) {
 			wfDebug( __METHOD__ . ": from DB\n" );
 			$res = $this->getDB()->select(
@@ -200,7 +200,7 @@ class BacklinkCache {
 	protected function getConditions( $table ) {
 		$prefix = $this->getPrefix( $table );
 
-		// FIXME imagelinks and categorylinks do not rely on getNamespace,
+		// @todo FIXME: imagelinks and categorylinks do not rely on getNamespace,
 		// they could be moved up for nicer case statements
 		switch ( $table ) {
 			case 'pagelinks':
diff --git a/includes/Block.php b/includes/Block.php
index f1b3e7f821..c9404a5c03 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -54,7 +54,7 @@ class Block {
 
 	/**
 	 * Constructor
-	 * FIXME: Don't know what the best format to have for this constructor is, but fourteen
+	 * @todo FIXME: Don't know what the best format to have for this constructor is, but fourteen
 	 * optional parameters certainly isn't it.
 	 */
 	function __construct( $address = '', $user = 0, $by = 0, $reason = '',
@@ -1059,7 +1059,7 @@ class Block {
 	 * this returns the unredacted name; frontend functions need to call $block->getRedactedName()
 	 * in this situation.
 	 * @return array( User|String, Block::TYPE_ constant )
-	 * FIXME: this should be an integral part of the Block member variables
+	 * @todo FIXME: This should be an integral part of the Block member variables
 	 */
 	public function getTargetAndType() {
 		return array( $this->getTarget(), $this->getType() );
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index bcb906ed2a..7ffaec8bf3 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -164,7 +164,7 @@ class CategoryViewer {
 		if ( $r == '' ) {
 			// If there is no category content to display, only
 			// show the top part of the navigation links.
-			// FIXME: cannot be completely suppressed because it
+			// @todo FIXME: Cannot be completely suppressed because it
 			//        is unknown if 'until' or 'from' makes this
 			//        give 0 results.
 			$r = $r . $this->getCategoryTop();
@@ -425,7 +425,7 @@ class CategoryViewer {
 		# Don't show articles section if there are none.
 		$r = '';
 
-		# FIXME, here and in the other two sections: we don't need to bother
+		# @todo FIXME: Here and in the other two sections: we don't need to bother
 		# with this rigamarole if the entire category contents fit on one page
 		# and have already been retrieved.  We can just use $rescnt in that
 		# case and save a query and some logic.
diff --git a/includes/Categoryfinder.php b/includes/Categoryfinder.php
index 1f08b7f837..cc9bf5e90e 100644
--- a/includes/Categoryfinder.php
+++ b/includes/Categoryfinder.php
@@ -42,6 +42,7 @@ class Categoryfinder {
 	 * @param $article_ids Array of article IDs
 	 * @param $categories FIXME
 	 * @param $mode String: FIXME, default 'AND'.
+	 * @todo FIXME: $categories/$mode
 	 */
 	function seed( $article_ids, $categories, $mode = 'AND' ) {
 		$this->articles = $article_ids;
diff --git a/includes/ConfEditor.php b/includes/ConfEditor.php
index c9fd2079da..324a4754b2 100644
--- a/includes/ConfEditor.php
+++ b/includes/ConfEditor.php
@@ -306,14 +306,14 @@ class ConfEditor {
 	function parseScalar( $str ) {
 		if ( $str !== '' && $str[0] == '\'' )
 			// Single-quoted string
-			// @todo Fixme: trim() call is due to mystery bug where whitespace gets
+			// @todo FIXME: trim() call is due to mystery bug where whitespace gets
 			// appended to the token; without it we ended up reading in the
 			// extra quote on the end!
 			return strtr( substr( trim( $str ), 1, -1 ),
 				array( '\\\'' => '\'', '\\\\' => '\\' ) );
 		if ( $str !== '' && @$str[0] == '"' )
 			// Double-quoted string
-			// @todo Fixme: trim() call is due to mystery bug where whitespace gets
+			// @todo FIXME: trim() call is due to mystery bug where whitespace gets
 			// appended to the token; without it we ended up reading in the
 			// extra quote on the end!
 			return stripcslashes( substr( trim( $str ), 1, -1 ) );
diff --git a/includes/DjVuImage.php b/includes/DjVuImage.php
index f2effcb666..80b7408cbe 100644
--- a/includes/DjVuImage.php
+++ b/includes/DjVuImage.php
@@ -72,7 +72,7 @@ class DjVuImage {
 	function dump() {
 		$file = fopen( $this->mFilename, 'rb' );
 		$header = fread( $file, 12 );
-		// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
+		// @todo FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
 		extract( unpack( 'a4magic/a4chunk/NchunkLength', $header ) );
 		echo "$chunk $chunkLength\n";
 		$this->dumpForm( $file, $chunkLength, 1 );
@@ -88,7 +88,7 @@ class DjVuImage {
 			if( $chunkHeader == '' ) {
 				break;
 			}
-			// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
+			// @todo FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
 			extract( unpack( 'a4chunk/NchunkLength', $chunkHeader ) );
 			echo str_repeat( ' ', $indent * 4 ) . "$chunk $chunkLength\n";
 
@@ -119,7 +119,7 @@ class DjVuImage {
 		if( strlen( $header ) < 16 ) {
 			wfDebug( __METHOD__ . ": too short file header\n" );
 		} else {
-			// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
+			// @todo FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
 			extract( unpack( 'a4magic/a4form/NformLength/a4subtype', $header ) );
 
 			if( $magic != 'AT&T' ) {
@@ -143,7 +143,7 @@ class DjVuImage {
 		if( strlen( $header ) < 8 ) {
 			return array( false, 0 );
 		} else {
-			// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
+			// @todo FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
 			extract( unpack( 'a4chunk/Nlength', $header ) );
 			return array( $chunk, $length );
 		}
@@ -202,7 +202,7 @@ class DjVuImage {
 			return false;
 		}
 
-		// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
+		// @todo FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
 		extract( unpack(
 			'nwidth/' .
 			'nheight/' .
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6bffb58148..cee2496382 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -705,7 +705,7 @@ class EditPage {
 		$this->bot = $request->getBool( 'bot', true );
 		$this->nosummary = $request->getBool( 'nosummary' );
 
-		// FIXME: unused variable?
+		// @todo FIXME: Unused variable?
 		$this->oldid = $request->getInt( 'oldid' );
 
 		$this->live = $request->getCheck( 'live' );
diff --git a/includes/Feed.php b/includes/Feed.php
index 183b8e6e59..e22ed9383b 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -418,7 +418,7 @@ class AtomFeed extends ChannelFeed {
 		<?php if( $item->getAuthor() ) { ?><author><name><?php print $item->getAuthor() ?></name></author><?php }?>
 	</entry>
 
-<?php /* FIXME need to add comments
+<?php /* @todo FIXME: Need to add comments
 	<?php if( $item->getComments() ) { ?><dc:comment><?php print $item->getComments() ?></dc:comment><?php }?>
 	  */
 	}
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 9c9ea74ef8..b5afa9d5cc 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -386,7 +386,7 @@ function wfLogProfilingData() {
 		$forward = "\t(proxied via {$_SERVER['REMOTE_ADDR']}{$forward})";
 	}
 	// Don't load $wgUser at this late stage just for statistics purposes
-	// FIXME: We can detect some anons even if it is not loaded. See User::getId()
+	// @todo FIXME: We can detect some anons even if it is not loaded. See User::getId()
 	if ( $wgUser->isItemLoaded( 'id' ) && $wgUser->isAnon() ) {
 		$forward .= ' anon';
 	}
@@ -1060,7 +1060,7 @@ function wfShowingResultsNum( $offset, $limit, $num ) {
 function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) {
 	global $wgLang;
 	$fmtLimit = $wgLang->formatNum( $limit );
-	// FIXME: Why on earth this needs one message for the text and another one for tooltip??
+	// @todo FIXME: Why on earth this needs one message for the text and another one for tooltip?
 	# Get prev/next link display text
 	$prev = wfMsgExt( 'prevn', array( 'parsemag', 'escape' ), $fmtLimit );
 	$next = wfMsgExt( 'nextn', array( 'parsemag', 'escape' ), $fmtLimit );
@@ -1134,7 +1134,7 @@ function wfNumLink( $offset, $limit, $title, $query = '' ) {
 
 /**
  * @todo document
- * @todo FIXME: we may want to blacklist some broken browsers
+ * @todo FIXME: We may want to blacklist some broken browsers
  *
  * @param $force Bool
  * @return bool Whereas client accept gzip compression
@@ -1144,7 +1144,7 @@ function wfClientAcceptsGzip( $force = false ) {
 	if ( $result === null || $force ) {
 		$result = false;
 		if( isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) {
-			# FIXME: we may want to blacklist some broken browsers
+			# @todo FIXME: We may want to blacklist some broken browsers
 			$m = array();
 			if( preg_match(
 				'/\bgzip(?:;(q)=([0-9]+(?:\.[0-9]+)))?\b/',
@@ -1699,7 +1699,7 @@ function wfAcceptToPrefs( $accept, $def = '*/*' ) {
 	$parts = explode( ',', $accept );
 
 	foreach( $parts as $part ) {
-		# FIXME: doesn't deal with params like 'text/html; level=1'
+		# @todo FIXME: Doesn't deal with params like 'text/html; level=1'
 		@list( $value, $qpart ) = explode( ';', trim( $part ) );
 		$match = array();
 		if( !isset( $qpart ) ) {
@@ -1749,7 +1749,7 @@ function mimeTypeMatch( $type, $avail ) {
  * @param $sprefs Array: server's offered types
  * @return string
  *
- * @todo FIXME: doesn't handle params like 'text/plain; charset=UTF-8'
+ * @todo FIXME: Doesn't handle params like 'text/plain; charset=UTF-8'
  * XXX: generalize to negotiate other stuff
  */
 function wfNegotiateType( $cprefs, $sprefs ) {
@@ -2613,7 +2613,7 @@ function wfMergeErrorArrays( /*...*/ ) {
 	$out = array();
 	foreach ( $args as $errors ) {
 		foreach ( $errors as $params ) {
-			# FIXME: sometimes get nested arrays for $params,
+			# @todo FIXME: Sometimes get nested arrays for $params,
 			# which leads to E_NOTICEs
 			$spec = implode( "\t", $params );
 			$out[$spec] = $params;
diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index e5f7a4c4f5..44669df8b5 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -582,7 +582,8 @@ class HTMLForm {
 
 	/**
 	 * Set the id for the submit button.
-	 * @param $t String.  FIXME: Integrity is *not* validated
+	 * @param $t String.
+	 * @todo FIXME: Integrity of $t is *not* validated
 	 */
 	function setSubmitID( $t ) {
 		$this->mSubmitID = $t;
@@ -1535,7 +1536,8 @@ class HTMLMultiSelectField extends HTMLFormField {
 			# field, is it because the user has not yet submitted the form, or that they
 			# have submitted it with all the options unchecked? We will have to assume the
 			# latter, which basically means that you can't specify 'positive' defaults
-			# for GET forms.  FIXME...
+			# for GET forms.
+			# @todo FIXME...
 			return $request->getArray( $this->mName, array() );
 		}
 	}
@@ -1562,7 +1564,7 @@ class HTMLMultiSelectField extends HTMLFormField {
  * Plus a text field underneath for an additional reason.  The 'value' of the field is
  * ""<select>: <extra reason>"", or "<extra reason>" if nothing has been selected in the
  * select dropdown.
- * FIXME: If made 'required', only the text field should be compulsory.
+ * @todo FIXME: If made 'required', only the text field should be compulsory.
  */
 class HTMLSelectAndOtherField extends HTMLSelectField {
 
diff --git a/includes/Html.php b/includes/Html.php
index 43419e7714..ce90a44fd7 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -437,7 +437,8 @@ class Html {
 				# Apparently we need to entity-encode \n, \r, \t, although the
 				# spec doesn't mention that.  Since we're doing strtr() anyway,
 				# and we don't need <> escaped here, we may as well not call
-				# htmlspecialchars().  FIXME: verify that we actually need to
+				# htmlspecialchars().
+				# @todo FIXME: Verify that we actually need to
 				# escape \n\r\t here, and explain why, exactly.
 				#
 				# We could call Sanitizer::encodeAttribute() for this, but we
@@ -452,8 +453,8 @@ class Html {
 				);
 				if ( $wgWellFormedXml ) {
 					# This is allowed per spec: <http://www.w3.org/TR/xml/#NT-AttValue>
-					# But reportedly it breaks some XML tools?  FIXME: is this
-					# really true?
+					# But reportedly it breaks some XML tools?
+					# @todo FIXME: Is this really true?
 					$map['<'] = '&lt;';
 				}
 				$ret .= " $key=$quote" . strtr( $value, $map ) . $quote;
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 54c676c4fc..effd829e47 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -96,7 +96,7 @@ class ImagePage extends Article {
 		$this->showRedirectedFromHeader();
 
 		if ( $wgShowEXIF && $this->displayImg->exists() ) {
-			// FIXME: bad interface, see note on MediaHandler::formatMetadata().
+			// @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata().
 			$formattedMetadata = $this->displayImg->formatMetadata();
 			$showmeta = $formattedMetadata !== false;
 		} else {
@@ -138,7 +138,7 @@ class ImagePage extends Article {
 			array( 'id' => 'filelinks' ),
 			wfMsg( 'imagelinks' ) ) . "\n" );
 		$this->imageDupes();
-		# TODO! FIXME! For some freaky reason, we can't redirect to foreign images.
+		# @todo FIXME: For some freaky reason, we can't redirect to foreign images.
 		# Yet we return metadata about the target. Definitely an issue in the FileRepo
 		$this->imageLinks();
 		
@@ -261,7 +261,7 @@ class ImagePage extends Article {
 	/**
 	 * Make a table with metadata to be shown in the output page.
 	 *
-	 * FIXME: bad interface, see note on MediaHandler::formatMetadata().
+	 * @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata().
 	 *
 	 * @param $metadata Array: the array containing the EXIF data
 	 * @return String The metadata table. This is treated as Wikitext (!)
@@ -272,7 +272,7 @@ class ImagePage extends Article {
 		$r .= "<table id=\"mw_metadata\" class=\"mw_metadata\">\n";
 		foreach ( $metadata as $type => $stuff ) {
 			foreach ( $stuff as $v ) {
-				# FIXME, why is this using escapeId for a class?!
+				# @todo FIXME: Why is this using escapeId for a class?!
 				$class = Sanitizer::escapeId( $v['id'] );
 				if ( $type == 'collapsed' ) {
 					$class .= ' collapsable';
diff --git a/includes/Import.php b/includes/Import.php
index 8bd65a6e5e..1e6df49d06 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -164,7 +164,7 @@ class WikiImporter {
 			// Don't override namespaces
 			$this->mTargetNamespace = null;
 		} elseif( $namespace >= 0 ) {
-			// FIXME: Check for validity
+			// @todo FIXME: Check for validity
 			$this->mTargetNamespace = intval( $namespace );
 		} else {
 			return false;
@@ -1026,14 +1026,14 @@ class WikiRevision {
 				__METHOD__
 			);
 			if( $prior ) {
-				// FIXME: this could fail slightly for multiple matches :P
+				// @todo FIXME: This could fail slightly for multiple matches :P
 				wfDebug( __METHOD__ . ": skipping existing revision for [[" .
 					$this->title->getPrefixedText() . "]], timestamp " . $this->timestamp . "\n" );
 				return false;
 			}
 		}
 
-		# FIXME: Use original rev_id optionally (better for backups)
+		# @todo FIXME: Use original rev_id optionally (better for backups)
 		# Insert the row
 		$revision = new Revision( array(
 			'page'       => $pageId,
@@ -1077,14 +1077,14 @@ class WikiRevision {
 
 	function importLogItem() {
 		$dbw = wfGetDB( DB_MASTER );
-		# FIXME: this will not record autoblocks
+		# @todo FIXME: This will not record autoblocks
 		if( !$this->getTitle() ) {
 			wfDebug( __METHOD__ . ": skipping invalid {$this->type}/{$this->action} log time, timestamp " .
 				$this->timestamp . "\n" );
 			return;
 		}
 		# Check if it exists already
-		// FIXME: use original log ID (better for backups)
+		// @todo FIXME: Use original log ID (better for backups)
 		$prior = $dbw->selectField( 'logging', '1',
 			array( 'log_type' => $this->getType(),
 				'log_action'    => $this->getAction(),
@@ -1096,7 +1096,7 @@ class WikiRevision {
 				'log_params'    => $this->params ),
 			__METHOD__
 		);
-		// FIXME: this could fail slightly for multiple matches :P
+		// @todo FIXME: This could fail slightly for multiple matches :P
 		if( $prior ) {
 			wfDebug( __METHOD__ . ": skipping existing item for Log:{$this->type}/{$this->action}, timestamp " .
 				$this->timestamp . "\n" );
@@ -1190,7 +1190,7 @@ class WikiRevision {
 			return false;
 		}
 
-		// @todo Fixme!
+		// @todo FIXME!
 		$src = $this->getSrc();
 		$data = Http::get( $src );
 		if( !$data ) {
diff --git a/includes/Linker.php b/includes/Linker.php
index e4b9991074..8dac33edb5 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -39,7 +39,7 @@ class Linker {
 	static function getInterwikiLinkAttributes( $title, $unused = null, $class = 'external' ) {
 		global $wgContLang;
 
-		# FIXME: We have a whole bunch of handling here that doesn't happen in
+		# @todo FIXME: We have a whole bunch of handling here that doesn't happen in
 		# getExternalLinkAttributes, why?
 		$title = urldecode( $title );
 		$title = $wgContLang->checkTitleEncoding( $title );
@@ -353,7 +353,7 @@ class Linker {
 
 		$threshold = $wgUser->getStubThreshold();
 		$colour = ( $size < $threshold ) ? 'stub' : '';
-		// FIXME: replace deprecated makeColouredLinkObj by link()
+		// @todo FIXME: Replace deprecated makeColouredLinkObj by link()
 		return self::makeColouredLinkObj( $nt, $colour, $text, $query, $trail, $prefix );
 	}
 
@@ -1148,7 +1148,7 @@ class Linker {
 	 * Formats wiki links and media links in text; all other wiki formatting
 	 * is ignored
 	 *
-	 * @todo Fixme: doesn't handle sub-links as in image thumb texts like the main parser
+	 * @todo FIXME: Doesn't handle sub-links as in image thumb texts like the main parser
 	 * @param $comment String: text to format links in
 	 * @param $title An optional title object used to links to sections
 	 * @param $local Boolean: whether section links should refer to local page
@@ -1716,7 +1716,7 @@ class Linker {
 		} else {
 			$accesskey = $message->plain();
 			if ( $accesskey === '' || $accesskey === '-' ) {
-				# FIXME: Per standard MW behavior, a value of '-' means to suppress the
+				# @todo FIXME: Per standard MW behavior, a value of '-' means to suppress the
 				# attribute, but this is broken for accesskey: that might be a useful
 				# value.
 				$accesskey = false;
@@ -1909,7 +1909,7 @@ class Linker {
 		global $wgEnableTooltipsAndAccesskeys;
 		if ( !$wgEnableTooltipsAndAccesskeys )
 			return array();
-		# FIXME: If Sanitizer::expandAttributes() treated "false" as "output
+		# @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
 		# no attribute" instead of "output '' as value for attribute", this
 		# would be three lines.
 		$attribs = array(
@@ -1933,7 +1933,7 @@ class Linker {
 		global $wgEnableTooltipsAndAccesskeys;
 		if ( !$wgEnableTooltipsAndAccesskeys )
 			return '';
-		# FIXME: If Sanitizer::expandAttributes() treated "false" as "output
+		# @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
 		# no attribute" instead of "output '' as value for attribute", this
 		# would be two lines.
 		$tooltip = self::titleAttrib( $name, $options );
diff --git a/includes/Message.php b/includes/Message.php
index 3ddbdcb684..5f6e9af429 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -48,9 +48,8 @@
  * $escaped = wfMessage( 'key' )->rawParams( 'apple' )->escaped();
  * </pre>
  *
- * TODO:
+ * @todo
  * - test, can we have tests?
- * - sort out the details marked with fixme
  *
  * @since 1.17
  * @author Niklas Laxström
@@ -355,7 +354,7 @@ class Message {
 	/**
 	 * Check whether a message does not exist, or is an empty string
 	 * @return Bool: true if is is and false if not
-	 * @todo Merge with isDisabled()?
+	 * @todo FIXME: Merge with isDisabled()?
 	 */
 	public function isBlank() {
 		$message = $this->fetchMessage();
diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 248c1e3708..de32dccdd4 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -564,7 +564,8 @@ class MimeMagic {
 	private function doGuessMimeType( $file, $ext ) { // TODO: remove $ext param
 		// Read a chunk of the file
 		wfSuppressWarnings();
-		$f = fopen( $file, 'rt' ); // FIXME: Shouldn't this be rb?
+		// @todo FIXME: Shouldn't this be rb?
+		$f = fopen( $file, 'rt' );
 		wfRestoreWarnings();
 		
 		if( !$f ) {
@@ -632,7 +633,7 @@ class MimeMagic {
 		 * heuristic, and won't match a file with a lot of non-PHP before.  It
 		 * will also match text files which could be PHP. :)
 		 *
-		 * FIXME: For this reason, the check is probably useless -- an attacker
+		 * @todo FIXME: For this reason, the check is probably useless -- an attacker
 		 * could almost certainly just pad the file with a lot of nonsense to
 		 * circumvent the check in any case where it would be a security
 		 * problem.  On the other hand, it causes harmful false positives (bug
@@ -856,7 +857,7 @@ class MimeMagic {
 
 		$m = null;
 		if ( $wgMimeDetectorCommand ) {
-			// FIXME: Use wfShellExec
+			// @todo FIXME: Use wfShellExec
 			$fn = wfEscapeShellArg( $file );
 			$m = `$wgMimeDetectorCommand $fn`;
 		} elseif ( function_exists( "finfo_open" ) && function_exists( "finfo_file" ) ) {
diff --git a/includes/OutputHandler.php b/includes/OutputHandler.php
index 8f310da27a..434749386f 100644
--- a/includes/OutputHandler.php
+++ b/includes/OutputHandler.php
@@ -42,7 +42,7 @@ function wfOutputHandler( $s ) {
  * @private
  */
 function wfRequestExtension() {
-	/// @todo Fixme: this sort of dupes some code in WebRequest::getRequestUrl()
+	/// @todo FIXME: this sort of dupes some code in WebRequest::getRequestUrl()
 	if( isset( $_SERVER['REQUEST_URI'] ) ) {
 		// Strip the query string...
 		list( $path ) = explode( '?', $_SERVER['REQUEST_URI'], 2 );
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 8519f80b72..627fc17d85 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -11,7 +11,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  * This class is used to prepare the final rendering. A skin is then
  * applied to the output parameters (links, javascript, html, categories ...).
  *
- * Another class (fixme) handles sending the whole page to the client.
+ * @todo FIXME: Another class handles sending the whole page to the client.
  *
  * Some comments comes from a pairing session between Zak Greant and Ashar Voultoiz
  * in November 2010.
@@ -115,11 +115,11 @@ class OutputPage {
 	/// Array of elements in <head>. Parser might add its own headers!
 	var $mHeadItems = array();
 
-	// Next variables probably comes from the resource loader @todo FIXME
+	// @todo FIXME: Next variables probably comes from the resource loader
 	var $mModules = array(), $mModuleScripts = array(), $mModuleStyles = array(), $mModuleMessages = array();
 	var $mResourceLoader;
 
-	/** @fixme is this still used ?*/
+	/** @todo FIXME: Is this still used ?*/
 	var $mInlineMsg = array();
 
 	var $mTemplateIds = array();
@@ -1594,7 +1594,7 @@ class OutputPage {
 	 *
 	 * @param $header String: header name
 	 * @param $option Array|null
-	 * @fixme Document the $option parameter; it appears to be for
+	 * @todo FIXME: Document the $option parameter; it appears to be for
 	 *        X-Vary-Options but what format is acceptable?
 	 */
 	public function addVaryHeader( $header, $option = null ) {
@@ -2604,7 +2604,7 @@ class OutputPage {
 				# XXX: additional security check/prompt?
 				$scripts .= Html::inlineScript( "\n" . $this->getRequest()->getText( 'wpTextbox1' ) . "\n" ) . "\n";
 			} else {
-				# FIXME: this means that User:Me/Common.js doesn't load when previewing
+				# @todo FIXME: This means that User:Me/Common.js doesn't load when previewing
 				# User:Me/Vector.js, and vice versa (bug26283)
 				$userScripts[] = 'user';
 			}
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 5f5d7c73cf..7daab1506a 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -89,7 +89,7 @@ class ProtectionForm {
 		$this->mCascade = $wgRequest->getBool( 'mwProtect-cascade', $this->mCascade );
 
 		foreach( $this->mApplicableTypes as $action ) {
-			// Fixme: this form currently requires individual selections,
+			// @todo FIXME: This form currently requires individual selections,
 			// but the db allows multiples separated by commas.
 			
 			// Pull the actual restriction from the DB
@@ -166,7 +166,7 @@ class ProtectionForm {
 				return false;
 			}
 
-			// Fixme: non-qualified absolute times are not in users specified timezone
+			// @todo FIXME: Non-qualified absolute times are not in users specified timezone
 			// and there isn't notice about it in the ui
 			$time = wfTimestamp( TS_MW, $unix );
 		}
diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index ca3d20824a..8cc5dd707c 100644
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -201,7 +201,7 @@ class RecentChange {
 				$editor = ($wgUser->getName() == $this->mAttribs['rc_user_text']) ? 
 					$wgUser : User::newFromName( $this->mAttribs['rc_user_text'], false );
 			}
-			# FIXME: this would be better as an extension hook
+			# @todo FIXME: This would be better as an extension hook
 			$enotif = new EmailNotification();
 			$title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
 			$enotif->notifyOnPageChange( $editor, $title,
diff --git a/includes/Revision.php b/includes/Revision.php
index fde05431ca..e72c7c1dd9 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -65,7 +65,7 @@ class Revision {
 	/**
 	 * Make a fake revision object from an archive table row. This is queried
 	 * for permissions or even inserted (as in Special:Undelete)
-	 * @todo Fixme: should be a subclass for RevisionDelete. [TS]
+	 * @todo FIXME: Should be a subclass for RevisionDelete. [TS]
 	 */
 	public static function newFromArchiveRow( $row, $overrides = array() ) {
 		$attribs = $overrides + array(
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 09fc8d1a67..df62b5e9c8 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1558,7 +1558,7 @@ class Sanitizer {
 
 			$host = preg_replace( $strip, '', $host );
 
-			// @todo Fixme: validate hostnames here
+			// @todo FIXME: Validate hostnames here
 
 			return $protocol . $host . $rest;
 		} else {
diff --git a/includes/Skin.php b/includes/Skin.php
index 4d30a17605..4cd89c2d06 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -421,7 +421,7 @@ abstract class Skin {
 		// Per-user custom styles
 		if ( $wgAllowUserCss ) {
 			if ( $this->getTitle()->isCssSubpage() && $this->userCanPreview( $this->getContext()->getRequest()->getVal( 'action' ) ) ) {
-				// @FIXME: properly escape the cdata!
+				// @todo FIXME: Properly escape the cdata!
 				$out->addInlineStyle( $this->getContext()->getRequest()->getText( 'wpTextbox1' ) );
 			} else {
 				$out->addModuleStyles( 'user' );
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 7351265e81..cca86c178b 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -194,7 +194,7 @@ class SkinTemplate extends Skin {
 			$tpl->set( 'usercss', false );
 
 			$this->userjs = $this->userjsprev = false;
-			# FIXME: this is the only use of OutputPage::isUserJsAllowed() anywhere; can we
+			# @todo FIXME: This is the only use of OutputPage::isUserJsAllowed() anywhere; can we
 			# get rid of it?  For that matter, why is any of this here at all?
 			$this->setupUserJs( $out->isUserJsAllowed() );
 			$tpl->setRef( 'userjs', $this->userjs );
@@ -671,11 +671,13 @@ class SkinTemplate extends Skin {
 				$title = SpecialPage::getTitleFor( 'Userlogin' );
 				$https_url = preg_replace( '/^http:/', 'https:', $title->getFullURL() );
 				$login_url['href']  = $https_url;
-				$login_url['class'] = 'link-https';  # FIXME class depends on skin
+				# @todo FIXME: Class depends on skin
+				$login_url['class'] = 'link-https';
 				if ( isset($createaccount_url) ) {
 					$https_url = preg_replace( '/^http:/', 'https:', $title->getFullURL("type=signup") );
 					$createaccount_url['href']  = $https_url;
-					$createaccount_url['class'] = 'link-https';  # FIXME class depends on skin
+					# @todo FIXME: Class depends on skin
+					$createaccount_url['class'] = 'link-https';
 				}
 			}
 
@@ -1279,7 +1281,7 @@ class SkinTemplate extends Skin {
 
 	/**
 	 * @private
-	 * FIXME: why is this duplicated in/from OutputPage::getHeadScripts()??
+	 * @todo FIXME: Why is this duplicated in/from OutputPage::getHeadScripts()??
 	 */
 	function setupUserJs( $allowUserJs ) {
 		global $wgRequest, $wgJsMimeType;
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index c2434d8278..6bc7de1869 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -389,7 +389,7 @@ class SpecialPage {
 		return $this->mFile;
 	}
 
-	// FIXME: decide which syntax to use for this, and stick to it
+	// @todo FIXME: Decide which syntax to use for this, and stick to it
 	/**
 	 * Whether this special page is listed in Special:SpecialPages
 	 * @since r3583 (v1.3)
@@ -929,7 +929,7 @@ class SpecialListBots extends SpecialRedirectToSpecial {
 
 /**
  * CreateAccount --> UserLogin/signup
- * FIXME: this (and the rest of the login frontend) needs to die a horrible painful death
+ * @todo FIXME: This (and the rest of the login frontend) needs to die a horrible painful death
  */
 class SpecialCreateAccount extends SpecialRedirectToSpecial {
 	function __construct(){
diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 0a8bc74eca..06440a4ba4 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -405,7 +405,7 @@ class SpecialPageFactory {
 	public static function executePath( Title &$title, RequestContext &$context, $including = false ) {
 		wfProfileIn( __METHOD__ );
 
-		// FIXME: redirects broken due to this call
+		// @todo FIXME: Redirects broken due to this call
 		$bits = explode( '/', $title->getDBkey(), 2 );
 		$name = $bits[0];
 		if ( !isset( $bits[1] ) ) { // bug 2087
diff --git a/includes/Title.php b/includes/Title.php
index 8f9e9163e0..6328284814 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -712,7 +712,8 @@ class Title {
 	 * @return String the prefixed title, with spaces
 	 */
 	public function getPrefixedText() {
-		if ( empty( $this->mPrefixedText ) ) { // FIXME: bad usage of empty() ?
+		// @todo FIXME: Bad usage of empty() ?
+		if ( empty( $this->mPrefixedText ) ) {
 			$s = $this->prefix( $this->mTextform );
 			$s = str_replace( '_', ' ', $s );
 			$this->mPrefixedText = $s;
@@ -894,7 +895,7 @@ class Title {
 				}
 			}
 
-			// FIXME: this causes breakage in various places when we
+			// @todo FIXME: This causes breakage in various places when we
 			// actually expected a local URL and end up with dupe prefixes.
 			if ( $wgRequest->getVal( 'action' ) == 'render' ) {
 				$url = $wgServer . $url;
@@ -920,7 +921,7 @@ class Title {
 		global $wgActionPaths;
 		if( !array_key_exists( 'action', $queryArray ) ) {
 			// Makes the default action 'view' and points to $wgArticlePath
-			// FIXME: this should be handled in Setup or Wiki!
+			// @todo FIXME: This should be handled in Setup or Wiki!
 			global $wgArticlePath;
 			$url = str_replace( '$1', $dbkey, $wgArticlePath );
 		} elseif( isset( $wgActionPaths[$queryArray['action']] ) ) {
@@ -1189,7 +1190,7 @@ class Title {
 	/**
 	 * Can $user perform $action on this page?
 	 *
-	 * FIXME: This *does not* check throttles (User::pingLimiter()).
+	 * @todo FIXME: This *does not* check throttles (User::pingLimiter()).
 	 *
 	 * @param $action String action that permission needs to be checked for
 	 * @param $user User to check
@@ -3113,7 +3114,7 @@ class Title {
 		// Do the actual move
 		$err = $this->moveToInternal( $nt, $reason, $createRedirect );
 		if ( is_array( $err ) ) {
-			# FIXME: What about the File we have already moved?
+			# @todo FIXME: What about the File we have already moved?
 			$dbw->rollback();
 			return $err;
 		}
@@ -3164,7 +3165,8 @@ class Title {
 			if ( $reason ) {
 				$comment .= wfMsgForContent( 'colon-separator' ) . $reason;
 			}
-			$log->addEntry( 'move_prot', $nt, $comment, array( $this->getPrefixedText() ) ); // FIXME: $params?
+			// @todo FIXME: $params?
+			$log->addEntry( 'move_prot', $nt, $comment, array( $this->getPrefixedText() ) );
 		}
 
 		# Update watchlists
diff --git a/includes/User.php b/includes/User.php
index 93ff7df909..a6695024e6 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1267,7 +1267,7 @@ class User {
 		wfProfileIn( __METHOD__ );
 
 		$found = false;
-		// FIXME: IPv6 ???  (http://bugs.php.net/bug.php?id=33170)
+		// @todo FIXME: IPv6 ???  (http://bugs.php.net/bug.php?id=33170)
 		if( IP::isIPv4( $ip ) ) {
 			# Reverse IP, bug 21255
 			$ipReversed = implode( '.', array_reverse( explode( '.', $ip ) ) );
@@ -2355,7 +2355,7 @@ class User {
 	/**
 	 * Get the current skin, loading it if required
 	 * @return Skin The current skin
-	 * @todo FIXME : need to check the old failback system [AV]
+	 * @todo FIXME: Need to check the old failback system [AV]
 	 * @deprecated since 1.18 Use ->getSkin() in the most relevant outputting context you have
 	 */
 	function getSkin() {
@@ -3836,7 +3836,7 @@ class User {
 	 * actually just returns array() unconditionally at the moment.  May as
 	 * well keep it around for when the browser bugs get fixed, though.
 	 *
-	 * FIXME : This does not belong here; put it in Html or Linker or somewhere
+	 * @todo FIXME: This does not belong here; put it in Html or Linker or somewhere
 	 *
 	 * @return array Array of HTML attributes suitable for feeding to
 	 *   Html::element(), directly or indirectly.  (Don't feed to Xml::*()!
@@ -3853,7 +3853,7 @@ class User {
 		# Note that the pattern requirement will always be satisfied if the
 		# input is empty, so we need required in all cases.
 		#
-		# FIXME (bug 23769): This needs to not claim the password is required
+		# @todo FIXME: Bug 23769: This needs to not claim the password is required
 		# if e-mail confirmation is being used.  Since HTML5 input validation
 		# is b0rked anyway in some browsers, just return nothing.  When it's
 		# re-enabled, fix this code to not output required for e-mail
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index a2e11d7504..f4f6b3bed0 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -166,7 +166,8 @@ class UserMailer {
 			$headers['Content-type'] = ( is_null( $contentType ) ?
 					'text/plain; charset=UTF-8' : $contentType );
 			$headers['Content-transfer-encoding'] = '8bit';
-			$headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME
+			// @todo FIXME
+			$headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>';
 			$headers['X-Mailer'] = 'MediaWiki mailer';
 
 			wfSuppressWarnings();
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index f96b723643..53e6bf5b91 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -45,7 +45,7 @@ class WebRequest {
 	private $response;
 
 	public function __construct() {
-		/// @todo Fixme: this preemptive de-quoting can interfere with other web libraries
+		/// @todo FIXME: This preemptive de-quoting can interfere with other web libraries
 		///        and increases our memory footprint. It would be cleaner to do on
 		///        demand; but currently we have no wrapper for $_SERVER etc.
 		$this->checkMagicQuotes();
diff --git a/includes/WebStart.php b/includes/WebStart.php
index ae81e8834b..604f79f325 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -98,7 +98,7 @@ if ( !defined( 'MW_COMPILED' ) ) {
 	require_once( "$IP/includes/AutoLoader.php" );
 
 	# Start profiler
-	# FIXME: rewrite wfProfileIn/wfProfileOut so that they can work in compiled mode
+	# @todo FIXME: Rewrite wfProfileIn/wfProfileOut so that they can work in compiled mode
 	require_once( "$IP/includes/profiler/Profiler.php" );
 	if ( file_exists( "$IP/StartProfiler.php" ) ) {
 		require_once( "$IP/StartProfiler.php" );
diff --git a/includes/Wiki.php b/includes/Wiki.php
index d0e2eac11a..25d220fc00 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -235,7 +235,7 @@ class MediaWiki {
 	 */
 	public static function articleFromTitle( $title, RequestContext $context ) {
 		if ( NS_MEDIA == $title->getNamespace() ) {
-			// FIXME: where should this go?
+			// @todo FIXME: Where should this go?
 			$title = Title::makeTitle( NS_FILE, $title->getDBkey() );
 		}
 
diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index e12f7abe82..b7c96d6aa8 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -142,7 +142,7 @@ class WikiReference {
 	/**
 	 * Helper function for getUrl()
 	 *
-	 * @todo FIXME: this may be generalized...
+	 * @todo FIXME: This may be generalized...
 	 * @param $page String: page name (must be normalised before calling this function!)
 	 * @return String: Url fragment
 	 */
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 33b86afd5a..3536fdfedd 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -267,7 +267,7 @@ class ApiEditPage extends ApiBase {
 		$oldRevId = $articleObj->getRevIdFetched();
 		$result = null;
 		// Fake $wgRequest for some hooks inside EditPage
-		// FIXME: This interface SUCKS
+		// @todo FIXME: This interface SUCKS
 		$oldRequest = $wgRequest;
 		$wgRequest = $req;
 
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index 5eb7ce45c1..fa576266c1 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -78,8 +78,9 @@ class ApiLogin extends ApiBase {
 				$wgUser->setOption( 'rememberpassword', 1 );
 				$wgUser->setCookies( $this->getMain()->getRequest() );
 
-				// Run hooks. FIXME: split back and frontend from this hook.
-				// FIXME: This hook should be placed in the backend
+				// Run hooks.
+				// @todo FIXME: Split back and frontend from this hook.
+				// @todo FIXME: This hook should be placed in the backend
 				$injected_html = '';
 				wfRunHooks( 'UserLoginComplete', array( &$wgUser, &$injected_html ) );
 
diff --git a/includes/cache/SquidUpdate.php b/includes/cache/SquidUpdate.php
index dddc7b8ff1..2caf269c6d 100644
--- a/includes/cache/SquidUpdate.php
+++ b/includes/cache/SquidUpdate.php
@@ -145,7 +145,7 @@ class SquidUpdate {
 
 		$htcpOpCLR = 4; // HTCP CLR
 
-		// FIXME PHP doesn't support these socket constants (include/linux/in.h)
+		// @todo FIXME: PHP doesn't support these socket constants (include/linux/in.h)
 		if( !defined( "IPPROTO_IP" ) ) {
 			define( "IPPROTO_IP", 0 );
 			define( "IP_MULTICAST_LOOP", 34 );
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 9ea88d1497..cd11bb8d16 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -44,7 +44,7 @@ interface DatabaseType {
 
 	/**
 	 * The DBMS-dependent part of query()
-	 * @todo Fixme: Make this private someday
+	 * @todo FIXME: Make this private someday
 	 *
 	 * @param  $sql String: SQL query.
 	 * @return Result object to feed to fetchObject, fetchRow, ...; or false on failure
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 446fd802d6..ce2fba89e6 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -269,10 +269,9 @@ class DatabasePostgres extends DatabaseBase {
 			$res = $res->result;
 		}
 		@$row = pg_fetch_object( $res );
-		# FIXME: HACK HACK HACK HACK debug
+		# @todo FIXME: HACK HACK HACK HACK debug
 
-		# TODO:
-		# hashar : not sure if the following test really trigger if the object
+		# @todo hashar: not sure if the following test really trigger if the object
 		#          fetching failed.
 		if( pg_last_error( $this->mConn ) ) {
 			throw new DBUnexpectedError( $this, 'SQL error: ' . htmlspecialchars( pg_last_error( $this->mConn ) ) );
@@ -541,7 +540,7 @@ class DatabasePostgres extends DatabaseBase {
 	 * Source items may be literals rather then field names, but strings should be quoted with Database::addQuotes()
 	 * $conds may be "*" to copy the whole table
 	 * srcTable may be an array of tables.
-	 * @todo FIXME: implement this a little better (seperate select/insert)?
+	 * @todo FIXME: Implement this a little better (seperate select/insert)?
 	 */
 	function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'DatabasePostgres::insertSelect',
 		$insertOptions = array(), $selectOptions = array() )
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 1b3e20412b..9662b03cd4 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -165,7 +165,7 @@ class LoadBalancer {
 	function getReaderIndex( $group = false, $wiki = false ) {
 		global $wgReadOnly, $wgDBClusterTimeout, $wgDBAvgStatusPoll, $wgDBtype;
 
-		# FIXME: For now, only go through all this for mysql databases
+		# @todo FIXME: For now, only go through all this for mysql databases
 		if ($wgDBtype != 'mysql') {
 			return $this->getWriterIndex();
 		}
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 2cecef6a6d..1cf98b492d 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -59,6 +59,7 @@ class DifferenceEngine {
 	 * @param $titleObj Title object that the diff is associated with
 	 * @param $old Integer: old ID we want to show and diff with.
 	 * @param $new String: either 'prev' or 'next'.
+	 * @todo FIXME: $rcid ???
 	 * @param $rcid Integer: ??? FIXME (default 0)
 	 * @param $refreshCache boolean If set, refreshes the diff cache
 	 * @param $unhide boolean If set, allow viewing deleted revs
diff --git a/includes/extauth/MediaWiki.php b/includes/extauth/MediaWiki.php
index a88f30efba..20f3645850 100644
--- a/includes/extauth/MediaWiki.php
+++ b/includes/extauth/MediaWiki.php
@@ -117,7 +117,7 @@ class ExternalUser_MediaWiki extends ExternalUser {
 	}
 
 	public function getPref( $pref ) {
-		# FIXME: Return other prefs too.  Lots of global-riddled code that does 
+		# @todo FIXME: Return other prefs too.  Lots of global-riddled code that does 
 		# this normally.
 		if ( $pref === 'emailaddress'
 		&& $this->row->user_email_authenticated !== null ) {
@@ -127,7 +127,7 @@ class ExternalUser_MediaWiki extends ExternalUser {
 	}
 
 	public function getGroups() {
-		# FIXME: Untested.
+		# @todo FIXME: Untested.
 		$groups = array();
 		$res = $this->mDb->select(
 			'user_groups',
diff --git a/includes/filerepo/ForeignAPIFile.php b/includes/filerepo/ForeignAPIFile.php
index 05976187d5..8005ac563e 100644
--- a/includes/filerepo/ForeignAPIFile.php
+++ b/includes/filerepo/ForeignAPIFile.php
@@ -161,7 +161,7 @@ class ForeignAPIFile extends File {
 		return $this->mInfo['mime'];
 	}
 	
-	/// @todo Fixme: may guess wrong on file types that can be eg audio or video
+	/// @todo FIXME: May guess wrong on file types that can be eg audio or video
 	function getMediaType() {
 		$magic = MimeMagic::singleton();
 		return $magic->getMediaType( null, $this->getMimeType() );
diff --git a/includes/filerepo/ForeignAPIRepo.php b/includes/filerepo/ForeignAPIRepo.php
index 55b1be302f..c461d4dfc9 100644
--- a/includes/filerepo/ForeignAPIRepo.php
+++ b/includes/filerepo/ForeignAPIRepo.php
@@ -109,7 +109,7 @@ class ForeignAPIRepo extends FileRepo {
 				$results[$k] = true;
 				unset( $files[$k] );
 			} elseif( self::isVirtualUrl( $f ) ) {
-				# TODO! FIXME! We need to be able to handle virtual
+				# @todo FIXME: We need to be able to handle virtual
 				# URLs better, at least when we know they refer to the
 				# same repo.
 				$results[$k] = false;
@@ -295,7 +295,7 @@ class ForeignAPIRepo extends FileRepo {
 			}
 		}
 
-		# FIXME: Delete old thumbs that aren't being used. Maintenance script?
+		# @todo FIXME: Delete old thumbs that aren't being used. Maintenance script?
 		wfSuppressWarnings();
 		if( !file_put_contents( $localFilename, $thumb ) ) {
 			wfRestoreWarnings();
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7cd2983c66..0d2d564ac3 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -634,7 +634,7 @@ abstract class Installer {
 
 		if ( !$compiledDBs ) {
 			$this->showError( 'config-no-db', $wgLang->commaList( $allNames ) );
-			// FIXME: this only works for the web installer!
+			// @todo FIXME: This only works for the web installer!
 			return false;
 		}
 
@@ -870,7 +870,7 @@ abstract class Installer {
 	 * Environment check for setting the preferred PHP file extension.
 	 */
 	protected function envCheckExtension() {
-		// FIXME: detect this properly
+		// @todo FIXME: Detect this properly
 		if ( defined( 'MW_INSTALL_PHP5_EXT' ) ) {
 			$ext = 'php5';
 		} else {
diff --git a/includes/installer/SqliteInstaller.php b/includes/installer/SqliteInstaller.php
index 2edb3d9bd6..189815af16 100644
--- a/includes/installer/SqliteInstaller.php
+++ b/includes/installer/SqliteInstaller.php
@@ -110,7 +110,7 @@ class SqliteInstaller extends DatabaseInstaller {
 		$dir = $this->getVar( 'wgSQLiteDataDir' );
 		$dbName = $this->getVar( 'wgDBname' );
 		try {
-			# FIXME: need more sensible constructor parameters, e.g. single associative array
+			# @todo FIXME: Need more sensible constructor parameters, e.g. single associative array
 			# Setting globals kind of sucks
 			$wgSQLiteDataDir = $dir;
 			$db = new DatabaseSqlite( false, false, false, $dbName );
diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 6e58434339..006f7720d2 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -19,7 +19,7 @@ class FormatJson {
 	 * @param $value Mixed: the value being encoded. Can be any type except a resource.
 	 * @param $isHtml Boolean
 	 *
-	 * @fixme "$isHtml" parameter's purpose is not documented. It appears to
+	 * @todo FIXME: "$isHtml" parameter's purpose is not documented. It appears to
 	 *        map to a parameter labeled "pretty-print output with indents and
 	 *        newlines" in Services_JSON::encode(), which has no string relation
 	 *        to HTML output.
diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 0ac2bfaf6b..9bb1470540 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -54,7 +54,7 @@ class BitmapHandler extends ImageHandler {
 		# Don't thumbnail an image so big that it will fill hard drives and send servers into swap
 		# JPEG has the handy property of allowing thumbnailing without full decompression, so we make
 		# an exception for it.
-		# FIXME: This actually only applies to ImageMagick
+		# @todo FIXME: This actually only applies to ImageMagick
 		if ( $mimeType !== 'image/jpeg' &&
 			$srcWidth * $srcHeight > $wgMaxImageArea )
 		{
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index 7857a56c3b..2836d31bcc 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -96,7 +96,7 @@ class Exif {
 	 * Constructor
 	 *
 	 * @param $file String: filename.
-	 * @fixme the following are broke:
+	 * @todo FIXME: The following are broke:
 	 * SubjectArea. Need to test the more obscure tags.
 	 *
 	 * DigitalZoomRatio = 0/0 is rejected. need to determine if that's valid.
diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php
index bce13a00a0..e830901623 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -842,10 +842,10 @@ class FormatMetadata {
 			wfDebug( __METHOD__ . ' metadata array with 0 elements!' );
 			return ""; // paranoia. This should never happen
 		}
-		/* Fixme: This should hide some of the list entries if there are
-		* say more than four. Especially if a field is translated into 20
-		* languages, we don't want to show them all by default
-		*/
+		/* @todo FIXME: This should hide some of the list entries if there are
+		 * say more than four. Especially if a field is translated into 20
+		 * languages, we don't want to show them all by default
+		 */
 		else {
 			global $wgContLang;
 			switch( $type ) {
diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index 547f411d41..92472f9667 100644
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -280,7 +280,7 @@ abstract class MediaHandler {
 	 */
 
 	/**
-	 * FIXME: I don't really like this interface, it's not very flexible
+	 * @todo FIXME: I don't really like this interface, it's not very flexible
 	 * I think the media handler should generate HTML instead. It can do
 	 * all the formatting according to some standard. That makes it possible
 	 * to do things like visual indication of grouped and chained streams
diff --git a/includes/media/PNGMetadataExtractor.php b/includes/media/PNGMetadataExtractor.php
index 9ee5a4a5d8..4c1887e951 100644
--- a/includes/media/PNGMetadataExtractor.php
+++ b/includes/media/PNGMetadataExtractor.php
@@ -353,7 +353,7 @@ class PNGMetadataExtractor {
 					continue;
 				}
 
-				// fixme: currently timezones are ignored.
+				// @todo FIXME: Currently timezones are ignored.
 				// possibly should be wfTimestamp's
 				// responsibility. (at least for numeric TZ)
 				$formatted = wfTimestamp( TS_EXIF, $value );
diff --git a/includes/media/XMP.php b/includes/media/XMP.php
index b0a811647b..d426f308da 100644
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@ -290,7 +290,7 @@ class XMPReader {
 	 * @return Boolean If it succeeded.
 	 */
 	public function parseExtended( $content ) {
-		// FIXME: This is untested. Hard to find example files
+		// @todo FIXME: This is untested. Hard to find example files
 		// or programs that make such files..
 		$guid = substr( $content, 0, 32 );
 		if ( !isset( $this->results['xmp-special']['HasExtendedXMP'] )
diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 854676eb9b..403e7a30ab 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -549,9 +549,9 @@ class CoreParserFunctions {
 	 * Return the size of the given page, or 0 if it's nonexistent.  This is an
 	 * expensive parser function and can't be called too many times per page.
 	 *
-	 * @todo Fixme: This doesn't work correctly on preview for getting the size
+	 * @todo FIXME: This doesn't work correctly on preview for getting the size
 	 *   of the current page.
-	 * @todo Fixme: Title::getLength() documentation claims that it adds things
+	 * @todo FIXME: Title::getLength() documentation claims that it adds things
 	 *   to the link cache, so the local cache here should be unnecessary, but
 	 *   in fact calling getLength() repeatedly for the same $page does seem to
 	 *   run one query for each call?
diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php
index 9d0e1bcc1f..835deb8284 100644
--- a/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@ -227,7 +227,7 @@ class LinkHolderArray {
 	}
 
 	/**
-	 * FIXME: update documentation. makeLinkObj() is deprecated.
+	 * @todo FIXME: Update documentation. makeLinkObj() is deprecated.
 	 * Replace <!--LINK--> link placeholders with actual links, in the buffer
 	 * Placeholders created in Skin::makeLinkObj()
 	 * Returns an array of link CSS classes, indexed by PDBK.
@@ -322,7 +322,7 @@ class LinkHolderArray {
 				$pdbk = $title->getPrefixedDBkey();
 				$linkCache->addGoodLinkObj( $s->page_id, $title, $s->page_len, $s->page_is_redirect, $s->page_latest );
 				$output->addLink( $title, $s->page_id );
-				# FIXME: convoluted data flow
+				# @todo FIXME: Convoluted data flow
 				# The redirect status and length is passed to getLinkColour via the LinkCache
 				# Use formal parameters instead
 				$colours[$pdbk] = Linker::getLinkColour( $title, $threshold );
@@ -523,7 +523,7 @@ class LinkHolderArray {
 						$entry['pdbk'] = $varPdbk;
 
 						// set pdbk and colour
-						# FIXME: convoluted data flow
+						# @todo FIXME: Convoluted data flow
 						# The redirect status and length is passed to getLinkColour via the LinkCache
 						# Use formal parameters instead
 						$colours[$varPdbk] = Linker::getLinkColour( $variantTitle, $threshold );
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 4a66369a3d..085f3922d2 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -517,7 +517,7 @@ class Parser {
 	 */
 	public function uniqPrefix() {
 		if ( !isset( $this->mUniqPrefix ) ) {
-			# @todo Fixme: this is probably *horribly wrong*
+			# @todo FIXME: This is probably *horribly wrong*
 			# LanguageConverter seems to want $wgParser's uniqPrefix, however
 			# if this is called for a parser cache hit, the parser may not
 			# have ever been initialized in the first place.
@@ -1964,7 +1964,7 @@ class Parser {
 			}
 
 			# NS_MEDIA is a pseudo-namespace for linking directly to a file
-			# FIXME: Should do batch file existence checks, see comment below
+			# @todo FIXME: Should do batch file existence checks, see comment below
 			if ( $ns == NS_MEDIA ) {
 				wfProfileIn( __METHOD__."-media" );
 				# Give extensions a chance to select the file revision for us
@@ -1984,7 +1984,7 @@ class Parser {
 			# Some titles, such as valid special pages or files in foreign repos, should
 			# be shown as bluelinks even though they're not included in the page table
 			#
-			# FIXME: isAlwaysKnown() can be expensive for file links; we should really do
+			# @todo FIXME: isAlwaysKnown() can be expensive for file links; we should really do
 			# batch file existence checks for NS_FILE and NS_MEDIA
 			if ( $iw == '' && $nt->isAlwaysKnown() ) {
 				$this->mOutput->addLink( $nt );
@@ -2276,7 +2276,7 @@ class Parser {
 					$output .= $this->openList( $char );
 
 					if ( ';' === $char ) {
-						# FIXME: This is dupe of code above
+						# @todo FIXME: This is dupe of code above
 						if ( $this->findColonNoLinks( $t, $term, $t2 ) !== false ) {
 							$t = $t2;
 							$output .= $term . $this->nextItem( ':' );
@@ -3041,7 +3041,7 @@ class Parser {
 		$originalTitle = $part1;
 
 		# $args is a list of argument nodes, starting from index 0, not including $part1
-		# *** FIXME if piece['parts'] is null then the call to getLength() below won't work b/c this $args isn't an object
+		# @todo FIXME: If piece['parts'] is null then the call to getLength() below won't work b/c this $args isn't an object
 		$args = ( null == $piece['parts'] ) ? array() : $piece['parts'];
 		wfProfileOut( __METHOD__.'-setup' );
 		wfProfileIn( __METHOD__."-title-$originalTitle" );
@@ -3770,7 +3770,7 @@ class Parser {
 		}
 		# (bug 8068) Allow control over whether robots index a page.
 		#
-		# FIXME (bug 14899): __INDEX__ always overrides __NOINDEX__ here!  This
+		# @todo FIXME: Bug 14899: __INDEX__ always overrides __NOINDEX__ here!  This
 		# is not desirable, the last one on the page should win.
 		if ( isset( $this->mDoubleUnderscores['noindex'] ) && $this->mTitle->canUseNoindex() ) {
 			$this->mOutput->setIndexPolicy( 'noindex' );
@@ -4026,7 +4026,7 @@ class Parser {
 			# HTML names must be case-insensitively unique (bug 10721).
 			# This does not apply to Unicode characters per
 			# http://dev.w3.org/html5/spec/infrastructure.html#case-sensitivity-and-string-comparison
-			# FIXME: We may be changing them depending on the current locale.
+			# @todo FIXME: We may be changing them depending on the current locale.
 			$arrayKey = strtolower( $safeHeadline );
 			if ( $legacyHeadline === false ) {
 				$legacyArrayKey = false;
@@ -4380,7 +4380,7 @@ class Parser {
 			return $text;
 		}
 
-		# FIXME: regex doesn't respect extension tags or nowiki
+		# @todo FIXME: Regex doesn't respect extension tags or nowiki
 		#  => Move this logic to braceSubstitution()
 		$substWord = MagicWord::get( 'subst' );
 		$substRegex = '/\{\{(?!(?:' . $substWord->getBaseRegex() . '))/x' . $substWord->getRegexCase();
@@ -4632,7 +4632,7 @@ class Parser {
 	}
 
 	/**
-	 * FIXME: update documentation. makeLinkObj() is deprecated.
+	 * @todo FIXME: Update documentation. makeLinkObj() is deprecated.
 	 * Replace <!--LINK--> link placeholders with actual links, in the buffer
 	 * Placeholders created in Skin::makeLinkObj()
 	 * Returns an array of link CSS classes, indexed by PDBK.
@@ -4882,7 +4882,7 @@ class Parser {
 						switch( $paramName ) {
 						case 'manualthumb':
 						case 'alt':
-							# @todo Fixme: possibly check validity here for
+							# @todo FIXME: Possibly check validity here for
 							# manualthumb? downstream behavior seems odd with
 							# missing manual thumbs.
 							$validated = true;
@@ -5381,7 +5381,8 @@ class Parser {
 		$text = preg_replace( '/\[\[:?([^[|]+)\|([^[]+)\]\]/', '$2', $text );
 		$text = preg_replace( '/\[\[:?([^[]+)\|?\]\]/', '$1', $text );
 
-		# Strip external link markup (FIXME: Not Tolerant to blank link text
+		# Strip external link markup
+		# @todo FIXME: Not tolerant to blank link text
 		# I.E. [http://www.mediawiki.org] will render as [1] or something depending
 		# on how many empty links there are on the page - need to figure that out.
 		$text = preg_replace( '/\[(?:' . wfUrlProtocols() . ')([^ ]+?) ([^[]+)\]/', '$2', $text );
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 88e25844a3..98ec4a1d5e 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -307,7 +307,7 @@ class ParserOptions {
 			$confstr .= '!*';
 
 		// add in language specific options, if any
-		// FIXME: This is just a way of retrieving the url/user preferred variant
+		// @todo FIXME: This is just a way of retrieving the url/user preferred variant
 		$confstr .= $wgContLang->getExtraHashOptions();
 
 		$confstr .= $wgRenderHashAppend;
diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php
index 5831996969..1ec3b63de0 100644
--- a/includes/revisiondelete/RevisionDelete.php
+++ b/includes/revisiondelete/RevisionDelete.php
@@ -464,7 +464,7 @@ class RevDel_FileItem extends RevDel_Item {
 
 	public function setBits( $bits ) {
 		# Queue the file op
-		# FIXME: move to LocalFile.php
+		# @todo FIXME: Move to LocalFile.php
 		if ( $this->isDeleted() ) {
 			if ( $bits & File::DELETED_FILE ) {
 				# Still deleted
diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php
index ea283ae993..ed57705651 100644
--- a/includes/revisiondelete/RevisionDeleter.php
+++ b/includes/revisiondelete/RevisionDeleter.php
@@ -213,7 +213,7 @@ class RevisionDeleter {
 			
 			// View/modify link...
 			if ( count( $undeletedRevisions ) ) {
-				// FIXME THIS IS A HORRIBLE HORRIBLE HACK AND SHOULD DIE
+				// @todo FIXME: THIS IS A HORRIBLE HORRIBLE HACK AND SHOULD DIE
 				// It's not possible to pass a list of both deleted and
 				// undeleted revisions to SpecialRevisionDelete, so we're
 				// stuck with two links. See bug 23363.
diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index f03ba79588..1d82190495 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -660,7 +660,7 @@ class SearchResultTooMany {
 
 
 /**
- * @todo Fixme: This class is horribly factored. It would probably be better to
+ * @todo FIXME: This class is horribly factored. It would probably be better to
  * have a useful base class to which you pass some standard information, then
  * let the fancy self-highlighters extend that.
  * @ingroup Search
@@ -941,7 +941,7 @@ class SearchHighlighter {
 			2 => '/(\[\[)|(\]\])/', // image
 			3 => "/(\n\\{\\|)|(\n\\|\\})/" ); // table
 
-		// FIXME: this should prolly be a hook or something
+		// @todo FIXME: This should prolly be a hook or something
 		if ( function_exists( 'wfCite' ) ) {
 			$spat .= '|(<ref>)'; // references via cite extension
 			$endPatterns[4] = '/(<ref>)|(<\/ref>)/';
@@ -1027,7 +1027,7 @@ class SearchHighlighter {
 		$anyterm = implode( '|', $terms );
 		$phrase = implode( "$wgSearchHighlightBoundaries+", $terms );
 
-		// FIXME: a hack to scale contextchars, a correct solution
+		// @todo FIXME: A hack to scale contextchars, a correct solution
 		// would be to have contextchars actually be char and not byte
 		// length, and do proper utf-8 substrings and lengths everywhere,
 		// but PHP is making that very hard and unclean to implement :(
@@ -1400,7 +1400,7 @@ class SearchHighlighter {
 
 /**
  * Dummy class to be used when non-supported Database engine is present.
- * @todo Fixme: dummy class should probably try something at least mildly useful,
+ * @todo FIXME: Dummy class should probably try something at least mildly useful,
  * such as a LIKE search through titles.
  * @ingroup Search
  */
diff --git a/includes/search/SearchIBM_DB2.php b/includes/search/SearchIBM_DB2.php
index 8cedd6f2d8..732573f519 100644
--- a/includes/search/SearchIBM_DB2.php
+++ b/includes/search/SearchIBM_DB2.php
@@ -151,7 +151,7 @@ class SearchIBM_DB2 extends SearchEngine {
 		$lc = SearchEngine::legalSearchChars();
 		$this->searchTerms = array();
 
-		# FIXME: This doesn't handle parenthetical expressions.
+		# @todo FIXME: This doesn't handle parenthetical expressions.
 		$m = array();
 		$q = array();
 
diff --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php
index 8b850fae36..b74fd7b276 100644
--- a/includes/search/SearchMssql.php
+++ b/includes/search/SearchMssql.php
@@ -159,7 +159,7 @@ class SearchMssql extends SearchEngine {
 		$lc = SearchEngine::legalSearchChars();
 		$this->searchTerms = array();
 
-		# FIXME: This doesn't handle parenthetical expressions.
+		# @todo FIXME: This doesn't handle parenthetical expressions.
 		$m = array();
 		$q = array();
 
diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php
index 4948ec72b8..1a478d7f60 100644
--- a/includes/search/SearchMySQL.php
+++ b/includes/search/SearchMySQL.php
@@ -50,7 +50,7 @@ class SearchMySQL extends SearchEngine {
 		$searchon = '';
 		$this->searchTerms = array();
 
-		# FIXME: This doesn't handle parenthetical expressions.
+		# @todo FIXME: This doesn't handle parenthetical expressions.
 		$m = array();
 		if( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/',
 			  $filteredText, $m, PREG_SET_ORDER ) ) {
diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index ff1f28fa0c..d9ad299eb3 100644
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -186,7 +186,7 @@ class SearchOracle extends SearchEngine {
 		$lc = SearchEngine::legalSearchChars();
 		$this->searchTerms = array();
 
-		# FIXME: This doesn't handle parenthetical expressions.
+		# @todo FIXME: This doesn't handle parenthetical expressions.
 		$m = array();
 		$searchon = '';
 		if (preg_match_all('/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/',
diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index 0b015684b4..4d324856cd 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -709,7 +709,7 @@ class SpecialBlock extends SpecialPage {
 
 	/**
 	 * Get an array of suggested block durations from MediaWiki:Ipboptions
-	 * FIXME: this uses a rather odd syntax for the options, should it be converted
+	 * @todo FIXME: This uses a rather odd syntax for the options, should it be converted
 	 *     to the standard "**<duration>|<displayname>" format?
 	 * @return Array
 	 */
diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 86ff1c3827..afebd4dc2a 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -184,7 +184,7 @@ class SpecialContributions extends SpecialPage {
 	 * @param $nt Title object for the target
 	 * @param $id Integer: User ID for the target
 	 * @return String: appropriately-escaped HTML to be output literally
-	 * @todo Fixme: almost the same as getSubTitle in SpecialDeletedContributions.php. Could be combined.
+	 * @todo FIXME: Almost the same as getSubTitle in SpecialDeletedContributions.php. Could be combined.
 	 */
 	protected function contributionsSub( $nt, $id ) {
 		global $wgLang, $wgUser, $wgOut;
@@ -606,7 +606,7 @@ class ContribsPager extends ReverseChronologicalPager {
 			$condition[] = 'rev_user >' . (int)($max - $max / 100);
 			$condition[] = 'ug_group IS NULL';
 			$index = 'user_timestamp';
-			# FIXME: other groups may have 'bot' rights
+			# @todo FIXME: Other groups may have 'bot' rights
 			$join_conds['user_groups'] = array( 'LEFT JOIN', "ug_user = rev_user AND ug_group = 'bot'" );
 		} else {
 			$tables = array( 'page', 'revision' );
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 8429585269..1213452faf 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -352,7 +352,7 @@ class DeletedContributionsPage extends SpecialPage {
 	 * @param $nt Title object for the target
 	 * @param $id Integer: User ID for the target
 	 * @return String: appropriately-escaped HTML to be output literally
-	 * @todo Fixme: almost the same as contributionsSub in SpecialContributions.php. Could be combined.
+	 * @todo FIXME: Almost the same as contributionsSub in SpecialContributions.php. Could be combined.
 	 */
 	function getSubTitle( $nt, $id ) {
 		global $wgLang, $wgUser, $wgOut;
diff --git a/includes/specials/SpecialDisambiguations.php b/includes/specials/SpecialDisambiguations.php
index 4ca5eaca54..e867d14a45 100644
--- a/includes/specials/SpecialDisambiguations.php
+++ b/includes/specials/SpecialDisambiguations.php
@@ -49,7 +49,7 @@ class DisambiguationsPage extends PageQueryPage {
 		$dp = Title::newFromText($dMsgText);
 		if( $dp ) {
 			if( $dp->getNamespace() != NS_TEMPLATE ) {
-				# FIXME we assume the disambiguation message is a template but
+				# @todo FIXME: We assume the disambiguation message is a template but
 				# the page can potentially be from another namespace :/
 				wfDebug("Mediawiki:disambiguationspage message does not refer to a template!\n");
 			}
@@ -78,7 +78,7 @@ class DisambiguationsPage extends PageQueryPage {
 			wfDebug("Mediawiki:disambiguationspage message does not link to any templates!\n");
 		}
 
-		// FIXME: What are pagelinks and p2 doing here?
+		// @todo FIXME: What are pagelinks and p2 doing here?
 		return array (
 			'tables' => array( 'templatelinks', 'p1' => 'page', 'pagelinks', 'p2' => 'page' ),
 			'fields' => array( 'p1.page_namespace AS namespace',
diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 4822cd4ae2..a4d94c7084 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -63,7 +63,7 @@ class SpecialExport extends SpecialPage {
 				$t = Title::makeTitleSafe( NS_MAIN, $catname );
 				if ( $t ) {
 					/**
-					 * @todo Fixme: this can lead to hitting memory limit for very large
+					 * @todo FIXME: This can lead to hitting memory limit for very large
 					 * categories. Ideally we would do the lookup synchronously
 					 * during the export in a single query.
 					 */
@@ -464,7 +464,7 @@ class SpecialExport extends SpecialPage {
 
 			if( $title ) {
 				$pageSet[$title->getPrefixedText()] = true;
-				/// @todo Fixme: May or may not be more efficient to batch these
+				/// @todo FIXME: May or may not be more efficient to batch these
 				///        by namespace when given multiple input pages.
 				$result = $dbr->select(
 					array( 'page', $table ),
diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 12b295958c..47ca49725b 100644
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -66,8 +66,8 @@ class SpecialImport extends SpecialPage {
 			return $wgOut->permissionRequired( 'import' );
 		}
 
-		# TODO: allow Title::getUserPermissionsErrors() to take an array
-		# FIXME: Title::checkSpecialsAndNSPermissions() has a very wierd expectation of what
+		# @todo Allow Title::getUserPermissionsErrors() to take an array
+		# @todo FIXME: Title::checkSpecialsAndNSPermissions() has a very wierd expectation of what
 		# getUserPermissionsErrors() might actually be used for, hence the 'ns-specialprotected'
 		$errors = wfMergeErrorArrays(
 			$this->getTitle()->getUserPermissionsErrors(
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index ef3e550557..ee37f8d6ff 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -405,7 +405,7 @@ class MovePageForm extends UnlistedSpecialPage {
 		# Do the actual move.
 		$error = $ot->moveTo( $nt, true, $this->reason, $createRedirect );
 		if ( $error !== true ) {
-			# FIXME: show all the errors in a list, not just the first one
+			# @todo FIXME: Show all the errors in a list, not just the first one
 			$this->showForm( reset( $error ) );
 			return;
 		}
@@ -449,10 +449,10 @@ class MovePageForm extends UnlistedSpecialPage {
 		#
 		# If the target namespace doesn't allow subpages, moving with subpages
 		# would mean that you couldn't move them back in one operation, which
-		# is bad.  FIXME: A specific error message should be given in this
-		# case.
+		# is bad.
+		# @todo FIXME: A specific error message should be given in this case.
 
-		// FIXME: Use Title::moveSubpages() here
+		// @todo FIXME: Use Title::moveSubpages() here
 		$dbr = wfGetDB( DB_MASTER );
 		if( $this->moveSubpages && (
 			MWNamespace::hasSubpages( $nt->getNamespace() ) || (
@@ -568,7 +568,7 @@ class MovePageForm extends UnlistedSpecialPage {
 
 		# Re-clear the file redirect cache, which may have been polluted by
 		# parsing in messages above. See CR r56745.
-		# FIXME: needs a more robust solution inside FileRepo.
+		# @todo FIXME: Needs a more robust solution inside FileRepo.
 		if( $ot->getNamespace() == NS_FILE ) {
 			RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $ot );
 		}
diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 84e4f5565e..bead424d21 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -169,7 +169,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 		);
 
 		// Disable some if needed
-		# FIXME: throws E_NOTICEs if not set; and doesn't obey hooks etc.
+		# @todo FIXME: Throws E_NOTICEs if not set; and doesn't obey hooks etc.
 		if ( $wgGroupPermissions['*']['createpage'] !== true ) {
 			unset( $filters['hideliu'] );
 		}
diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index ee2b10b194..f4863cf428 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -210,7 +210,7 @@ class SpecialPasswordReset extends FormSpecialPage {
 		if ( $result->isGood() ) {
 			return true;
 		} else {
-			// FIXME: The email didn't send, but we have already set the password throttle
+			// @todo FIXME: The email didn't send, but we have already set the password throttle
 			// timestamp, so they won't be able to try again until it expires...  :(
 			return array( array( 'mailerror', $result->getMessage() ) );
 		}
diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php
index 72d7e37947..cf1dbbd7ac 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -139,7 +139,7 @@ class SpecialPrefixindex extends SpecialAllpages {
 			list( $namespace, $prefixKey, $prefix ) = $prefixList;
 			list( /* $fromNS */, $fromKey, ) = $fromList;
 
-			### FIXME: should complain if $fromNs != $namespace
+			### @todo FIXME: Should complain if $fromNs != $namespace
 
 			$dbr = wfGetDB( DB_SLAVE );
 
@@ -158,7 +158,7 @@ class SpecialPrefixindex extends SpecialAllpages {
 				)
 			);
 
-			### FIXME: side link to previous
+			### @todo FIXME: Side link to previous
 
 			$n = 0;
 			if( $res->numRows() > 0 ) {
diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index 21730a58d2..5b8b9c865e 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -441,7 +441,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
 
 	/**
 	 * Show some introductory text
-	 * FIXME Wikimedia-specific policy text
+	 * @todo FIXME: Wikimedia-specific policy text
 	 */
 	protected function addUsageText() {
 		global $wgOut, $wgUser;
diff --git a/includes/specials/SpecialUncategorizedimages.php b/includes/specials/SpecialUncategorizedimages.php
index c71dc376b1..3efed74705 100644
--- a/includes/specials/SpecialUncategorizedimages.php
+++ b/includes/specials/SpecialUncategorizedimages.php
@@ -27,7 +27,7 @@
  *
  * @ingroup SpecialPage
  */
-// FIXME: Use an instance of UncategorizedPagesPage or something
+// @todo FIXME: Use an instance of UncategorizedPagesPage or something
 class UncategorizedImagesPage extends ImageQueryPage {
 
 	function __construct( $name = 'Uncategorizedimages' ) {
diff --git a/includes/specials/SpecialUncategorizedpages.php b/includes/specials/SpecialUncategorizedpages.php
index 765c9c3ba6..08a694486c 100644
--- a/includes/specials/SpecialUncategorizedpages.php
+++ b/includes/specials/SpecialUncategorizedpages.php
@@ -26,7 +26,7 @@
  *
  * @ingroup SpecialPage
  */
-// FIXME: Make $requestedNamespace selectable, unify all subclasses into one
+// @todo FIXME: Make $requestedNamespace selectable, unify all subclasses into one
 class UncategorizedPagesPage extends PageQueryPage {
 	protected $requestedNamespace = false;
 
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 237fcc53a9..7e68ad1de1 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -969,14 +969,14 @@ class SpecialUndelete extends SpecialPage {
 		$sk = $wgUser->getSkin();
 		$isDeleted = !( $rev->getId() && $rev->getTitle() );
 		if( $isDeleted ) {
-			/// @todo Fixme: $rev->getTitle() is null for deleted revs...?
+			/// @todo FIXME: $rev->getTitle() is null for deleted revs...?
 			$targetPage = $this->getTitle();
 			$targetQuery = array(
 				'target' => $this->mTargetObj->getPrefixedText(),
 				'timestamp' => wfTimestamp( TS_MW, $rev->getTimestamp() )
 			);
 		} else {
-			/// @todo Fixme getId() may return non-zero for deleted revs...
+			/// @todo FIXME: getId() may return non-zero for deleted revs...
 			$targetPage = $rev->getTitle();
 			$targetQuery = array( 'oldid' => $rev->getId() );
 		}
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 32b8ab6d11..f793b41963 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -980,7 +980,7 @@ class UploadForm extends HTMLForm {
 				'label-message' => 'destfilename',
 				'size' => 60,
 				'default' => $this->mDestFile,
-				# FIXME: hack to work around poor handling of the 'default' option in HTMLForm
+				# @todo FIXME: Hack to work around poor handling of the 'default' option in HTMLForm
 				'nodata' => strval( $this->mDestFile ) !== '',
 			),
 			'UploadDescription' => array(
diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 6d59a8340d..b4381dad1e 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -98,7 +98,7 @@ class UserrightsPage extends SpecialPage {
 		}
 
 		if( !$this->userCanChangeRights( $wgUser, true ) ) {
-			// fixme... there may be intermediate groups we can mention.
+			// @todo FIXME: There may be intermediate groups we can mention.
 			$wgOut->showPermissionsErrorPage( array( array(
 				$wgUser->isAnon()
 					? 'userrights-nologin'
diff --git a/includes/specials/SpecialWantedpages.php b/includes/specials/SpecialWantedpages.php
index 8878d27397..2b8a2bbed6 100644
--- a/includes/specials/SpecialWantedpages.php
+++ b/includes/specials/SpecialWantedpages.php
@@ -37,7 +37,7 @@ class WantedPagesPage extends WantedQueryPage {
 		if ( $inc ) {
 			@list( $limit, $nlinks ) = explode( '/', $par, 2 );
 			$this->limit = (int)$limit;
-			// FIXME: nlinks is ignored
+			// @todo FIXME: nlinks is ignored
 			$nlinks = $nlinks === 'nlinks';
 			$this->offset = 0;
 		} else {
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 8efe94d354..d2db66100a 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -896,7 +896,7 @@ abstract class UploadBase {
 
 		$chunk = trim( $chunk );
 
-		# FIXME: convert from UTF-16 if necessarry!
+		# @todo FIXME: Convert from UTF-16 if necessarry!
 		wfDebug( __METHOD__ . ": checking for embedded scripts and HTML stuff\n" );
 
 		# check for HTML doctype
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index ea598552e1..1264d1e6fb 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -885,7 +885,7 @@ class LanguageConverter {
 		if ( strpos( $code, '/' ) === false ) {
 			$txt = MessageCache::singleton()->get( 'Conversiontable', true, $code );
 			if ( $txt === false ) {
-				# FIXME: this method doesn't seem to be expecting
+				# @todo FIXME: This method doesn't seem to be expecting
 				# this possible outcome...
 				$txt = '&lt;Conversiontable&gt;';
 			}
diff --git a/languages/classes/LanguageAr.php b/languages/classes/LanguageAr.php
index 77c4602512..32baed12af 100644
--- a/languages/classes/LanguageAr.php
+++ b/languages/classes/LanguageAr.php
@@ -30,7 +30,7 @@ class LanguageAr extends Language {
 	 * Temporary hack for bug 9413: replace Arabic presentation forms with their
 	 * standard equivalents.
 	 *
-	 * FIXME: This is language-specific for now only to avoid the negative
+	 * @todo FIXME: This is language-specific for now only to avoid the negative
 	 * performance impact of enabling it for all languages.
 	 */
 	function normalize( $s ) {
diff --git a/languages/classes/LanguageBe.php b/languages/classes/LanguageBe.php
index 0b14733343..260e635537 100644
--- a/languages/classes/LanguageBe.php
+++ b/languages/classes/LanguageBe.php
@@ -16,7 +16,7 @@ class LanguageBe extends Language {
 
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
-		// FIXME: CLDR defines 4 plural forms instead of 3
+		// @todo FIXME: CLDR defines 4 plural forms instead of 3
 		//        http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
 		$forms = $this->preConvertPlural( $forms, 3 );
 
diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php
index b29d877005..fe9460c313 100644
--- a/languages/classes/LanguageBe_tarask.php
+++ b/languages/classes/LanguageBe_tarask.php
@@ -24,7 +24,7 @@ class LanguageBe_tarask extends Language {
 		// if no number with word, then use $form[0] for singular and $form[1] for plural or zero
 		if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1];
 
-		// FIXME: CLDR defines 4 plural forms instead of 3
+		// @todo FIXME: CLDR defines 4 plural forms instead of 3
 		//        http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
 		$forms = $this->preConvertPlural( $forms, 3 );
 
diff --git a/languages/classes/LanguageBs.php b/languages/classes/LanguageBs.php
index 6432109d70..bf2876a081 100644
--- a/languages/classes/LanguageBs.php
+++ b/languages/classes/LanguageBs.php
@@ -10,7 +10,7 @@ class LanguageBs extends Language {
 		if ( !count( $forms ) ) { return ''; }
 		$forms = $this->preConvertPlural( $forms, 3 );
 
-		// FIXME: CLDR defines 4 plural forms instead of 3. Plural for decimals is missing.
+		// @todo FIXME: CLDR defines 4 plural forms instead of 3. Plural for decimals is missing.
 		//        http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
 		if ( $count > 10 && floor( ( $count % 100 ) / 10 ) == 1 ) {
 			return $forms[2];
diff --git a/languages/classes/LanguageCy.php b/languages/classes/LanguageCy.php
index d7727de236..c0f186d799 100644
--- a/languages/classes/LanguageCy.php
+++ b/languages/classes/LanguageCy.php
@@ -9,7 +9,7 @@ class LanguageCy extends Language {
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
 
-		// FIXME: CLDR defines 4 plural forms; very different, actually.
+		// @todo FIXME: CLDR defines 4 plural forms; very different, actually.
 		// See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#cy
 		$forms = $this->preConvertPlural( $forms, 6 );
 		$count = abs( $count );
diff --git a/languages/classes/LanguageHr.php b/languages/classes/LanguageHr.php
index 888029be3a..aca180a182 100644
--- a/languages/classes/LanguageHr.php
+++ b/languages/classes/LanguageHr.php
@@ -8,7 +8,7 @@ class LanguageHr extends Language {
 
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
-		// FIXME: CLDR defines 4 plural forms instead of 3. Plural for for decimals is missing.
+		// @todo FIXME: CLDR defines 4 plural forms instead of 3. Plural for for decimals is missing.
 		//        http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
 		$forms = $this->preConvertPlural( $forms, 3 );
 
diff --git a/languages/classes/LanguageLv.php b/languages/classes/LanguageLv.php
index fea2d21f8a..8a78303cb9 100644
--- a/languages/classes/LanguageLv.php
+++ b/languages/classes/LanguageLv.php
@@ -22,7 +22,7 @@ class LanguageLv extends Language {
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
 
-		// FIXME: CLDR defines 3 plural forms instead of 2.  Form for 0 is missing.
+		// @todo FIXME: CLDR defines 3 plural forms instead of 2.  Form for 0 is missing.
 		//        http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#lv
 		$forms = $this->preConvertPlural( $forms, 2 );
 
diff --git a/languages/classes/LanguageMl.php b/languages/classes/LanguageMl.php
index 3cd30eb2cb..62747a8340 100644
--- a/languages/classes/LanguageMl.php
+++ b/languages/classes/LanguageMl.php
@@ -13,7 +13,7 @@ class LanguageMl extends Language {
 	 * bug 9413. Also fixes miscellaneous problems due to mishandling of ZWJ,
 	 * e.g. bug 11162.
 	 *
-	 * FIXME: This is language-specific for now only to avoid the negative
+	 * @todo FIXME: This is language-specific for now only to avoid the negative
 	 * performance impact of enabling it for all languages.
 	 */
 	function normalize( $s ) {
diff --git a/languages/classes/LanguageRu.php b/languages/classes/LanguageRu.php
index 8f027048b5..31f54e9a65 100644
--- a/languages/classes/LanguageRu.php
+++ b/languages/classes/LanguageRu.php
@@ -76,7 +76,7 @@ class LanguageRu extends Language {
 		// if no number with word, then use $form[0] for singular and $form[1] for plural or zero
 		if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1];
 
-		// FIXME: CLDR defines 4 plural forms. Form with decimals missing.
+		// @todo FIXME: CLDR defines 4 plural forms. Form with decimals missing.
 		// See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ru
 		$forms = $this->preConvertPlural( $forms, 3 );
 
diff --git a/languages/classes/LanguageSh.php b/languages/classes/LanguageSh.php
index e62d7ba37d..a45258f9fe 100644
--- a/languages/classes/LanguageSh.php
+++ b/languages/classes/LanguageSh.php
@@ -11,7 +11,7 @@ class LanguageSh extends Language {
 		// if no number with word, then use $form[0] for singular and $form[1] for plural or zero
 		if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1];
 
-		// FIXME: CLDR defines 4 plural forms. Form with decimals missing.
+		// @todo FIXME: CLDR defines 4 plural forms. Form with decimals missing.
 		// See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#sh
 		$forms = $this->preConvertPlural( $forms, 3 );
 
diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 22f9ca42b0..5e2a3c4898 100644
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -207,7 +207,7 @@ class LanguageSr extends LanguageSr_ec {
 			return $count == 1 ? $forms[0] : $forms[1];
 		}
 
-		// FIXME: CLDR defines 4 plural forms. Form with decimals missing.
+		// @todo FIXME: CLDR defines 4 plural forms. Form with decimals missing.
 		// See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ru
 		$forms = $this->preConvertPlural( $forms, 3 );
 
diff --git a/languages/classes/LanguageUk.php b/languages/classes/LanguageUk.php
index 6c0cf8daf0..959f6c0c74 100644
--- a/languages/classes/LanguageUk.php
+++ b/languages/classes/LanguageUk.php
@@ -62,7 +62,7 @@ class LanguageUk extends Language {
 		// if no number with word, then use $form[0] for singular and $form[1] for plural or zero
 		if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1];
 
-		// FIXME: CLDR defines 4 plural forms. Form for decimals is missing/
+		// @todo FIXME: CLDR defines 4 plural forms. Form for decimals is missing/
 		// See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#uk
 		$forms = $this->preConvertPlural( $forms, 3 );
 
diff --git a/languages/classes/LanguageYue.php b/languages/classes/LanguageYue.php
index aff3d29ec8..75f4a83aa2 100644
--- a/languages/classes/LanguageYue.php
+++ b/languages/classes/LanguageYue.php
@@ -12,7 +12,7 @@ class LanguageYue extends Language {
 	/**
 	 * Eventually this should be a word segmentation;
 	 * for now just treat each character as a word.
-	 * @todo Fixme: only do this for Han characters...
+	 * @todo FIXME: Only do this for Han characters...
 	 */
 	function segmentByWord( $string ) {
 		$reg = "/([\\xc0-\\xff][\\x80-\\xbf]*)/";
diff --git a/languages/classes/LanguageZh_hans.php b/languages/classes/LanguageZh_hans.php
index a65162bc1c..137f094140 100644
--- a/languages/classes/LanguageZh_hans.php
+++ b/languages/classes/LanguageZh_hans.php
@@ -13,7 +13,7 @@ class LanguageZh_hans extends Language {
 	/**
 	 * Eventually this should be a word segmentation;
 	 * for now just treat each character as a word.
-	 * @todo Fixme: only do this for Han characters...
+	 * @todo FIXME: Only do this for Han characters...
 	 */
 	function segmentByWord( $string ) {
 		$reg = "/([\\xc0-\\xff][\\x80-\\xbf]*)/";
diff --git a/languages/messages/MessagesKs.php b/languages/messages/MessagesKs.php
index 0de9087317..deafa887cd 100644
--- a/languages/messages/MessagesKs.php
+++ b/languages/messages/MessagesKs.php
@@ -9,7 +9,7 @@
  *
  */
 
-# FIXME: inherit almost everything for now
+# @todo FIXME: Inherit almost everything for now
 $rtl = true;
 
 $digitTransformTable = array(
diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php
index b25b9bbe7d..c8e909582f 100644
--- a/maintenance/cleanupImages.php
+++ b/maintenance/cleanupImages.php
@@ -150,7 +150,7 @@ class ImageCleanup extends TableCleanup {
 			$this->output( "DRY RUN: would rename $path to $finalPath\n" );
 		} else {
 			$this->output( "renaming $path to $finalPath\n" );
-			// XXX: should this use File::move()?  FIXME?
+			// @todo FIXME: Should this use File::move()?
 			$db->begin();
 			$db->update( 'image',
 				array( 'img_name' => $final ),
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index a82f6de1f4..d3cf30ccfe 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -84,8 +84,8 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 	MWFunction::call( MW_CONFIG_CALLBACK );
 } elseif ( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
 	// Load settings, using wikimedia-mode if needed
-	// Fixme: replace this hack with general farm-friendly code
-	# TODO FIXME! Wikimedia-specific stuff needs to go away to an ext
+	// @todo FIXME: Replace this hack with general farm-friendly code
+	# @todo FIXME: Wikimedia-specific stuff needs to go away to an ext
 	# Maybe a hook?
 	global $cluster;
 	$wgWikiFarm = true;
diff --git a/maintenance/fixDoubleRedirects.php b/maintenance/fixDoubleRedirects.php
index e1f9a44083..c1d14dd850 100644
--- a/maintenance/fixDoubleRedirects.php
+++ b/maintenance/fixDoubleRedirects.php
@@ -92,7 +92,7 @@ class FixDoubleRedirects extends Maintenance {
 				}
 			} else {
 				$jobs[] = $job;
-				// FIXME: hardcoded constant 10000 copied from DoubleRedirectJob class
+				// @todo FIXME: Hardcoded constant 10000 copied from DoubleRedirectJob class
 				if ( count( $jobs ) > 10000 ) {
 					$this->queueJobs( $jobs, $dryrun );
 					$jobs = array();
diff --git a/maintenance/fuzz-tester.php b/maintenance/fuzz-tester.php
index 1d8ceec36f..a38eae8d00 100644
--- a/maintenance/fuzz-tester.php
+++ b/maintenance/fuzz-tester.php
@@ -2063,18 +2063,18 @@ class api extends pageTest {
 
 	// API watchlist feed mode.
 	private static function feedwatchlistMode() {
-		// FIXME: add "wikiFuzz::makeFuzz(2)" as possible value below?
+		// @todo FIXME: Add "wikiFuzz::makeFuzz(2)" as possible value below?
 		return array ( "feedformat"    => wikiFuzz::chooseInput( array( "rss", "atom" ) ) );
 	}
 
 	// API query mode.
 	private static function queryMode() {
-		// FIXME: add "wikiFuzz::makeFuzz(2)" as possible params for the elements below?
+		// @todo FIXME: Add "wikiFuzz::makeFuzz(2)" as possible params for the elements below?
 		//        Suspect this will stuff up the tests more, but need to check.
 		$params = array (
-					 // FIXME: More titles.
+					 // @todo FIXME: More titles.
 					 "titles"        => wikiFuzz::chooseInput( array( "Main Page" ) ),
-					 // FIXME: More pageids.
+					 // @todo FIXME: More pageids.
 					 "pageids"       => 1,
 					 "prop"          => wikiFuzz::chooseInput( array( "info", "revisions", "watchlist" ) ),
 					 "list"          => wikiFuzz::chooseInput( array( "allpages", "logevents", "watchlist", "usercontribs", "recentchanges", "backlinks", "embeddedin", "imagelinks" ) ),
@@ -2168,7 +2168,7 @@ class api extends pageTest {
 		$this->params["action"] = $action;
 
 		// Set the cookie:
-		// FIXME: need to get this cookie dynamically set, rather than hard-coded.
+		// @todo FIXME: Need to get this cookie dynamically set, rather than hard-coded.
 		$this->cookie = "wikidbUserID=10001; wikidbUserName=Test; wikidb_session=178df0fe68c75834643af65dec9ec98a; wikidbToken=1adc6753d62c44aec950c024d7ae0540";
 
 		// Output format
diff --git a/maintenance/importUseModWiki.php b/maintenance/importUseModWiki.php
index 1c80ba31b3..a28d57a55f 100644
--- a/maintenance/importUseModWiki.php
+++ b/maintenance/importUseModWiki.php
@@ -269,7 +269,7 @@ XML;
 	}
 
 	/**
-	 * @fixme don't use /e
+	 * @todo FIXME: Don't use /e
 	 */
 	private function mungeToUtf8( $string ) {
 		$string = preg_replace ( '/&#([0-9]+);/e', 'wfUtf8Sequence($1)', $string );
diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php
index dc73960eff..ed511f7405 100644
--- a/maintenance/mwdocgen.php
+++ b/maintenance/mwdocgen.php
@@ -238,7 +238,8 @@ case 6:
 $versionNumber = getSvnRevision( $input );
 if ( $versionNumber === false ) { # Not using subversion ?
 	$svnstat = ''; # Not really useful if subversion not available
-	$version = 'trunk'; # FIXME
+	# @todo FIXME
+	$version = 'trunk';
 } else {
 	$version = "trunk (r$versionNumber)";
 }
diff --git a/maintenance/populateSha1.php b/maintenance/populateSha1.php
index 165a6cfe53..1ab9109d3c 100644
--- a/maintenance/populateSha1.php
+++ b/maintenance/populateSha1.php
@@ -54,7 +54,7 @@ class PopulateSha1 extends Maintenance {
 		$imageTable = $dbw->tableName( 'image' );
 
 		if ( $method == 'pipe' ) {
-			// @fixme kill this and replace with a second unbuffered DB connection.
+			// @todo FIXME: Kill this and replace with a second unbuffered DB connection.
 			global $wgDBuser, $wgDBserver, $wgDBpassword, $wgDBname;
 			$cmd = 'mysql -u' . wfEscapeShellArg( $wgDBuser ) .
 				' -h' . wfEscapeShellArg( $wgDBserver ) .
diff --git a/tests/phpunit/includes/GlobalTest.php b/tests/phpunit/includes/GlobalTest.php
index b76ea07cbb..31929d70db 100644
--- a/tests/phpunit/includes/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalTest.php
@@ -327,7 +327,7 @@ class GlobalTest extends MediaWikiTestCase {
 			wfTimestamp( TS_RFC2822, '0117-08-09 12:34:56'),
 			'Death of Roman Emperor [[Trajan]]');
 
-		/* FIXME: 00 to 101 years are taken as being in [1970-2069] */
+		/* @todo FIXME: 00 to 101 years are taken as being in [1970-2069] */
 
 		$this->assertEquals( 'Sun, 01 Jan 0101 00:00:00 GMT',
 			wfTimestamp( TS_RFC2822, '-58979923200'),
@@ -499,7 +499,8 @@ class GlobalTest extends MediaWikiTestCase {
 		
 		$old_log_file = $wgDebugLogFile;
 		$wgDebugLogFile = tempnam( wfTempDir(), 'mw-' );
-		$wgDebugTimestamps = false; # FIXME: this setting should be tested
+		# @todo FIXME: This setting should be tested
+		$wgDebugTimestamps = false;
 		
 		
 		
@@ -807,7 +808,8 @@ class GlobalTest extends MediaWikiTestCase {
 		/*	
 			// ISO 15924 :
 			array( 'sr-Cyrl', 'sr-Cyrl' ),
-			array( 'SR-lATN', 'sr-Latn' ), # FIXME fix our function?
+			# @todo FIXME: Fix our function?
+			array( 'SR-lATN', 'sr-Latn' ),
 			array( 'fr-latn', 'fr-Latn' ),
 			// Use lowercase for single segment
 			// ISO 3166-1-alpha-2 code
diff --git a/tests/phpunit/includes/IPTest.php b/tests/phpunit/includes/IPTest.php
index 5c8cca7d1e..05deb40c33 100644
--- a/tests/phpunit/includes/IPTest.php
+++ b/tests/phpunit/includes/IPTest.php
@@ -262,7 +262,7 @@ class IPTest extends MediaWikiTestCase {
 	 * @covers IP::toUnsigned
 	 */
 	public function testip2longWrapper() {
-		// fixme : add more tests ?
+		// @todo FIXME: Add more tests ?
 		$this->assertEquals( pow(2,32) - 1, IP::toUnsigned( '255.255.255.255' ));
 		$i = 'IN.VA.LI.D';
 		$this->assertFalse( IP::toUnSigned( $i ) );
@@ -349,7 +349,7 @@ class IPTest extends MediaWikiTestCase {
 		$this->assertEquals( array( 0, 0 ), IP::parseCIDR('0.0.0.0/0') );
 		$this->assertEquals( array( 0, 0 ), IP::parseCIDR('255.255.255.255/0') );
 
-		// FIXME : add more tests.
+		// @todo FIXME: Add more tests.
 
 		# This part test network shifting
 		$this->assertNet( '192.0.0.0'  , '192.0.0.2/24'   );
diff --git a/tests/phpunit/includes/MWNamespaceTest.php b/tests/phpunit/includes/MWNamespaceTest.php
index c3e5507cf1..e1e0fe6d0f 100644
--- a/tests/phpunit/includes/MWNamespaceTest.php
+++ b/tests/phpunit/includes/MWNamespaceTest.php
@@ -39,7 +39,7 @@ class MWNamespaceTest extends PHPUnit_Framework_TestCase {
 	 */
 	public function testIsMovable() {
 		$this->assertFalse( MWNamespace::isMovable( NS_CATEGORY ) );
-		# FIXME : write more tests!!
+		# @todo FIXME: Write more tests!!
 	}
 
 	/**
@@ -233,7 +233,7 @@ class MWNamespaceTest extends PHPUnit_Framework_TestCase {
 		// Tests that user defined namespace #252 is not content:
 		$this->assertFalse( MWNamespace::isContent( 252 ) );
 
-		# FIXME: is global saving really required for PHPUnit?
+		# @todo FIXME: Is global saving really required for PHPUnit?
 		// Bless namespace # 252 as a content namespace
 		global $wgContentNamespaces;
 		$savedGlobal = $wgContentNamespaces;
diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php
index 37044bc5a3..e322293169 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -93,7 +93,7 @@ class TitleTest extends MediaWikiTestCase {
 			array( '/wiki/edit/Recentchanges?foo=A&bar=1', 'Recentchanges', 'foo=A&action=edit&bar=1' ),
 			array( '/wiki/edit/Recentchanges?foo=A&bar=1', 'Recentchanges', 'action=edit&foo=A&bar=1' ),
 
-			# FIXME The next two are equals but need investigation:
+			# @todo FIXME: The next two are equals but need investigation:
 			array( '/wiki/edit/Recentchanges', 'Recentchanges', 'action=view&action=edit' ),
 			array( '/wiki/view/Recentchanges?action=edit&action=view', 'Recentchanges', 'action=edit&action=view' ),
 		);
@@ -105,7 +105,7 @@ class TitleTest extends MediaWikiTestCase {
 	 */
 	function testGetLocalUrlWithVariantArticlePaths( $expected, $dbkey, $query )
 	{
-		# FIXME find a language with variants!
+		# @todo FIXME: Find a language with variants!
 		$this->markTestIncomplete();
 
 		$actions = array( 'edit' => '/wiki/edit/$1' );
diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index ad5480b261..b7eb6a3d62 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -144,7 +144,7 @@ class XmlTest extends MediaWikiTestCase {
 			"Date menu next month is 11 months ago"
 		);
 
-		# FIXME: please note there is no year there!
+		# @todo FIXME: Please note there is no year there!
 		$this->assertEquals(
 			'<label for="year">From year (and earlier):</label> <input name="year" size="4" value="" id="year" maxlength="4" /> <label for="month">From month (and earlier):</label> <select id="month" name="month" class="mw-month-selector"><option value="-1">all</option>
 <option value="1">January</option>
diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php b/tests/phpunit/includes/parser/MagicVariableTest.php
index 507fbfd101..b237f0def5 100644
--- a/tests/phpunit/includes/parser/MagicVariableTest.php
+++ b/tests/phpunit/includes/parser/MagicVariableTest.php
@@ -46,7 +46,7 @@ class MagicVariableTest extends PHPUnit_Framework_TestCase {
 	}
 
 	############### TESTS #############################################
-	# FIXME:
+	# @todo FIXME:
 	#  - those got copy pasted, we can probably make them cleaner
 	#  - tests are lacking useful messages
 
diff --git a/tests/phpunit/includes/specials/SpecialRecentchanges.php b/tests/phpunit/includes/specials/SpecialRecentchanges.php
index 48e31f3abc..a98e7c1a39 100644
--- a/tests/phpunit/includes/specials/SpecialRecentchanges.php
+++ b/tests/phpunit/includes/specials/SpecialRecentchanges.php
@@ -29,7 +29,7 @@ class SpecialRecentchangesTest extends MediaWikiTestCase {
 
 		# Filter out rc_timestamp conditions which depends on the test runtime
 		# This condition is not needed as of march 2, 2011 -- hashar
-		# FIXME: find a way to generate the correct rc_timestamp
+		# @todo FIXME: Find a way to generate the correct rc_timestamp
 		$queryConditions = array_filter(
 			$this->rc->buildMainQueryConds( $formOptions ),
 			'SpecialRecentchangesTest::filterOutRcTimestampCondition'
diff --git a/tests/selenium/SeleniumServerManager.php b/tests/selenium/SeleniumServerManager.php
index 7b1c2349a6..9e2d4aa8f5 100644
--- a/tests/selenium/SeleniumServerManager.php
+++ b/tests/selenium/SeleniumServerManager.php
@@ -141,7 +141,7 @@ class SeleniumServerManager {
 
 		$output = array();
 		$user = $_ENV['USER'];
-		// @fixme this should be a little more generalized :)
+		// @todo FIXME: This should be a little more generalized :)
 		if (PHP_OS == 'Darwin') {
 			// Mac OS X's ps barfs on the 'w' param, but doesn't need it.
 			$ps = "ps -U %s";
-- 
2.20.1