diff --git a/websocketpp/connection.hpp b/websocketpp/connection.hpp
index efda6a2d9b..f73f9b5f9d 100644
--- a/websocketpp/connection.hpp
+++ b/websocketpp/connection.hpp
@@ -751,7 +751,7 @@ public:
      * values explicitly.
      *
      * This member function is valid only from the http() and validate() handler
-     * callbacks
+     * callbacks.
      *
      * @param code Code to set
      * @param msg Message to set
@@ -766,7 +766,7 @@ public:
      * message be automatically set.
      *
      * This member function is valid only from the http() and validate() handler
-     * callbacks
+     * callbacks.
      *
      * @param code Code to set
      * @param msg Message to set
@@ -782,7 +782,7 @@ public:
      * to something else after calling set_body
      *
      * This member function is valid only from the http() and validate() handler
-     * callbacks
+     * callbacks.
      *
      * @param value String data to include as the body content.
      * @see websocketpp::http::response::set_body
@@ -796,7 +796,7 @@ public:
      * replace_header to overwrite existing values.
      *
      * This member function is valid only from the http() and validate() handler
-     * callbacks
+     * callbacks, or to a client connection before connect has been called.
      *
      * @param key Name of the header to set
      * @param val Value to add
@@ -808,10 +808,10 @@ public:
     /// Replace a header
     /**
      * If a header with this name already exists the old value will be replaced
-     * Use add_header to append to a list of existing values.
+     * Use append_header to append to a list of existing values.
      *
      * This member function is valid only from the http() and validate() handler
-     * callbacks
+     * callbacks, or to a client connection before connect has been called.
      *
      * @param key Name of the header to set
      * @param val Value to set
@@ -825,7 +825,7 @@ public:
      * Removes a header from the response.
      *
      * This member function is valid only from the http() and validate() handler
-     * callbacks
+     * callbacks, or to a client connection before connect has been called.
      *
      * @param key The name of the header to remove
      * @see websocketpp::http::parser::remove_header