From 0970623e670e056715dac4c5155141bb625c226a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 22 Mar 2019 12:05:35 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- README.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.html b/README.html index 78e4606ba..7c7924f2c 100644 --- a/README.html +++ b/README.html @@ -343,7 +343,7 @@ credentials and you already have those.

The projects that require middleware generally include a docker-compose.yml, so consider using -Docker Compose to run the middeware servers +Docker Compose to run the middeware servers in Docker containers. See the README in the scripts demo repository for specific instructions about the common cases of mongo, @@ -380,15 +380,15 @@ a modified file in the correct place. Just commit it and push the change.

Working with the code

If you don’t have an IDE preference we would recommend that you use -Spring Tools Suite or -Eclipse when working with the code. We use the -m2eclipse eclipse plugin for maven support. Other IDEs and tools +Spring Tools Suite or +Eclipse when working with the code. We use the +m2eclipse eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better.

Importing into eclipse with m2eclipse

-

We recommend the m2eclipse eclipse plugin when working with +

We recommend the m2eclipse eclipse plugin when working with eclipse. If you don’t already have m2eclipse installed it is available from the "eclipse marketplace".

@@ -474,7 +474,7 @@ you can import formatter settings using the eclipse-code-formatter.xml file from the Spring Cloud Build project. If using IntelliJ, you can use the -Eclipse Code Formatter +Eclipse Code Formatter Plugin to import the same file.

  • @@ -501,7 +501,7 @@ than cosmetic changes).

    other target branch in the main project).

  • -

    When writing a commit message please follow these conventions, +

    When writing a commit message please follow these conventions, if you are fixing an existing issue please add Fixes gh-XXXX at the end of the commit message (where XXXX is the issue number).

    • @@ -613,7 +613,7 @@ message (where XXXX is the issue number).

    <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
 		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
 	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
 	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>