@@ -37,45 +37,45 @@
  * @brief This callback is called when the XML parser found a processing
  *	  instruction.
  *
  * @param parser The parser which found a processing instruction
  * @param target The target of the processing instruction
- * @param data The data of the processing instruction
+ * @param text The text of the processing instruction
  */
 -			  (void)parser: (OFXMLParser *)parser
   foundProcessingInstructionWithTarget: (OFString *)target
-				  data: (OFString *)data;
+				  text: (OFString *)text;
 
 /**
  * @brief This callback is called when the XML parser found the start of a new
  *	  tag.
  *
  * @param parser The parser which found a new tag
  * @param name The name of the tag which just started
  * @param prefix The prefix of the tag which just started or `nil`
- * @param ns The namespace of the tag which just started or `nil`
+ * @param nameSpace The namespace of the tag which just started or `nil`
  * @param attributes The attributes included in the tag which just started or
  *		     `nil`
  */
 -    (void)parser: (OFXMLParser *)parser
   didStartElement: (OFString *)name
 	   prefix: (nullable OFString *)prefix
-	namespace: (nullable OFString *)ns
+	namespace: (nullable OFString *)nameSpace
        attributes: (nullable OFArray OF_GENERIC(OFXMLAttribute *) *)attributes;
 
 /**
  * @brief This callback is called when the XML parser found the end of a tag.
  *
  * @param parser The parser which found the end of a tag
  * @param name The name of the tag which just ended
  * @param prefix The prefix of the tag which just ended or `nil`
- * @param ns The namespace of the tag which just ended or `nil`
+ * @param nameSpace The namespace of the tag which just ended or `nil`
  */
 -  (void)parser: (OFXMLParser *)parser
   didEndElement: (OFString *)name
 	 prefix: (nullable OFString *)prefix
-      namespace: (nullable OFString *)ns;
+      namespace: (nullable OFString *)nameSpace;
 
 /**
  * @brief This callback is called when the XML parser found characters.
  *
  * In case there are comments or CDATA, it is possible that this callback is
@@ -185,24 +185,36 @@
 /**
  * @brief Parses the specified buffer with the specified size.
  *
  * @param buffer The buffer to parse
  * @param length The length of the buffer
+ * @throw OFMalformedXMLException The XML was malformed
+ * @throw OFUnboundPrefixException A prefix was used that was not bound to any
+ *				   namespace
+ * @throw OFInvalidEncodingException The XML is not in the encoding it specified
  */
 - (void)parseBuffer: (const char *)buffer length: (size_t)length;
 
 /**
  * @brief Parses the specified string.
  *
  * @param string The string to parse
+ * @throw OFMalformedXMLException The XML was malformed
+ * @throw OFUnboundPrefixException A prefix was used that was not bound to any
+ *				   namespace
+ * @throw OFInvalidEncodingException The XML is not in the encoding it specified
  */
 - (void)parseString: (OFString *)string;
 
 /**
  * @brief Parses the specified stream.
  *
  * @param stream The stream to parse
+ * @throw OFMalformedXMLException The XML was malformed
+ * @throw OFUnboundPrefixException A prefix was used that was not bound to any
+ *				   namespace
+ * @throw OFInvalidEncodingException The XML is not in the encoding it specified
  */
 - (void)parseStream: (OFStream *)stream;
 @end
 
 OF_ASSUME_NONNULL_END