This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 0b94fa0 [CAMEL-15285] fix broken anchors and images (#3987) 0b94fa0 is described below commit 0b94fa081b56bda0f6739129e40cb84d39e8ed67 Author: Alexander Schwartz <alexander.schwa...@gmx.net> AuthorDate: Thu Jul 9 15:48:25 2020 +0200 [CAMEL-15285] fix broken anchors and images (#3987) * CAMEL-15285 marking source with four dashes to be rendered correctly * CAMEL-15285 fix image reference * CAMEL-15285 removing invalid characters form IDs so that they are not rendered as text * CAMEL-15285 fix link to barcode image --- .../resources/org/apache/camel/catalog/docs/barcode-dataformat.adoc | 2 +- .../resources/org/apache/camel/catalog/docs/durable-subscriber.adoc | 2 +- .../resources/org/apache/camel/catalog/docs/netty-component.adoc | 2 +- .../resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc | 5 ++--- components/camel-apns/src/main/docs/apns-component.adoc | 2 +- components/camel-barcode/src/main/docs/barcode-dataformat.adoc | 2 +- components/camel-cm-sms/src/main/docs/cm-sms-component.adoc | 4 ++-- components/camel-crypto/src/main/docs/pgp-dataformat.adoc | 5 ++--- components/camel-netty/src/main/docs/netty-component.adoc | 2 +- .../src/main/docs/modules/eips/pages/durable-subscriber.adoc | 2 +- docs/components/modules/ROOT/pages/apns-component.adoc | 2 +- docs/components/modules/ROOT/pages/cm-sms-component.adoc | 4 ++-- docs/components/modules/ROOT/pages/netty-component.adoc | 2 +- docs/components/modules/dataformats/pages/barcode-dataformat.adoc | 2 +- docs/components/modules/dataformats/pages/pgp-dataformat.adoc | 5 ++--- docs/user-manual/modules/ROOT/pages/books.adoc | 2 +- docs/user-manual/modules/ROOT/pages/exception-clause.adoc | 2 +- .../modules/ROOT/pages/parameter-binding-annotations.adoc | 2 +- docs/user-manual/modules/ROOT/pages/pojo-consuming.adoc | 2 +- docs/user-manual/modules/ROOT/pages/security.adoc | 2 +- docs/user-manual/modules/ROOT/pages/spring-remoting.adoc | 2 +- 21 files changed, 26 insertions(+), 29 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/barcode-dataformat.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/barcode-dataformat.adoc index 605e61f..d4bf4ea 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/barcode-dataformat.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/barcode-dataformat.adoc @@ -105,7 +105,7 @@ template.sendBody("direct://code", "This is a testmessage!"); You should find inside the 'barcode_out' folder this image: -image::qr-code.png[image] +image::ROOT:qr-code.png[image] === Unmarshalling diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/durable-subscriber.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/durable-subscriber.adoc index 89125ec..faba184 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/durable-subscriber.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/durable-subscriber.adoc @@ -7,7 +7,7 @@ from the xref:enterprise-integration-patterns.adoc[EIP patterns] book. Camel supports the Durable Subscriber from the EIP patterns using components such as the JMS or Kafka component which supports publish & subscribe using topics with support for non-durable and durable subscribers. -image::eip/DurableSubscriberSolution.gif[image] +image::eip/DurableSubscriptionSolution.gif[image] == Sample diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/netty-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/netty-component.adoc index 70bdf4b..6fba203 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/netty-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/netty-component.adoc @@ -433,7 +433,7 @@ Spring DSL based configuration of endpoint ... ---- -[[Netty-UsingBasicSSL/TLSconfigurationontheJettyComponent]] +[[Netty-UsingBasicSSLTLSconfigurationontheJettyComponent]] Using Basic SSL/TLS configuration on the Jetty Component [source,java] diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc index 21c2ac4..34a2dc9 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc @@ -152,9 +152,8 @@ The following files should now exist and can be used to run the example ls -l ~/.gnupg/pubring.gpg ~/.gnupg/secring.gpg ----------------------------------------------- -[[Crypto-PGPDecrypting/VerifyingofMessagesEncrypted/SignedbyDifferentPrivate/PublicKeys]] -PGP Decrypting/Verifying of Messages Encrypted/Signed by Different -== Private/Public Keys +[[Crypto-PGPDecryptingVerifyingofMessagesEncryptedSignedbyDifferentPrivatePublicKeys]] +== PGP Decrypting/Verifying of Messages Encrypted/Signed by Different Private/Public Keys A PGP Data Formater can decrypt/verify messages which have been encrypted by different public keys or signed by different private keys. diff --git a/components/camel-apns/src/main/docs/apns-component.adoc b/components/camel-apns/src/main/docs/apns-component.adoc index a947cf8..a302d06 100644 --- a/components/camel-apns/src/main/docs/apns-component.adoc +++ b/components/camel-apns/src/main/docs/apns-component.adoc @@ -277,7 +277,7 @@ Create camel context and declare apns component programmatically } ---------------------------------------------------------------------------------- -[[APNS-ApnsProducer-iOStargetdevicedynamicallyconfiguredviaheader:"CamelApnsTokens"]] +[[APNS-ApnsProducer-iOStargetdevicedynamicallyconfiguredviaheader:CamelApnsTokens]] ApnsProducer - iOS target device dynamically configured via header: `"CamelApnsTokens"` diff --git a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc index 605e61f..d4bf4ea 100644 --- a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc +++ b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc @@ -105,7 +105,7 @@ template.sendBody("direct://code", "This is a testmessage!"); You should find inside the 'barcode_out' folder this image: -image::qr-code.png[image] +image::ROOT:qr-code.png[image] === Unmarshalling diff --git a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc index 76a57df..cf77d5e 100644 --- a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc +++ b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc @@ -27,14 +27,14 @@ Maven users will need to add the following dependency to their pom.xml for this component: [source,xml] ---- +---- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cm-sms</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> ---- +---- == Options diff --git a/components/camel-crypto/src/main/docs/pgp-dataformat.adoc b/components/camel-crypto/src/main/docs/pgp-dataformat.adoc index 21c2ac4..34a2dc9 100644 --- a/components/camel-crypto/src/main/docs/pgp-dataformat.adoc +++ b/components/camel-crypto/src/main/docs/pgp-dataformat.adoc @@ -152,9 +152,8 @@ The following files should now exist and can be used to run the example ls -l ~/.gnupg/pubring.gpg ~/.gnupg/secring.gpg ----------------------------------------------- -[[Crypto-PGPDecrypting/VerifyingofMessagesEncrypted/SignedbyDifferentPrivate/PublicKeys]] -PGP Decrypting/Verifying of Messages Encrypted/Signed by Different -== Private/Public Keys +[[Crypto-PGPDecryptingVerifyingofMessagesEncryptedSignedbyDifferentPrivatePublicKeys]] +== PGP Decrypting/Verifying of Messages Encrypted/Signed by Different Private/Public Keys A PGP Data Formater can decrypt/verify messages which have been encrypted by different public keys or signed by different private keys. diff --git a/components/camel-netty/src/main/docs/netty-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc index 70bdf4b..6fba203 100644 --- a/components/camel-netty/src/main/docs/netty-component.adoc +++ b/components/camel-netty/src/main/docs/netty-component.adoc @@ -433,7 +433,7 @@ Spring DSL based configuration of endpoint ... ---- -[[Netty-UsingBasicSSL/TLSconfigurationontheJettyComponent]] +[[Netty-UsingBasicSSLTLSconfigurationontheJettyComponent]] Using Basic SSL/TLS configuration on the Jetty Component [source,java] diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/durable-subscriber.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/durable-subscriber.adoc index 89125ec..faba184 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/durable-subscriber.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/durable-subscriber.adoc @@ -7,7 +7,7 @@ from the xref:enterprise-integration-patterns.adoc[EIP patterns] book. Camel supports the Durable Subscriber from the EIP patterns using components such as the JMS or Kafka component which supports publish & subscribe using topics with support for non-durable and durable subscribers. -image::eip/DurableSubscriberSolution.gif[image] +image::eip/DurableSubscriptionSolution.gif[image] == Sample diff --git a/docs/components/modules/ROOT/pages/apns-component.adoc b/docs/components/modules/ROOT/pages/apns-component.adoc index e829327..271872c 100644 --- a/docs/components/modules/ROOT/pages/apns-component.adoc +++ b/docs/components/modules/ROOT/pages/apns-component.adoc @@ -279,7 +279,7 @@ Create camel context and declare apns component programmatically } ---------------------------------------------------------------------------------- -[[APNS-ApnsProducer-iOStargetdevicedynamicallyconfiguredviaheader:"CamelApnsTokens"]] +[[APNS-ApnsProducer-iOStargetdevicedynamicallyconfiguredviaheader:CamelApnsTokens]] ApnsProducer - iOS target device dynamically configured via header: `"CamelApnsTokens"` diff --git a/docs/components/modules/ROOT/pages/cm-sms-component.adoc b/docs/components/modules/ROOT/pages/cm-sms-component.adoc index 62ca704..d78a88e 100644 --- a/docs/components/modules/ROOT/pages/cm-sms-component.adoc +++ b/docs/components/modules/ROOT/pages/cm-sms-component.adoc @@ -29,14 +29,14 @@ Maven users will need to add the following dependency to their pom.xml for this component: [source,xml] ---- +---- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cm-sms</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> ---- +---- == Options diff --git a/docs/components/modules/ROOT/pages/netty-component.adoc b/docs/components/modules/ROOT/pages/netty-component.adoc index 64a5770..bb4fade 100644 --- a/docs/components/modules/ROOT/pages/netty-component.adoc +++ b/docs/components/modules/ROOT/pages/netty-component.adoc @@ -435,7 +435,7 @@ Spring DSL based configuration of endpoint ... ---- -[[Netty-UsingBasicSSL/TLSconfigurationontheJettyComponent]] +[[Netty-UsingBasicSSLTLSconfigurationontheJettyComponent]] Using Basic SSL/TLS configuration on the Jetty Component [source,java] diff --git a/docs/components/modules/dataformats/pages/barcode-dataformat.adoc b/docs/components/modules/dataformats/pages/barcode-dataformat.adoc index 3c233d9..7c1a68f 100644 --- a/docs/components/modules/dataformats/pages/barcode-dataformat.adoc +++ b/docs/components/modules/dataformats/pages/barcode-dataformat.adoc @@ -107,7 +107,7 @@ template.sendBody("direct://code", "This is a testmessage!"); You should find inside the 'barcode_out' folder this image: -image::qr-code.png[image] +image::ROOT:qr-code.png[image] === Unmarshalling diff --git a/docs/components/modules/dataformats/pages/pgp-dataformat.adoc b/docs/components/modules/dataformats/pages/pgp-dataformat.adoc index ecdc892..216b744 100644 --- a/docs/components/modules/dataformats/pages/pgp-dataformat.adoc +++ b/docs/components/modules/dataformats/pages/pgp-dataformat.adoc @@ -154,9 +154,8 @@ The following files should now exist and can be used to run the example ls -l ~/.gnupg/pubring.gpg ~/.gnupg/secring.gpg ----------------------------------------------- -[[Crypto-PGPDecrypting/VerifyingofMessagesEncrypted/SignedbyDifferentPrivate/PublicKeys]] -PGP Decrypting/Verifying of Messages Encrypted/Signed by Different -== Private/Public Keys +[[Crypto-PGPDecryptingVerifyingofMessagesEncryptedSignedbyDifferentPrivatePublicKeys]] +== PGP Decrypting/Verifying of Messages Encrypted/Signed by Different Private/Public Keys A PGP Data Formater can decrypt/verify messages which have been encrypted by different public keys or signed by different private keys. diff --git a/docs/user-manual/modules/ROOT/pages/books.adoc b/docs/user-manual/modules/ROOT/pages/books.adoc index 73a8516..3aa6f25 100644 --- a/docs/user-manual/modules/ROOT/pages/books.adoc +++ b/docs/user-manual/modules/ROOT/pages/books.adoc @@ -64,7 +64,7 @@ your app—details you can find only in the Camel code itself. Written by the developers of Camel, this book distills their experience and practical insights so that you can tackle integration tasks like a pro. -[[Books-ApacheCamelDeveloper'sCookbook]] +[[Books-ApacheCamelDevelopersCookbook]] == Apache Camel Developer's Cookbook http://www.packtpub.com/apache-camel-developers-cookbook/book[Apache diff --git a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc index adb8456..f420018 100644 --- a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc +++ b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc @@ -643,7 +643,7 @@ And the same example in Spring XML: </camelContext> ---- -[[ExceptionClause-WhatistheDifferenceBetweenHandledandContinued?]] +[[ExceptionClause-WhatistheDifferenceBetweenHandledandContinued]] == What is the Difference Between Handled and Continued? If handled is true, then the thrown exception will be _handled_ and diff --git a/docs/user-manual/modules/ROOT/pages/parameter-binding-annotations.adoc b/docs/user-manual/modules/ROOT/pages/parameter-binding-annotations.adoc index d837b38..3073bc6 100644 --- a/docs/user-manual/modules/ROOT/pages/parameter-binding-annotations.adoc +++ b/docs/user-manual/modules/ROOT/pages/parameter-binding-annotations.adoc @@ -192,7 +192,7 @@ public class Foo { } ---- -[[ParameterBindingAnnotations-Advancedexampleusing@Bean]] +[[ParameterBindingAnnotations-AdvancedexampleusingBean]] ==== Advanced example using @Bean And an example of using the the diff --git a/docs/user-manual/modules/ROOT/pages/pojo-consuming.adoc b/docs/user-manual/modules/ROOT/pages/pojo-consuming.adoc index a5e34ff..a39c1bc 100644 --- a/docs/user-manual/modules/ROOT/pages/pojo-consuming.adoc +++ b/docs/user-manual/modules/ROOT/pages/pojo-consuming.adoc @@ -190,7 +190,7 @@ Now Camel matches step 5, and loses the prefix *on* in the name, and looks for 'service' as the property. And because there is a getServiceEndpoint method, Camel will use that. -[[POJOConsuming-Whichapproachtouse?]] +[[POJOConsuming-Whichapproachtouse]] == Which approach to use? Using the @Consume annotations are simpler when you are creating a diff --git a/docs/user-manual/modules/ROOT/pages/security.adoc b/docs/user-manual/modules/ROOT/pages/security.adoc index e4fe589..bb4fd05 100644 --- a/docs/user-manual/modules/ROOT/pages/security.adoc +++ b/docs/user-manual/modules/ROOT/pages/security.adoc @@ -31,7 +31,7 @@ utilizing Route Policies are * xref:components:others:shiro.adoc[Shiro Security] * xref:components:others:spring-security.adoc[Spring Security] -[[Security-PayloadSecurity-DataFormatsandProducers/Consumersofferingencryption/decryptionservices]] +[[Security-PayloadSecurity-DataFormatsandProducersConsumersofferingencryptiondecryptionservices]] == Payload Security - Data Formats and Producers/Consumers offering encryption/decryption services Camel offers encryption/decryption services to secure payloads or diff --git a/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc b/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc index 9525dca..de20c21 100644 --- a/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc +++ b/docs/user-manual/modules/ROOT/pages/spring-remoting.adoc @@ -318,7 +318,7 @@ there is only a single parameter of the type } ---- -[[SpringRemoting-@Handler]] +[[SpringRemoting-Handler]] === @Handler You can mark a method in your bean with the `@Handler` annotation to