From 933d1abcdd5ceae3c19b6ce98a0d589d4d5e3b8b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 17 Dec 2015 17:24:54 +0100 Subject: [PATCH] Polish doc --- docs/src/main/asciidoc/jce.adoc | 6 +++--- docs/src/main/asciidoc/spring-cloud-commons.adoc | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/src/main/asciidoc/jce.adoc b/docs/src/main/asciidoc/jce.adoc index 26ff40eb..2cf6f0fb 100644 --- a/docs/src/main/asciidoc/jce.adoc +++ b/docs/src/main/asciidoc/jce.adoc @@ -1,7 +1,7 @@ If you are getting an exception due to "Illegal key size" and you are using Sun's JDK, you need to install the Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files. See the following links for more information: -* Java 6 JCE Link http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html -* Java 7 JCE Link http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html -* Java 8 JCE Link http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html +* http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html[Java 6 JCE] +* http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[Java 7 JCE] +* http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[Java 8 JCE] Extract files into JDK/jre/lib/security folder (whichever version of JRE/JDK x64/x86 you are using). \ No newline at end of file diff --git a/docs/src/main/asciidoc/spring-cloud-commons.adoc b/docs/src/main/asciidoc/spring-cloud-commons.adoc index d91ae2d1..482f130a 100644 --- a/docs/src/main/asciidoc/spring-cloud-commons.adoc +++ b/docs/src/main/asciidoc/spring-cloud-commons.adoc @@ -1,12 +1,15 @@ = Cloud Native Applications -:github: https://github.com/spring-cloud/spring-cloud-commons +:githubroot: https://github.com/spring-cloud +:github: {githubroot}/spring-cloud-commons :githubmaster: {github}/tree/master :docslink: {githubmaster}/docs/src/main/asciidoc :toc: include::intro.adoc[] -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc[] +// TODO: figure out remote includes in docs and replace pasted text +// include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc[] +NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {docslink}[github]. == Spring Cloud Context: Application Context Services @@ -272,7 +275,7 @@ classpath (Maven co-ordinates "org.springframework.security:spring-security-rsa") and you also need the full strength JCE extensions in your JVM. -include::jce.adoc +include::jce.adoc[] === Endpoints @@ -308,7 +311,7 @@ public class MyClass { The URI needs to use a virtual host name (ie. service name, not a host name). The Ribbon client is used to create a full physical address. See -{github-code}/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java[RibbonAutoConfiguration] +{githubroot}/spring-cloud-netflix/blob/master/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java[RibbonAutoConfiguration] for details of how the `RestTemplate` is set up. === Multiple RestTemplate objects