=doc fix broken links in scala-side HTTP docs

2015-06-19 15:35:24 +02:00 · 2015-06-19 15:35:24 +02:00 · afe2ed3c79
commit afe2ed3c79
parent fc301396c6
124 changed files with 128 additions and 128 deletions
--- a/akka-docs-dev/rst/scala/http/configuration.rst
+++ b/akka-docs-dev/rst/scala/http/configuration.rst
@ -19,7 +19,7 @@ akka-http-core
 akka-http-core-scala
 ~~~~~~~~~~~~~~~~~~~~

-.. literalinclude:: ../../../../akka-http-scala/src/main/resources/reference.conf
+.. literalinclude:: ../../../../akka-http/src/main/resources/reference.conf
   :language: none


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejection.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejection.rst
@ -8,7 +8,7 @@ cancelRejection
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: cancelRejection

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejections.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/cancelRejections.rst
@ -8,7 +8,7 @@ cancelRejections
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: cancelRejections

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extract.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extract.rst
@ -8,7 +8,7 @@ Calculates a value from the request context and provides the value to the inner
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extract

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractExecutionContext.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractExecutionContext.rst
@ -8,7 +8,7 @@ extractExecutionContext
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extractExecutionContext

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractFlowMaterializer.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractFlowMaterializer.rst
@ -8,7 +8,7 @@ extractFlowMaterializer
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extractFlowMaterializer

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractLog.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractLog.rst
@ -8,7 +8,7 @@ extractLog
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extractLog

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequest.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequest.rst
@ -8,7 +8,7 @@ Extracts the complete ``HttpRequest`` instance.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extractRequest

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequestContext.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractRequestContext.rst
@ -8,7 +8,7 @@ extractRequestContext
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extractRequestContext

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractSettings.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractSettings.rst
@ -8,7 +8,7 @@ extractSettings
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extractSettings

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUnmatchedPath.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUnmatchedPath.rst
@ -8,7 +8,7 @@ Extracts the unmatched path from the request context.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extractUnmatchedPath

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUri.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/extractUri.rst
@ -8,7 +8,7 @@ Access the full URI of the request.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: extractUri

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapInnerRoute.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapInnerRoute.rst
@ -8,7 +8,7 @@ Changes the execution model of the inner route by wrapping it with arbitrary log
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapInnerRoute

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRejections.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRejections.rst
@ -8,7 +8,7 @@ Transforms the list of rejections the inner route produced.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapRejections

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequest.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequest.rst
@ -8,7 +8,7 @@ Transforms the request before it is handled by the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapRequest

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequestContext.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRequestContext.rst
@ -8,7 +8,7 @@ Transforms the ``RequestContext`` before it is passed to the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapRequestContext

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponse.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponse.rst
@ -8,7 +8,7 @@ Changes the response that was generated by the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapResponse

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseEntity.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseEntity.rst
@ -8,7 +8,7 @@ Changes the response entity that was generated by the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapResponseEntity

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseHeaders.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapResponseHeaders.rst
@ -8,7 +8,7 @@ Changes the list of response headers that was generated by the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapResponseHeaders

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResult.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResult.rst
@ -8,7 +8,7 @@ Changes the message the inner route sends to the responder.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapRouteResult

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultFuture.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultFuture.rst
@ -8,7 +8,7 @@ mapRouteResultFuture
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapRouteResultFuture

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultPF.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultPF.rst
@ -8,7 +8,7 @@ Changes the message the inner route sends to the responder.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapRouteResultPF

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWith.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWith.rst
@ -8,7 +8,7 @@ mapRouteResultWith
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapRouteResultWith

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWithPF.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapRouteResultWithPF.rst
@ -8,7 +8,7 @@ mapRouteResultWithPF
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapRouteResultWithPF

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapSettings.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapSettings.rst
@ -8,7 +8,7 @@ mapSettings
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapSettings

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapUnmatchedPath.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/mapUnmatchedPath.rst
@ -8,7 +8,7 @@ Transforms the unmatchedPath field of the request context for inner routes.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: mapUnmatchedPath

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/pass.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/pass.rst
@ -8,7 +8,7 @@ A directive that passes the request unchanged to its inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: pass

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/provide.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/provide.rst
@ -8,7 +8,7 @@ Provides a constant value to the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: provide

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejections.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejections.rst
@ -8,7 +8,7 @@ recoverRejections
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: recoverRejections

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejectionsWith.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/recoverRejectionsWith.rst
@ -8,7 +8,7 @@ recoverRejectionsWith
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: recoverRejectionsWith

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/textract.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/textract.rst
@ -8,7 +8,7 @@ Calculates a tuple of values from the request context and provides them to the i
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: textract

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/tprovide.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/tprovide.rst
@ -8,7 +8,7 @@ Provides a tuple of values to the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: tprovide

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withExecutionContext.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withExecutionContext.rst
@ -8,7 +8,7 @@ withExecutionContext
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: withExecutionContext

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withFlowMaterializer.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withFlowMaterializer.rst
@ -8,7 +8,7 @@ withFlowMaterializer
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: withFlowMaterializer

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withLog.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withLog.rst
@ -8,7 +8,7 @@ withLog
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: withLog

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withSettings.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/basic-directives/withSettings.rst
@ -8,7 +8,7 @@ withSettings
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala
   :snippet: withSettings

 Description
