From 1572ea8d75373b6260bfafed722b91d1cb9c731b Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Thu, 30 Apr 2020 17:31:19 -0400
Subject: [PATCH] Fix docsZip gradle task and doc links

---
 build.gradle                         | 6 +++---
 src/reference/asciidoc/amqp.adoc     | 2 +-
 src/reference/asciidoc/appendix.adoc | 4 ++--
 src/reference/asciidoc/logging.adoc  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 950e801d..66caf8db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -424,7 +424,7 @@ asciidoctorPdf {
 		sourceDir "$buildDir/asciidoc"
 		inputs.dir(sourceDir)
 		sources {
-			include 'index-single.adoc'
+			include 'index.adoc'
 		}
 		options doctype: 'book'
 		attributes 'icons': 'font',
@@ -556,11 +556,11 @@ task docsZip(type: Zip, dependsOn: [reference]) {
 			into 'api'
 		}
 
-		from ('build/asciidoc/html5') {
+		from ('build/docs/asciidoc') {
 			into 'reference/html'
 		}
 
-		from ('build/asciidoc/pdf') {
+		from ('build/docs/asciidocPdf') {
 			include 'index.pdf'
 			rename  'index.pdf', 'spring-amqp-reference.pdf'
 			into 'reference/pdf'
diff --git a/src/reference/asciidoc/amqp.adoc b/src/reference/asciidoc/amqp.adoc
index 49a2b6dd..9c10997b 100644
--- a/src/reference/asciidoc/amqp.adoc
+++ b/src/reference/asciidoc/amqp.adoc
@@ -252,7 +252,7 @@ PooledChannelConnectionFactory pcf() throws Exception {
 
 This factory manages a single connection and two `ThreadLocal` s, one for transactional channels, the other for non-transactional channels.
 This factory ensures that all operations on the same thread use the same channel (as long as it remains open).
-This facilitates <<strict-ordering>> without the need for <<scoped-operations>>.
+This facilitates strict message ordering without the need for <<scoped-operations>>.
 To avoid memory leaks, if your application uses many short-lived threads, you must call the factory's `closeThreadChannel()` to release the channel resource.
 
 ====== `CachingConnectionFactory`
diff --git a/src/reference/asciidoc/appendix.adoc b/src/reference/asciidoc/appendix.adoc
index 04f659de..d07fc50d 100644
--- a/src/reference/asciidoc/appendix.adoc
+++ b/src/reference/asciidoc/appendix.adoc
@@ -112,7 +112,7 @@ See <<template-confirms>> for more information.
 Also, the publisher confirm type is now specified with the `ConfirmType` enum instead of the two mutually exclusive setter methods.
 
 The `RabbitConnectionFactoryBean` now uses TLS 1.2 by default when SSL is enabled.
-See <<rabbitconnectionfactorybean-configuring-ssl>> for more information.
+See <<rabbitconnectionfactorybean-and-configuring-ssl>> for more information.
 
 ===== New MessagePostProcessor Classes
 
@@ -203,7 +203,7 @@ See `setReplyErrorHandler` on the `RabbitTemplate`.
 ===== Message Conversion
 
 We introduced a new `Jackson2XmlMessageConverter` to support converting messages from and to XML format.
-See <<Jackson2XmlMessageConverter>> for more information.
+See <<jackson2xml>> for more information.
 
 ===== Management REST API
 
diff --git a/src/reference/asciidoc/logging.adoc b/src/reference/asciidoc/logging.adoc
index 2579a7d6..fe07bf4d 100644
--- a/src/reference/asciidoc/logging.adoc
+++ b/src/reference/asciidoc/logging.adoc
@@ -72,12 +72,12 @@ Retries are delayed as follows: `N ^ log(N)`, where `N` is the retry number.
 | useSsl
 | false
 | Whether to use SSL for the RabbitMQ connection.
-See <<_rabbitconnectionfactorybean_and_configuring_ssl>>
+See <<rabbitconnectionfactorybean-configuring-ssl>>
 
 | verifyHostname
 | true
 | Enable server hostname verification for TLS connections.
-See <<_rabbitconnectionfactorybean_and_configuring_ssl>>
+See <<rabbitconnectionfactorybean-configuring-ssl>>
 
 | sslAlgorithm
 | null