From 0b67c1c9c93d6db3dabf52fc4e7d43f8edabb31f Mon Sep 17 00:00:00 2001
From: Artur <artur@vaadin.com>
Date: Wed, 25 Jan 2017 15:52:11 +0200
Subject: Update @HtmlImport javadoc to match implementation (#8331)

---
 .../src/main/java/com/vaadin/annotations/HtmlImport.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'server')

diff --git a/server/src/main/java/com/vaadin/annotations/HtmlImport.java b/server/src/main/java/com/vaadin/annotations/HtmlImport.java
index f0c52ff171..f815134dbb 100644
--- a/server/src/main/java/com/vaadin/annotations/HtmlImport.java
+++ b/server/src/main/java/com/vaadin/annotations/HtmlImport.java
@@ -34,16 +34,17 @@ import com.vaadin.server.ClientConnector;
  * There is no automatic loading of any polyfill.
  * <p>
  * <ul>
- * <li>Relative URLs are interpreted as relative to the {@code VAADIN} folder,
- * i.e. {@literal bower_components/paper-slider/paper-slider.html} is equal to
- * {@literal vaadin://bower_components/paper-slider/paper-slider.html}.
+ * <li>Relative URLs are mapped to APP/PUBLISHED/[url] which are by default
+ * served from the classpath relative to the class where the annotation is
+ * defined.
  * <li>Absolute URLs including protocol and host are used as is on the
  * client-side.
  * </ul>
- * Note that it is a good idea to use relative URLs and place all HTML imports
- * in the same folder. Polymer elements rely on importing dependencies using
- * relative paths {@literal ../../other-element/other-element.html}, which will
- * not work if they are installed in different locations.
+ * Note that it is a good idea to use URLs starting with {@literal vaadin://}
+ * and place all HTML imports inside {@literal VAADIN/bower_components}. Polymer
+ * elements rely on importing dependencies using relative paths
+ * {@literal ../../other-element/other-element.html}, which will not work if
+ * they are installed in different locations.
  * <p>
  * HTML imports are added to the page after any {@code @JavaScript} dependencies
  * added at the same time.
-- 
cgit v1.2.3