diff --git a/akka-docs/rst/java/stream/index.rst b/akka-docs/rst/java/stream/index.rst index 3bc5c32c61..16ed4ee2ee 100644 --- a/akka-docs/rst/java/stream/index.rst +++ b/akka-docs/rst/java/stream/index.rst @@ -23,5 +23,3 @@ Streams stages-overview stream-cookbook ../../general/stream/stream-configuration - migration-guide-1.0-2.x-java - migration-guide-2.0-2.4-java diff --git a/akka-docs/rst/java/stream/migration-guide-1.0-2.x-java.rst b/akka-docs/rst/java/stream/migration-guide-1.0-2.x-java.rst deleted file mode 100644 index 38a83e0b0b..0000000000 --- a/akka-docs/rst/java/stream/migration-guide-1.0-2.x-java.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. _migration-2.0-java: - -####################################### -Migration Guide Akka Streams 1.0 to 2.x -####################################### - -For this migration guide see `the documentation for Akka Streams 2.0`_. - -.. _`the documentation for Akka Streams 2.0`: http://doc.akka.io/docs/akka-stream-and-http-experimental/2.0.2/java/migration-guide-1.0-2.x-java.html diff --git a/akka-docs/rst/java/stream/migration-guide-2.0-2.4-java.rst b/akka-docs/rst/java/stream/migration-guide-2.0-2.4-java.rst deleted file mode 100644 index 26cf7faaa2..0000000000 --- a/akka-docs/rst/java/stream/migration-guide-2.0-2.4-java.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. _migration-streams-2.0-2.4-java: - -########################################### -Migration Guide Akka Streams 2.0.x to 2.4.x -########################################### - -Migration from Akka Streams 2.0.x to 2.4.x is described in the -`documentation of 2.4 `_. diff --git a/akka-docs/rst/project/migration-guide-stream-1.0-2.x.rst b/akka-docs/rst/project/migration-guide-stream-1.0-2.x.rst new file mode 100644 index 0000000000..47d833b7cb --- /dev/null +++ b/akka-docs/rst/project/migration-guide-stream-1.0-2.x.rst @@ -0,0 +1,12 @@ +.. _migration-2.0-scala: + +####################################### +Migration Guide Akka Streams 1.0 to 2.x +####################################### + +For this migration guide see `the Scala documentation for Akka Streams 2.0`_ +or `the Java documentation for Akka Streams 2.0`_. + +.. _`the Scala documentation for Akka Streams 2.0`: http://doc.akka.io/docs/akka-stream-and-http-experimental/2.0.2/scala/migration-guide-1.0-2.x-scala.html + +.. _`the Java documentation for Akka Streams 2.0`: http://doc.akka.io/docs/akka-stream-and-http-experimental/2.0.2/java/migration-guide-1.0-2.x-java.html diff --git a/akka-docs/rst/scala/stream/migration-guide-2.0-2.4-scala.rst b/akka-docs/rst/project/migration-guide-stream-2.0-2.4.rst similarity index 50% rename from akka-docs/rst/scala/stream/migration-guide-2.0-2.4-scala.rst rename to akka-docs/rst/project/migration-guide-stream-2.0-2.4.rst index 56263414ae..bd7029b5ad 100644 --- a/akka-docs/rst/scala/stream/migration-guide-2.0-2.4-scala.rst +++ b/akka-docs/rst/project/migration-guide-stream-2.0-2.4.rst @@ -5,4 +5,5 @@ Migration Guide Akka Streams 2.0.x to 2.4.x ########################################### Migration from Akka Streams 2.0.x to 2.4.x is described in the -`documentation of 2.4 `_. +`Scala documentation of 2.4 `_ or +`Java documentation of 2.4 `_.. diff --git a/akka-docs/rst/project/migration-guides.rst b/akka-docs/rst/project/migration-guides.rst index d7a7b031eb..6bd071e562 100644 --- a/akka-docs/rst/project/migration-guides.rst +++ b/akka-docs/rst/project/migration-guides.rst @@ -13,4 +13,6 @@ Migration Guides migration-guide-persistence-experimental-2.3.x-2.4.x migration-guide-eventsourced-2.3.x migration-guide-2.3.x-2.4.x + migration-guide-stream-1.0-2.x + migration-guide-stream-2.0-2.4 migration-guide-2.4.x-2.5.x diff --git a/akka-docs/rst/scala/stream/index.rst b/akka-docs/rst/scala/stream/index.rst index a337529ac0..a7d1f143de 100644 --- a/akka-docs/rst/scala/stream/index.rst +++ b/akka-docs/rst/scala/stream/index.rst @@ -23,5 +23,3 @@ Streams stages-overview stream-cookbook ../../general/stream/stream-configuration - migration-guide-1.0-2.x-scala - migration-guide-2.0-2.4-scala diff --git a/akka-docs/rst/scala/stream/migration-guide-1.0-2.x-scala.rst b/akka-docs/rst/scala/stream/migration-guide-1.0-2.x-scala.rst deleted file mode 100644 index b150213b5f..0000000000 --- a/akka-docs/rst/scala/stream/migration-guide-1.0-2.x-scala.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. _migration-2.0-scala: - -####################################### -Migration Guide Akka Streams 1.0 to 2.x -####################################### - -For this migration guide see `the documentation for Akka Streams 2.0`_. - -.. _`the documentation for Akka Streams 2.0`: http://doc.akka.io/docs/akka-stream-and-http-experimental/2.0.2/scala/migration-guide-1.0-2.x-scala.html