@@ -73,16 +73,10 @@
 @class OFArray;
 @class OFURL;
 
 /**
  * \brief A class for handling strings.
- *
- * <b>Warning:</b> If you add methods to OFString using a category, you are not
- * allowed to access the ivars directly, as these might be still uninitialized
- * for a constant string and get initialized on the first message! Therefore,
- * you should use the corresponding methods to get the ivars, which ensures the
- * constant string is initialized.
  */
 @interface OFString: OFObject <OFCopying, OFMutableCopying, OFComparing,
     OFSerialization, OFJSONRepresentation>
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly) size_t length;
@@ -626,11 +620,12 @@
 /**
  * \brief Returns the range of the string.
  *
  * \param string The string to search
  * \param options Options modifying search behaviour.
- *		  Possible values: OF_STRING_SEARCH_BACKWARDS
+ *		  Possible values:
+ *		    * OF_STRING_SEARCH_BACKWARDS
  * \return The range of the first occurrence of the string or a range with
  *	   OF_NOT_FOUND as start position if it was not found
  */
 - (of_range_t)rangeOfString: (OFString*)string
 		    options: (int)options;
@@ -638,11 +633,12 @@
 /**
  * \brief Returns the range of the string in the specified range.
  *
  * \param string The string to search
  * \param options Options modifying search behaviour.
- *		  Possible values: OF_STRING_SEARCH_BACKWARDS
+ *		  Possible values:
+ *		    * OF_STRING_SEARCH_BACKWARDS
  * \param range The range in which to search
  * \return The range of the first occurrence of the string or a range with
  *	   OF_NOT_FOUND as start position if it was not found
  */
 - (of_range_t)rangeOfString: (OFString*)string
@@ -705,11 +701,12 @@
  *	  string in the specified range with the specified replacement.
  *
  * \param string The string to replace
  * \param replacement The string with which it should be replaced
  * \param options Options modifying search behaviour.
- *		  Possible values: None yet
+ *		  Possible values:
+ *		    * None yet
  * \param range The range in which to replace the string
  * \return A new string with the occurrences of the specified string replaced
  */
 - (OFString*)stringByReplacingOccurrencesOfString: (OFString*)string
 				       withString: (OFString*)replacement
@@ -731,11 +728,11 @@
 - (OFString*)lowercaseString;
 
 /**
  * \brief Returns the string capitalized.
  *
- * \note This only considers spaces, tab and newlines to be word delimiters!
+ * \note This only considers spaces, tabs and newlines to be word delimiters!
  *	 Also note that this might change in the future to all word delimiters
  *	 specified by Unicode!
  *
  * \return The capitalized string
  */
@@ -789,12 +786,13 @@
 
 /**
  * \brief Separates an OFString into an OFArray of OFStrings.
  *
  * \param delimiter The delimiter for separating
- * \param options Options according to which the string should be separated
- * 		  Possible values: OF_STRING_SKIP_EMPTY
+ * \param options Options according to which the string should be separated.
+ * 		  Possible values:
+ * 		    * OF_STRING_SKIP_EMPTY
  * \return An autoreleased OFArray with the separated string
  */
 - (OFArray*)componentsSeparatedByString: (OFString*)delimiter
 				options: (int)options;