--- 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
@ -10,7 +10,7 @@ by http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-26.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CacheConditionDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CacheConditionDirectives.scala
   :snippet: conditional


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequest.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequest.rst
@ -9,7 +9,7 @@ Tries to decode the request with the specified ``Decoder`` or rejects the reques
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
   :snippet: decodeRequest

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequestWith.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/decodeRequestWith.rst
@ -8,7 +8,7 @@ decodeRequestWith
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
   :snippet: decodeRequestWith

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponse.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponse.rst
@ -9,7 +9,7 @@ Tries to encode the response with the specified ``Encoder`` or rejects the reque
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
   :snippet: encodeResponse

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponseWith.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/encodeResponseWith.rst
@ -8,7 +8,7 @@ encodeResponseWith
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
   :snippet: encodeResponseWith

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/requestEncodedWith.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/requestEncodedWith.rst
@ -9,7 +9,7 @@ rejects the request with an ``UnacceptedRequestEncodingRejection(encoding)``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
   :snippet: requestEncodedWith

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/responseEncodingAccepted.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/coding-directives/responseEncodingAccepted.rst
@ -9,7 +9,7 @@ rejects the request with an ``UnacceptedResponseEncodingRejection(encoding)``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala
   :snippet: responseEncodingAccepted

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/cookie.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/cookie.rst
@ -9,7 +9,7 @@ the cookie is missing.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala
   :snippet: cookie

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/deleteCookie.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/deleteCookie.rst
@ -8,7 +8,7 @@ Adds a header to the response to request the removal of the cookie with the give
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala
   :snippet: deleteCookie

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/optionalCookie.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/optionalCookie.rst
@ -8,7 +8,7 @@ Extracts an optional cookie with a given name from a request.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala
   :snippet: optionalCookie

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/setCookie.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/cookie-directives/setCookie.rst
@ -8,7 +8,7 @@ Adds a header to the response to request the update of the cookie with the given
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala
   :snippet: setCookie

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleExceptions.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleExceptions.rst
@ -8,7 +8,7 @@ Catches exceptions thrown by the inner route and handles them using the specifie
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala
   :snippet: handleExceptions

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleRejections.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/execution-directives/handleRejections.rst
@ -8,7 +8,7 @@ Handles rejections produced by the inner route and handles them using the specif
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala
   :snippet: handleRejections

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.rst
@ -9,7 +9,7 @@ served as browsable listings.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
   :snippet: getFromBrowseableDirectories

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.rst
@ -8,6 +8,6 @@ The single-directory variant of :ref:`-getFromBrowseableDirectories-`.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
   :snippet: getFromBrowseableDirectory

--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromDirectory.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromDirectory.rst
@ -8,7 +8,7 @@ Completes GET requests with the content of a file underneath the given directory
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
   :snippet: getFromDirectory

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromFile.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromFile.rst
@ -8,7 +8,7 @@ Completes GET requests with the content of the given file.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
   :snippet: getFromFile

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResource.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResource.rst
@ -8,7 +8,7 @@ Completes GET requests with the content of the given classpath resource.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
   :snippet: getFromResource

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.rst
@ -8,7 +8,7 @@ Completes GET requests with the content of the given classpath resource director
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
   :snippet: getFromResourceDirectory

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.rst
@ -9,7 +9,7 @@ directory contents is performed by the in-scope `Marshaller[DirectoryListing]`.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala
   :snippet: listDirectoryContents

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formField.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/form-field-directives/formField.rst
@ -8,7 +8,7 @@ An alias for :ref:`-formFields-`.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala
   :snippet: formField

 Description
