Commit 65a9953c authored by Phillip Webb's avatar Phillip Webb

Fix a new remaining 'zero' and 'bootstrap' terms

Issue: #54095231
parent b665a2bb
# Spring Zero # Spring Boot
Spring Zero is "Spring for Snowboarders". If you are kewl, or just impatient, and you Spring Boot is "Spring for Snowboarders". If you are kewl, or just impatient, and you
want to use Spring, then this is the place to be. Spring Zero is the code-name for a want to use Spring, then this is the place to be. Spring Boot is the code-name for a
group of related technologies, that will get you up and running with group of related technologies, that will get you up and running with
Spring-powered, production-grade applications and services with absolute minimum fuss. Spring-powered, production-grade applications and services with absolute minimum fuss.
It takes an opinionated view of the Spring family so that new and existing users can It takes an opinionated view of the Spring family so that new and existing users can
...@@ -41,7 +41,7 @@ or above. ...@@ -41,7 +41,7 @@ or above.
$ mvn clean install $ mvn clean install
An `alias` can be used for the Spring Zero command line tool: An `alias` can be used for the Spring Boot command line tool:
$ alias spring="java -jar ~/.m2/repository/org/springframework/boot/spring-cli/0.5.0.BUILD-SNAPSHOT/spring-cli-0.5.0.BUILD-SNAPSHOT.jar" $ alias spring="java -jar ~/.m2/repository/org/springframework/boot/spring-cli/0.5.0.BUILD-SNAPSHOT/spring-cli-0.5.0.BUILD-SNAPSHOT.jar"
...@@ -95,8 +95,8 @@ _NOTE: the above example assumes your build system has imported the `spring-star ...@@ -95,8 +95,8 @@ _NOTE: the above example assumes your build system has imported the `spring-star
maven pom._ maven pom._
## Spring Zero Components ## Spring Boot Components
There are a number of components in Zero. Here are the important ones: There are a number of components in Boot. Here are the important ones:
### The Spring CLI ### The Spring CLI
The 'spring' command line application compiles and runs Groovy source, making it super The 'spring' command line application compiles and runs Groovy source, making it super
...@@ -106,8 +106,8 @@ can also watch files, automatically recompiling and restarting when they change. ...@@ -106,8 +106,8 @@ can also watch files, automatically recompiling and restarting when they change.
*See [spring-cli/README](spring-cli/README.md).* *See [spring-cli/README](spring-cli/README.md).*
### Spring Bootstrap ### Spring Boot
The main library providing features that support the other parts of Spring Zero. The main library providing features that support the other parts of Spring Boot.
Features include: Features include:
* `SpringApplication` - a class with static convenience methods that make it really easy * `SpringApplication` - a class with static convenience methods that make it really easy
...@@ -183,6 +183,6 @@ samples are provided: ...@@ -183,6 +183,6 @@ samples are provided:
* spring-boot-sample-profile - example showing Spring's `@profile` support * spring-boot-sample-profile - example showing Spring's `@profile` support
* spring-boot-sample-traditional - shows Spring Zero with more traditional WAR packaging * spring-boot-sample-traditional - shows Spring Zero with more traditional WAR packaging
(but also executable using `java -jar`) (but also executable using `java -jar`)
* spring-boot-sample-xml - Example show how Spring Zero can be mixed with trditional XML * spring-boot-sample-xml - Example show how Spring Boot can be mixed with traditional XML
configuration configuration
# Contributing to Spring Zero # Contributing to Spring Boot
Spring Zero is released under the non-restrictive Apache 2.0 license. If you would like Spring Boot is released under the non-restrictive Apache 2.0 license. If you would like
to contribute something, or simply want to hack on the code this document should help to contribute something, or simply want to hack on the code this document should help
you get started. you get started.
...@@ -30,7 +30,7 @@ We recommend the [m2eclipe](http://eclipse.org/m2e/) eclipse plugin when working ...@@ -30,7 +30,7 @@ We recommend the [m2eclipe](http://eclipse.org/m2e/) eclipse plugin when working
eclipse. If you don't already have m2eclipse installed it is available from the "eclipse eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
marketplace". marketplace".
Spring Zero includes project specific source formatting settings, in order to have these Spring Boot includes project specific source formatting settings, in order to have these
work with m2eclipse, we provide an additional eclipse plugin that you can install: work with m2eclipse, we provide an additional eclipse plugin that you can install:
* Select `Install new software` from the `help` menu * Select `Install new software` from the `help` menu
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="12"> <profiles version="12">
<profile kind="CodeFormatterProfile" name="Spring Zero" version="12"> <profile kind="CodeFormatterProfile" name="Spring Boot" version="12">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/> <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment