diff --git a/src/audio/midi/juce_MidiMessage.h b/src/audio/midi/juce_MidiMessage.h
index 53ee86a384..87b4bcf5c0 100644
--- a/src/audio/midi/juce_MidiMessage.h
+++ b/src/audio/midi/juce_MidiMessage.h
@@ -243,6 +243,7 @@ public:
 
         @param channel      the midi channel, in the range 1 to 16
         @param noteNumber   the key number, 0 to 127
+        @param velocity     in the range 0 to 127
         @see isNoteOff
     */
     static const MidiMessage noteOff (int channel, int noteNumber, uint8 velocity = 0) throw();
diff --git a/src/gui/components/menus/juce_PopupMenu.h b/src/gui/components/menus/juce_PopupMenu.h
index ec5e560a74..13d656fd8a 100644
--- a/src/gui/components/menus/juce_PopupMenu.h
+++ b/src/gui/components/menus/juce_PopupMenu.h
@@ -448,9 +448,9 @@ public:
         */
         bool isItemHighlighted() const throw()                  { return isHighlighted; }
 
-        /** @internal. */
+        /** @internal */
         bool isTriggeredAutomatically() const throw()           { return triggeredAutomatically; }
-        /** @internal. */
+        /** @internal */
         void setHighlighted (bool shouldBeHighlighted);
 
     private:
diff --git a/src/gui/components/windows/juce_DialogWindow.h b/src/gui/components/windows/juce_DialogWindow.h
index 57f76a4899..c5591bb4bd 100644
--- a/src/gui/components/windows/juce_DialogWindow.h
+++ b/src/gui/components/windows/juce_DialogWindow.h
@@ -154,7 +154,7 @@ public:
         @param useBottomRightCornerResizer     if shouldBeResizable is true, this indicates whether
                                     to use a border or corner resizer component. See ResizableWindow::setResizable()
     */
-   #if JUCE_MODAL_LOOPS_PERMITTED
+   #if JUCE_MODAL_LOOPS_PERMITTED || DOXYGEN
     static int showModalDialog (const String& dialogTitle,
                                 Component* contentComponent,
                                 Component* componentToCentreAround,
diff --git a/src/text/juce_CharPointer_ASCII.h b/src/text/juce_CharPointer_ASCII.h
index 4285c0468e..464e377965 100644
--- a/src/text/juce_CharPointer_ASCII.h
+++ b/src/text/juce_CharPointer_ASCII.h
@@ -67,9 +67,9 @@ public:
     inline bool operator== (const CharPointer_ASCII& other) const throw() { return data == other.data; }
     inline bool operator!= (const CharPointer_ASCII& other) const throw() { return data != other.data; }
     inline bool operator<= (const CharPointer_ASCII& other) const throw() { return data <= other.data; }
-    inline bool operator<  (const CharPointer_ASCII& other) const throw() { return data < other.data; }
+    inline bool operator<  (const CharPointer_ASCII& other) const throw() { return data <  other.data; }
     inline bool operator>= (const CharPointer_ASCII& other) const throw() { return data >= other.data; }
-    inline bool operator>  (const CharPointer_ASCII& other) const throw() { return data > other.data; }
+    inline bool operator>  (const CharPointer_ASCII& other) const throw() { return data >  other.data; }
 
     /** Returns the address that this pointer is pointing to. */
     inline CharType* getAddress() const throw()         { return data; }
diff --git a/src/text/juce_CharPointer_UTF16.h b/src/text/juce_CharPointer_UTF16.h
index 4f7bd834cf..064d33e990 100644
--- a/src/text/juce_CharPointer_UTF16.h
+++ b/src/text/juce_CharPointer_UTF16.h
@@ -68,9 +68,9 @@ public:
     inline bool operator== (const CharPointer_UTF16& other) const throw() { return data == other.data; }
     inline bool operator!= (const CharPointer_UTF16& other) const throw() { return data != other.data; }
     inline bool operator<= (const CharPointer_UTF16& other) const throw() { return data <= other.data; }
-    inline bool operator<  (const CharPointer_UTF16& other) const throw() { return data < other.data; }
+    inline bool operator<  (const CharPointer_UTF16& other) const throw() { return data <  other.data; }
     inline bool operator>= (const CharPointer_UTF16& other) const throw() { return data >= other.data; }
-    inline bool operator>  (const CharPointer_UTF16& other) const throw() { return data > other.data; }
+    inline bool operator>  (const CharPointer_UTF16& other) const throw() { return data >  other.data; }
 
     /** Returns the address that this pointer is pointing to. */
     inline CharType* getAddress() const throw()         { return data; }
diff --git a/src/text/juce_CharPointer_UTF32.h b/src/text/juce_CharPointer_UTF32.h
index b74365bb8e..3b3ee9032a 100644
--- a/src/text/juce_CharPointer_UTF32.h
+++ b/src/text/juce_CharPointer_UTF32.h
@@ -64,9 +64,9 @@ public:
     inline bool operator== (const CharPointer_UTF32& other) const throw() { return data == other.data; }
     inline bool operator!= (const CharPointer_UTF32& other) const throw() { return data != other.data; }
     inline bool operator<= (const CharPointer_UTF32& other) const throw() { return data <= other.data; }
-    inline bool operator<  (const CharPointer_UTF32& other) const throw() { return data < other.data; }
+    inline bool operator<  (const CharPointer_UTF32& other) const throw() { return data <  other.data; }
     inline bool operator>= (const CharPointer_UTF32& other) const throw() { return data >= other.data; }
-    inline bool operator>  (const CharPointer_UTF32& other) const throw() { return data > other.data; }
+    inline bool operator>  (const CharPointer_UTF32& other) const throw() { return data >  other.data; }
 
     /** Returns the address that this pointer is pointing to. */
     inline CharType* getAddress() const throw()         { return data; }
diff --git a/src/text/juce_CharPointer_UTF8.h b/src/text/juce_CharPointer_UTF8.h
index 09916f4700..947d17a03e 100644
--- a/src/text/juce_CharPointer_UTF8.h
+++ b/src/text/juce_CharPointer_UTF8.h
@@ -63,9 +63,9 @@ public:
     inline bool operator== (const CharPointer_UTF8& other) const throw() { return data == other.data; }
     inline bool operator!= (const CharPointer_UTF8& other) const throw() { return data != other.data; }
     inline bool operator<= (const CharPointer_UTF8& other) const throw() { return data <= other.data; }
-    inline bool operator<  (const CharPointer_UTF8& other) const throw() { return data < other.data; }
+    inline bool operator<  (const CharPointer_UTF8& other) const throw() { return data <  other.data; }
     inline bool operator>= (const CharPointer_UTF8& other) const throw() { return data >= other.data; }
-    inline bool operator>  (const CharPointer_UTF8& other) const throw() { return data > other.data; }
+    inline bool operator>  (const CharPointer_UTF8& other) const throw() { return data >  other.data; }
 
     /** Returns the address that this pointer is pointing to. */
     inline CharType* getAddress() const throw()         { return data; }
diff --git a/src/text/juce_String.h b/src/text/juce_String.h
index 6d9c78c351..1c132227f7 100644
--- a/src/text/juce_String.h
+++ b/src/text/juce_String.h
@@ -254,11 +254,7 @@ public:
         }
     }
 
-    /** Appends a string to the end of this one.
-
-        @param textToAppend     the string to add
-        @param maxCharsToTake   the maximum number of characters to take from the string passed in
-    */
+    /** Appends a string to the end of this one. */
     template <class CharPointer>
     void appendCharPointer (const CharPointer& textToAppend)
     {