--- 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
@ -44,7 +44,7 @@ as required, optional, or repeated, or to filter requests where a form field has
    extract multiple occurrences of field "distance" as ``Iterable[String]``
 ``"distance".as[Int].*``
    extract multiple occurrences of field "distance" as ``Iterable[Int]``, you need a matching implicit ``Deserializer`` in scope for that to work
-    (see also :ref:`unmarshalling`)
+    (see also :ref:`http-unmarshalling-scala`)
 ``"distance".as(deserializer).*``
    extract multiple occurrences of field "distance" with an explicit ``Deserializer``

--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/completeOrRecoverWith.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/completeOrRecoverWith.rst
@ -9,7 +9,7 @@ with the implicitly given ``ToResponseMarshaller[T]``. Runs the inner route if t
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala
   :snippet: completeOrRecoverWith

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onComplete.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onComplete.rst
@ -9,7 +9,7 @@ result as a value of type ``Try[T]`` and passes it to the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala
   :snippet: onComplete

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onSuccess.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/future-directives/onSuccess.rst
@ -9,7 +9,7 @@ extracts its result as a value of type ``T`` and passes it to the inner route.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala
   :snippet: onSuccess

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValue.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValue.rst
@ -9,7 +9,7 @@ Traverses the list of request headers with the specified function and extracts t
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
   :snippet: headerValue

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByName.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValueByName.rst
@ -8,7 +8,7 @@ Extracts the value of the HTTP request header with the given name.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
   :snippet: headerValueByName

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValuePF.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/headerValuePF.rst
@ -9,7 +9,7 @@ result of calling the function.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
   :snippet: headerValuePF

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValue.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValue.rst
@ -9,7 +9,7 @@ Traverses the list of request headers with the specified function and extracts t
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
   :snippet: optionalHeaderValue

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByName.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValueByName.rst
@ -8,7 +8,7 @@ Optionally extracts the value of the HTTP request header with the given name.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
   :snippet: optionalHeaderValueByName

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValuePF.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/header-directives/optionalHeaderValuePF.rst
@ -9,7 +9,7 @@ result of calling the function.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
   :snippet: optionalHeaderValuePF

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/extractHost.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/extractHost.rst
@ -9,7 +9,7 @@ Extracts the hostname part of the Host header value in the request.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala
   :snippet: extractHost


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/host.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/host-directives/host.rst
@ -10,7 +10,7 @@ in the request.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala
   :snippet: host


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/completeWith.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/marshalling-directives/completeWith.rst
@ -9,7 +9,7 @@ inner route.  You can use it to decouple marshaller resolution from request comp
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala
   :snippet: completeWith[T]

 Description
--- 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
@ -11,7 +11,7 @@ The ``entity`` method will either pass the ``value`` to the inner route or map t
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala
   :snippet: entity

 Description
--- 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
@ -11,7 +11,7 @@ the in-scope marshaller.  ``handleWith`` can be a convenient method combining ``
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala
   :snippet: handleWith

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/delete.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/delete.rst
@ -8,7 +8,7 @@ Matches requests with HTTP method ``DELETE``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: delete


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/extractMethod.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/extractMethod.rst
@ -8,7 +8,7 @@ extractMethod
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: extractMethod

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/get.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/get.rst
@ -8,7 +8,7 @@ Matches requests with HTTP method ``GET``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: get

 Description
--- 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
@ -8,7 +8,7 @@ Matches requests with HTTP method ``HEAD``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: head

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/method.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/method.rst
@ -8,7 +8,7 @@ Matches HTTP requests based on their method.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: method

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/options.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/options.rst
@ -8,7 +8,7 @@ Matches requests with HTTP method ``OPTIONS``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: options

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/overrideMethodWithParameter.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/overrideMethodWithParameter.rst
@ -8,7 +8,7 @@ overrideMethodWithParameter
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: overrideMethodWithParameter

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/patch.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/patch.rst
@ -8,7 +8,7 @@ Matches requests with HTTP method ``PATCH``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: patch

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/post.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/post.rst
@ -8,7 +8,7 @@ Matches requests with HTTP method ``POST``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: post

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/put.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/method-directives/put.rst
@ -8,7 +8,7 @@ Matches requests with HTTP method ``PUT``.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala
   :snippet: put

 Description
