From 61bb7634d1741f02956dc02870d6f8b01b0a48e7 Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Tue, 9 Feb 2016 20:21:52 +0100 Subject: [PATCH 1/2] -doc remove outdated list of http frameworks built on Akka --- akka-docs/rst/additional/http.rst | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 akka-docs/rst/additional/http.rst diff --git a/akka-docs/rst/additional/http.rst b/akka-docs/rst/additional/http.rst deleted file mode 100644 index a7e80aa1bf..0000000000 --- a/akka-docs/rst/additional/http.rst +++ /dev/null @@ -1,26 +0,0 @@ -.. _http-module: - -Incomplete List of HTTP Frameworks -################################## - -Play -==== - -The `Play framework `_ is built using Akka, and is well suited for building both full web applications as well as REST services. - -Spray -===== - -The `Spray toolkit `_ is built using Akka, and is a minimalistic HTTP/REST layer. - -Akka Mist -========= - -If you are using Akka Mist (Akka's old HTTP/REST module) with Akka 1.x and wish to upgrade to 2.x -there is now a port of Akka Mist to Akka 2.x. You can find it `here `_. - -Other Alternatives -================== - -There are a bunch of other alternatives for using Akka with HTTP/REST. You can find some of them -among the `Community Projects `_. From df97afe6064dcd9ab03c03d479896c2ce00d5b2f Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Wed, 10 Feb 2016 12:45:01 +0100 Subject: [PATCH 2/2] =doc #19737 explain websocket -> WebSocket change in migration guide --- akka-docs/rst/additional/index.rst | 1 - .../rst/scala/stream/migration-guide-2.0-2.4-scala.rst | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/akka-docs/rst/additional/index.rst b/akka-docs/rst/additional/index.rst index 99188bb63a..be35078c23 100644 --- a/akka-docs/rst/additional/index.rst +++ b/akka-docs/rst/additional/index.rst @@ -8,4 +8,3 @@ Additional Information books language-bindings osgi - http diff --git a/akka-docs/rst/scala/stream/migration-guide-2.0-2.4-scala.rst b/akka-docs/rst/scala/stream/migration-guide-2.0-2.4-scala.rst index 6658f28540..0afd5d2611 100644 --- a/akka-docs/rst/scala/stream/migration-guide-2.0-2.4-scala.rst +++ b/akka-docs/rst/scala/stream/migration-guide-2.0-2.4-scala.rst @@ -146,3 +146,12 @@ Please consult the :class:`GraphStage` documentation (:ref:`graphstage-scala`) a on migrating from :class:`AsyncStage` to :class:`GraphStage`. .. _`previous migration guide`: http://doc.akka.io/docs/akka-stream-and-http-experimental/2.0.2/scala/migration-guide-1.0-2.x-scala.html#AsyncStage_has_been_replaced_by_GraphStage + +Websocket now consistently named WebSocket +------------------------------------------ + +Previously we had a mix of methods and classes called ``websocket`` or ``Websocket``, which was in contradiction with +how the word is spelled in the spec and some other places of Akka HTTP. + +Methods and classes using the word WebSocket now consistently use it as ``WebSocket``, so updating is as simple as +find-and-replacing the lower-case ``s`` to an upper-case ``S`` wherever the word WebSocket appeared. \ No newline at end of file