root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-04-18 09:50:09 +02:00
parent c7645604a6 4ef7ea324f
commit e72306b33e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -291,9 +291,9 @@ and `non-option` arguments, as shown in the following example:
[source,java,indent=0]
----
import org.springframework.boot.*
import org.springframework.beans.factory.annotation.*
import org.springframework.stereotype.*
import org.springframework.boot.*;
import org.springframework.beans.factory.annotation.*;
import org.springframework.stereotype.*;
@Component
public class MyBean {
@ -327,8 +327,8 @@ discussed earlier. The following example shows a `CommandLineRunner` with a `run
[source,java,indent=0]
----
import org.springframework.boot.*
import org.springframework.stereotype.*
import org.springframework.boot.*;
import org.springframework.stereotype.*;
@Component
public class MyBean implements CommandLineRunner {
@ -433,8 +433,8 @@ property, as shown in the following example:
[source,java,indent=0]
----
import org.springframework.stereotype.*
import org.springframework.beans.factory.annotation.*
import org.springframework.stereotype.*;
import org.springframework.beans.factory.annotation.*;
@Component
public class MyBean {
@ -4595,7 +4595,7 @@ relevant annotation to its method, as shown in the following example:
[source,java,indent=0]
----
import org.springframework.cache.annotation.Cacheable
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Component;
@Component

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View File

@ -385,7 +385,7 @@ The `Application.java` file would declare the `main` method, along with the basi
package com.example.myapplication;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class Application {