Index: src/OFDNSResourceRecord.h
==================================================================
--- src/OFDNSResourceRecord.h
+++ src/OFDNSResourceRecord.h
@@ -152,11 +152,11 @@
 
 /**
  * @class OFAAAADNSResourceRecord \
  *	  OFDNSResourceRecord.h ObjFW/OFDNSResourceRecord.h
  *
- * @brief A class represenging a DNS resource record.
+ * @brief A class representing a DNS resource record.
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFAAAADNSResourceRecord: OFDNSResourceRecord
 {
 	OFSocketAddress _address;
@@ -390,11 +390,11 @@
 		  domainName: (OFString *)domainName
 			 TTL: (uint32_t)TTL OF_DESIGNATED_INITIALIZER;
 @end
 
 /**
- * @class OFRPNSResourceRecord \
+ * @class OFRPDNSResourceRecord \
  *	  OFDNSResourceRecord.h ObjFW/OFDNSResourceRecord.h
  *
  * @brief A class representing an RP DNS resource record.
  */
 OF_SUBCLASSING_RESTRICTED

Index: src/OFData.h
==================================================================
--- src/OFData.h
+++ src/OFData.h
@@ -123,11 +123,11 @@
 /**
  * @brief Creates a new OFData with the specified `count` items of size 1 by
  *	  taking over ownership of the specified items pointer.
  *
  * If initialization fails for whatever reason, the passed memory is *not*
- * free'd if `freeWhenDone` is true.
+ * freed if `freeWhenDone` is true.
  *
  * @param items The items to store in the OFData
  * @param count The number of items
  * @param freeWhenDone Whether to free the pointer when it is no longer needed
  *		       by the OFData
@@ -140,11 +140,11 @@
 /**
  * @brief Creates a new OFData with the specified `count` items of the
  *	  specified size by taking ownership of the specified items pointer.
  *
  * If initialization fails for whatever reason, the passed memory is *not*
- * free'd if `freeWhenDone` is true.
+ * freed if `freeWhenDone` is true.
  *
  * @param items The items to store in the OFData
  * @param count The number of items
  * @param itemSize The item size of a single item in bytes
  * @param freeWhenDone Whether to free the pointer when it is no longer needed
@@ -242,11 +242,11 @@
  * @brief Initializes an already allocated OFData with the specified `count`
  *	  items of size 1 by taking over ownership of the specified items
  *	  pointer.
  *
  * If initialization fails for whatever reason, the passed memory is *not*
- * free'd if `freeWhenDone` is true.
+ * freed if `freeWhenDone` is true.
  *
  * @param items The items to store in the OFData
  * @param count The number of items
  * @param freeWhenDone Whether to free the pointer when it is no longer needed
  *		       by the OFData
@@ -260,11 +260,11 @@
  * @brief Initializes an already allocated OFData with the specified `count`
  *	  items of the specified size by taking ownership of the specified
  *	  items pointer.
  *
  * If initialization fails for whatever reason, the passed memory is *not*
- * free'd if `freeWhenDone` is true.
+ * freed if `freeWhenDone` is true.
  *
  * @param items The items to store in the OFData
  * @param count The number of items
  * @param itemSize The item size of a single item in bytes
  * @param freeWhenDone Whether to free the pointer when it is no longer needed

Index: src/OFDatagramSocket.h
==================================================================
--- src/OFDatagramSocket.h
+++ src/OFDatagramSocket.h
@@ -261,11 +261,11 @@
 
 /**
  * @brief Asynchronously sends the specified datagram to the specified address.
  *
  * @param data The data to send as a datagram
- * @param receiver A pointer to an @ref OFSocketAddress to which the datgram
+ * @param receiver A pointer to an @ref OFSocketAddress to which the datagram
  *		   should be sent. The receiver is copied.
  * @param runLoopMode The run loop mode in which to perform the async send
  */
 - (void)asyncSendData: (OFData *)data
 	     receiver: (const OFSocketAddress *)receiver

