Fixed references to XHTML and issue found in review #8294

7 files changed, 15 insertions, 16 deletions

diff --git a/server/src/com/vaadin/server/AbstractErrorMessage.java b/server/src/com/vaadin/server/AbstractErrorMessage.java
index 98cdcd4f8c..38fd9830b6 100644
--- a/server/src/com/vaadin/server/AbstractErrorMessage.java
+++ b/server/src/com/vaadin/server/AbstractErrorMessage.java
@@ -45,7 +45,7 @@ public abstract class AbstractErrorMessage implements ErrorMessage {
         PREFORMATTED,
 
         /**
-         * Content mode, where the error contains XHTML.
+         * Content mode, where the error contains HTML.
          * 
          */
         HTML,
diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index 8b4da44f9b..11a6484f9b 100644
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -211,7 +211,6 @@ public abstract class BootstrapHandler implements RequestHandler {
                 document.baseUri());
 
         document.child(0).before(doctype);
-        document.body().parent().attr("xmlns", "http://www.w3.org/1999/xhtml");
 
         Element head = document.head();
         head.appendElement("meta").attr("http-equiv", "Content-Type")
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index f92024d3b3..04cf914603 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -474,9 +474,9 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * information on what the description is. This method will trigger a
      * {@link RepaintRequestEvent}.
      * 
-     * The description is displayed as HTML/XHTML in tooltips or directly in
-     * certain components so care should be taken to avoid creating the
-     * possibility for HTML injection and possibly XSS vulnerabilities.
+     * The description is displayed as HTML in tooltips or directly in certain
+     * components so care should be taken to avoid creating the possibility for
+     * HTML injection and possibly XSS vulnerabilities.
      * 
      * @param description
      *            the new description string for the component.
diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java
index 492e0c25c6..320a9dc97c 100644
--- a/server/src/com/vaadin/ui/Component.java
+++ b/server/src/com/vaadin/ui/Component.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -405,8 +405,8 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * </pre>
      * 
      * <p>
-     * The contents of a caption are automatically quoted, so no raw XHTML can
-     * be rendered in a caption. The validity of the used character encoding,
+     * The contents of a caption are automatically quoted, so no raw HTML can be
+     * rendered in a caption. The validity of the used character encoding,
      * usually UTF-8, is not checked.
      * </p>
      * 
diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java
index 828a1b91ad..a01ff78044 100644
--- a/server/src/com/vaadin/ui/CustomLayout.java
+++ b/server/src/com/vaadin/ui/CustomLayout.java
@@ -44,7 +44,7 @@ import com.vaadin.shared.ui.customlayout.CustomLayoutState;
  * locations in a way that is suitable for them. One typical example would be to
  * create visual design for a web site as a custom layout: the visual design
  * would define locations for "menu", "body", and "title", for example. The
- * layout would then be implemented as an XHTML template for each theme.
+ * layout would then be implemented as an HTML template for each theme.
  * </p>
  * 
  * <p>
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index b58de68af2..8b5cd87648 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -68,7 +68,7 @@ public class Label extends AbstractComponent implements Property<String>,
     public static final ContentMode CONTENT_PREFORMATTED = ContentMode.PREFORMATTED;
 
     /**
-     * @deprecated From 7.0, use {@link ContentMode#XHTML} instead
+     * @deprecated From 7.0, use {@link ContentMode#HTML} instead
      */
     @Deprecated
     public static final ContentMode CONTENT_XHTML = ContentMode.HTML;
@@ -432,9 +432,9 @@ public class Label extends AbstractComponent implements Property<String>,
      * 
      * <p>
      * In RAW, PREFORMATTED and TEXT modes, the label contents are compared as
-     * is. In XML, UIDL and XHTML modes, only CDATA is compared and tags
-     * ignored. If the other object is not a Label, its toString() return value
-     * is used in comparison.
+     * is. In XML, UIDL and HTML modes, only CDATA is compared and tags ignored.
+     * If the other object is not a Label, its toString() return value is used
+     * in comparison.
      * </p>
      * 
      * @param other
diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java
index c70c72f341..70598f5c14 100644
--- a/server/src/com/vaadin/ui/Panel.java
+++ b/server/src/com/vaadin/ui/Panel.java
@@ -90,7 +90,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * Creates a new empty panel with caption. Default layout is used.
      * 
      * @param caption
-     *            the caption used in the panel (HTML/XHTML).
+     *            the caption used in the panel (HTML).
      */
     public Panel(String caption) {
         this(caption, null);
@@ -100,7 +100,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * Creates a new empty panel with the given caption and content.
      * 
      * @param caption
-     *            the caption of the panel (HTML/XHTML).
+     *            the caption of the panel (HTML).
      * @param content
      *            the content used in the panel.
      */
@@ -112,7 +112,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /**
      * Sets the caption of the panel.
      * 
-     * Note that the caption is interpreted as HTML/XHTML and therefore care
+     * Note that the caption is interpreted as HTML and therefore care
      * should be taken not to enable HTML injection and XSS attacks using panel
      * captions. This behavior may change in future versions.
      *