diff --git a/akka-docs-dev/rst/scala/code/docs/http/scaladsl/HttpServerExampleSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/scaladsl/HttpServerExampleSpec.scala index e75117b7d8..99d77b8124 100644 --- a/akka-docs-dev/rst/scala/code/docs/http/scaladsl/HttpServerExampleSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/http/scaladsl/HttpServerExampleSpec.scala @@ -136,7 +136,7 @@ class HttpServerExampleSpec extends WordSpec with Matchers { path("hello") { get { complete { -

Say hello to spray

+

Say hello to akka-http

} } } diff --git a/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/RespondWithDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/RespondWithDirectivesExamplesSpec.scala index 933f00bed5..868443ea36 100644 --- a/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/RespondWithDirectivesExamplesSpec.scala +++ b/akka-docs-dev/rst/scala/code/docs/http/scaladsl/server/directives/RespondWithDirectivesExamplesSpec.scala @@ -28,14 +28,14 @@ class RespondWithDirectivesExamplesSpec extends RoutingSpec { "respondWithHeaders-examples" in { val route = path("foo") { - respondWithHeaders(RawHeader("Funky-Muppet", "gonzo"), Origin(Seq(HttpOrigin("http://spray.io")))) { + respondWithHeaders(RawHeader("Funky-Muppet", "gonzo"), Origin(Seq(HttpOrigin("http://akka.io")))) { complete("beep") } } Get("/foo") ~> route ~> check { header("Funky-Muppet") shouldEqual Some(RawHeader("Funky-Muppet", "gonzo")) - header[Origin] shouldEqual Some(Origin(Seq(HttpOrigin("http://spray.io")))) + header[Origin] shouldEqual Some(Origin(Seq(HttpOrigin("http://akka.io")))) responseAs[String] shouldEqual "beep" } } diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cache-condition-directives/conditional.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cache-condition-directives/conditional.rst index 4723a1201b..58b4aed359 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cache-condition-directives/conditional.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cache-condition-directives/conditional.rst @@ -33,7 +33,7 @@ targeted by the request has already been established and the respective ETag/Las The :ref:`FileAndResourceDirectives` internally use the ``conditional`` directive for ETag and Last-Modified support -(if the ``spray.routing.file-get-conditional`` setting is enabled). +(if the ``akka.http.routing.file-get-conditional`` setting is enabled). __ http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26#section-6 __ https://datatracker.ietf.org/wg/httpbis/ diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logRequest.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logRequest.rst index e2caabb814..367f1755c1 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logRequest.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logRequest.rst @@ -19,7 +19,7 @@ Signature The signature shown is simplified, the real signature uses magnets. [1]_ .. [1] See `The Magnet Pattern`_ for an explanation of magnet-based overloading. -.. _`The Magnet Pattern`: /blog/2012-12-13-the-magnet-pattern/ +.. _`The Magnet Pattern`: http://spray.io/blog/2012-12-13-the-magnet-pattern/ Description ----------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logRequestResult.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logRequestResult.rst index aa75d4876e..ed5f6945b6 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logRequestResult.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logRequestResult.rst @@ -19,7 +19,7 @@ Signature The signature shown is simplified, the real signature uses magnets. [1]_ .. [1] See `The Magnet Pattern`_ for an explanation of magnet-based overloading. -.. _`The Magnet Pattern`: /blog/2012-12-13-the-magnet-pattern/ +.. _`The Magnet Pattern`: http://spray.io/blog/2012-12-13-the-magnet-pattern/ Description ----------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logResult.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logResult.rst index 037bc52aba..ccb9eb2d68 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logResult.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/debugging-directives/logResult.rst @@ -19,7 +19,7 @@ Signature The signature shown is simplified, the real signature uses magnets. [1]_ .. [1] See `The Magnet Pattern`_ for an explanation of magnet-based overloading. -.. _`The Magnet Pattern`: /blog/2012-12-13-the-magnet-pattern/ +.. _`The Magnet Pattern`: http://spray.io/blog/2012-12-13-the-magnet-pattern/ Description ----------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/index.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/index.rst index fc4b27927c..41acfad2b8 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/index.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/index.rst @@ -3,7 +3,7 @@ FileAndResourceDirectives ========================= -Like the :ref:`RouteDirectives` the ``FileAndResourceDirectives`` are somewhat special in spray's routing DSL. +Like the :ref:`RouteDirectives` the ``FileAndResourceDirectives`` are somewhat special in akka-http's routing DSL. Contrary to all other directives they do not produce instances of type ``Directive[L <: HList]`` but rather "plain" routes of type ``Route``. The reason is that they are not meant for wrapping an inner route (like most other directives, as intermediate-level diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formFields.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formFields.rst index 889e0ad16f..bf28bfce9d 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formFields.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formFields.rst @@ -18,7 +18,7 @@ The signature shown is simplified and written in pseudo-syntax, the real signatu ```` doesn't really exist but consists of the syntactic variants as shown in the description and the examples. .. [1] See `The Magnet Pattern`_ for an explanation of magnet-based overloading. -.. _`The Magnet Pattern`: /blog/2012-12-13-the-magnet-pattern/ +.. _`The Magnet Pattern`: http://spray.io/blog/2012-12-13-the-magnet-pattern/ Description ----------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByType.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByType.rst index 430c067ede..200ab57339 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByType.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByType.rst @@ -15,7 +15,7 @@ Signature The signature shown is simplified, the real signature uses magnets. [1]_ .. [1] See `The Magnet Pattern`_ for an explanation of magnet-based overloading. -.. _`The Magnet Pattern`: /blog/2012-12-13-the-magnet-pattern/ +.. _`The Magnet Pattern`: http://spray.io/blog/2012-12-13-the-magnet-pattern/ Description ----------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByType.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByType.rst index 864e9c201e..80f096ec5a 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByType.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByType.rst @@ -15,7 +15,7 @@ Signature The signature shown is simplified, the real signature uses magnets. [1]_ .. [1] See `The Magnet Pattern`_ for an explanation of magnet-based overloading. -.. _`The Magnet Pattern`: /blog/2012-12-13-the-magnet-pattern/ +.. _`The Magnet Pattern`: http://spray.io/blog/2012-12-13-the-magnet-pattern/ Description ----------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/entity.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/entity.rst index 51ffdec320..62af516e77 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/entity.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/entity.rst @@ -6,7 +6,7 @@ entity Unmarshalls the request entity to the given type and passes it to its inner Route. An unmarshaller returns an ``Either`` with ``Right(value)`` if successful or ``Left(exception)`` for a failure. The ``entity`` method will either pass the ``value`` to the inner route or map the ``exception`` to a -``spray.routing.Rejection``. +``akka.http.scaladsl.server.Rejection``. Signature --------- @@ -17,13 +17,13 @@ Signature Description ----------- -The ``entity`` directive works in conjuction with ``as`` and ``spray.httpx.unmarshalling`` to +The ``entity`` directive works in conjuction with ``as`` and ``akka.http.scaladsl.unmarshalling`` to convert some serialized "wire format" value into a higher-level object structure. :ref:`The unmarshalling documentation ` explains this process in detail. This directive simplifies extraction and error handling to the specified type from the request. An unmarshaller will return a ``Left(exception)`` in the case of an error. This is converted to a -``spray.routing.Rejection`` within the ``entity`` directive. The following table lists how exceptions +``akka.http.scaladsl.server.Rejection`` within the ``entity`` directive. The following table lists how exceptions are mapped to rejections: ========================== ============ diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/handleWith.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/handleWith.rst index edd3ed3b05..7f7825cec1 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/handleWith.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/handleWith.rst @@ -21,15 +21,15 @@ The ``handleWith`` directive is used when you want to handle a route with a give type A ⇒ B. ``handleWith`` will use both an in-scope unmarshaller to convert a request into type A and an in-scope marshaller to convert type B into a response. This is helpful when your core business logic resides in some other class or you want your business logic to be independent -of *Spray*. You can use ``handleWith`` to "hand off" processing to a given function without requiring -any spray-specific functionality. +of the REST interface written with akka-http. You can use ``handleWith`` to "hand off" processing +to a given function without requiring any akka-http-specific functionality. ``handleWith`` is similar to ``produce``. The main difference is ``handleWith`` automatically calls ``complete`` when the function passed to ``handleWith`` returns. Using ``produce`` you must explicity call the completion function passed from the ``produce`` function. See :ref:`marshalling ` and :ref:`unmarshalling ` for guidance -on marshalling entities with Spray. +on marshalling entities with akka-http. Examples -------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/index.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/index.rst index 0a3f89a275..ba0d9ed891 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/index.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/index.rst @@ -3,7 +3,7 @@ Marshalling Directives ====================== -Marshalling directives work in conjunction with ``spray.httpx.marshalling`` and ``spray.httpx.unmarshalling`` to convert +Marshalling directives work in conjunction with ``akka.http.scaladsl.marshalling`` and ``akka.http.scaladsl.unmarshalling`` to convert a request entity to a specific type or a type to a response. See :ref:`marshalling ` and :ref:`unmarshalling ` for specific diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/head.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/head.rst index 68a810b51c..eec9e4f83c 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/head.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/head.rst @@ -19,8 +19,8 @@ method ``HEAD`` are passed on to the inner route. All others are rejected with a ``MethodRejection``, which is translated into a ``405 Method Not Allowed`` response by the default :ref:`RejectionHandler `. -.. note:: By default, spray-can handles HEAD-requests transparently by dispatching a GET-request to the handler and - stripping of the result body. See the ``spray.can.server.transparent-head-requests`` setting for how to disable +.. note:: By default, akka-http handles HEAD-requests transparently by dispatching a GET-request to the handler and + stripping of the result body. See the ``akka.http.server.transparent-head-requests`` setting for how to disable this behavior. Example diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/extractClientIP.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/extractClientIP.rst index 7240a56575..cf0ba704ea 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/extractClientIP.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/extractClientIP.rst @@ -15,9 +15,8 @@ Signature Description ----------- -spray-can and spray-servlet adds the ``Remote-Address`` header to every request automatically if the respective -setting ``spray.can.server.remote-address-header`` or ``spray.servlet.remote-address-header`` is set to ``on``. -Per default it is set to ``off``. +The akka-http server engine adds the ``Remote-Address`` header to every request automatically if the respective +setting ``akka.http.server.remote-address-header`` is set to ``on``. Per default it is set to ``off``. Example ------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameters.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameters.rst index 4d875587e2..301f06f6d1 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameters.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameters.rst @@ -18,7 +18,7 @@ The signature shown is simplified and written in pseudo-syntax, the real signatu ```` doesn't really exist but consists of the syntactic variants as shown in the description and the examples. .. [1] See `The Magnet Pattern`_ for an explanation of magnet-based overloading. -.. _`The Magnet Pattern`: /blog/2012-12-13-the-magnet-pattern/ +.. _`The Magnet Pattern`: http://spray.io/blog/2012-12-13-the-magnet-pattern/ Description ----------- diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/range-directives/withRangeSupport.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/range-directives/withRangeSupport.rst index f2aba08795..49cabe507f 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/range-directives/withRangeSupport.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/range-directives/withRangeSupport.rst @@ -18,7 +18,7 @@ Signature The signature shown is simplified, the real signature uses magnets. [1]_ .. [1] See `The Magnet Pattern`_ for an explanation of magnet-based overloading. -.. _`The Magnet Pattern`: /blog/2012-12-13-the-magnet-pattern/ +.. _`The Magnet Pattern`: http://spray.io/blog/2012-12-13-the-magnet-pattern/ Description @@ -34,7 +34,7 @@ ranges with a ``TooManyRangesRejection``. Requests with unsatisfiable ranges are rejected with an ``UnsatisfiableRangeRejection``. The ``withRangeSupport()`` form (without parameters) uses the ``range-coalescing-threshold`` and ``range-count-limit`` -settings from the ``spray.routing`` configuration. +settings from the ``akka.http.routing`` configuration. This directive is transparent to non-``GET`` requests. diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/complete.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/complete.rst index e83edb47d0..57f838c16a 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/complete.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/complete.rst @@ -21,7 +21,7 @@ Signature The signature shown is simplified, the real signature uses magnets. [1]_ -.. [1] See `The Magnet Pattern `_ for an explanation of magnet-based overloading. +.. [1] See `The Magnet Pattern `_ for an explanation of magnet-based overloading. Description diff --git a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/index.rst b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/index.rst index 9f72611fe5..64e541110b 100644 --- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/index.rst +++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/route-directives/index.rst @@ -3,7 +3,7 @@ RouteDirectives =============== -The ``RouteDirectives`` have a special role in spray's routing DSL. Contrary to all other directives (except most +The ``RouteDirectives`` have a special role in akka-http's routing DSL. Contrary to all other directives (except most :ref:`FileAndResourceDirectives`) they do not produce instances of type ``Directive[L <: HList]`` but rather "plain" routes of type ``Route``. The reason is that the ``RouteDirectives`` are not meant for wrapping an inner route (like most other directives, as