Index: src/OFDate.h
==================================================================
--- src/OFDate.h
+++ src/OFDate.h
@@ -187,20 +187,20 @@
 				 format: (OFString *)format;
 
 /**
  * @brief Returns a date in the distant future.
  *
- * The date is system-dependant.
+ * The date is system-dependent.
  *
  * @return A date in the distant future
  */
 + (instancetype)distantFuture;
 
 /**
  * @brief Returns a date in the distant past.
  *
- * The date is system-dependant.
+ * The date is system-dependent.
  *
  * @return A date in the distant past
  */
 + (instancetype)distantPast;
 

Index: src/OFFileManager.h
==================================================================
--- src/OFFileManager.h
+++ src/OFFileManager.h
@@ -762,11 +762,11 @@
 			 forName: (OFString *)name
 		     ofItemAtIRI: (OFIRI *)IRI;
 
 #ifdef OF_FILE_MANAGER_SUPPORTS_EXTENDED_ATTRIBUTES
 /**
- * @brief Removes the extended attribute for the specified name wof the item at
+ * @brief Removes the extended attribute for the specified name of the item at
  *	  the specified path.
  *
  * This method is not available on some systems.
  *
  * @param name The name of the extended attribute to remove
@@ -779,11 +779,11 @@
 - (void)removeExtendedAttributeForName: (OFString *)name
 			  ofItemAtPath: (OFString *)path;
 #endif
 
 /**
- * @brief Removes the extended attribute for the specified name wof the item at
+ * @brief Removes the extended attribute for the specified name of the item at
  *	  the specified IRI.
  *
  * This method is not available for all IRIs.
  *
  * @param name The name of the extended attribute to remove

Index: src/OFHTTPResponse.h
==================================================================
--- src/OFHTTPResponse.h
+++ src/OFHTTPResponse.h
@@ -72,11 +72,11 @@
  * @return The response as a string
  */
 - (OFString *)readString;
 
 /**
- * @brief Rread the response as a string, trying to detect the encoding and
+ * @brief Read the response as a string, trying to detect the encoding and
  *	  falling back to the specified encoding if not detectable.
  *
  * @return The response as a string
  */
 - (OFString *)readStringWithEncoding: (OFStringEncoding)encoding;

Index: src/OFIRI.h
==================================================================
--- src/OFIRI.h
+++ src/OFIRI.h
@@ -216,11 +216,11 @@
 /**
  * @brief Creates a new IRI with the specified local file path.
  *
  * @param path The local file path
  * @param isDirectory Whether the path is a directory, in which case a slash is
- *		      appened if there is no slash yet
+ *		      appended if there is no slash yet
  * @return An initialized OFIRI
  */
 + (instancetype)fileIRIWithPath: (OFString *)path
 		    isDirectory: (bool)isDirectory;
 #endif
@@ -265,11 +265,11 @@
  * @brief Initializes an already allocated OFIRI with the specified local file
  *	  path.
  *
  * @param path The local file path
  * @param isDirectory Whether the path is a directory, in which case a slash is
- *		      appened if there is no slash yet
+ *		      appended if there is no slash yet
  * @return An initialized OFIRI
  */
 - (instancetype)initFileIRIWithPath: (OFString *)path
 			isDirectory: (bool)isDirectory;
 #endif

Index: src/OFIRIHandler.h
==================================================================
--- src/OFIRIHandler.h
+++ src/OFIRIHandler.h
@@ -330,11 +330,11 @@
 - (void)setExtendedAttributeData: (OFData *)data
 			 forName: (OFString *)name
 		     ofItemAtIRI: (OFIRI *)IRI;
 
 /**
- * @brief Removes the extended attribute for the specified name wof the item at
+ * @brief Removes the extended attribute for the specified name of the item at
  *	  the specified IRI.
  *
  * This method is not available for all IRIs.
  *
  * @param name The name of the extended attribute to remove

Index: src/OFList.h
==================================================================
--- src/OFList.h
+++ src/OFList.h
@@ -20,12 +20,12 @@
 OF_ASSUME_NONNULL_BEGIN
 
 /** @file */
 
 /*
- * Make clang's -Wdocumentation shut about about using @struct on someting it
- * thinks is not a struct. Doxygen requires it this way.
+ * Make clang's -Wdocumentation shut up about about using @struct on something
+ * it thinks is not a struct. Doxygen requires it this way.
  */
 #ifdef __clang__
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Wdocumentation"
 #endif

