2 files changed, 15 insertions, 19 deletions

diff --git a/documentation/layout/chapter-layout.asciidoc b/documentation/layout/chapter-layout.asciidoc
index 176a29a4fa..4c49bba944 100644
--- a/documentation/layout/chapter-layout.asciidoc
+++ b/documentation/layout/chapter-layout.asciidoc
@@ -1,6 +1,11 @@
 [[layout]]
 == Managing Layout
 
+////
+TODO The intro text below is now completely hidden, as this text is
+not visible in web edition and all the text is web-conditional.
+////
+
 ifdef::web[]
 Ever since the ancient xeroxians invented graphical user interfaces, programmers
 have wanted to make GUI programming ever easier for themselves. Solutions
@@ -43,16 +48,17 @@ presentations, such as books and most web pages. Real applications, however,
 need to have more control. They need to be able to change the state of user
 interface components and even their layout on the run. This creates a need to
 separate the presentation from content on exactly the right
-level.////
+level.
+
+////
 Vaadin provides a solution for this, using themes and CSS, but let us first look
-at what Java did for UI
-programming.
+at what Java did for UI programming.
 ////
+
 ////
 Changing the layout steps right on the feet of the graphics designers, so we
 have a conflict. We will discuss this conflict later, but let us first look at
-what Java did for UI
-programming.
+what Java did for UI programming.
 ////
 endif::web[]
 
diff --git a/documentation/layout/layout-csslayout.asciidoc b/documentation/layout/layout-csslayout.asciidoc
index 5600978e06..10c4740705 100644
--- a/documentation/layout/layout-csslayout.asciidoc
+++ b/documentation/layout/layout-csslayout.asciidoc
@@ -29,7 +29,7 @@ component:
 [source, java]
 ----
 CssLayout layout = new CssLayout();
-        
+
 // Component with a layout-managed caption and icon
 TextField tf = new TextField("A TextField");
 tf.setIcon(new ThemeResource("icons/user.png"));
@@ -39,7 +39,7 @@ layout.addComponent(tf);
 Label label = new Label("A Label");
 label.setWidth(Sizeable.SIZE_UNDEFINED, 0);
 layout.addComponent(label);
-        
+
 layout.addComponent(new Button("A Button"));
 ----
 
@@ -120,19 +120,14 @@ logic behind the other layout components is there to give nice default behaviour
 and to handle the differences in different browsers. Some browsers, no need to
 say which, are notoriously incompatible with the CSS standards, so they require
 a lot of custom CSS. You may need to make use of the browser-specific style
-classes in the root element of the
-application.////
-TODO: described in <xref
-linkend="advanced.browserinfo"/>
-////
+classes in the root element of the application.
+// TODO: ... described in <<advanced.browserinfo>>
 Some features in the other layouts are not even solvable in pure CSS, at least
 in all browsers.
 
-
 [[layout.csslayout.css]]
 == Styling with CSS
 
-
 [source, css]
 ----
 .v-csslayout {}
@@ -148,7 +143,6 @@ enabled. The components are contained in an element with
 For example, we could style the basic [classname]#CssLayout# example shown
 earlier as follows:
 
-
 [source, css]
 ----
 /* Have the caption right of the text box, bottom-aligned */
@@ -178,7 +172,3 @@ at the same level as the actual component elements. This may cause problems with
 wrapping in [literal]#++inline-block++# mode, as wrapping can occur between the
 caption and its corresponding component element just as well as between
 components. Such use case is therefore not feasible.
-
-
-
-