From 61d942823bb4c7ec063a0beb08baa1c1913950ba Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 22 May 2020 09:59:39 +0000 Subject: [PATCH] Sync docs from 1.0.x to gh-pages --- 1.0.x/reference/html/README.html | 17 +++++++++++++---- 1.0.x/reference/html/index.html | 17 +++++++++++++---- .../html/spring-cloud-circuitbreaker.html | 17 +++++++++++++---- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/1.0.x/reference/html/README.html b/1.0.x/reference/html/README.html index 91bc501..f9f3682 100644 --- a/1.0.x/reference/html/README.html +++ b/1.0.x/reference/html/README.html @@ -125,8 +125,9 @@ $(addBlockSwitches);
  • 1.2. Documentation
  • 1.3. Working with the code
    • @@ -496,7 +497,15 @@ a modified file in the correct place. Just commit it and push the change.

    should also work without issue as long as they use Maven 3.3.3 or better.

    -

    1.3.1. Importing into eclipse with m2eclipse

    +

    1.3.1. Activate the Spring Maven profile

    +
    +

    Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors.

    +
    +
    +
    +

    1.3.2. Importing into eclipse with m2eclipse

    We recommend the m2eclipse eclipse plugin when working with eclipse. If you don’t already have m2eclipse installed it is available from the "eclipse @@ -523,7 +532,7 @@ pom into your settings.xml.

    -

    1.3.2. Importing into eclipse without m2eclipse

    +

    1.3.3. Importing into eclipse without m2eclipse

    If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command:

    diff --git a/1.0.x/reference/html/index.html b/1.0.x/reference/html/index.html index 91bc501..f9f3682 100644 --- a/1.0.x/reference/html/index.html +++ b/1.0.x/reference/html/index.html @@ -125,8 +125,9 @@ $(addBlockSwitches);
  • 1.2. Documentation
  • 1.3. Working with the code
    • @@ -496,7 +497,15 @@ a modified file in the correct place. Just commit it and push the change.

    should also work without issue as long as they use Maven 3.3.3 or better.

    -

    1.3.1. Importing into eclipse with m2eclipse

    +

    1.3.1. Activate the Spring Maven profile

    +
    +

    Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors.

    +
    +
    +
    +

    1.3.2. Importing into eclipse with m2eclipse

    We recommend the m2eclipse eclipse plugin when working with eclipse. If you don’t already have m2eclipse installed it is available from the "eclipse @@ -523,7 +532,7 @@ pom into your settings.xml.

    -

    1.3.2. Importing into eclipse without m2eclipse

    +

    1.3.3. Importing into eclipse without m2eclipse

    If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command:

    diff --git a/1.0.x/reference/html/spring-cloud-circuitbreaker.html b/1.0.x/reference/html/spring-cloud-circuitbreaker.html index 91bc501..f9f3682 100644 --- a/1.0.x/reference/html/spring-cloud-circuitbreaker.html +++ b/1.0.x/reference/html/spring-cloud-circuitbreaker.html @@ -125,8 +125,9 @@ $(addBlockSwitches);
  • 1.2. Documentation
  • 1.3. Working with the code
    • @@ -496,7 +497,15 @@ a modified file in the correct place. Just commit it and push the change.

    should also work without issue as long as they use Maven 3.3.3 or better.

    -

    1.3.1. Importing into eclipse with m2eclipse

    +

    1.3.1. Activate the Spring Maven profile

    +
    +

    Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors.

    +
    +
    +
    +

    1.3.2. Importing into eclipse with m2eclipse

    We recommend the m2eclipse eclipse plugin when working with eclipse. If you don’t already have m2eclipse installed it is available from the "eclipse @@ -523,7 +532,7 @@ pom into your settings.xml.

    -

    1.3.2. Importing into eclipse without m2eclipse

    +

    1.3.3. Importing into eclipse without m2eclipse

    If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command: