10 files changed, 6 insertions, 45 deletions
diff --git a/documentation/advanced/advanced-navigator.asciidoc b/documentation/advanced/advanced-navigator.asciidoc
index 4d74c683e5..7ef5b1ac36 100644
--- a/documentation/advanced/advanced-navigator.asciidoc
+++ b/documentation/advanced/advanced-navigator.asciidoc
@@ -60,7 +60,6 @@ public class NavigatorUI extends UI {
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.navigator.basic[on-line example, window="_blank"].
 
 The [classname]#Navigator# automatically sets the URI fragment of the
 application URL. It also registers a [interfacename]#URIFragmentChangedListener#
@@ -137,7 +136,6 @@ public class StartView extends VerticalLayout implements View {
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.navigator.basic[on-line example, window="_blank"].
 
 You can initialize the view content in the constructor, as was done in the
 example above, or in the [methodname]#enter()# method. The advantage with the
@@ -262,7 +260,6 @@ public class MainView extends VerticalLayout implements View {
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.navigator.basic[on-line example, window="_blank"].
 
 The animal sub-view would have the following declarative design:
 
@@ -275,7 +272,6 @@ The animal sub-view would have the following declarative design:
   <vaadin-label _id="back" size-auto :middle :center/>
 </vaadin-vertical-layout>
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.navigator.basic[on-line example, window="_blank"].
 
 The main view is shown in <<figure.advanced.navigator.mainview>>. At this point,
 the URL would be [literal]#++http://localhost:8080/myapp#!main/reindeer++#.
diff --git a/documentation/advanced/advanced-printing.asciidoc b/documentation/advanced/advanced-printing.asciidoc
index 9ed39eced1..0443f43cbe 100644
--- a/documentation/advanced/advanced-printing.asciidoc
+++ b/documentation/advanced/advanced-printing.asciidoc
@@ -49,7 +49,6 @@ print.addClickListener(new Button.ClickListener() {
     }
 });
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.printing.this[on-line example, window="_blank"].
 
 The button in the above example would print the current page, including the
 button itself. You can hide such elements in CSS, as well as otherwise style the
@@ -92,7 +91,6 @@ opener.setFeatures("height=200,width=400,resizable");
 Button print = new Button("Click to Print");
 opener.extend(print);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.printing.open[on-line example, window="_blank"].
 
 How the browser opens the window, as an actual (popup) window or just a tab,
 depends on the browser. After printing, we automatically close the window with
@@ -173,7 +171,6 @@ layout.addComponent(name);
 layout.addComponent(ok);
 layout.addComponent(print);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.printing.pdfgeneration[on-line example, window="_blank"].
 
 
 (((range="endofrange", startref="term.advanced.printing")))
diff --git a/documentation/advanced/advanced-push.asciidoc b/documentation/advanced/advanced-push.asciidoc
index 365e674a50..4238c21139 100644
--- a/documentation/advanced/advanced-push.asciidoc
+++ b/documentation/advanced/advanced-push.asciidoc
@@ -270,7 +270,6 @@ public class PushyUI extends UI {
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.push.simple[on-line example, window="_blank"].
 
 When sharing data between UIs or user sessions, you need to consider the
 message-passing mechanism more carefully, as explained next.
@@ -331,7 +330,6 @@ public class Broadcaster implements Serializable {
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.push.pusharound[on-line example, window="_blank"].
 
 In Java 8, you could use lambda expressions for the listeners instead of the
 interface, and a parameterless expression to create the runnable:
@@ -343,7 +341,6 @@ for (final Consumer<String> listener: listeners)
     executorService.execute(() ->
             listener.accept(message));
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.push.pusharound[on-line example, window="_blank"].
 
 
 [[advanced.push.pusharound.receiving]]
@@ -392,7 +389,6 @@ public class PushAroundUI extends UI
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.push.pusharound[on-line example, window="_blank"].
 
 
 [[advanced.push.pusharound.sending]]
@@ -419,7 +415,6 @@ send.addClickListener(new ClickListener() {
     }
 });
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.push.pusharound[on-line example, window="_blank"].
 
 
 
diff --git a/documentation/advanced/advanced-shortcuts.asciidoc b/documentation/advanced/advanced-shortcuts.asciidoc
index fa3c92fdae..c1fffe4617 100644
--- a/documentation/advanced/advanced-shortcuts.asciidoc
+++ b/documentation/advanced/advanced-shortcuts.asciidoc
@@ -68,7 +68,6 @@ name.addShortcutListener(
                                         ModifierKey.ALT));
 layout.addComponent(name);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.shortcut.focus[on-line example, window="_blank"].
 
 You can also specify the shortcut by a shorthand notation, where the shortcut
 key is indicated with an ampersand ( [literal]#++&++#).
@@ -81,7 +80,6 @@ TextField address = new TextField("Address (Alt+A)");
 address.addShortcutListener(
         new AbstractField.FocusShortcut(address, "&Address"));
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.shortcut.focus[on-line example, window="_blank"].
 
 This is especially useful for internationalization, so that you can determine
 the shortcut key from the localized string.
diff --git a/documentation/advanced/advanced-urifu.asciidoc b/documentation/advanced/advanced-urifu.asciidoc
index 709d6c4bd3..e245c8e727 100644
--- a/documentation/advanced/advanced-urifu.asciidoc
+++ b/documentation/advanced/advanced-urifu.asciidoc
@@ -68,7 +68,6 @@ method from the current [classname]#Page# object. The fragment is known when the
 String fragment = getPage().getUriFragment();
 enter(fragment);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.urifragment.basic[on-line example, window="_blank"].
 
 To enable reusing the same code when the URI fragment is changed, as described
 next, it is usually best to build the relevant part of the UI in a separate
@@ -110,7 +109,6 @@ public class MyUI extends UI {
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.urifragment.basic[on-line example, window="_blank"].
 
 <<figure.advanced.urifu>> shows an application that allows specifying the menu
 selection with a URI fragment and correspondingly sets the fragment when the
@@ -173,7 +171,6 @@ public class MyCustomServlet extends VaadinServlet
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#advanced.urifragment.basic[on-line example, window="_blank"].
 
 The crawlable content does not need to be human readable. It can provide an
 index of links to other application states, as we did in the example above. The
diff --git a/documentation/advanced/advanced-windows.asciidoc b/documentation/advanced/advanced-windows.asciidoc
index d838ee81d0..0e8b5351a6 100644
--- a/documentation/advanced/advanced-windows.asciidoc
+++ b/documentation/advanced/advanced-windows.asciidoc
@@ -68,7 +68,7 @@ For example:
 
 [source, java]
 ----
-@Theme("book-examples")
+@Theme("mytheme")
 public static class MyPopupUI extends UI {
     @Override
     protected void init(VaadinRequest request) {
@@ -147,10 +147,9 @@ browsing can open the window in another tab, depending on the browser settings.
 === URL and Session
 
 The URL path for a popup window UI is by default determined from the UI class
-name, by prefixig it with " [literal]#++popup/++#". For example, for the example
-UI giver earlier, the URL would be
-[literal]#++/book-examples/book/popup/MyPopupUI++#.
-
+name, by prefixing it with "[literal]#++popup/++#". For example, for the
+UI given earlier, the URL would be
+[literal]#++/example/base/popup/MyPopupUI++#.
 
 
 [[advanced.windows.popup-closing]]
diff --git a/documentation/clientside/clientside-compiling.asciidoc b/documentation/clientside/clientside-compiling.asciidoc
index ac1c41bf5d..6a6f87f0e3 100644
--- a/documentation/clientside/clientside-compiling.asciidoc
+++ b/documentation/clientside/clientside-compiling.asciidoc
@@ -172,7 +172,6 @@ The class path includes source folder in case there are custom widgets, compiled
 </target>
 ----
 
-You can find the complete example build script for compiling widget sets with Ant and Ivy in the https://github.com/vaadin/book-examples/blob/master/build/build.xml[build.xml for the Book Examples].
-You can copy the build script to your project and, once configured, run it with Ant.
+You can copy the example build script to your project and, once configured, run it with Ant.
 You may need to do some configuration in the build targets, such as to exclude or include source or target paths.
 endif::web[]
diff --git a/documentation/themes/themes-compiling.asciidoc b/documentation/themes/themes-compiling.asciidoc
index 442144ea0d..97f2d9b317 100644
--- a/documentation/themes/themes-compiling.asciidoc
+++ b/documentation/themes/themes-compiling.asciidoc
@@ -159,7 +159,7 @@ Start with the following configuration:
     ... other project build definitions ...
 
     <!-- Name of the theme -->
-    <property name="theme" value="book-examples"/>
+    <property name="theme" value="mytheme"/>
 
     <!-- Compilation result directory -->
     <property name="result" value="build/result"/>
diff --git a/documentation/themes/themes-fonticon.asciidoc b/documentation/themes/themes-fonticon.asciidoc
index 9dd5824be5..c1d1ce2341 100644
--- a/documentation/themes/themes-fonticon.asciidoc
+++ b/documentation/themes/themes-fonticon.asciidoc
@@ -56,7 +56,6 @@ layout.addComponent(name);
 Button ok = new Button("OK", FontAwesome.CHECK);
 layout.addComponent(ok);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.fonticon.basic[on-line example, window="_blank"].
 
 The result is illustrated in <<figure.themes.fonticon.using>>, with the color
 styling described next.
@@ -97,7 +96,6 @@ Label label = new Label("I " +
 label.addStyleName("redicon");
 layout.addComponent(label);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.fonticon.html[on-line example, window="_blank"].
 
 The HTML code has the [stylename]#v-icon# style, which you can modify in CSS:
 
@@ -107,7 +105,6 @@ The HTML code has the [stylename]#v-icon# style, which you can modify in CSS:
     color: red;
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.fonticon.html[on-line example, window="_blank"].
 
 The result is illustrated in <<figure.themes.fonticon-html.label>>, with the color
 styling described next.
@@ -133,8 +130,6 @@ public String getHtml() {
            Integer.toHexString(codepoint) + ";</span>";
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.fonticon.html[on-line example, window="_blank"].
-
 
 [[themes.fonticon.anywhere]]
 == Using Font Icons in Other Text
@@ -153,7 +148,6 @@ TextField amount = new TextField("Amount (in " +
 amount.addStyleName("awesomecaption");
 layout.addComponent(amount);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.fonticon.intext[on-line example, window="_blank"].
 
 You need to set the font family in CSS.
 
@@ -163,7 +157,6 @@ You need to set the font family in CSS.
     font-family: FontAwesome;
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.fonticon.intext[on-line example, window="_blank"].
 
 
 [[themes.fonticon.custom]]
@@ -242,7 +235,6 @@ public enum MyFontIcon implements FontIcon {
     }
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.fonticon.custom[on-line example, window="_blank"].
 
 Then you can use it as usual:
 
@@ -252,7 +244,6 @@ TextField name = new TextField("Amount");
 name.setIcon(MyFontIcon.EURO);
 layout.addComponent(name);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.fonticon.custom[on-line example, window="_blank"].
 
 You could make the implementation a class as well, instead of an enumeration, to
 allow other ways to specify the icons.
diff --git a/documentation/themes/themes-responsive.asciidoc b/documentation/themes/themes-responsive.asciidoc
index b4377f9b66..f19316cb9c 100644
--- a/documentation/themes/themes-responsive.asciidoc
+++ b/documentation/themes/themes-responsive.asciidoc
@@ -36,7 +36,6 @@ content.addComponent(c);
 // Enable Responsive CSS selectors for the component
 Responsive.makeResponsive(c);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.responsive.basic[on-line example, window="_blank"].
 
 You can now use [literal]#++width-range++# and [literal]#++height-range++#
 conditions in CSS selectors as follows:
@@ -67,7 +66,6 @@ conditions in CSS selectors as follows:
     font-size: 36pt;
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.responsive.basic[on-line example, window="_blank"].
 
 You can have overlapping size ranges, in which case all the selectors matching
 the current size are enabled.
@@ -126,7 +124,6 @@ Image image = new Image(null,
 image.addStyleName("itembox");
 layout.addComponent(image);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.responsive.flexwrap[on-line example, window="_blank"].
 
 The SCSS could be as follows:
 
@@ -160,7 +157,6 @@ The SCSS could be as follows:
     .itembox {width: 50%}
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.responsive.flexwrap[on-line example, window="_blank"].
 
 The layout in the wide mode is shown in <<figure.theme.responsive.flexwrap>>.
 
@@ -214,7 +210,6 @@ Label notenoughspace = new Label("Quite small space");
 notenoughspace.addStyleName("notenoughspace");
 layout.addComponent(notenoughspace);
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.responsive.display[on-line example, window="_blank"].
 
 The SCSS could be as follows:
 
@@ -252,7 +247,6 @@ The SCSS could be as follows:
     .notenoughspace {display: none}
 }
 ----
-See the http://demo.vaadin.com/book-examples-vaadin7/book#themes.responsive.display[on-line example, window="_blank"].
 
 endif::web[]
 
@@ -265,11 +259,6 @@ link:http://demo.vaadin.com/responsive/[demo.vaadin.com/responsive]. It
 demonstrates the flexible wrapping technique described in
 <<themes.responsive.wrap>>.
 
-The
-link:http://demo.vaadin.com/book-examples-vaadin7/book/#themes.responsive.basic[Book
-Examples] demo provides the examples given in this chapter, as well as some
-others.
-
 ((("Parking
 demo")))
 ((("TouchKit", "Parking