Index: src/OFMatrix4x4.h
==================================================================
--- src/OFMatrix4x4.h
+++ src/OFMatrix4x4.h
@@ -60,11 +60,11 @@
  */
 - (instancetype)initWithValues: (const float [_Nonnull 4][4])values
     OF_DESIGNATED_INITIALIZER;
 
 /**
- * @brief Mulitplies the receiver with the specified matrix on the left side
+ * @brief Multiplies the receiver with the specified matrix on the left side
  *	  and the receiver on the right side.
  *
  * @param matrix The matrix to multiply the receiver with
  */
 - (void)multiplyWithMatrix: (OFMatrix4x4 *)matrix;

Index: src/OFMutableIRI.h
==================================================================
--- src/OFMutableIRI.h
+++ src/OFMutableIRI.h
@@ -201,11 +201,11 @@
 /**
  * @brief Appends the specified path component.
  *
  * @param component The component to append
  * @param isDirectory Whether the path is a directory, in which case a slash is
- *		      appened if there is no slash yet
+ *		      appended if there is no slash yet
  */
 - (void)appendPathComponent: (OFString *)component
 		isDirectory: (bool)isDirectory;
 
 /**

Index: src/OFMutableString.h
==================================================================
--- src/OFMutableString.h
+++ src/OFMutableString.h
@@ -175,11 +175,11 @@
  * @brief Replaces all occurrences of a string in the specified range with
  *	  another string.
  *
  * @param string The string to replace
  * @param replacement The string with which it should be replaced
- * @param options Options modifying search behaviour
+ * @param options Options modifying search behavior
  *		  Possible values: None yet
  * @param range The range in which the string should be replaced
  */
 - (void)replaceOccurrencesOfString: (OFString *)string
 			withString: (OFString *)replacement

Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -81,11 +81,11 @@
  */
 typedef OFComparisonResult (^OFComparator)(id _Nonnull left, id _Nonnull right);
 #endif
 
 /**
- * @brief An enum for representing endianess.
+ * @brief An enum for representing endianness.
  */
 typedef enum {
 	/** Most significant byte first (big endian) */
 	OFByteOrderBigEndian,
 	/** Least significant byte first (little endian) */
@@ -113,11 +113,11 @@
 /**
  * @brief Creates a new OFRange.
  *
  * @param start The starting index of the range
  * @param length The length of the range
- * @return An OFRangeith the specified start and length
+ * @return An OFRange with the specified start and length
  */
 static OF_INLINE OFRange OF_CONST_FUNC
 OFMakeRange(size_t start, size_t length)
 {
 	OFRange range = { start, length };
@@ -1375,11 +1375,12 @@
 /**
  * @protocol OFComparing OFObject.h ObjFW/OFObject.h
  *
  * @brief A protocol for comparing objects.
  *
- * This protocol is implemented by objects that can be compared. Its only method, @ref compare:, should be overridden with a stronger type.
+ * This protocol is implemented by objects that can be compared. Its only
+ * method, @ref compare:, should be overridden with a stronger type.
  */
 @protocol OFComparing
 /**
  * @brief Compares the object to another object.
  *
@@ -1448,11 +1449,11 @@
 
 /**
  * @brief Frees memory allocated by @ref OFAllocMemory, @ref OFAllocZeroedMemory
  *	  or @ref OFResizeMemory.
  *
- * @param pointer A pointer to the memory to free or nil (passing nil ooes
+ * @param pointer A pointer to the memory to free or nil (passing nil does
  *		  nothing)
  */
 extern void OFFreeMemory(void *_Nullable pointer);
 
 #ifdef OF_APPLE_RUNTIME

Index: src/OFPlugin.h
==================================================================
--- src/OFPlugin.h
+++ src/OFPlugin.h
@@ -73,11 +73,11 @@
 
 /**
  * @brief Returns the address for the specified symbol, or `nil` if not found.
  *
  * @param symbol The symbol to return the address for
- * @return The address for the speccified symbol, or `nil` if not found
+ * @return The address for the specified symbol, or `nil` if not found
  */
 - (nullable void *)addressForSymbol: (OFString *)symbol;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFSettings.h
==================================================================
--- src/OFSettings.h
+++ src/OFSettings.h
@@ -23,11 +23,11 @@
 /**
  * @class OFSettings OFSettings.h ObjFW/OFSettings.h
  *
  * Paths are delimited by dots, for example `category.subcategory.key`.
  *
- * @note The behaviour when accessing a path with a different type than it has
+ * @note The behavior when accessing a path with a different type than it has
  *	 been accessed with before is undefined! If you want to change the type
  *	 for a path, remove it and then set it with the new type.
  *
  * @brief A class for storing and retrieving settings
  */

Index: src/OFStream.h
==================================================================
--- src/OFStream.h
+++ src/OFStream.h
@@ -493,11 +493,11 @@
  * @brief Reads a uint16_t from the stream which is encoded in big endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A uint16_t from the stream in native endianess
+ * @return A uint16_t from the stream in native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -507,11 +507,11 @@
  * @brief Reads a uint32_t from the stream which is encoded in big endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A uint32_t from the stream in the native endianess
+ * @return A uint32_t from the stream in the native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -521,11 +521,11 @@
  * @brief Reads a uint64_t from the stream which is encoded in big endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A uint64_t from the stream in the native endianess
+ * @return A uint64_t from the stream in the native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -535,11 +535,11 @@
  * @brief Reads a float from the stream which is encoded in big endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A float from the stream in the native endianess
+ * @return A float from the stream in the native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -549,11 +549,11 @@
  * @brief Reads a double from the stream which is encoded in big endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A double from the stream in the native endianess
+ * @return A double from the stream in the native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -563,11 +563,11 @@
  * @brief Reads a uint16_t from the stream which is encoded in little endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A uint16_t from the stream in native endianess
+ * @return A uint16_t from the stream in native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -577,11 +577,11 @@
  * @brief Reads a uint32_t from the stream which is encoded in little endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A uint32_t from the stream in the native endianess
+ * @return A uint32_t from the stream in the native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -591,11 +591,11 @@
  * @brief Reads a uint64_t from the stream which is encoded in little endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A uint64_t from the stream in the native endianess
+ * @return A uint64_t from the stream in the native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -605,11 +605,11 @@
  * @brief Reads a float from the stream which is encoded in little endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A float from the stream in the native endianess
+ * @return A float from the stream in the native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */
@@ -619,11 +619,11 @@
  * @brief Reads a double from the stream which is encoded in little endian.
  *
  * @warning Only call this when you know that enough data is available!
  *	    Otherwise you will get an exception!
  *
- * @return A double from the stream in the native endianess
+ * @return A double from the stream in the native endianness
  * @throw OFReadFailedException Reading failed
  * @throw OFTruncatedDataException The end of the stream was reached before
  *				   reading enough bytes
  * @throw OFNotOpenException The stream is not open
  */

Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -77,15 +77,15 @@
 	OFStringEncodingISO8859_15,
 	/** Windows-1251 */
 	OFStringEncodingWindows1251,
 	/** Windows-1252 */
 	OFStringEncodingWindows1252,
-	/** Codepage 437 */
+	/** Code page 437 */
 	OFStringEncodingCodepage437,
-	/** Codepage 850 */
+	/** Code page 850 */
 	OFStringEncodingCodepage850,
-	/** Codepage 858 */
+	/** Code page 858 */
 	OFStringEncodingCodepage858,
 	/** Mac OS Roman */
 	OFStringEncodingMacRoman,
 	/** KOI8-R */
 	OFStringEncodingKOI8R,
@@ -132,11 +132,11 @@
  * @brief A class for handling strings.
  */
 @interface OFString: OFObject <OFCopying, OFMutableCopying, OFComparing,
     OFJSONRepresentation, OFMessagePackRepresentation>
 /**
- * @brief The length of the string in Unicode codepoints.
+ * @brief The length of the string in Unicode code points.
  */
 @property (readonly, nonatomic) size_t length;
 
 /**
  * @brief The OFString as a UTF-8 encoded C string.
@@ -305,11 +305,11 @@
 /**
  * @brief Creates a new OFString from a UTF-8 encoded C string without copying
  *	  the string, if possible.
  *
  * If initialization fails for whatever reason, the passed C string is *not*
- * free'd if `freeWhenDone` is true.
+ * freed if `freeWhenDone` is true.
  *
  * @note OFMutableString always creates a copy!
  *
  * @param UTF8String A UTF-8 encoded C string to initialize the OFString with
  * @param freeWhenDone Whether to free the C string when the OFString gets
@@ -323,11 +323,11 @@
 /**
  * @brief Creates a new OFString from a UTF-8 encoded C string with the
  *	  specified length without copying the string, if possible.
  *
  * If initialization fails for whatever reason, the passed C string is *not*
- * free'd if `freeWhenDone` is true.
+ * freed if `freeWhenDone` is true.
  *
  * @note OFMutableString always creates a copy!
  *
  * @param UTF8String A UTF-8 encoded C string to initialize the OFString with
  * @param UTF8StringLength The length of the UTF-8 encoded C string
@@ -529,13 +529,13 @@
 /**
  * @brief Creates a new OFString with the contents of the specified IRI.
  *
  * If the IRI's scheme is file, it tries UTF-8 encoding.
  *
- * If the IRI's scheme is http(s), it tries to detect the encoding from the HTTP
- * headers. If it could not detect the encoding using the HTTP headers, it tries
- * UTF-8.
+ * If the IRI's scheme is `http` or `https`, it tries to detect the encoding
+ * from the HTTP headers. If it could not detect the encoding using the HTTP
+ * headers, it tries UTF-8.
  *
  * @param IRI The IRI to the contents for the string
  * @return A new autoreleased OFString
  * @throw OFInvalidEncodingException The string is not in the expected encoding
  */
@@ -585,11 +585,11 @@
 /**
  * @brief Initializes an already allocated OFString from an UTF-8 encoded C
  *	  string without copying the string, if possible.
  *
  * If initialization fails for whatever reason, the passed C string is *not*
- * free'd if `freeWhenDone` is true.
+ * freed if `freeWhenDone` is true.
  *
  * @note OFMutableString always creates a copy!
  *
  * @param UTF8String A UTF-8 encoded C string to initialize the OFString with
  * @param freeWhenDone Whether to free the C string when it is not needed
@@ -604,11 +604,11 @@
  * @brief Initializes an already allocated OFString from an UTF-8 encoded C
  *	  string with the specified length without copying the string, if
  *	  possible.
  *
  * If initialization fails for whatever reason, the passed C string is *not*
- * free'd if `freeWhenDone` is true.
+ * freed if `freeWhenDone` is true.
  *
  * @note OFMutableString always creates a copy!
  *
  * @param UTF8String A UTF-8 encoded C string to initialize the OFString with
  * @param UTF8StringLength The length of the UTF-8 encoded C string
@@ -830,13 +830,13 @@
  * @brief Initializes an already allocated OFString with the contents of the
  *	  specified IRI.
  *
  * If the IRI's scheme is file, it tries UTF-8 encoding.
  *
- * If the IRI's scheme is http(s), it tries to detect the encoding from the HTTP
- * headers. If it could not detect the encoding using the HTTP headers, it tries
- * UTF-8.
+ * If the IRI's scheme is `http` or `https`, it tries to detect the encoding
+ * from the HTTP headers. If it could not detect the encoding using the HTTP
+ * headers, it tries UTF-8.
  *
  * @param IRI The IRI to the contents for the string
  * @return An initialized OFString
  * @throw OFInvalidEncodingException The string is not in the expected encoding
  */
@@ -1003,11 +1003,11 @@
 
 /**
  * @brief Returns the index of the first character from the set.
  *
  * @param characterSet The set of characters to search for
- * @param options Options modifying search behaviour
+ * @param options Options modifying search behavior
  * @return The index of the first occurrence of a character from the set or
  *	   `OFNotFound` if it was not found
  */
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 			  options: (OFStringSearchOptions)options;
@@ -1014,11 +1014,11 @@
 
 /**
  * @brief Returns the index of the first character from the set.
  *
  * @param characterSet The set of characters to search for
- * @param options Options modifying search behaviour
+ * @param options Options modifying search behavior
  * @param range The range in which to search
  * @return The index of the first occurrence of a character from the set or
  *	   `OFNotFound` if it was not found
  */
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
@@ -1043,11 +1043,11 @@
 
 /**
  * @brief Creates a substring from the beginning to the specified index.
  *
  * @param idx The index at which the substring should end, exclusive
- * @return The subtring from the beginning to the specified index
+ * @return The substring from the beginning to the specified index
  */
 - (OFString *)substringToIndex: (size_t)idx;
 
 /**
  * @brief Creates a substring with the specified range.
@@ -1149,11 +1149,11 @@
  * @brief Creates a new string by replacing the occurrences of the specified
  *	  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.
+ * @param options Options modifying search behavior.
  *		  Possible values are:
  *		    * None yet, pass 0
  * @param range The range in which to replace the string
  * @return A new string with the occurrences of the specified string replaced
  */

Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -78,11 +78,11 @@
 @property (class, nonatomic) uint16_t SOCKS5Port;
 #endif
 
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 /**
- * @brief Whether the socket sends keep alives for the connection.
+ * @brief Whether the socket sends keep-alives for the connection.
  *
  * @warning This is not available on the Wii or Nintendo 3DS!
  *
  * @throw OFGetOptionFailedException The option could not be retrieved
  * @throw OFSetOptionFailedException The option could not be set

Index: src/OFThread.h
==================================================================
--- src/OFThread.h
+++ src/OFThread.h
@@ -293,11 +293,11 @@
 
 /**
  * @brief This routine is executed when the thread's main method has finished
  *	  executing or terminate has been called.
  *
- * @note Be sure to call [super handleTermination]!
+ * @note Be sure to call `[super handleTermination]`!
  */
 - (void)handleTermination OF_REQUIRES_SUPER;
 
 /**
  * @brief Starts the thread.

Index: src/OFXMLElement.h
==================================================================
--- src/OFXMLElement.h
+++ src/OFXMLElement.h
@@ -60,11 +60,11 @@
  */
 @property OF_NULLABLE_PROPERTY (readonly, nonatomic)
     OFArray OF_GENERIC(OFXMLAttribute *) *attributes;
 
 /**
- * @brief An array of OFXMLNodes with all children of the element.
+ * @brief An array of @ref OFXMLNode with all children of the element.
  */
 @property OF_NULLABLE_PROPERTY (nonatomic, copy)
     OFArray OF_GENERIC(OFXMLNode *) *children;
 
 /**
@@ -319,11 +319,11 @@
 - (void)insertChild: (OFXMLNode *)child atIndex: (size_t)index;
 
 /**
  * @brief Inserts the specified children at the specified index.
  *
- * @param children An array of OFXMLNodes which are added as children
+ * @param children An array of @ref OFXMLNode which are added as children
  * @param index The index where the child is added
  */
 - (void)insertChildren: (OFArray OF_GENERIC(OFXMLNode *) *)children
 	       atIndex: (size_t)index;
 

Index: src/OFZIPArchiveEntry.h
==================================================================
--- src/OFZIPArchiveEntry.h
+++ src/OFZIPArchiveEntry.h
@@ -196,11 +196,11 @@
  * @return The ZIP entry version as a string
  */
 extern OFString *OFZIPArchiveEntryVersionToString(uint16_t version);
 
 /**
- * @brief Convers the ZIP entry compression method to a string.
+ * @brief Converts the ZIP entry compression method to a string.
  *
  * @param compressionMethod The ZIP entry compression method to convert to a
  *			    string
  * @return The ZIP entry compression method as a string
  */

Index: src/exceptions/OFCreateSymbolicLinkFailedException.h
==================================================================
--- src/exceptions/OFCreateSymbolicLinkFailedException.h
+++ src/exceptions/OFCreateSymbolicLinkFailedException.h
@@ -33,16 +33,16 @@
 	int _errNo;
 	OF_RESERVE_IVARS(OFCreateSymbolicLinkFailedException, 4)
 }
 
 /**
- * @brief The IRI at which the symlink should have been created.
+ * @brief The IRI at which the symbolic link should have been created.
  */
 @property (readonly, nonatomic) OFIRI *IRI;
 
 /**
- * @brief The target for the symlink.
+ * @brief The target for the symbolic link.
  */
 @property (readonly, nonatomic) OFString *target;
 
 /**
  * @brief The errno of the error that occurred.
@@ -50,11 +50,11 @@
 @property (readonly, nonatomic) int errNo;
 
 /**
  * @brief Creates a new, autoreleased create symbolic link failed exception.
  *
- * @param IRI The IRI where the symlink should have been created
+ * @param IRI The IRI where the symbolic link should have been created
  * @param target The target for the symbolic link
  * @param errNo The errno of the error that occurred
  * @return A new, autoreleased create symbolic link failed exception
  */
 + (instancetype)exceptionWithIRI: (OFIRI *)IRI
@@ -65,11 +65,11 @@
 
 /**
  * @brief Initializes an already allocated create symbolic link failed
  *	  exception.
  *
- * @param IRI The IRI where the symlink should have been created
+ * @param IRI The IRI where the symbolic link should have been created
  * @param target The target for the symbolic link
  * @param errNo The errno of the error that occurred
  * @return An initialized create symbolic link failed exception
  */
 - (instancetype)initWithIRI: (OFIRI *)IRI

Index: src/runtime/ObjFWRT.h
==================================================================
--- src/runtime/ObjFWRT.h
+++ src/runtime/ObjFWRT.h
@@ -132,11 +132,11 @@
  */
 typedef bool BOOL;
 #endif
 
 /**
- * @brief A method implemenation.
+ * @brief A method implementation.
  *
  * @param object The messaged object
  * @param selector The selector sent
  */
 typedef id _Nullable (*IMP)(id _Nonnull object, SEL _Nonnull selector, ...);
@@ -310,11 +310,11 @@
  *	    ABI, small structs might not use the struct return ABI.
  *
  * @param class_ The class whose method implementation should be returned
  * @param selector The selector for the method whose implementation should be
  *		   returned
- * @return The class's metod implementation for the specified selector
+ * @return The class's method implementation for the specified selector
  */
 extern IMP _Nullable class_getMethodImplementation(Class _Nullable class_,
     SEL _Nonnull selector);
 
 /**
@@ -325,11 +325,11 @@
  *	    ABI, small structs might not use the struct return ABI.
  *
  * @param class_ The class whose method implementation should be returned
  * @param selector The selector for the method whose implementation should be
  *		   returned
- * @return The class's metod implementation for the specified selector
+ * @return The class's method implementation for the specified selector
  */
 extern IMP _Nullable class_getMethodImplementation_stret(Class _Nullable class_,
     SEL _Nonnull selector);
 
 /**