diff --git a/plist-cil/ASCIIPropertyListParser.cs b/plist-cil/ASCIIPropertyListParser.cs
index 30ea4c8..063752f 100644
--- a/plist-cil/ASCIIPropertyListParser.cs
+++ b/plist-cil/ASCIIPropertyListParser.cs
@@ -32,22 +32,26 @@ using System.Runtime.CompilerServices;
 namespace Claunia.PropertyList
 {
     /// <summary>
-    /// <p>
+    /// <para>
     /// Parser for ASCII property lists. Supports Apple OS X/iOS and GnuStep/NeXTSTEP format.
     /// This parser is based on the recursive descent paradigm, but the underlying grammar
     /// is not explicitely defined.
-    /// </p>
-    /// <p>
+    /// </para>
+    /// <para>
     /// Resources on ASCII property list format:
-    /// </p>
-    /// <ul>
-    /// <li><a href="https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/PropertyLists/OldStylePlists/OldStylePLists.html">
+    /// </para>
+    /// <para>
+    /// https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/PropertyLists/OldStylePlists/OldStylePLists.html
+    /// </para>
+    /// <para>
     /// Property List Programming Guide - Old-Style ASCII Property Lists
-    /// </a></li>
-    /// <li><a href="http://www.gnustep.org/resources/documentation/Developer/Base/Reference/NSPropertyList.html">
+    /// </para>
+    /// <para>
+    /// http://www.gnustep.org/resources/documentation/Developer/Base/Reference/NSPropertyList.html
+    /// </para>
+    /// <para>
     /// GnuStep - NSPropertyListSerialization class documentation
-    /// </a></li>
-    /// </ul>
+    /// </para>
     /// </summary>
     /// @author Daniel Dreibrodt
     /// @author Natalia Portillo
diff --git a/plist-cil/ChangeLog b/plist-cil/ChangeLog
index 60fd51d..b0e8067 100644
--- a/plist-cil/ChangeLog
+++ b/plist-cil/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-20  Natalia Portillo  <claunia@claunia.com>
+
+	* NSObject.cs:
+	* ASCIIPropertyListParser.cs:
+	  Modify some JavaDoc to Xml.
+
 2015-02-20  Natalia Portillo  <claunia@claunia.com>
 
 	* NSDictionary.cs:
diff --git a/plist-cil/NSObject.cs b/plist-cil/NSObject.cs
index 3ef2e52..401e012 100644
--- a/plist-cil/NSObject.cs
+++ b/plist-cil/NSObject.cs
@@ -375,16 +375,14 @@ namespace Claunia.PropertyList
         /// <summary>
         /// Converts this NSObject into an equivalent object
         /// of the .NET Runtime Environment.
-        /// <ul>
-        /// <li><see cref="NSArray"/> objects are converted to arrays.</li>
-        /// <li><see cref="NSDictionary"/> objects are converted to objects extending the <see cref="Dictionary{TKey, TValue}"/> class.</li>
-        /// <li><see cref="NSSet"/> objects are converted to objects extending the <see cref="List{NSObject}"/> class.</li>
-        /// <li><see cref="NSNumber"/> objects are converted to primitive number values (<see cref="int"/>, <see cref="long"/>, <see cref="double"/> or <see cref="bool"/>).</li>
-        /// <li><see cref="NSString"/> objects are converted to <see cref="string"/> objects.</li>
-        /// <li><see cref="NSData"/> objects are converted to <see cref="byte"/> arrays.</li>
-        /// <li><see cref="NSDate"/> objects are converted to <see cref="System.DateTime"/> objects.</li>
-        /// <li><see cref="UID"/> objects are converted to <see cref="byte"/> arrays.</li>
-        /// </ul>
+        /// <para><see cref="NSArray"/> objects are converted to arrays.</para>
+        /// <para><see cref="NSDictionary"/> objects are converted to objects extending the <see cref="Dictionary{TKey, TValue}"/> class.</para>
+        /// <para><see cref="NSSet"/> objects are converted to objects extending the <see cref="List{NSObject}"/> class.</para>
+        /// <para><see cref="NSNumber"/> objects are converted to primitive number values (<see cref="int"/>, <see cref="long"/>, <see cref="double"/> or <see cref="bool"/>).</para>
+        /// <para><see cref="NSString"/> objects are converted to <see cref="string"/> objects.</para>
+        /// <para><see cref="NSData"/> objects are converted to <see cref="byte"/> arrays.</para>
+        /// <para><see cref="NSDate"/> objects are converted to <see cref="System.DateTime"/> objects.</para>
+        /// <para><see cref="UID"/> objects are converted to <see cref="byte"/> arrays.</para>
         /// </summary>
         /// <returns>A native .NET object representing this NSObject's value.</returns>
         public Object ToObject()