Closes gh-6046
This commit is contained in:
Johnny Lim
2016-05-26 21:04:32 +09:00
committed by Stephane Nicoll
parent 6f5bd2e13a
commit 70adefc87b
14 changed files with 15 additions and 17 deletions

View File

@@ -31,7 +31,7 @@ content into your application; rather pick only the properties that you need.
# BANNER
banner.charset=UTF-8 # Banner file encoding.
banner.location=classpath:banner.txt # Banner file location.
banner.image.location=classpath:banner.gif # (Banner image file location, jpg/png can also be used).
banner.image.location=classpath:banner.gif # Banner image file location (jpg/png can also be used).
banner.image.width= # Width of the banner image in chars (default 76)
banner.image.height= # Height of the banner image in chars (default based on image height)
banner.image.margin= # Left hand image margin in chars (default 2)

View File

@@ -97,7 +97,7 @@ a traditional web container should be placed in `WEB-INF/lib-provided`.
The core class used to support loading nested jars is
`org.springframework.boot.loader.jar.JarFile`. It allows you to load jar
content from a standard jar file, or from nested child jar data. When first loaded, the
location of each `JarEntry` is mapped to a physical file offset of the outer jar:
location of each `JarEntry` is mapped to a physical file offset of the outer jar:
[indent=0]
----

View File

@@ -228,7 +228,7 @@ For example, the following declaration:
@DependencyManagementBom("com.example.custom-bom:1.0.0")
----
Will pick up `custom-bom-1.0.0.pom` in a Maven repository under
Will pick up `custom-bom-1.0.0.pom` in a Maven repository under
`com/example/custom-versions/1.0.0/`.
When multiple BOMs are specified they are applied in the order that they're declared.

View File

@@ -52,7 +52,7 @@ such as the user that launched the application.
The banner that is printed on start up can be changed by adding a `banner.txt` file
to your classpath, or by setting `banner.location` to the location of such a file.
If the file has an unusual encoding you can set `banner.charset` (default is `UTF-8`).
In addition a text file, you can also add a `banner.gif`, `banner.jpg` or `banner.png`
In addition to a text file, you can also add a `banner.gif`, `banner.jpg` or `banner.png`
image file to your classpath, or set a `banner.image.location` property. Images will be
converted into an ASCII art representation and printed above any text banner.
@@ -1741,7 +1741,7 @@ this:
+- <other public assets>
----
To map all `5xx` errors using a freemarker template, you'd have a structure like this:
To map all `5xx` errors using a FreeMarker template, you'd have a structure like this:
[source,indent=0,subs="verbatim,quotes,attributes"]
----
@@ -1750,7 +1750,7 @@ To map all `5xx` errors using a freemarker template, you'd have a structure like
+- java/
| + <source code>
+- resources/
+- template/
+- templates/
+- error/
| +- 5xx.ftl
+- <other templates>
@@ -1786,7 +1786,7 @@ will then pick up any unhandled exceptions.
For applications that aren't using Spring MVC, you can use the `ErrorPageRegistrar`
interface to directly register `ErrorPages`. This abstraction works directly with the
underlying embedded servlet container and will work even if you don't have a Spring MVC
`DispatcherServlet`
`DispatcherServlet`.
[source,java,indent=0,subs="verbatim,quotes,attributes"]