From 0053b77e2cd8a3003b3eb745019cef89138605eb Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Tue, 26 Sep 2023 16:30:24 +0200 Subject: [PATCH 1/2] Revert "Update service discovery feature descriptions in documentation" This reverts commit 0e5748f505c034b6c45579458bfb4cd2a80cdedc. Temporariliy revert change till the CLA is signed by the contributor. --- docs/src/main/asciidoc/README.adoc | 6 +++--- docs/src/main/asciidoc/sagan-index.adoc | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 848e46453..438339975 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -8,9 +8,9 @@ include::intro.adoc[] == Features -* Service Registration: Eureka instances can be registered with Spring-managed beans -* Service Discovery: Clients can discover the registered instances using Spring-managed beans -* Embedded Eureka Server: An Eureka server can be embedded with declarative Java configuration +* Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans +* Service Discovery: an embedded Eureka server can be created with declarative Java configuration + == Building diff --git a/docs/src/main/asciidoc/sagan-index.adoc b/docs/src/main/asciidoc/sagan-index.adoc index a88e59794..eb78f3386 100644 --- a/docs/src/main/asciidoc/sagan-index.adoc +++ b/docs/src/main/asciidoc/sagan-index.adoc @@ -2,11 +2,10 @@ Spring Cloud Netflix provides Netflix OSS integrations for Spring Boot apps thro ## Features -Spring Cloud Netflix provides the following features: +Spring Cloud Netflix features: -* Service Registration: Eureka instances can be registered with Spring-managed beans -* Service Discovery: Clients can discover the registered instances using Spring-managed beans -* Embedded Eureka Server: An Eureka server can be embedded with declarative Java configuration +* Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans +* Service Discovery: an embedded Eureka server can be created with declarative Java configuration ## Getting Started From c6ed320cb0255a565e843ae7580adb8016fe32d9 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Tue, 26 Sep 2023 16:33:00 +0200 Subject: [PATCH 2/2] Regenerate docs. --- README.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 1fc2057c6..dccc040e4 100644 --- a/README.adoc +++ b/README.adoc @@ -50,9 +50,9 @@ patterns provided include Service Discovery (Eureka). == Features -* Service Registration: Eureka instances can be registered with Spring-managed beans -* Service Discovery: Clients can discover the registered instances using Spring-managed beans -* Embedded Eureka Server: An Eureka server can be embedded with declarative Java configuration +* Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans +* Service Discovery: an embedded Eureka server can be created with declarative Java configuration + == Building