sanitizing MonoTODOs.

svn path=/trunk/mcs/; revision=67899

23 files changed, 59 insertions, 59 deletions

diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs b/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs
index 69d418a5e08..aeadf6f85a3 100644
--- a/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs
@@ -438,7 +438,7 @@ namespace Mono.Xml.Xsl
 #endregion
 		
 #region Scope (version, {excluded, extension} namespaces)
-		[MonoTODO ("This will work, but is *very* slow")]
+		// FIXME: This will work, but is *very* slow
 		public bool IsExtensionNamespace (string nsUri)
 		{
 			if (nsUri == XsltNamespace) return true;
diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/MSXslScriptManager.cs b/mcs/class/System.XML/Mono.Xml.Xsl/MSXslScriptManager.cs
index 3d5f9176d1b..cc61bbf49fe 100644
--- a/mcs/class/System.XML/Mono.Xml.Xsl/MSXslScriptManager.cs
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/MSXslScriptManager.cs
@@ -43,7 +43,7 @@ using System.Xml.Xsl;
 
 namespace Mono.Xml.Xsl {
 
-	[MonoTODO ("Correct evidence handling; test other than simple string case")]
+	// FIXME: Correct evidence handling; test other than simple string case
 	internal class MSXslScriptManager {
 		Hashtable scripts = new Hashtable ();
 
diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/XslDecimalFormat.cs b/mcs/class/System.XML/Mono.Xml.Xsl/XslDecimalFormat.cs
index 6655bbc3cde..8464b05c983 100644
--- a/mcs/class/System.XML/Mono.Xml.Xsl/XslDecimalFormat.cs
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/XslDecimalFormat.cs
@@ -250,7 +250,7 @@ namespace Mono.Xml.Xsl {
 			return pos;
 		}
 
-		[MonoTODO ("Collect grouping digits")]
+		// FIXME: Collect grouping digits
 		private int ParseNumber (int start, string pattern, XslDecimalFormat format)
 		{
 			int pos = start;
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlAtomicValue.cs b/mcs/class/System.XML/System.Xml.Schema/XmlAtomicValue.cs
index a543e74db95..e7c4dd96e16 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlAtomicValue.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlAtomicValue.cs
@@ -36,7 +36,7 @@ using System.Xml.XPath;
 
 namespace System.Xml.Schema
 {
-	[MonoTODO ("This class is unused and thus won't be finished.")]
+	[MonoTODO] // This class is unused and thus won't be finished.
 	public sealed class XmlAtomicValue : XPathItem, ICloneable
 	{
 		bool booleanValue;
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
index 96c12c18bbf..4861bd04804 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
@@ -554,7 +554,7 @@ namespace System.Xml.Schema
 			return errorCount;
 		}
 
-		[MonoTODO ("Return clone in case when it returns itself")]
+		// FIXME: Return clone in case when it returns itself
 		internal override XmlSchemaParticle GetOptimizedParticle (bool isTop)
 		{
 			if (OptimizedParticle != null)
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInference.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInference.cs
index eaa7e86abf2..02ac9141f82 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInference.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInference.cs
@@ -66,7 +66,13 @@ using Choice = System.Xml.Schema.XmlSchemaChoice;
 
 namespace System.Xml.Schema
 {
-	[MonoTODO ("merge primitive types; infer gYearMonth too; in some cases sequence should contain element whose minOccurs=0 (no obvious rules right now); reject some non-supported schema components")]
+	[MonoTODO]
+	// FIXME:
+	// - merge primitive types
+	// - infer gYearMonth too
+	// - in some cases sequence should contain element whose minOccurs=0
+	//    (no obvious rules right now)
+	// - reject some non-supported schema components
 	public sealed class XmlSchemaInference
 	{
 		public enum InferenceOption {
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs
index 6d07da4d77b..a9462809f3c 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs
@@ -170,7 +170,8 @@ namespace System.Xml.Schema
 			return schema;
 		}
 
-		[MonoTODO ("Check the exact behavior when namespaces are in conflict (but it would be preferable to wait for 2.0 RTM).")]
+		[MonoTODO]
+		// FIXME: Check the exact behavior when namespaces are in conflict (but it would be preferable to wait for 2.0 RTM)
 		public void Add (XmlSchemaSet schemaSet)
 		{
 			ArrayList al = new ArrayList ();
@@ -189,7 +190,7 @@ namespace System.Xml.Schema
 			return schema;
 		}
 
-		[MonoTODO ("It should be the actual compilation engine.")]
+		// FIXME: It should be the actual compilation engine.
 		public void Compile ()
 		{
 			ClearGlobalComponents ();
@@ -261,7 +262,8 @@ namespace System.Xml.Schema
 			return ns == null ? "" : ns;
 		}
 
-		[MonoTODO ("Check exact behavior")]
+		[MonoTODO]
+		// FIXME: Check exact behavior
 		public XmlSchema Remove (XmlSchema schema)
 		{
 			if (schema == null)
@@ -330,7 +332,6 @@ namespace System.Xml.Schema
 			return schemas;
 		}
 
-		[MonoTODO]
 		public ICollection Schemas (string targetNamespace)
 		{
 			targetNamespace = GetSafeNs (targetNamespace);
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs
index fa6ce8181fb..a7d52536b57 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs
@@ -102,7 +102,8 @@ namespace System.Xml.Schema
 		}
 
 		[XmlIgnore]
-		[MonoTODO ("This property works as always returning a valid schema type.")]
+		// FIXME:This property works as always returning a valid schema type.
+		[MonoTODO]
 		// In .NET 2.0, all schema types used in schema documents must
 		// be XmlSchemaType, even if it is primitive type, in terms of
 		// non-obsolete System.Xml.Schema members.
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
index 8141db77e8f..28e8f5016ac 100644
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
@@ -238,7 +238,7 @@ namespace System.Xml.Schema
 				al.Add (p);
 		}
 
-		[MonoTODO ("Need some tests.")]
+		[MonoTODO] // Need some tests.
 		// Its behavior is not obvious. For example, it does not
 		// contain groups (xs:sequence/xs:choice/xs:all). Since it
 		// might contain xs:any, it could not be of type element[].
@@ -309,7 +309,7 @@ namespace System.Xml.Schema
 		}
 
 		// I guess it is for validation error recovery
-		[MonoTODO ("Find out how XmlSchemaInfo is used.")]
+		[MonoTODO] // FIXME: Find out how XmlSchemaInfo is used.
 		public void SkipToEndElement (XmlSchemaInfo info)
 		{
 			CheckState (Transition.Content);
@@ -435,7 +435,7 @@ namespace System.Xml.Schema
 		// represented by current simple content type. (try passing
 		// some kind of object to this method to check the behavior.)
 		// EndTagDeriv
-		[MonoTODO ("Handle 'var' parameter.")]
+		[MonoTODO] // FIXME: Handle 'var' parameter.
 		public object ValidateEndElement (XmlSchemaInfo info,
 			object var)
 		{
diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs
index 726a582c3cf..58ee7ca7453 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs
@@ -77,7 +77,7 @@ namespace System.Xml.Serialization
 			
 		}
 		
-		[MonoTODO ("mappings?")]
+		[MonoTODO]// FIXME: mappings?
 		public SoapCodeExporter (CodeNamespace codeNamespace, 
 								CodeCompileUnit codeCompileUnit, 
 								CodeDomProvider codeProvider, 
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
index 5c3447cf8ae..5c07bcd0280 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
@@ -84,7 +84,7 @@ namespace System.Xml.Serialization
 			
 		}
 		
-		[MonoTODO ("mappings?")]
+		[MonoTODO]// FIXME: mappings?
 		public XmlCodeExporter (CodeNamespace codeNamespace, 
 								CodeCompileUnit codeCompileUnit, 
 								CodeDomProvider codeProvider, 
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
index 19fd9fb2188..0be642ca013 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
@@ -137,7 +137,7 @@ namespace System.Xml.Serialization {
 		}
 
 #if NET_2_0
-		[MonoTODO ("writeAccessors, validate, mapping access")]
+		[MonoTODO] // FIXME: handle writeAccessors, validate, and mapping access
 		public
 #endif
 		XmlMembersMapping ImportMembersMapping (string elementName, 
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
index 8731491eb93..69d6d105229 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
@@ -41,7 +41,8 @@ using System.Reflection;
 namespace System.Xml.Serialization 
 {
 #if NET_2_0
-	[MonoTODO ("provide expected elements/attributes on unknown elements/attributs")]
+	[MonoTODO]
+	// FIXME: provide expected elements/attributes on unknown elements/attributs
 #endif
 	public abstract class XmlSerializationReader 
 #if NET_2_0
@@ -287,13 +288,13 @@ namespace System.Xml.Serialization
 			return result;
 		}
 
-		[MonoTODO ("Implement")]
+		[MonoTODO]
 		protected void FixupArrayRefs (object fixup)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO ("Implement")]
+		[MonoTODO]
 		protected int GetArrayLength (string name, string ns)
 		{
 			throw new NotImplementedException ();
@@ -792,19 +793,19 @@ namespace System.Xml.Serialization
 			return Convert.FromBase64String (Reader.ReadString());
 		}
 
-		[MonoTODO ("Implement")]
+		[MonoTODO]
 		protected static byte[] ToByteArrayBase64 (string value)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO ("Implement")]
+		[MonoTODO]
 		protected byte[] ToByteArrayHex (bool isNull)
 		{
 			throw new NotImplementedException ();
 		}
 
-		[MonoTODO ("Implement")]
+		[MonoTODO]
 		protected static byte[] ToByteArrayHex (string value)
 		{
 			throw new NotImplementedException ();
diff --git a/mcs/class/System.XML/System.Xml.XPath/Expression.cs b/mcs/class/System.XML/System.Xml.XPath/Expression.cs
index 7f724d428b0..fc81742b5b7 100644
--- a/mcs/class/System.XML/System.Xml.XPath/Expression.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/Expression.cs
@@ -739,7 +739,7 @@ namespace System.Xml.XPath
 			}
 		}
 
-		[MonoTODO ("Avoid extraneous evaluation")]
+		// FIXME: Avoid extraneous evaluation
 		public override bool EvaluateBoolean (BaseIterator iter)
 		{
 			XPathResultType typeL = _left.GetReturnType (iter);
@@ -840,7 +840,7 @@ namespace System.Xml.XPath
 			get { return HasStaticValue ? Compare (_left.StaticValueAsNumber, _right.StaticValueAsNumber) : false; }
 		}
 
-		[MonoTODO ("Avoid extraneous evaluation.")]
+		// FIXME: Avoid extraneous evaluation.
 		public override bool EvaluateBoolean (BaseIterator iter)
 		{
 			XPathResultType typeL = _left.GetReturnType (iter);
@@ -1496,7 +1496,7 @@ namespace System.Xml.XPath
 		{
 			this.type = type;
 		}
-		[MonoTODO ("Better description.")]
+		// FIXME: Better description
 		public NodeTypeTest (Axes axis, XPathNodeType type, String param) : base (axis)
 		{
 			this.type = type;
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
index a4ea087110c..23ac485e5a6 100644
--- a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
@@ -651,13 +651,11 @@ namespace System.Xml.XPath
 			return Clone ();
 		}
 
-		[MonoTODO]
 		public virtual object Evaluate (string xpath, IXmlNamespaceResolver nsResolver)
 		{
 			return Evaluate (Compile (xpath), null, nsResolver);
 		}
 
-		[MonoTODO]
 		public virtual IDictionary<string, string> GetNamespacesInScope (XmlNamespaceScope scope)
 		{
 			IDictionary<string, string> table = new Dictionary<string, string> ();
@@ -991,7 +989,6 @@ namespace System.Xml.XPath
 				}
 				return sb.ToString ();
 			}
-			[MonoTODO]
 			set {
 				switch (NodeType) {
 				case XPathNodeType.Root:
@@ -1006,14 +1003,12 @@ namespace System.Xml.XPath
 			}
 		}
 
-		[MonoTODO]
 		public virtual IXmlSchemaInfo SchemaInfo {
 			get {
 				return null;
 			}
 		}
 
-		[MonoTODO]
 		public override object TypedValue {
 			get {
 				switch (NodeType) {
@@ -1064,7 +1059,6 @@ namespace System.Xml.XPath
 			}
 		}
 
-		[MonoTODO]
 		public override XmlSchemaType XmlType {
 			get {
 				if (SchemaInfo != null)
@@ -1107,7 +1101,6 @@ namespace System.Xml.XPath
 			w.Close ();
 		}
 
-		[MonoTODO]
 		public virtual void AppendChild (
 			XPathNavigator nav)
 		{
@@ -1131,7 +1124,6 @@ namespace System.Xml.XPath
 		}
 
 		// must override it.
-		[MonoTODO ("needs tests")]
 		public virtual XmlWriter CreateAttributes ()
 		{
 			throw new NotSupportedException ();
@@ -1183,7 +1175,6 @@ namespace System.Xml.XPath
 			}
 		}
 
-		[MonoTODO]
 		public virtual void InsertAfter (XPathNavigator nav)
 		{
 			InsertAfter (new XPathNavigatorReader (nav));
@@ -1206,7 +1197,6 @@ namespace System.Xml.XPath
 			}
 		}
 
-		[MonoTODO]
 		public virtual void InsertBefore (XPathNavigator nav)
 		{
 			InsertBefore (new XPathNavigatorReader (nav));
@@ -1249,7 +1239,6 @@ namespace System.Xml.XPath
 			}
 		}
 
-		[MonoTODO]
 		public virtual void PrependChild (XPathNavigator nav)
 		{
 			PrependChild (new XPathNavigatorReader (nav));
@@ -1274,7 +1263,6 @@ namespace System.Xml.XPath
 			throw new NotSupportedException ();
 		}
 
-		[MonoTODO]
 		public virtual void ReplaceSelf (XPathNavigator navigator)
 		{
 			ReplaceSelf (new XPathNavigatorReader (navigator));
@@ -1292,7 +1280,6 @@ namespace System.Xml.XPath
 			throw new NotSupportedException ();
 		}
 
-		[MonoTODO]
 		private void DeleteChildren ()
 		{
 			switch (NodeType) {
diff --git a/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs b/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs
index 0ce5c419a75..f7f0fc28420 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XslCompiledTransform.cs
@@ -42,7 +42,8 @@ using Mono.Xml.Xsl;
 
 namespace System.Xml.Xsl
 {
-	[MonoTODO ("Of cource this is just a stub")]
+	[MonoTODO]
+	// FIXME: Of cource this is just a stub for now.
 	public sealed class XslCompiledTransform
 	{
 		bool enable_debug;
diff --git a/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs b/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
index 97a40b06396..08f49da4067 100644
--- a/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
+++ b/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
@@ -45,7 +45,7 @@ namespace System.Xml.Xsl {
 		CompiledStylesheet s;

 		XmlResolver xmlResolver = new XmlUrlResolver ();

 

-		[MonoTODO ("Security check.")]

+		[MonoTODO] // FIXME: audit security check

 #if NET_2_0

 #elif NET_1_1

 		[Obsolete ("You should pass XmlResolver to Transform() method", false)]

diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
index 50bb0401b5f..937fde3376a 100644
--- a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
+++ b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
@@ -363,7 +363,7 @@ namespace System.Xml
 				return false;
 			string prefix = decls [idx + 1].Prefix;
 			for (int i = idx + 1; i <= declPos; i++)
-				if ((object) decls [idx].Prefix == prefix)
+				if ((object) decls [idx].Prefix == (object) prefix)
 					return true;
 			return false;
 		}
diff --git a/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs b/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs
index 553181388ee..4e0c1efce6f 100644
--- a/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs
+++ b/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs
@@ -109,7 +109,8 @@ namespace System.Xml
 
 #region Methods
 
-		[MonoTODO ("CAS: imperative PermitOnly isn't supported")]
+		[MonoTODO]
+		// FIXME: imperative PermitOnly isn't supported
 		public override object GetEntity (
 			Uri absoluteUri, string role, Type ofObjectToReturn)
 		{
diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
index 4ed0ded2c96..af67f4f3fbe 100644
--- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
@@ -685,7 +685,7 @@ namespace System.Xml
 		}
 
 #if NET_2_0
-		[MonoTODO ("Implement for performance reason")]
+		[MonoTODO] // FIXME: Implement, for performance improvement
 		public override void Skip ()
 		{
 			base.Skip ();
diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
index 3a53d887e09..76e07128177 100644
--- a/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader2.cs
@@ -620,7 +620,7 @@ namespace System.Xml
 			base.Skip ();
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public TextReader GetRemainder ()
 		{
 			if (entity != null) {
@@ -636,7 +636,7 @@ namespace System.Xml
 			return true;
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public int ReadBase64 (byte [] buffer, int offset, int length)
 		{
 			if (entity != null)
@@ -645,7 +645,7 @@ namespace System.Xml
 				return source.ReadBase64 (buffer, offset, length);
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public int ReadBinHex (byte [] buffer, int offset, int length)
 		{
 			if (entity != null)
@@ -654,7 +654,7 @@ namespace System.Xml
 				return source.ReadBinHex (buffer, offset, length);
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public int ReadChars (char [] buffer, int offset, int length)
 		{
 			if (entity != null)
@@ -664,7 +664,7 @@ namespace System.Xml
 		}
 
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public override int ReadContentAsBase64 (byte [] buffer, int offset, int length)
 		{
 			if (entity != null)
@@ -673,7 +673,7 @@ namespace System.Xml
 				return source.ReadContentAsBase64 (buffer, offset, length);
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public override int ReadContentAsBinHex (byte [] buffer, int offset, int length)
 		{
 			if (entity != null)
@@ -682,7 +682,7 @@ namespace System.Xml
 				return source.ReadContentAsBinHex (buffer, offset, length);
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public override int ReadElementContentAsBase64 (byte [] buffer, int offset, int length)
 		{
 			if (entity != null)
@@ -691,7 +691,7 @@ namespace System.Xml
 				return source.ReadElementContentAsBase64 (buffer, offset, length);
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public override int ReadElementContentAsBinHex (byte [] buffer, int offset, int length)
 		{
 			if (entity != null)
diff --git a/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs b/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
index 92145b55005..0edb0c68543 100644
--- a/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
@@ -305,7 +305,8 @@ namespace System.Xml
 		}
 #endif
 
-		[MonoTODO ("We decided not to support XDR schema that spec is obsolete.")]
+		[MonoTODO]
+		// We decided not to support XDR schema; it is obsolete.
 		public ValidationType ValidationType {
 			get { return validationType; }
 			set {
@@ -468,7 +469,8 @@ namespace System.Xml
 			return validatingReader.MoveToNextAttribute ();
 		}
 
-		[MonoTODO ("We decided not to support XDR schema that spec is obsolete.")]
+		[MonoTODO]
+		// We decided not to support XDR schema; it is obsolete.
 		public override bool Read ()
 		{
 			if (validatingReader == null) {
@@ -571,7 +573,7 @@ namespace System.Xml
 		}
 
 #if NET_2_0
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public override int ReadContentAsBase64 (byte [] buffer, int offset, int length)
 		{
 			if (validatingReader != null)
@@ -580,7 +582,7 @@ namespace System.Xml
 				return sourceReader.ReadContentAsBase64 (buffer, offset, length);
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public override int ReadContentAsBinHex (byte [] buffer, int offset, int length)
 		{
 			if (validatingReader != null)
@@ -589,7 +591,7 @@ namespace System.Xml
 				return sourceReader.ReadContentAsBinHex (buffer, offset, length);
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public override int ReadElementContentAsBase64 (byte [] buffer, int offset, int length)
 		{
 			if (validatingReader != null)
@@ -598,7 +600,7 @@ namespace System.Xml
 				return sourceReader.ReadElementContentAsBase64 (buffer, offset, length);
 		}
 
-		[MonoTODO ("Check how expanded entity is handled here.")]
+		[MonoTODO] // FIXME: Check how expanded entity is handled here.
 		public override int ReadElementContentAsBinHex (byte [] buffer, int offset, int length)
 		{
 			if (validatingReader != null)
diff --git a/mcs/class/System.XML/System.Xml/XmlWriter.cs b/mcs/class/System.XML/System.Xml/XmlWriter.cs
index 00e3c0df0d2..a30759875cf 100644
--- a/mcs/class/System.XML/System.Xml/XmlWriter.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriter.cs
@@ -400,7 +400,7 @@ namespace System.Xml
 		}
 
 #if NET_2_0
-		[MonoTODO ("test defattr handling")]
+		[MonoTODO] // FIXME: test defattr handling
 		public virtual void WriteNode (XPathNavigator navigator, bool defattr)
 		{
 			if (navigator == null)