[gxml] NodeList.vala, DomNode.vala, Attr.vala: create some future merge conflicts to fix doc generation now

[Richard Hans Schwarting <rschwart src gnome org>]

commit 08610bbf722b913a0d74f17fcf90a3e0ae43d480
Author: Richard Schwarting <aquarichy gmail com>
Date:   Thu Aug 22 11:27:29 2013 -0400

    NodeList.vala, DomNode.vala, Attr.vala: create some future merge conflicts to fix doc generation now 
while merging changes; whoops

 gxml/Attr.vala     |    2 +-
 gxml/DomNode.vala  |    8 ++++----
 gxml/NodeList.vala |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gxml/Attr.vala b/gxml/Attr.vala
index 1eff420..82b178a 100644
--- a/gxml/Attr.vala
+++ b/gxml/Attr.vala
@@ -190,7 +190,7 @@ namespace GXml {
                 * underlying document. If the attribute is changed,
                 * it is set to false.
                 *
-                * @todo: this requires support from the DTD, and
+                * #todo: this requires support from the DTD, and
                 * probably libxml2's xmlAttribute
                 *
                 * Version: DOM Level 1 Core
diff --git a/gxml/DomNode.vala b/gxml/DomNode.vala
index bc399f6..2082f3e 100644
--- a/gxml/DomNode.vala
+++ b/gxml/DomNode.vala
@@ -72,7 +72,7 @@ namespace GXml {
 
                /**
                 * The list of attributes that store namespace definitions.  This is not part of a DOM spec.
-                * @TODO: determine best API for exposing these, as it's not defined in the IDL
+                * #TODO: determine best API for exposing these, as it's not defined in the IDL
                 */
                public virtual NodeList? namespace_definitions {
                        get {
@@ -207,7 +207,7 @@ namespace GXml {
                 * Version: DOM Level 1 Core
                 * URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#attribute-childNodes]]
                 *
-                * @todo: identify node types that use children for values, like attribute
+                * #todo: identify node types that use children for values, like attribute
                 */
                public virtual NodeList? child_nodes {
                        // TODO: need to implement NodeList
@@ -294,8 +294,8 @@ namespace GXml {
                /* Methods */
 
                /* These may need to be overridden by subclasses that support them.
-                * @TODO: figure out what non-BackedNode classes should be doing with these, anyway
-                * @TODO: want to throw other relevant errors */
+                * #TODO: figure out what non-BackedNode classes should be doing with these, anyway
+                * #TODO: want to throw other relevant errors */
 
                /**
                 * Insert `new_child` as a child to this node, and place
diff --git a/gxml/NodeList.vala b/gxml/NodeList.vala
index c6ff3ae..e6c43c6 100644
--- a/gxml/NodeList.vala
+++ b/gxml/NodeList.vala
@@ -127,11 +127,11 @@ namespace GXml {
                /**
                 * Creates an XML string representation of the nodes in the list.
                 *
+                * #todo: write a test
+                *
                 * @param in_line Whether to parse and expand entities or not.
                 *
                 * @return The list as an XML string.
-                *
-                * @todo: write a test
                 */
                public abstract string to_string (bool in_line);
        }