Fix application documentation for 8 (#8045)

* Fix application documentation for 8

Updated where only small changes, mention not updated when more changes.

diff --git a/documentation/application/application-architecture.asciidoc b/documentation/application/application-architecture.asciidoc
index 15f0dcbafbf8635c555b53cf93fd114f9e92b0e1..8a019f7b416c9d196c5673434b3d55764cf48268 100644 (file)
--- a/documentation/application/application-architecture.asciidoc
+++ b/documentation/application/application-architecture.asciidoc
@@ -7,6 +7,8 @@ layout: page
 [[application.architecture]]
 = Building the UI
 
+*_This section has not yet been updated to Vaadin Framework 8_*
+
 Vaadin user interfaces are built hierarchically from components, so that the
 leaf components are contained within layout components and other component
 containers. Building the hierarchy starts from the top (or bottom - whichever

diff --git a/documentation/application/application-declarative.asciidoc b/documentation/application/application-declarative.asciidoc
index b741cf1cabad29207ff92115facaed7edf8a252d..dd6523ca8644c519f376f8543a4aab4366221481 100644 (file)
--- a/documentation/application/application-declarative.asciidoc
+++ b/documentation/application/application-declarative.asciidoc
@@ -191,8 +191,8 @@ documentation of Vaadin.
 Component properties are directly mapped to the attributes of the HTML elements
 according to the names of the properties. Attributes are written in lower-case
 letters and dash is used for word separation instead of upper-case letters in
-the Java methods, so that [literal]#++input-prompt++# attribute is equivalent to
-[methodname]#setInputPrompt()#.
+the Java methods, so that [literal]#++placeholder++# attribute is equivalent to
+[methodname]#setPlaceholder()#.
 
 For example, the __caption__ property, which you can set with
 [methodname]#setCaption()#, is represented as [literal]#++caption++# attribute.
@@ -203,7 +203,7 @@ classes.
 
 [source, html]
 ----
-<vaadin-text-field caption="Name" input-prompt="Enter Name"/>
+<vaadin-text-field caption="Name" placeholder="Enter Name"/>
 ----
 
 

diff --git a/documentation/application/application-lifecycle.asciidoc b/documentation/application/application-lifecycle.asciidoc
index 8ce552c663a1b9a82d967cf5bcbf671e20a17b64..7bace1cdfcd6f5c2e85c32da982e50b2c0251385 100644 (file)
--- a/documentation/application/application-lifecycle.asciidoc
+++ b/documentation/application/application-lifecycle.asciidoc
@@ -19,8 +19,8 @@ Before a Vaadin application can be used, it has to be deployed to a Java web
 server, as described in
 <<dummy/../../../framework/application/application-environment#application.environment,"Deploying
 an Application">>. Deploying reads the servlet classes annotated with the
-[literal]#++@WebServlet++# annotation (Servlet 3.0) or the [filename]#web.xml#
-deployment descriptor (Servlet 2.4) in the application to register servlets for
+[literal]#++@WebServlet++# annotation or the [filename]#web.xml#
+deployment descriptor in the application to register servlets for
 specific URL paths and loads the classes. Deployment does not yet normally run
 any code in the application, although static blocks in classes are executed when
 they are loaded.
@@ -103,20 +103,6 @@ public class MyServlet extends VaadinServlet {
 To add custom functionality around request handling, you can override the
 [methodname]#service()# method.
 
-To use the custom servlet class in a Servlet 2.4 project, you need to define it
-in the [filename]#web.xml# deployment descriptor instead of the regular
-[classname]#VaadinServlet# class, as described in
-<<dummy/../../../framework/application/application-environment#application.environment.web-xml,"Using
-a web.xml Deployment Descriptor">>.
-
-
-ifdef::web[]
-[[application.lifecycle.servlet-service.portletcustomization]]
-=== Customizing Vaadin Portlet
-
-__To Be Done__
-
-endif::web[]
 
 ifdef::web[]
 [[application.lifecycle.servlet-service.servicecustomization]]
@@ -195,13 +181,6 @@ public class MyServlet extends VaadinServlet
 }
 ----
 
-If using Servlet 2.4, you need to configure the custom servlet class in the
-[parameter]#servlet-class# parameter in the [filename]#web.xml# descriptor
-instead of the [classname]#VaadinServlet#, as described in
-<<dummy/../../../framework/application/application-environment#application.environment.web-xml,"Using
-a web.xml Deployment Descriptor">>.
-
-
 
 [[application.lifecycle.ui]]
 == Loading a UI