REST is no longer experimental

2 files changed, 7 insertions, 9 deletions

diff --git a/src/cowboy_rest.erl b/src/cowboy_rest.erl
index 2ec3e5a..c28b627 100644
--- a/src/cowboy_rest.erl
+++ b/src/cowboy_rest.erl
@@ -12,12 +12,10 @@
 %% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-%% @doc Experimental REST protocol implementation.
+%% @doc REST protocol implementation.
 %%
-%% Based on the Webmachine Diagram from Alan Dean and Justin Sheehy, which
-%% can be found in the Webmachine source tree, and on the Webmachine
-%% documentation available at http://wiki.basho.com/Webmachine.html
-%% at the time of writing.
+%% Originally based on the Webmachine Diagram from Alan Dean and
+%% Justin Sheehy.
 -module(cowboy_rest).
 -behaviour(cowboy_sub_protocol).
 
diff --git a/src/cowboy_static.erl b/src/cowboy_static.erl
index dd7eed5..ae0f9e6 100644
--- a/src/cowboy_static.erl
+++ b/src/cowboy_static.erl
@@ -15,10 +15,10 @@
 %% @doc Static resource handler.
 %%
 %% This built in HTTP handler provides a simple file serving capability for
-%% cowboy applications. It should be considered an experimental feature because
-%% of it's dependency on the experimental REST handler. It's recommended to be
-%% used for small or temporary environments where it is not preferrable to set
-%% up a second server just to serve files.
+%% cowboy applications. It is provided as a convenience for small or temporary
+%% environments where it is not preferrable to set up a second server just
+%% to serve files. It is recommended to use a CDN instead for efficiently
+%% handling static files, preferrably on a cookie-less domain name.
 %%
 %% If this handler is used the Erlang node running the cowboy application must
 %% be configured to use an async thread pool. This is configured by adding the