Index: src/OFMutableString.h
==================================================================
--- src/OFMutableString.h
+++ src/OFMutableString.h
@@ -17,52 +17,52 @@
 /**
  * A class for storing and modifying strings.
  */
 @interface OFMutableString: OFString {}
 /**
- * Sets the OFString to the specified OFString.
+ * Sets the OFString to the specified UTF-8 encoded C string.
  *
- * \param str An OFString to set the OFString to.
+ * \param str A UTF-8 encoded C string to set the OFString to.
  */
 - setToCString: (const char*)str;
 
 /**
- * Appends a C string to the OFString.
+ * Appends a UTF-8 encoded C string to the OFString.
  *
- * \param str A C string to append
+ * \param str A UTF-8 encoded C string to append
  */
 - appendCString: (const char*)str;
 
 /**
- * Appends a C string with the specified length to the OFString.
+ * Appends a UTF-8 encoded C string with the specified length to the OFString.
  *
- * \param str A C string to append
- * \param len The length of the C string
+ * \param str A UTF-8 encoded C string to append
+ * \param len The length of the UTF-8 encoded C string
  */
 - appendCString: (const char*)str
      withLength: (size_t)len;
 
 /**
- * Appends a C string to the OFString without checking whether it is valid
- * UTF-8.
+ * Appends a UTF-8 encoded C string to the OFString without checking whether it
+ * is valid UTF-8.
  *
  * Only use this if you are 100% sure the string you append is either ASCII or
  * UTF-8!
  *
- * \param str A C string to append
+ * \param str A UTF-8 encoded C string to append
  */
 - appendCStringWithoutUTF8Checking: (const char*)str;
 
 /**
- * Appends a C string with the specified length to the OFString without checking
- * whether it is valid UTF-8.
+ * Appends a UTF-8 encoded C string with the specified length to the OFString
+ * without checking whether it is valid UTF-8.
  *
  * Only use this if you are 100% sure the string you append is either ASCII or
  * UTF-8!
  *
- * \param str A C string to append
- * \param len The length of the C string
+ * \param str A UTF-8 encoded C string to append
+ * \param len The length of the UTF-8 encoded C string
  */
 - appendCStringWithoutUTF8Checking: (const char*)str
 			 andLength: (size_t)len;
 
 /**
@@ -71,19 +71,19 @@
  * \param str An OFString to append
  */
 - appendString: (OFString*)str;
 
 /**
- * Appends a formatted C string to the OFString.
+ * Appends a formatted UTF-8 encoded C string to the OFString.
  * See printf for the format syntax.
  *
  * \param fmt A format string which generates the string to append
  */
 - appendWithFormat: (OFString*)fmt, ...;
 
 /**
- * Appends a formatted C string to the OFString.
+ * Appends a formatted UTF-8 encoded C string to the OFString.
  * See printf for the format syntax.
  *
  * \param fmt A format string which generates the string to append
  * \param args The arguments used in the format string
  */

Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -39,21 +39,22 @@
  * \return A new autoreleased OFString
  */
 + string;
 
 /**
- * Creates a new OFString from a C string.
+ * Creates a new OFString from a UTF-8 encoded C string.
  *
- * \param str A C string to initialize the OFString with
+ * \param str A UTF-8 encoded C string to initialize the OFString with
  * \return A new autoreleased OFString
  */
 + stringWithCString: (const char*)str;
 
 /**
- * Creates a new OFString from a C string with the specified length.
+ * Creates a new OFString from a UTF-8 encoded C string with the specified
+ * length.
  *
- * \param str A C string to initialize the OFString with
+ * \param str A UTF-8 encoded C string to initialize the OFString with
  * \param len The length of the string
  * \return A new autoreleased OFString
  */
 + stringWithCString: (const char*)str
 	  andLength: (size_t)len;
@@ -81,22 +82,22 @@
  * \return An initialized OFString
  */
 - init;
 
 /**
- * Initializes an already allocated OFString from a C string.
+ * Initializes an already allocated OFString from a UTF-8 encoded C string.
  *
- * \param str A C string to initialize the OFString with
+ * \param str A UTF-8 encoded C string to initialize the OFString with
  * \return An initialized OFString
  */
 - initWithCString: (const char*)str;
 
 /**
- * Initializes an already allocated OFString from a C string with the specified
- * length.
+ * Initializes an already allocated OFString from a UTF-8 encoded C string with
+ * the specified length.
  *
- * \param str A C string to initialize the OFString with
+ * \param str A UTF-8 encoded C string to initialize the OFString with
  * \param len The length of the string
  * \return An initialized OFString
  */
 - initWithCString: (const char*)str
 	andLength: (size_t)len;
@@ -128,11 +129,11 @@
  * \return An initialized OFString
  */
 - initWithString: (OFString*)str;
 
 /**
- * \return The OFString as a C string
+ * \return The OFString as a UTF-8 encoded C string
  */
 - (const char*)cString;
 
 /**
  * \return The length of the OFString