From 0e2046745099971ec4720fe5a415999330daf225 Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:02:49 +0100 Subject: [PATCH 1/6] docs: show template's Akka logo --- docs/src/main/paradox/_template/logo.st | 1 - 1 file changed, 1 deletion(-) delete mode 100644 docs/src/main/paradox/_template/logo.st diff --git a/docs/src/main/paradox/_template/logo.st b/docs/src/main/paradox/_template/logo.st deleted file mode 100644 index 38bc44ea07..0000000000 --- a/docs/src/main/paradox/_template/logo.st +++ /dev/null @@ -1 +0,0 @@ - From efb5d12c381e617232df1dd64d09cc77e6c40e40 Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:15:55 +0100 Subject: [PATCH 2/6] Also point Alpakka examples to the repo instead --- docs/src/main/paradox/.htaccess | 2 +- docs/src/main/paradox/examples/elasticsearch-samples.md | 4 ++-- docs/src/main/paradox/examples/ftp-samples.md | 4 ++-- docs/src/main/paradox/examples/index.md | 2 +- docs/src/main/paradox/examples/jms-samples.md | 2 +- docs/src/main/paradox/examples/mqtt-samples.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/src/main/paradox/.htaccess b/docs/src/main/paradox/.htaccess index e79d0249dd..e34d07597f 100644 --- a/docs/src/main/paradox/.htaccess +++ b/docs/src/main/paradox/.htaccess @@ -1,7 +1,7 @@ # This file can be used for redirects like: RedirectMatch 301 ^/docs/alpakka/([^/]+)/data-transformations/recordio.html https://doc.akka.io/libraries/alpakka/$1/data-transformations/simple-codecs.html # Move CSV example to alpakka-samples -RedirectMatch 301 ^/docs/alpakka/([^/]+)/examples/csv-samples.html https://akka.io/alpakka-samples/ +RedirectMatch 301 ^/docs/alpakka/([^/]+)/examples/csv-samples.html https://github.com/akka/alpakka-samples/ # Drop pre-1.0 release notes RedirectMatch 301 ^/docs/alpakka/([^/]+)/release-notes/1.0-RC1.html https://doc.akka.io/libraries/alpakka/$1/release-notes/1.0.x.html RedirectMatch 301 ^/docs/alpakka/([^/]+)/release-notes/1.0-M3.html https://doc.akka.io/libraries/alpakka/$1/release-notes/1.0.x.html diff --git a/docs/src/main/paradox/examples/elasticsearch-samples.md b/docs/src/main/paradox/examples/elasticsearch-samples.md index b8aecd46c1..dedf24660c 100644 --- a/docs/src/main/paradox/examples/elasticsearch-samples.md +++ b/docs/src/main/paradox/examples/elasticsearch-samples.md @@ -2,9 +2,9 @@ ### Example: Index all data from an RDBMS table into Elasticsearch -This example is now available in the [Alpakka Samples](https://akka.io/alpakka-samples/jdbc-to-elasticsearch/) project. +This example is now available in the [Alpakka Samples](https://github.com/akka/alpakka-samples/tree/main/alpakka-sample-jdbc-to-elasticsearch) project. ### Example: Read from a Kafka topic and publish to Elasticsearch -This example is now available in the [Alpakka Samples](https://akka.io/alpakka-samples/kafka-to-elasticsearch/) project. +This example is now available in the [Alpakka Samples](https://github.com/akka/alpakka-samples/tree/main/alpakka-sample-kafka-to-elasticsearch) project. diff --git a/docs/src/main/paradox/examples/ftp-samples.md b/docs/src/main/paradox/examples/ftp-samples.md index 73bf664284..bb085a48b6 100644 --- a/docs/src/main/paradox/examples/ftp-samples.md +++ b/docs/src/main/paradox/examples/ftp-samples.md @@ -2,8 +2,8 @@ ### Example: Copy all files from an FTP server to local files -This example is available in the [Alpakka Samples](https://akka.io/alpakka-samples/ftp-to-file/) project. +This example is available in the [Alpakka Samples](https://github.com/akka/alpakka-samples/tree/main/alpakka-sample-ftp-to-file) project. ### Example: Rotate data stream over to multiple compressed files on SFTP server -This example is available in the [Alpakka Samples](https://akka.io/alpakka-samples/rotate-logs-to-ftp/) project. +This example is available in the [Alpakka Samples](https://github.com/akka/alpakka-samples/tree/main/alpakka-sample-rotate-logs-to-ftp) project. diff --git a/docs/src/main/paradox/examples/index.md b/docs/src/main/paradox/examples/index.md index be725a20d1..2009ef9f9e 100644 --- a/docs/src/main/paradox/examples/index.md +++ b/docs/src/main/paradox/examples/index.md @@ -2,6 +2,6 @@ @@@ note -Alpakka examples are available in the [Alpakka Samples](https://akka.io/alpakka-samples/) documentation created from the [Alpakka Samples Repository](https://github.com/akka/alpakka-samples). +Alpakka examples are available in the [Alpakka Samples Repository](https://github.com/akka/alpakka-samples). @@@ diff --git a/docs/src/main/paradox/examples/jms-samples.md b/docs/src/main/paradox/examples/jms-samples.md index ae35298116..a1afa6f374 100644 --- a/docs/src/main/paradox/examples/jms-samples.md +++ b/docs/src/main/paradox/examples/jms-samples.md @@ -1,3 +1,3 @@ # JMS -JMS examples are shown in the [Alpakka Samples](https://akka.io/alpakka-samples/jms/) project. +JMS examples are shown in the [Alpakka Samples](https://github.com/akka/alpakka-samples/tree/main/alpakka-sample-jms) project. diff --git a/docs/src/main/paradox/examples/mqtt-samples.md b/docs/src/main/paradox/examples/mqtt-samples.md index de8016bbde..f50b71a18d 100644 --- a/docs/src/main/paradox/examples/mqtt-samples.md +++ b/docs/src/main/paradox/examples/mqtt-samples.md @@ -2,4 +2,4 @@ ## Example: Read from an MQTT topic, group messages and publish to Kafka -This example is available in the [Alpakka Samples](https://akka.io/alpakka-samples/mqtt-to-kafka/) project. +This example is available in the [Alpakka Samples](https://github.com/akka/alpakka-samples/tree/main/alpakka-sample-mqtt-to-kafka) project. From 0870ef6c93b99e490d3a1e7c2535f9d8c2ad5b8d Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:27:06 +0100 Subject: [PATCH 3/6] CoC link --- docs/src/main/paradox/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md index f6744e87fe..1c8123ef28 100644 --- a/docs/src/main/paradox/overview.md +++ b/docs/src/main/paradox/overview.md @@ -27,7 +27,7 @@ If you want to try out a connector that has not yet been released, give @ref[sna Please feel free to contribute to Alpakka by reporting issues you identify, or by suggesting changes to the code. Please refer to our [contributing instructions](https://github.com/akka/alpakka/blob/main/CONTRIBUTING.md) and our [contributor advice](https://github.com/akka/alpakka/blob/main/contributor-advice.md) to learn how it can be done. The target structure for Alpakka connectors is illustrated by the @ref[Reference connector](reference.md). -We want Akka and Alpakka to strive in a welcoming and open atmosphere and expect all contributors to respect our [code of conduct](https://www.lightbend.com/conduct). +We want Akka and Alpakka to strive in a welcoming and open atmosphere and expect all contributors to respect our [code of conduct](https://akka.io/conduct). [![alpakka]][alpakka-scaladex] Feel free to tag your project with *akka-streams* keyword in Scaladex for easier discoverability. From 1fb8845d7cc7b8b15f588800fef7f54ad446736c Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:37:22 +0100 Subject: [PATCH 4/6] Discuss link --- project/project-info.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/project-info.conf b/project/project-info.conf index 2db3f66cc4..f5da827523 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -19,8 +19,8 @@ project-info { } forums: [ { - text: "Lightbend Discuss" - url: "https://discuss.akka.com/c/akka/" + text: "Akka Discuss" + url: "https://discuss.akka.io/c/akka/" } ] } From 91bded26e3de2792a68ad666a9f4092c3fada477 Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:38:16 +0100 Subject: [PATCH 5/6] Discuss link 2 --- project/project-info.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/project-info.conf b/project/project-info.conf index f5da827523..5e3d449b9d 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -20,7 +20,7 @@ project-info { forums: [ { text: "Akka Discuss" - url: "https://discuss.akka.io/c/akka/" + url: "https://discuss.akka.io" } ] } From 9d3cf5625cd891b55082acef95cd95bf96e3993a Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:59:20 +0100 Subject: [PATCH 6/6] Remove old links --- docs/src/main/paradox/release-notes/1.0.x.md | 2 +- docs/src/main/paradox/release-notes/2.0.x.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/paradox/release-notes/1.0.x.md b/docs/src/main/paradox/release-notes/1.0.x.md index 43c44bda40..fe1088a320 100644 --- a/docs/src/main/paradox/release-notes/1.0.x.md +++ b/docs/src/main/paradox/release-notes/1.0.x.md @@ -92,7 +92,7 @@ If you have kept to older versions of Alpakka to avoid multiple upgrades, **now Most artifacts of Alpakka are available for Scala 2.11, 2.12 and 2.13.0-M5. -Alpakka 1.0.0 modules require at least [Akka](https://akka.io/blog/news-archive.html) 2.5.21. Some modules built up [Akka HTTP](https://doc.akka.io/libraries/akka-http/current/release-notes/10.1.x.html) 10.1.7. +Alpakka 1.0.0 modules require at least Akka 2.5.21. Some modules built up [Akka HTTP](https://doc.akka.io/libraries/akka-http/current/release-notes/10.1.x.html) 10.1.7. ### Compatibility diff --git a/docs/src/main/paradox/release-notes/2.0.x.md b/docs/src/main/paradox/release-notes/2.0.x.md index de07f090c2..17e17fe13f 100644 --- a/docs/src/main/paradox/release-notes/2.0.x.md +++ b/docs/src/main/paradox/release-notes/2.0.x.md @@ -147,7 +147,7 @@ Released 2020-04-30 - **Alpakka 2.0 updates dependencies for most connectors.** - **Alpakka 2.0 requires Akka 2.5.31 or Akka 2.6.4.** We recommend upgrading your projects to the latest versions of Akka. -- Many Alpakka APIs haven't changed since Alpakka 1.0. We hope adapting to the changes will be easy. For the time being we don't have dedicated migration guides. Please reach out in the [Discuss forum](https://discuss.akka.io/c/akka/streams-and-alpakka) if you run into problems. +- Many Alpakka APIs haven't changed since Alpakka 1.0. We hope adapting to the changes will be easy. For the time being we don't have dedicated migration guides. Please reach out in the [Discuss forum](https://discuss.akka.io/c/akka-libraries) if you run into problems. ## Major new functionality