summaryrefslogtreecommitdiffstats
path: root/documentation/application
diff options
context:
space:
mode:
authorMarko Gronroos <magi@vaadin.com>2016-07-25 00:00:36 +0300
committerArtur Signell <artur@vaadin.com>2016-08-05 10:19:47 +0300
commit4a4d05b0354829df86c4f106868d421dca349b34 (patch)
treedb70be8fce2298dbf427775f07b1146e82c66e33 /documentation/application
parent3ea6a0087b140a13ed0685afa2ffe08a45b82719 (diff)
downloadvaadin-framework-4a4d05b0354829df86c4f106868d421dca349b34.tar.gz
vaadin-framework-4a4d05b0354829df86c4f106868d421dca349b34.zip
Rescaled images in layout chapter. Various small formatting fixes. Updated history and other matters in introduction.
Change-Id: I0d5e76f7fb07f967dd04941a23e79dfb30049731
Diffstat (limited to 'documentation/application')
-rw-r--r--documentation/application/application-environment.asciidoc4
-rw-r--r--documentation/application/application-resources.asciidoc2
2 files changed, 3 insertions, 3 deletions
diff --git a/documentation/application/application-environment.asciidoc b/documentation/application/application-environment.asciidoc
index 3df4bcb48e..9f73508683 100644
--- a/documentation/application/application-environment.asciidoc
+++ b/documentation/application/application-environment.asciidoc
@@ -190,11 +190,11 @@ class MyUI extends UI {
You can also define it in the [filename]#web.xml# descriptor for the servlet:
-[source, xml, subs="normal"]
+[subs="normal"]
----
<init-param>
<param-name>widgetset</param-name>
- <param-value>com.example.myproject.MyWidgetSet</param-value>
+ <param-value>[replaceable]##com.example.myproject.MyWidgetSet##</param-value>
</init-param>
----
diff --git a/documentation/application/application-resources.asciidoc b/documentation/application/application-resources.asciidoc
index 339d3eb340..7340030b3a 100644
--- a/documentation/application/application-resources.asciidoc
+++ b/documentation/application/application-resources.asciidoc
@@ -237,7 +237,7 @@ The resulting image is shown in <<figure.application.resource.stream>>.
[[figure.application.resource.stream]]
.A stream resource
-image::img/application_streamresource.png[width=25%, scaledwidth=35%]
+image::img/application_streamresource.png[width=25%, scaledwidth=25%]
Another way to create dynamic content is a request handler, described in
<<dummy/../../../framework/advanced/advanced-requesthandler#advanced.requesthandler,"Request