diff --git a/include/boost/beast/websocket/stream.hpp b/include/boost/beast/websocket/stream.hpp
index f0cab54b..7e400bf8 100644
--- a/include/boost/beast/websocket/stream.hpp
+++ b/include/boost/beast/websocket/stream.hpp
@@ -344,21 +344,31 @@ public:
     //--------------------------------------------------------------------------
 
 #if BOOST_BEAST_DOXYGEN
+    /// Get the option value
     template<class Option>
     void
     get_option(Option& opt);
 
+    /// Set the option value
     template<class Option>
     void
     set_option(Option opt);
 #else
-
     void set_option(decorator opt);
-
-    void get_option(timeout& opt);
-    void set_option(timeout const& opt);
 #endif
 
+    /** Set the timeout option
+
+        @throws system_error on failure to reset the
+        timer.
+    */
+    void
+    set_option(timeout const& opt);
+
+    /// Get the timeout option
+    void
+    get_option(timeout& opt);
+
     /** Set the permessage-deflate extension options
 
         @throws invalid_argument if `deflateSupported == false`, and either