--- 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
@ -9,7 +9,7 @@ Provides the value of ``X-Forwarded-For``, ``Remote-Address``, or ``X-Real-IP``
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
   :snippet: extractClientIP

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/rejectEmptyResponse.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/rejectEmptyResponse.rst
@ -8,7 +8,7 @@ Replaces a response with no content with an empty rejection.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
   :snippet: rejectEmptyResponse


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityEmpty.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityEmpty.rst
@ -10,7 +10,7 @@ Otherwise, the request is rejected.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
   :snippet: requestEntityEmpty


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityPresent.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/requestEntityPresent.rst
@ -10,7 +10,7 @@ Otherwise, the request is rejected.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
   :snippet: requestEntityPresent


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/validate.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/misc-directives/validate.rst
@ -9,7 +9,7 @@ request with a ``ValidationRejection`` containing the given error message.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala
   :snippet: validate


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameter.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameter.rst
@ -8,7 +8,7 @@ An alias for :ref:`-parameters-`.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala
   :snippet: parameter

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMap.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMap.rst
@ -9,7 +9,7 @@ parameter values.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala
   :snippet: parameterMap

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMultiMap.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterMultiMap.rst
@ -9,7 +9,7 @@ a parameter name to a list of all its values.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala
   :snippet: parameterMultiMap

 Description
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterSeq.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/parameter-directives/parameterSeq.rst
@ -8,7 +8,7 @@ Extracts all parameters at once in the original order as (name, value) tuples of
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala
   :snippet: parameterSeq

 Description
--- 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
@ -43,7 +43,7 @@ as required, optional, or repeated, or to filter requests where a parameter has
    extract multiple occurrences of parameter "distance" as ``Iterable[String]``
 ``"distance".as[Int].*``
    extract multiple occurrences of parameter "distance" as ``Iterable[Int]``, you need a matching ``Deserializer`` in scope for that to work
-    (see also :ref:`unmarshalling`)
+    (see also :ref:`http-unmarshalling-scala`)
 ``"distance".as(deserializer).*``
    extract multiple occurrences of parameter "distance" with an explicit ``Deserializer``

@ -89,13 +89,13 @@ Deserialized parameter
   :snippet: mapped-value

 Repeated parameter
-+++++++++++++++++++++++++++++
++++++++++++++++++

 ... includecode2:: ../../../../code/docs/http/scaladsl/server/directives/ParameterDirectivesExamplesSpec.scala
   :snippet: repeated

 Repeated, deserialized parameter
-++++++++++++++++++++++
++++++++++++++++++++++++++++++++

 ... includecode2:: ../../../../code/docs/http/scaladsl/server/directives/ParameterDirectivesExamplesSpec.scala
   :snippet: mapped-repeated
--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/path.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/path.rst
@ -10,7 +10,7 @@ one or more values (depending on the type of the argument).
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
   :snippet: path


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEnd.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEnd.rst
@ -10,7 +10,7 @@ path has been fully matched by a higher-level :ref:`-path-` or :ref:`-pathPrefix
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
   :snippet: pathEnd


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEndOrSingleSlash.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathEndOrSingleSlash.rst
@ -10,7 +10,7 @@ or contains only one single slash.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
   :snippet: pathEndOrSingleSlash


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefix.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefix.rst
@ -10,7 +10,7 @@ potentially extracts one or more values (depending on the type of the argument).
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
   :snippet: pathPrefix


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefixTest.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathPrefixTest.rst
@ -11,7 +11,7 @@ the unmatched path.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
   :snippet: pathPrefixTest


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSingleSlash.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSingleSlash.rst
@ -10,7 +10,7 @@ contains exactly one single slash.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
   :snippet: pathSingleSlash


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffix.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffix.rst
@ -10,7 +10,7 @@ potentially extracts one or more values (depending on the type of the argument).
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
   :snippet: pathSuffix


--- a/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffixTest.rst
+++ b/akka-docs-dev/rst/scala/http/routing-dsl/directives/path-directives/pathSuffixTest.rst
@ -11,7 +11,7 @@ the unmatched path.
 Signature
 ---------

-.. includecode2:: /../../akka-http-scala/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
+.. includecode2:: /../../akka-http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala
   :snippet: pathSuffixTest


--- a/Show more
+++ b/Show more