From 3114fc06381076d4e902478479cbab9e2226bd21 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Mon, 5 Feb 2018 13:07:12 -0500 Subject: [PATCH] Docs changes Update Kafka/Rabbit binder docs to use an aggregate docs Update docs sub-modules to latest master in the corresponding repos Fixes #42 --- spring-cloud-stream-docs/core | 2 +- spring-cloud-stream-docs/kafka | 2 +- spring-cloud-stream-docs/rabbit | 2 +- .../src/main/asciidoc/spring-cloud-stream-aggregate.adoc | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-cloud-stream-docs/core b/spring-cloud-stream-docs/core index 9cc0b83a3..1211a273f 160000 --- a/spring-cloud-stream-docs/core +++ b/spring-cloud-stream-docs/core @@ -1 +1 @@ -Subproject commit 9cc0b83a38e6b7f94adf80740dfe88c2124b2e37 +Subproject commit 1211a273f61a8de12b37b5c8bf4731a22ed023ed diff --git a/spring-cloud-stream-docs/kafka b/spring-cloud-stream-docs/kafka index b3f42fe67..5e0688df7 160000 --- a/spring-cloud-stream-docs/kafka +++ b/spring-cloud-stream-docs/kafka @@ -1 +1 @@ -Subproject commit b3f42fe67d987fe81b055f87d7dd4c99c298665c +Subproject commit 5e0688df72e16c25e088d5d70036a1c2a118e986 diff --git a/spring-cloud-stream-docs/rabbit b/spring-cloud-stream-docs/rabbit index 1ba17dcf0..d628f15b8 160000 --- a/spring-cloud-stream-docs/rabbit +++ b/spring-cloud-stream-docs/rabbit @@ -1 +1 @@ -Subproject commit 1ba17dcf0a8dc69e7d395784fbe98558fc1380e0 +Subproject commit d628f15b8c2b4464165dea4887b71e5fca18319e diff --git a/spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-aggregate.adoc b/spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-aggregate.adoc index 51fb339b7..b3662ac90 100644 --- a/spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-aggregate.adoc +++ b/spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-aggregate.adoc @@ -4,10 +4,8 @@ include::{stream-docs-basedir}/core/spring-cloud-stream-core-docs/src/main/ascii == Apache Kafka Binder -include::{stream-docs-basedir}/kafka/spring-cloud-stream-binder-kafka-docs/src/main/asciidoc/overview.adoc[leveloffset=+1] -include::{stream-docs-basedir}/kafka/spring-cloud-stream-binder-kafka-docs/src/main/asciidoc/dlq.adoc[leveloffset=+1] +include::{stream-docs-basedir}/kafka/spring-cloud-stream-binder-kafka-docs/src/main/asciidoc/spring-cloud-stream-binder-kafka-aggregate.adoc[leveloffset=+1] == RabbitMQ Binder -include::{stream-docs-basedir}/rabbit/spring-cloud-stream-binder-rabbit-docs/src/main/asciidoc/overview.adoc[leveloffset=+1] -include::{stream-docs-basedir}/rabbit/spring-cloud-stream-binder-rabbit-docs/src/main/asciidoc/dlq.adoc[leveloffset=+1] +include::{stream-docs-basedir}/rabbit/spring-cloud-stream-binder-rabbit-docs/src/main/asciidoc/spring-cloud-stream-binder-rabbit-aggregate.adoc[leveloffset=+1]