=doc #1290 Merge common/timeouts.md and a few client-side pages (#1298)

* =doc #1290 Merge common/timeouts.md * =doc #1290 Merge client-side/client-https-support.md * =doc #1290 Merge client-side/client-transport.md * =doc #1290 Merge client-side/connection-level.md * Remove header that is defined twice
akka · Jul 25, 2017 · 5bcbd75 · 5bcbd75
1 parent f0e52e6
commit 5bcbd75
Show file tree

Hide file tree

Showing 27 changed files with 95 additions and 387 deletions.
diff --git a/docs/src/main/paradox/java/http/client-side/client-https-support.md b/docs/src/main/paradox/java/http/client-side/client-https-support.md
diff --git a/docs/src/main/paradox/java/http/client-side/client-https-support.md b/docs/src/main/paradox/java/http/client-side/client-https-support.md
@@ -0,0 +1 @@
+../../../scala/http/client-side/client-https-support.md
diff --git a/docs/src/main/paradox/java/http/client-side/client-transport.md b/docs/src/main/paradox/java/http/client-side/client-transport.md
diff --git a/docs/src/main/paradox/java/http/client-side/client-transport.md b/docs/src/main/paradox/java/http/client-side/client-transport.md
@@ -0,0 +1 @@
+../../../scala/http/client-side/client-transport.md
diff --git a/docs/src/main/paradox/java/http/client-side/connection-level.md b/docs/src/main/paradox/java/http/client-side/connection-level.md
diff --git a/docs/src/main/paradox/java/http/client-side/connection-level.md b/docs/src/main/paradox/java/http/client-side/connection-level.md
@@ -0,0 +1 @@
+../../../scala/http/client-side/connection-level.md
diff --git a/docs/src/main/paradox/java/http/client-side/websocket-support.md b/docs/src/main/paradox/java/http/client-side/websocket-support.md
@@ -72,7 +72,7 @@ Simple example sending a message and printing any incoming message:
 
 ## webSocketClientLayer
 
-Just like the @ref[Stand-Alone HTTP Layer Usage](connection-level.md#http-client-layer-java) for regular HTTP requests, the WebSocket layer can be used fully detached from the
+Just like the @ref[Stand-Alone HTTP Layer Usage](connection-level.md#http-client-layer) for regular HTTP requests, the WebSocket layer can be used fully detached from the
 underlying TCP interface. The same scenarios as described for regular HTTP requests apply here.
 
 The returned layer forms a `BidiFlow<Message, SslTlsOutbound, SslTlsInbound, Message, CompletionStage<WebSocketUpgradeResponse>>`.

diff --git a/docs/src/main/paradox/java/http/common/timeouts.md b/docs/src/main/paradox/java/http/common/timeouts.md
diff --git a/docs/src/main/paradox/java/http/common/timeouts.md b/docs/src/main/paradox/java/http/common/timeouts.md
@@ -0,0 +1 @@
+../../../scala/http/common/timeouts.md
diff --git a/docs/src/main/paradox/java/http/implications-of-streaming-http-entity.md b/docs/src/main/paradox/java/http/implications-of-streaming-http-entity.md
@@ -1,4 +1,3 @@
-<a id="implications-of-streaming-http-entities-java"></a>
 # Implications of the streaming nature of Request/Response Entities
 
 Akka HTTP is streaming *all the way through*, which means that the back-pressure mechanisms enabled by Akka Streams