Unified deprecation messages

Change-Id: If3fc2c2d9b251cbc6f2a9da2ede23ff17f7362ef

80 files changed, 338 insertions, 324 deletions

diff --git a/server/src/com/vaadin/data/Container.java b/server/src/com/vaadin/data/Container.java
index 1a453c7cd6..b91665250d 100644
--- a/server/src/com/vaadin/data/Container.java
+++ b/server/src/com/vaadin/data/Container.java
@@ -1060,7 +1060,7 @@ public interface Container extends Serializable {
                 Container.ItemSetChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addItemSetChangeListener(ItemSetChangeListener)}
          **/
         @Deprecated
@@ -1076,7 +1076,7 @@ public interface Container extends Serializable {
                 Container.ItemSetChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeItemSetChangeListener(ItemSetChangeListener)}
          **/
         @Deprecated
@@ -1162,7 +1162,7 @@ public interface Container extends Serializable {
                 Container.PropertySetChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addPropertySetChangeListener(PropertySetChangeListener)}
          **/
         @Deprecated
@@ -1178,7 +1178,7 @@ public interface Container extends Serializable {
                 Container.PropertySetChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removePropertySetChangeListener(PropertySetChangeListener)}
          **/
         @Deprecated
diff --git a/server/src/com/vaadin/data/Item.java b/server/src/com/vaadin/data/Item.java
index bff046bd38..95b0aba59d 100644
--- a/server/src/com/vaadin/data/Item.java
+++ b/server/src/com/vaadin/data/Item.java
@@ -181,7 +181,7 @@ public interface Item extends Serializable {
                 Item.PropertySetChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addPropertySetChangeListener(PropertySetChangeListener)}
          **/
         @Deprecated
@@ -197,7 +197,7 @@ public interface Item extends Serializable {
                 Item.PropertySetChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removePropertySetChangeListener(PropertySetChangeListener)}
          **/
         @Deprecated
diff --git a/server/src/com/vaadin/data/Property.java b/server/src/com/vaadin/data/Property.java
index 146355cb48..0b2900a6c4 100644
--- a/server/src/com/vaadin/data/Property.java
+++ b/server/src/com/vaadin/data/Property.java
@@ -307,7 +307,7 @@ public interface Property<T> extends Serializable {
         public void addValueChangeListener(Property.ValueChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addValueChangeListener(ValueChangeListener)}
          **/
         @Deprecated
@@ -323,7 +323,7 @@ public interface Property<T> extends Serializable {
                 Property.ValueChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeValueChangeListener(ValueChangeListener)}
          **/
         @Deprecated
@@ -398,7 +398,7 @@ public interface Property<T> extends Serializable {
                 Property.ReadOnlyStatusChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addReadOnlyStatusChangeListener(ReadOnlyStatusChangeListener)}
          **/
         @Deprecated
@@ -414,7 +414,7 @@ public interface Property<T> extends Serializable {
                 Property.ReadOnlyStatusChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeReadOnlyStatusChangeListener(ReadOnlyStatusChangeListener)}
          **/
         @Deprecated
diff --git a/server/src/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/com/vaadin/data/util/AbstractBeanContainer.java
index 3767f816e9..dce071ccd5 100644
--- a/server/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractBeanContainer.java
@@ -742,7 +742,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addPropertySetChangeListener}
+     * @deprecated As of 7.0, replaced by {@link #addPropertySetChangeListener}
      **/
     @Deprecated
     @Override
@@ -757,7 +757,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/data/util/AbstractContainer.java b/server/src/com/vaadin/data/util/AbstractContainer.java
index ff8fc90651..e4f2b57f83 100644
--- a/server/src/com/vaadin/data/util/AbstractContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractContainer.java
@@ -109,7 +109,7 @@ public abstract class AbstractContainer implements Container {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
@@ -133,7 +133,7 @@ public abstract class AbstractContainer implements Container {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
@@ -159,7 +159,7 @@ public abstract class AbstractContainer implements Container {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
@@ -182,7 +182,7 @@ public abstract class AbstractContainer implements Container {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
index be8abe0c75..ffb3ddffe7 100644
--- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
@@ -360,7 +360,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     // ItemSetChangeNotifier
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
@@ -382,7 +382,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/data/util/AbstractProperty.java b/server/src/com/vaadin/data/util/AbstractProperty.java
index aefe00ad32..674690c75e 100644
--- a/server/src/com/vaadin/data/util/AbstractProperty.java
+++ b/server/src/com/vaadin/data/util/AbstractProperty.java
@@ -74,7 +74,8 @@ public abstract class AbstractProperty<T> implements Property<T>,
      * format.
      * 
      * @return String representation of the value stored in the Property
-     * @deprecated use {@link #getValue()} instead and possibly toString on that
+     * @deprecated As of 7.0, use {@link #getValue()} instead and possibly
+     *             toString on that
      */
     @Deprecated
     @Override
@@ -139,7 +140,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
      **/
     @Override
@@ -163,7 +164,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
      **/
     @Override
@@ -226,7 +227,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
     @Override
@@ -244,7 +245,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/data/util/BeanItemContainer.java b/server/src/com/vaadin/data/util/BeanItemContainer.java
index 3f3bf1de9d..0177bf149d 100644
--- a/server/src/com/vaadin/data/util/BeanItemContainer.java
+++ b/server/src/com/vaadin/data/util/BeanItemContainer.java
@@ -110,7 +110,8 @@ public class BeanItemContainer<BEANTYPE> extends
      * @throws IllegalArgumentException
      *             If the collection is null or empty.
      * 
-     * @deprecated use {@link #BeanItemContainer(Class, Collection)} instead
+     * @deprecated As of 6.5, use {@link #BeanItemContainer(Class, Collection)}
+     *             instead
      */
     @SuppressWarnings("unchecked")
     @Deprecated
diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index ade8c22745..a0d10f3e02 100644
--- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -719,7 +719,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Override
@@ -743,7 +743,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Override
@@ -768,7 +768,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Override
@@ -793,7 +793,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
index a44da84ae8..e248638fd6 100644
--- a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
@@ -519,7 +519,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Override
@@ -543,7 +543,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Override
@@ -568,7 +568,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Override
@@ -593,7 +593,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java
index 6326d494b2..81ee4ae2a0 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/com/vaadin/data/util/IndexedContainer.java
@@ -490,7 +490,7 @@ public class IndexedContainer extends
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
@@ -506,7 +506,7 @@ public class IndexedContainer extends
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
@@ -530,7 +530,7 @@ public class IndexedContainer extends
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
     @Override
@@ -553,7 +553,7 @@ public class IndexedContainer extends
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
     @Override
@@ -956,8 +956,8 @@ public class IndexedContainer extends
          * 
          * @return <code>String</code> representation of the value stored in the
          *         Property
-         * @deprecated use {@link #getValue()} instead and possibly toString on
-         *             that
+         * @deprecated As of 7.0, use {@link #getValue()} instead and possibly
+         *             toString on that
          */
         @Deprecated
         @Override
@@ -1026,7 +1026,7 @@ public class IndexedContainer extends
         }
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
          **/
         @Override
@@ -1048,7 +1048,7 @@ public class IndexedContainer extends
         }
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
          **/
         @Override
@@ -1101,8 +1101,8 @@ public class IndexedContainer extends
      * @throws CloneNotSupportedException
      *             if an object cannot be cloned. .
      * 
-     * @deprecated cloning support might be removed from IndexedContainer in the
-     *             future
+     * @deprecated As of 6.6. Cloning support might be removed from
+     *             IndexedContainer in the future
      */
     @Deprecated
     @Override
diff --git a/server/src/com/vaadin/data/util/PropertyFormatter.java b/server/src/com/vaadin/data/util/PropertyFormatter.java
index 58a53cd7da..9c8d38825c 100644
--- a/server/src/com/vaadin/data/util/PropertyFormatter.java
+++ b/server/src/com/vaadin/data/util/PropertyFormatter.java
@@ -46,7 +46,7 @@ import com.vaadin.data.util.converter.Converter;
  *            type of the underlying property (a PropertyFormatter is always a
  *            Property&lt;String&gt;)
  * 
- * @deprecated Since 7.0 replaced by {@link Converter}
+ * @deprecated As of 7.0, replaced by {@link Converter}
  * @author Vaadin Ltd.
  * @since 5.3.0
  */
diff --git a/server/src/com/vaadin/data/util/PropertysetItem.java b/server/src/com/vaadin/data/util/PropertysetItem.java
index 7ca0fc6973..86b9412ac0 100644
--- a/server/src/com/vaadin/data/util/PropertysetItem.java
+++ b/server/src/com/vaadin/data/util/PropertysetItem.java
@@ -209,7 +209,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addPropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)}
      **/
     @Override
@@ -233,7 +233,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removePropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
index bd6b1a75bf..d40c518c3a 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
@@ -70,7 +70,7 @@ final public class ColumnProperty implements Property {
      * @param value
      * @param type
      * 
-     * @deprecated as of 7.0. Use
+     * @deprecated As of 7.0. Use
      *             {@link #ColumnProperty(String, boolean, boolean, boolean, boolean, Object, Class)
      *             instead
      */
@@ -257,7 +257,8 @@ final public class ColumnProperty implements Property {
      * Returns the value of the Property in human readable textual format.
      * 
      * @see java.lang.Object#toString()
-     * @deprecated get the string representation from the value
+     * @deprecated As of 7.0, use {@link #getValue()} instead and possibly
+     *             toString on that
      */
     @Deprecated
     @Override
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 69186fc310..305b7d5861 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -1520,7 +1520,7 @@ public class SQLContainer implements Container, Container.Filterable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Override
@@ -1546,7 +1546,7 @@ public class SQLContainer implements Container, Container.Filterable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Override
@@ -1601,7 +1601,7 @@ public class SQLContainer implements Container, Container.Filterable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addRowIdChangeListener(RowIdChangeListener)}
      **/
     @Deprecated
@@ -1622,7 +1622,7 @@ public class SQLContainer implements Container, Container.Filterable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeRowIdChangeListener(RowIdChangeListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
index d6457bfe7b..a9d40b7ed2 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
@@ -61,7 +61,7 @@ public class FreeformQuery implements QueryDelegate {
      * @param connectionPool
      *            the JDBCConnectionPool to use to open connections to the SQL
      *            database.
-     * @deprecated @see
+     * @deprecated As of 6.7, @see
      *             {@link FreeformQuery#FreeformQuery(String, JDBCConnectionPool, String...)}
      */
     @Deprecated
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
index 5b14ab53b9..fa9d92e35e 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
@@ -34,8 +34,8 @@ public interface FreeformQueryDelegate extends Serializable {
      * @param pagelength
      *            the number of records (rows) to fetch. 0 means all records
      *            starting from offset.
-     * @deprecated Implement {@link FreeformStatementDelegate} instead of
-     *             {@link FreeformQueryDelegate}
+     * @deprecated As of 6.7. Implement {@link FreeformStatementDelegate}
+     *             instead of {@link FreeformQueryDelegate}
      */
     @Deprecated
     public String getQueryString(int offset, int limit)
@@ -48,8 +48,8 @@ public interface FreeformQueryDelegate extends Serializable {
      * 
      * @return row count
      * @throws SQLException
-     * @deprecated Implement {@link FreeformStatementDelegate} instead of
-     *             {@link FreeformQueryDelegate}
+     * @deprecated As of 6.7. Implement {@link FreeformStatementDelegate}
+     *             instead of {@link FreeformQueryDelegate}
      */
     @Deprecated
     public String getCountQuery() throws UnsupportedOperationException;
@@ -121,8 +121,8 @@ public interface FreeformQueryDelegate extends Serializable {
      *            the values of the primary keys
      * @throws UnsupportedOperationException
      *             to use the default logic in FreeformQuery
-     * @deprecated Implement {@link FreeformStatementDelegate} instead of
-     *             {@link FreeformQueryDelegate}
+     * @deprecated As of 6.7. Implement {@link FreeformStatementDelegate}
+     *             instead of {@link FreeformQueryDelegate}
      */
     @Deprecated
     public String getContainsRowQueryString(Object... keys)
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
index 10a710e823..068251490e 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
@@ -214,7 +214,7 @@ public interface QueryDelegate extends Serializable {
                 QueryDelegate.RowIdChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addRowIdChangeListener(RowIdChangeListener)}
          **/
         @Deprecated
@@ -230,7 +230,7 @@ public interface QueryDelegate extends Serializable {
                 QueryDelegate.RowIdChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeRowIdChangeListener(RowIdChangeListener)}
          **/
         @Deprecated
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index 89dc5e41a7..f91794690d 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
@@ -712,7 +712,7 @@ public class TableQuery implements QueryDelegate,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
      **/
     @Override
@@ -732,7 +732,7 @@ public class TableQuery implements QueryDelegate,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/data/validator/CompositeValidator.java b/server/src/com/vaadin/data/validator/CompositeValidator.java
index 58a7fd2192..33de2fd7f7 100644
--- a/server/src/com/vaadin/data/validator/CompositeValidator.java
+++ b/server/src/com/vaadin/data/validator/CompositeValidator.java
@@ -52,12 +52,12 @@ public class CompositeValidator implements Validator {
     }
 
     /**
-     * @deprecated from 7.0, use {@link CombinationMode#AND} instead    
+     * @deprecated As of 7.0, use {@link CombinationMode#AND} instead    
      */
     @Deprecated
     public static final CombinationMode MODE_AND = CombinationMode.AND;
     /**
-     * @deprecated from 7.0, use {@link CombinationMode#OR} instead    
+     * @deprecated As of 7.0, use {@link CombinationMode#OR} instead    
      */
     @Deprecated
     public static final CombinationMode MODE_OR = CombinationMode.OR;
diff --git a/server/src/com/vaadin/data/validator/DoubleValidator.java b/server/src/com/vaadin/data/validator/DoubleValidator.java
index b4c92abfe7..df5a3ca292 100644
--- a/server/src/com/vaadin/data/validator/DoubleValidator.java
+++ b/server/src/com/vaadin/data/validator/DoubleValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
  * 
  * @author Vaadin Ltd.
  * @since 5.4
- * @deprecated in Vaadin 7.0. Use an Double converter on the field instead.
+ * @deprecated As of 7.0. Use an Double converter on the field instead.
  */
 @Deprecated
 @SuppressWarnings("serial")
@@ -34,7 +34,7 @@ public class DoubleValidator extends AbstractStringValidator {
      * 
      * @param errorMessage
      *            the message to display in case the value does not validate.
-     * @deprecated in Vaadin 7.0. Use a Double converter on the field instead
+     * @deprecated As of 7.0. Use a Double converter on the field instead
      *             and/or use a {@link DoubleRangeValidator} for validating that
      *             the value is inside a given range.
      */
diff --git a/server/src/com/vaadin/data/validator/IntegerValidator.java b/server/src/com/vaadin/data/validator/IntegerValidator.java
index 732e7052fd..0173ca08fa 100644
--- a/server/src/com/vaadin/data/validator/IntegerValidator.java
+++ b/server/src/com/vaadin/data/validator/IntegerValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.data.validator;
  * 
  * @author Vaadin Ltd.
  * @since 5.4
- * @deprecated in Vaadin 7.0. Use an Integer converter on the field instead.
+ * @deprecated As of 7.0. Use an Integer converter on the field instead.
  */
 @SuppressWarnings("serial")
 @Deprecated
@@ -34,7 +34,7 @@ public class IntegerValidator extends AbstractStringValidator {
      * 
      * @param errorMessage
      *            the message to display in case the value does not validate.
-     * @deprecated in Vaadin 7.0. Use an Integer converter on the field instead
+     * @deprecated As of 7.0. Use an Integer converter on the field instead
      *             and/or use an {@link IntegerRangeValidator} for validating
      *             that the value is inside a given range.
      */
diff --git a/server/src/com/vaadin/event/FieldEvents.java b/server/src/com/vaadin/event/FieldEvents.java
index 1a1bc95305..e0a8b8348b 100644
--- a/server/src/com/vaadin/event/FieldEvents.java
+++ b/server/src/com/vaadin/event/FieldEvents.java
@@ -62,7 +62,7 @@ public interface FieldEvents {
         public void addFocusListener(FocusListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addFocusListener(FocusListener)}
          **/
         @Deprecated
@@ -78,7 +78,7 @@ public interface FieldEvents {
         public void removeFocusListener(FocusListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeFocusListener(FocusListener)}
          **/
         @Deprecated
@@ -114,7 +114,7 @@ public interface FieldEvents {
         public void addBlurListener(BlurListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addBlurListener(BlurListener)}
          **/
         @Deprecated
@@ -130,7 +130,7 @@ public interface FieldEvents {
         public void removeBlurListener(BlurListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeBlurListener(BlurListener)}
          **/
         @Deprecated
@@ -289,7 +289,7 @@ public interface FieldEvents {
         public void addTextChangeListener(TextChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addTextChangeListener(TextChangeListener)}
          **/
         @Deprecated
@@ -298,7 +298,7 @@ public interface FieldEvents {
         public void removeTextChangeListener(TextChangeListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeTextChangeListener(TextChangeListener)}
          **/
         @Deprecated
diff --git a/server/src/com/vaadin/event/ItemClickEvent.java b/server/src/com/vaadin/event/ItemClickEvent.java
index 99c36cf51b..5b5879e9ef 100644
--- a/server/src/com/vaadin/event/ItemClickEvent.java
+++ b/server/src/com/vaadin/event/ItemClickEvent.java
@@ -122,7 +122,7 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
         public void addItemClickListener(ItemClickListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addItemClickListener(ItemClickListener)}
          **/
         @Deprecated
@@ -137,7 +137,7 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
         public void removeItemClickListener(ItemClickListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeItemClickListener(ItemClickListener)}
          **/
         @Deprecated
diff --git a/server/src/com/vaadin/event/LayoutEvents.java b/server/src/com/vaadin/event/LayoutEvents.java
index c113ff1595..1a1283912c 100644
--- a/server/src/com/vaadin/event/LayoutEvents.java
+++ b/server/src/com/vaadin/event/LayoutEvents.java
@@ -81,7 +81,7 @@ public interface LayoutEvents {
         public void addLayoutClickListener(LayoutClickListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #addLayoutClickListener(LayoutClickListener)}
          **/
         @Deprecated
@@ -96,7 +96,7 @@ public interface LayoutEvents {
         public void removeLayoutClickListener(LayoutClickListener listener);
 
         /**
-         * @deprecated Since 7.0, replaced by
+         * @deprecated As of 7.0, replaced by
          *             {@link #removeLayoutClickListener(LayoutClickListener)}
          **/
         @Deprecated
diff --git a/server/src/com/vaadin/event/MouseEvents.java b/server/src/com/vaadin/event/MouseEvents.java
index 37c6d665b5..dd0651047c 100644
--- a/server/src/com/vaadin/event/MouseEvents.java
+++ b/server/src/com/vaadin/event/MouseEvents.java
@@ -46,17 +46,17 @@ public interface MouseEvents {
      */
     public static class ClickEvent extends Component.Event {
         /**
-         * @deprecated use {@link Button#LEFT} instead.
+         * @deprecated As of 7.0, use {@link Button#LEFT} instead.
          */
         @Deprecated
         public static final MouseButton BUTTON_LEFT = MouseButton.LEFT;
         /**
-         * @deprecated use {@link Button#MIDDLE} instead.
+         * @deprecated As of 7.0, use {@link Button#MIDDLE} instead.
          */
         @Deprecated
         public static final MouseButton BUTTON_MIDDLE = MouseButton.MIDDLE;
         /**
-         * @deprecated use {@link Button#RIGHT} instead.
+         * @deprecated As of 7.0, use {@link Button#RIGHT} instead.
          */
         @Deprecated
         public static final MouseButton BUTTON_RIGHT = MouseButton.RIGHT;
diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index 8b5bd78d01..da4142ef96 100644
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -117,7 +117,7 @@ public abstract class AbstractClientConnector implements ClientConnector,
     }
 
     /**
-     * @deprecated As of 7.0.0, use {@link #markAsDirty()} instead
+     * @deprecated As of 7.0, use {@link #markAsDirty()} instead
      */
     @Deprecated
     @Override
@@ -455,7 +455,7 @@ public abstract class AbstractClientConnector implements ClientConnector,
     }
 
     /**
-     * @deprecated As of 7.0.0, use {@link #markAsDirtyRecursive()} instead
+     * @deprecated As of 7.0, use {@link #markAsDirtyRecursive()} instead
      */
     @Override
     @Deprecated
@@ -847,7 +847,7 @@ public abstract class AbstractClientConnector implements ClientConnector,
      *            the object instance who owns the activation method.
      * @param methodName
      *            the name of the activation method.
-     * @deprecated This method should be avoided. Use
+     * @deprecated As of 7.0. This method should be avoided. Use
      *             {@link #addListener(Class, Object, Method)} or
      *             {@link #addListener(String, Class, Object, Method)} instead.
      */
@@ -938,7 +938,7 @@ public abstract class AbstractClientConnector implements ClientConnector,
      * @param methodName
      *            the name of the method owned by <code>target</code> that's
      *            registered to listen to events of type <code>eventType</code>.
-     * @deprecated This method should be avoided. Use
+     * @deprecated As of 7.0. This method should be avoided. Use
      *             {@link #removeListener(Class, Object, Method)} instead.
      */
     @Deprecated
diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index cbb62ddaad..4525546f6d 100644
--- a/server/src/com/vaadin/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java
@@ -95,7 +95,7 @@ import com.vaadin.ui.Window;
  * <p>
  * TODO Document better!
  * 
- * @deprecated will likely change or be removed in a future version
+ * @deprecated As of 7.0. Will likely change or be removed in a future version
  */
 @Deprecated
 @SuppressWarnings("serial")
@@ -112,7 +112,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
      * 
      * @author peholmst
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     public interface Callback extends Serializable {
@@ -2334,7 +2334,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
     /**
      * @return
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected abstract BootstrapHandler createBootstrapHandler();
diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index 13268c596c..cfe15f9d37 100644
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -48,7 +48,7 @@ import com.vaadin.ui.UI;
  * @author Vaadin Ltd
  * @since 7.0.0
  * 
- * @deprecated will likely change or be removed in a future version
+ * @deprecated As of 7.0. Will likely change or be removed in a future version
  */
 @Deprecated
 public abstract class BootstrapHandler implements RequestHandler {
diff --git a/server/src/com/vaadin/server/ClientConnector.java b/server/src/com/vaadin/server/ClientConnector.java
index 4a09158da5..b51a1d6eec 100644
--- a/server/src/com/vaadin/server/ClientConnector.java
+++ b/server/src/com/vaadin/server/ClientConnector.java
@@ -171,7 +171,7 @@ public interface ClientConnector extends Connector {
     public ClientConnector getParent();
 
     /**
-     * @deprecated As of 7.0.0, use {@link #markAsDirty()} instead
+     * @deprecated As of 7.0, use {@link #markAsDirty()} instead
      */
     @Deprecated
     public void requestRepaint();
@@ -188,7 +188,7 @@ public interface ClientConnector extends Connector {
     public void markAsDirty();
 
     /**
-     * @deprecated As of 7.0.0, use {@link #markAsDirtyRecursive()} instead
+     * @deprecated As of 7.0, use {@link #markAsDirtyRecursive()} instead
      */
     @Deprecated
     public void requestRepaintAll();
diff --git a/server/src/com/vaadin/server/CommunicationManager.java b/server/src/com/vaadin/server/CommunicationManager.java
index 1d8ef2d0e7..5f46930384 100644
--- a/server/src/com/vaadin/server/CommunicationManager.java
+++ b/server/src/com/vaadin/server/CommunicationManager.java
@@ -33,7 +33,7 @@ import com.vaadin.ui.UI;
  * @author Vaadin Ltd.
  * @since 5.0
  * 
- * @deprecated will likely change or be removed in a future version
+ * @deprecated As of 7.0. Will likely change or be removed in a future version
  */
 @Deprecated
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/ErrorMessage.java b/server/src/com/vaadin/server/ErrorMessage.java
index fcc481e826..193617ad90 100644
--- a/server/src/com/vaadin/server/ErrorMessage.java
+++ b/server/src/com/vaadin/server/ErrorMessage.java
@@ -83,32 +83,32 @@ public interface ErrorMessage extends Serializable {
     }
 
     /**
-     * @deprecated from 7.0, use {@link ErrorLevel#SYSTEMERROR} instead    
+     * @deprecated As of 7.0, use {@link ErrorLevel#SYSTEMERROR} instead    
      */
     @Deprecated
     public static final ErrorLevel SYSTEMERROR = ErrorLevel.SYSTEMERROR;
 
     /**
-     * @deprecated from 7.0, use {@link ErrorLevel#CRITICAL} instead    
+     * @deprecated As of 7.0, use {@link ErrorLevel#CRITICAL} instead    
      */
     @Deprecated
     public static final ErrorLevel CRITICAL = ErrorLevel.CRITICAL;
 
     /**
-     * @deprecated from 7.0, use {@link ErrorLevel#ERROR} instead    
+     * @deprecated As of 7.0, use {@link ErrorLevel#ERROR} instead    
      */
 
     @Deprecated
     public static final ErrorLevel ERROR = ErrorLevel.ERROR;
 
     /**
-     * @deprecated from 7.0, use {@link ErrorLevel#WARNING} instead    
+     * @deprecated As of 7.0, use {@link ErrorLevel#WARNING} instead    
      */
     @Deprecated
     public static final ErrorLevel WARNING = ErrorLevel.WARNING;
 
     /**
-     * @deprecated from 7.0, use {@link ErrorLevel#INFORMATION} instead    
+     * @deprecated As of 7.0, use {@link ErrorLevel#INFORMATION} instead    
      */
     @Deprecated
     public static final ErrorLevel INFORMATION = ErrorLevel.INFORMATION;
diff --git a/server/src/com/vaadin/server/LegacyApplication.java b/server/src/com/vaadin/server/LegacyApplication.java
index 598cfbf832..d5e3f28587 100644
--- a/server/src/com/vaadin/server/LegacyApplication.java
+++ b/server/src/com/vaadin/server/LegacyApplication.java
@@ -32,8 +32,8 @@ import com.vaadin.ui.UI;
  * additional browser level windows and defining the theme for the entire
  * application.
  * 
- * @deprecated This class is only intended to ease migration and should not be
- *             used for new projects.
+ * @deprecated As of 7.0. This class is only intended to ease migration and
+ *             should not be used for new projects.
  * 
  * @since 7.0
  */
diff --git a/server/src/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
index d139ee19f6..36bd52d4fa 100644
--- a/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
+++ b/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
@@ -29,8 +29,8 @@ import com.vaadin.ui.UI;
  * @author Vaadin Ltd
  * @since 7.0.0
  * 
- * @deprecated Used only to support LegacyApplication - will be removed when
- *             LegacyApplication support is removed.
+ * @deprecated As of 7.0. Used only to support LegacyApplication - will be
+ *             removed when LegacyApplication support is removed.
  */
 @Deprecated
 public abstract class LegacyApplicationUIProvider extends UIProvider {
diff --git a/server/src/com/vaadin/server/Page.java b/server/src/com/vaadin/server/Page.java
index 6746eadc58..f2b5498fd1 100644
--- a/server/src/com/vaadin/server/Page.java
+++ b/server/src/com/vaadin/server/Page.java
@@ -212,19 +212,19 @@ public class Page implements Serializable {
                     "browserWindowResized", BrowserWindowResizeEvent.class);
 
     /**
-     * @deprecated from 7.0, use {@link BorderStyle#NONE} instead.
+     * @deprecated As of 7.0, use {@link BorderStyle#NONE} instead.
      */
     @Deprecated
     public static final BorderStyle BORDER_NONE = BorderStyle.NONE;
 
     /**
-     * @deprecated from 7.0, use {@link BorderStyle#MINIMAL} instead.
+     * @deprecated As of 7.0, use {@link BorderStyle#MINIMAL} instead.
      */
     @Deprecated
     public static final BorderStyle BORDER_MINIMAL = BorderStyle.MINIMAL;
 
     /**
-     * @deprecated from 7.0, use {@link BorderStyle#DEFAULT} instead.
+     * @deprecated As of 7.0, use {@link BorderStyle#DEFAULT} instead.
      */
     @Deprecated
     public static final BorderStyle BORDER_DEFAULT = BorderStyle.DEFAULT;
@@ -330,7 +330,7 @@ public class Page implements Serializable {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addUriFragmentChangedListener(UriFragmentChangedListener)}
      **/
     @Deprecated
@@ -345,7 +345,7 @@ public class Page implements Serializable {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeUriFragmentChangedListener(UriFragmentChangedListener)}
      **/
     @Deprecated
@@ -510,7 +510,7 @@ public class Page implements Serializable {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addBrowserWindowResizeListener(BrowserWindowResizeListener)}
      **/
     @Deprecated
@@ -532,7 +532,7 @@ public class Page implements Serializable {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBrowserWindowResizeListener(BrowserWindowResizeListener)}
      **/
     @Deprecated
@@ -762,7 +762,7 @@ public class Page implements Serializable {
     }
 
     /**
-     * @deprecated only retained to maintain compatibility with
+     * @deprecated As of 7.0, only retained to maintain compatibility with
      *             LegacyWindow.open methods. See documentation for
      *             {@link LegacyWindow#open(Resource, String, int, int, BorderStyle)}
      *             for discussion about replacing API.
@@ -797,7 +797,7 @@ public class Page implements Serializable {
      * @param notification
      *            The notification message to show
      * 
-     * @deprecated Use Notification.show(Page) instead.
+     * @deprecated As of 7.0, use Notification.show(Page) instead.
      */
     @Deprecated
     public void showNotification(Notification notification) {
diff --git a/server/src/com/vaadin/server/PortletCommunicationManager.java b/server/src/com/vaadin/server/PortletCommunicationManager.java
index ce67aedcb3..3e0af96bf7 100644
--- a/server/src/com/vaadin/server/PortletCommunicationManager.java
+++ b/server/src/com/vaadin/server/PortletCommunicationManager.java
@@ -38,7 +38,7 @@ import com.vaadin.ui.UI;
  * @author peholmst
  * 
  * 
- * @deprecated will likely change or be removed in a future version
+ * @deprecated As of 7.0. Will likely change or be removed in a future version
  */
 @Deprecated
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/Sizeable.java b/server/src/com/vaadin/server/Sizeable.java
index 36562a059d..ec1409990a 100644
--- a/server/src/com/vaadin/server/Sizeable.java
+++ b/server/src/com/vaadin/server/Sizeable.java
@@ -28,55 +28,55 @@ import java.io.Serializable;
 public interface Sizeable extends Serializable {
 
     /**
-     * @deprecated from 7.0, use {@link Unit#PIXELS} instead    
+     * @deprecated As of 7.0, use {@link Unit#PIXELS} instead    
      */
     @Deprecated
     public static final Unit UNITS_PIXELS = Unit.PIXELS;
 
     /**
-     * @deprecated from 7.0, use {@link Unit#POINTS} instead    
+     * @deprecated As of 7.0, use {@link Unit#POINTS} instead    
      */
     @Deprecated
     public static final Unit UNITS_POINTS = Unit.POINTS;
 
     /**
-     * @deprecated from 7.0, use {@link Unit#PICAS} instead    
+     * @deprecated As of 7.0, use {@link Unit#PICAS} instead    
      */
     @Deprecated
     public static final Unit UNITS_PICAS = Unit.PICAS;
 
     /**
-     * @deprecated from 7.0, use {@link Unit#EM} instead    
+     * @deprecated As of 7.0, use {@link Unit#EM} instead    
      */
     @Deprecated
     public static final Unit UNITS_EM = Unit.EM;
 
     /**
-     * @deprecated from 7.0, use {@link Unit#EX} instead    
+     * @deprecated As of 7.0, use {@link Unit#EX} instead    
      */
     @Deprecated
     public static final Unit UNITS_EX = Unit.EX;
 
     /**
-     * @deprecated from 7.0, use {@link Unit#MM} instead    
+     * @deprecated As of 7.0, use {@link Unit#MM} instead    
      */
     @Deprecated
     public static final Unit UNITS_MM = Unit.MM;
 
     /**
-     * @deprecated from 7.0, use {@link Unit#CM} instead    
+     * @deprecated As of 7.0, use {@link Unit#CM} instead    
      */
     @Deprecated
     public static final Unit UNITS_CM = Unit.CM;
 
     /**
-     * @deprecated from 7.0, use {@link Unit#INCH} instead    
+     * @deprecated As of 7.0, use {@link Unit#INCH} instead    
      */
     @Deprecated
     public static final Unit UNITS_INCH = Unit.INCH;
 
     /**
-     * @deprecated from 7.0, use {@link Unit#PERCENTAGE} instead    
+     * @deprecated As of 7.0, use {@link Unit#PERCENTAGE} instead    
      */
     @Deprecated
     public static final Unit UNITS_PERCENTAGE = Unit.PERCENTAGE;
diff --git a/server/src/com/vaadin/server/UserError.java b/server/src/com/vaadin/server/UserError.java
index d7837fb65d..d7b2d1212f 100644
--- a/server/src/com/vaadin/server/UserError.java
+++ b/server/src/com/vaadin/server/UserError.java
@@ -27,19 +27,19 @@ package com.vaadin.server;
 public class UserError extends AbstractErrorMessage {
 
     /**
-     * @deprecated from 7.0, use {@link ContentMode#TEXT} instead    
+     * @deprecated As of 7.0, use {@link ContentMode#TEXT} instead    
      */
     @Deprecated
     public static final ContentMode CONTENT_TEXT = ContentMode.TEXT;
 
     /**
-     * @deprecated from 7.0, use {@link ContentMode#PREFORMATTED} instead    
+     * @deprecated As of 7.0, use {@link ContentMode#PREFORMATTED} instead    
      */
     @Deprecated
     public static final ContentMode CONTENT_PREFORMATTED = ContentMode.PREFORMATTED;
 
     /**
-     * @deprecated from 7.0, use {@link ContentMode#HTML} instead    
+     * @deprecated As of 7.0, use {@link ContentMode#HTML} instead    
      */
     @Deprecated
     public static final ContentMode CONTENT_XHTML = ContentMode.HTML;
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index 3f7c4472e9..69eb3d4f02 100644
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -64,7 +64,7 @@ import com.vaadin.util.CurrentInstance;
 public class VaadinPortlet extends GenericPortlet implements Constants {
 
     /**
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     public static final String RESOURCE_URL_ID = "APP";
@@ -220,7 +220,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * This portlet parameter is used to add styles to the main element. E.g
      * "height:500px" generates a style="height:500px" to the main element.
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     public static final String PORTLET_PARAMETER_STYLE = "style";
@@ -229,13 +229,13 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * This portal parameter is used to define the name of the Vaadin theme that
      * is used for all Vaadin applications in the portal.
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     public static final String PORTAL_PARAMETER_VAADIN_THEME = "vaadin.theme";
 
     /**
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     public static final String WRITE_AJAX_PAGE_SCRIPT_WIDGETSET_SHOULD_WRITE = "writeAjaxPageScriptWidgetsetShouldWrite";
@@ -295,7 +295,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
     /**
      * @author Vaadin Ltd
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected enum RequestType {
@@ -306,7 +306,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @param vaadinRequest
      * @return
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinPortletRequest vaadinRequest) {
@@ -357,7 +357,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @throws PortletException
      * @throws IOException
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected void handleRequest(PortletRequest request,
@@ -684,7 +684,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @throws IOException
      *             if the writing failed due to input/output error.
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     void criticalNotification(VaadinPortletRequest request,
diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index 4e7d61d702..f97ba6e729 100644
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -167,7 +167,7 @@ public class VaadinPortletService extends VaadinService {
      *            the request to get a request type for
      * @return the request type
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinRequest request) {
diff --git a/server/src/com/vaadin/server/VaadinPortletSession.java b/server/src/com/vaadin/server/VaadinPortletSession.java
index 989ed0b3ea..8027222a5b 100644
--- a/server/src/com/vaadin/server/VaadinPortletSession.java
+++ b/server/src/com/vaadin/server/VaadinPortletSession.java
@@ -52,7 +52,7 @@ import com.vaadin.util.CurrentInstance;
  * 
  * @author peholmst
  * 
- * @deprecated will likely change or be removed in a future version
+ * @deprecated As of 7.0. Will likely change or be removed in a future version
  */
 @Deprecated
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java
index 02463242f4..50fca54cf7 100644
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/com/vaadin/server/VaadinService.java
@@ -57,13 +57,13 @@ public abstract class VaadinService implements Serializable {
                     SessionDestroyEvent.class);
 
     /**
-     * @deprecated Only supported for {@link LegacyApplication}.
+     * @deprecated As of 7.0. Only supported for {@link LegacyApplication}.
      */
     @Deprecated
     public static final String URL_PARAMETER_RESTART_APPLICATION = "restartApplication";
 
     /**
-     * @deprecated Only supported for {@link LegacyApplication}.
+     * @deprecated As of 7.0. Only supported for {@link LegacyApplication}.
      */
     @Deprecated
     public static final String URL_PARAMETER_CLOSE_APPLICATION = "closeApplication";
@@ -434,7 +434,7 @@ public abstract class VaadinService implements Serializable {
      * @return
      * @throws MalformedURLException
      * 
-     * @deprecated Only used to support {@link LegacyApplication}.
+     * @deprecated As of 7.0. Only used to support {@link LegacyApplication}.
      */
     @Deprecated
     protected URL getApplicationUrl(VaadinRequest request)
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 414e814ffd..14a7ca211f 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -441,7 +441,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @throws IOException
      *             if the writing failed due to input/output error.
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected void criticalNotification(VaadinServletRequest request,
@@ -535,7 +535,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      *            the resource path.
      * @return the resource path.
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected static String getResourcePath(ServletContext servletContext,
@@ -592,7 +592,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param themeName
      * @return
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected static String stripSpecialChars(String themeName) {
@@ -626,7 +626,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @throws IOException
      * @throws ServletException
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     void handleServiceSessionExpired(VaadinServletRequest request,
@@ -980,7 +980,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * 
      * @since 6.6.7
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected boolean isAllowedVAADINResourceUrl(HttpServletRequest request,
@@ -1071,7 +1071,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @author Vaadin Ltd
      * @since 7.0.0
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected enum RequestType {
@@ -1082,7 +1082,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param request
      * @return
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinServletRequest request) {
@@ -1174,7 +1174,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      *             if the application is denied access to the persistent data
      *             store represented by the given URL.
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected URL getApplicationUrl(HttpServletRequest request)
@@ -1214,7 +1214,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param unsafe
      * @return a safe string to be added inside an html tag
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     public static final String safeEscapeForHtml(String unsafe) {
diff --git a/server/src/com/vaadin/server/VaadinServletService.java b/server/src/com/vaadin/server/VaadinServletService.java
index 9cb97873e7..100b873ef7 100644
--- a/server/src/com/vaadin/server/VaadinServletService.java
+++ b/server/src/com/vaadin/server/VaadinServletService.java
@@ -139,7 +139,7 @@ public class VaadinServletService extends VaadinService {
      *            the request to get a request type for
      * @return the request type
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinRequest request) {
diff --git a/server/src/com/vaadin/server/VaadinSession.java b/server/src/com/vaadin/server/VaadinSession.java
index 87f5be3e2c..1e5c4ec516 100644
--- a/server/src/com/vaadin/server/VaadinSession.java
+++ b/server/src/com/vaadin/server/VaadinSession.java
@@ -161,7 +161,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * Get the web browser associated with this session.
      * 
      * @return
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public WebBrowser getBrowser() {
@@ -221,7 +222,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
     /**
      * @return
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public AbstractCommunicationManager getCommunicationManager() {
@@ -234,7 +236,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * @param underlyingSession
      * @return
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public static VaadinSession getForSession(VaadinService service,
@@ -254,7 +257,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * 
      * @param service
      *            TODO
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public void removeFromSession(VaadinService service) {
@@ -268,7 +272,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
     /**
      * @param session
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public void storeInSession(VaadinService service, WrappedSession session) {
@@ -500,7 +505,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      *            A connector that has not yet been assigned an id.
      * @return A new id for the connector
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public String createConnectorId(ClientConnector connector) {
@@ -568,7 +574,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      *            the bootstrap response event for which listeners should be
      *            fired
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public void modifyBootstrapResponse(BootstrapResponse response) {
@@ -587,7 +594,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * 
      * @since 7.0.0
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public void cleanupInactiveUIs() {
@@ -613,7 +621,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * @param ui
      *            the UI to remove
      * 
-     * @deprecated Method is declared as public only to support
+     * @deprecated As of 7.0. Method is declared as public only to support
      *             {@link LegacyApplication#close()} and will be removed when
      *             LegacyApplciation support is removed.
      */
@@ -677,13 +685,15 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * 
      * @since 7.0.0
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      * 
      * @param ui
      *            The UI whose status to check
      * @return true if the UI is alive, false if it could be removed.
      * 
-     * @deprecated will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected boolean isUIAlive(UI ui) {
diff --git a/server/src/com/vaadin/server/VariableOwner.java b/server/src/com/vaadin/server/VariableOwner.java
index 825a5804ef..6a9d53a45f 100644
--- a/server/src/com/vaadin/server/VariableOwner.java
+++ b/server/src/com/vaadin/server/VariableOwner.java
@@ -32,8 +32,9 @@ import com.vaadin.ui.LegacyComponent;
  * 
  * @author Vaadin Ltd.
  * @since 3.0
- * @deprecated in 7.0. Only provided to ease porting of Vaadin 6 components. Do
- *             not implement this directly, implement {@link LegacyComponent}.
+ * @deprecated As of 7.0. Only provided to ease porting of Vaadin 6 components.
+ *             Do not implement this directly, implement {@link LegacyComponent}
+ *             .
  */
 @Deprecated
 public interface VariableOwner extends Serializable {
diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java
index 26d9b5576a..0ae274c8ff 100644
--- a/server/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/server/src/com/vaadin/ui/AbsoluteLayout.java
@@ -636,7 +636,7 @@ public class AbsoluteLayout extends AbstractLayout implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addLayoutClickListener(LayoutClickListener)}
      **/
     @Override
@@ -652,7 +652,7 @@ public class AbsoluteLayout extends AbstractLayout implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeLayoutClickListener(LayoutClickListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 811a1dc2f6..876a6c482d 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -126,7 +126,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     }
 
     /**
-     * @deprecated as of 7.0. Use {@link #setId(String)}
+     * @deprecated As of 7.0. Use {@link #setId(String)}
      */
     @Deprecated
     public void setDebugId(String id) {
@@ -134,7 +134,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     }
 
     /**
-     * @deprecated as of 7.0. Use {@link #getId()}
+     * @deprecated As of 7.0. Use {@link #getId()}
      */
     @Deprecated
     public String getDebugId() {
diff --git a/server/src/com/vaadin/ui/AbstractComponentContainer.java b/server/src/com/vaadin/ui/AbstractComponentContainer.java
index 135194f12c..427bb3491c 100644
--- a/server/src/com/vaadin/ui/AbstractComponentContainer.java
+++ b/server/src/com/vaadin/ui/AbstractComponentContainer.java
@@ -103,7 +103,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
      **/
     @Override
@@ -120,7 +120,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
      **/
     @Override
@@ -137,7 +137,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
      **/
     @Override
@@ -154,7 +154,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index 53301f093a..5c4a3468bb 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/com/vaadin/ui/AbstractField.java
@@ -370,7 +370,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements
      * Returns the (field) value converted to a String using toString().
      * 
      * @see java.lang.Object#toString()
-     * @deprecated Instead use {@link #getValue()} to get the value of the
+     * @deprecated As of 7.0, use {@link #getValue()} to get the value of the
      *             field, {@link #getConvertedValue()} to get the field value
      *             converted to the data model type or
      *             {@link #getPropertyDataSource()} .getValue() to get the value
@@ -1011,7 +1011,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
     @Override
@@ -1032,7 +1032,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
     @Override
@@ -1124,7 +1124,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
      **/
     @Override
@@ -1146,7 +1146,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
index 5f5768a237..650e61a0c8 100644
--- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -344,7 +344,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addLayoutClickListener(LayoutClickListener)}
      **/
     @Override
@@ -360,7 +360,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeLayoutClickListener(LayoutClickListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java
index e656ef1e0a..ac80dfbb74 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/com/vaadin/ui/AbstractSelect.java
@@ -109,44 +109,44 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
-     * @deprecated from 7.0, use {@link ItemCaptionMode#ID} instead
+     * @deprecated As of 7.0, use {@link ItemCaptionMode#ID} instead
      */
     @Deprecated
     public static final ItemCaptionMode ITEM_CAPTION_MODE_ID = ItemCaptionMode.ID;
 
     /**
-     * @deprecated from 7.0, use {@link ItemCaptionMode#ITEM} instead
+     * @deprecated As of 7.0, use {@link ItemCaptionMode#ITEM} instead
      */
     @Deprecated
     public static final ItemCaptionMode ITEM_CAPTION_MODE_ITEM = ItemCaptionMode.ITEM;
 
     /**
-     * @deprecated from 7.0, use {@link ItemCaptionMode#INDEX} instead
+     * @deprecated As of 7.0, use {@link ItemCaptionMode#INDEX} instead
      */
     @Deprecated
     public static final ItemCaptionMode ITEM_CAPTION_MODE_INDEX = ItemCaptionMode.INDEX;
 
     /**
-     * @deprecated from 7.0, use {@link ItemCaptionMode#EXPLICIT_DEFAULTS_ID}
+     * @deprecated As of 7.0, use {@link ItemCaptionMode#EXPLICIT_DEFAULTS_ID}
      *             instead
      */
     @Deprecated
     public static final ItemCaptionMode ITEM_CAPTION_MODE_EXPLICIT_DEFAULTS_ID = ItemCaptionMode.EXPLICIT_DEFAULTS_ID;
 
     /**
-     * @deprecated from 7.0, use {@link ItemCaptionMode#EXPLICIT} instead
+     * @deprecated As of 7.0, use {@link ItemCaptionMode#EXPLICIT} instead
      */
     @Deprecated
     public static final ItemCaptionMode ITEM_CAPTION_MODE_EXPLICIT = ItemCaptionMode.EXPLICIT;
 
     /**
-     * @deprecated from 7.0, use {@link ItemCaptionMode#ICON_ONLY} instead
+     * @deprecated As of 7.0, use {@link ItemCaptionMode#ICON_ONLY} instead
      */
     @Deprecated
     public static final ItemCaptionMode ITEM_CAPTION_MODE_ICON_ONLY = ItemCaptionMode.ICON_ONLY;
 
     /**
-     * @deprecated from 7.0, use {@link ItemCaptionMode#PROPERTY} instead
+     * @deprecated As of 7.0, use {@link ItemCaptionMode#PROPERTY} instead
      */
     @Deprecated
     public static final ItemCaptionMode ITEM_CAPTION_MODE_PROPERTY = ItemCaptionMode.PROPERTY;
@@ -162,17 +162,17 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     public interface Filtering extends Serializable {
 
         /**
-         * @deprecated from 7.0, use {@link FilteringMode#OFF} instead
+         * @deprecated As of 7.0, use {@link FilteringMode#OFF} instead
          */
         @Deprecated
         public static final FilteringMode FILTERINGMODE_OFF = FilteringMode.OFF;
         /**
-         * @deprecated from 7.0, use {@link FilteringMode#STARTSWITH} instead
+         * @deprecated As of 7.0, use {@link FilteringMode#STARTSWITH} instead
          */
         @Deprecated
         public static final FilteringMode FILTERINGMODE_STARTSWITH = FilteringMode.STARTSWITH;
         /**
-         * @deprecated from 7.0, use {@link FilteringMode#CONTAINS} instead
+         * @deprecated As of 7.0, use {@link FilteringMode#CONTAINS} instead
          */
         @Deprecated
         public static final FilteringMode FILTERINGMODE_CONTAINS = FilteringMode.CONTAINS;
@@ -1487,7 +1487,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Override
@@ -1513,7 +1513,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
      **/
     @Override
@@ -1537,7 +1537,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Override
@@ -1563,7 +1563,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java
index 086357f224..926c8e2c86 100644
--- a/server/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -507,7 +507,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addSplitterClickListener(SplitterClickListener)}
      **/
     @Deprecated
@@ -521,7 +521,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeSplitterClickListener(SplitterClickListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/AbstractTextField.java b/server/src/com/vaadin/ui/AbstractTextField.java
index 5a436d92c1..cb69022918 100644
--- a/server/src/com/vaadin/ui/AbstractTextField.java
+++ b/server/src/com/vaadin/ui/AbstractTextField.java
@@ -517,7 +517,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addTextChangeListener(TextChangeListener)}
      **/
     @Override
@@ -533,7 +533,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeTextChangeListener(TextChangeListener)}
      **/
     @Override
@@ -686,7 +686,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
     @Override
@@ -701,7 +701,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
     @Override
@@ -717,7 +717,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     * @deprecated As of 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
     @Override
     @Deprecated
@@ -731,7 +731,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index b4b7bf64be..d581293713 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -305,7 +305,7 @@ public class Button extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addClickListener(ClickListener)}
      **/
     @Deprecated
@@ -325,7 +325,7 @@ public class Button extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeClickListener(ClickListener)}
      **/
     @Deprecated
@@ -374,7 +374,7 @@ public class Button extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     * @deprecated As of 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
     @Override
     @Deprecated
@@ -388,7 +388,7 @@ public class Button extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
     @Override
@@ -404,7 +404,7 @@ public class Button extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
     @Override
@@ -419,7 +419,7 @@ public class Button extends AbstractComponent implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/CheckBox.java b/server/src/com/vaadin/ui/CheckBox.java
index 8a42182598..bda686c63d 100644
--- a/server/src/com/vaadin/ui/CheckBox.java
+++ b/server/src/com/vaadin/ui/CheckBox.java
@@ -125,7 +125,7 @@ public class CheckBox extends AbstractField<Boolean> {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     * @deprecated As of 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
     @Deprecated
     public void addListener(BlurListener listener) {
@@ -137,7 +137,7 @@ public class CheckBox extends AbstractField<Boolean> {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
     @Deprecated
@@ -151,7 +151,7 @@ public class CheckBox extends AbstractField<Boolean> {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
     @Deprecated
@@ -164,7 +164,7 @@ public class CheckBox extends AbstractField<Boolean> {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
     @Deprecated
@@ -177,8 +177,8 @@ public class CheckBox extends AbstractField<Boolean> {
      * 
      * @return True iff the button is pressed down or checked.
      * 
-     * @deprecated Use {@link #getValue()} instead and, if needed, handle null
-     *             values.
+     * @deprecated As of 7.0, use {@link #getValue()} instead and, if needed,
+     *             handle null values.
      */
     @Deprecated
     public boolean booleanValue() {
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java
index 4987d69fdd..c35ecdb21f 100644
--- a/server/src/com/vaadin/ui/ComboBox.java
+++ b/server/src/com/vaadin/ui/ComboBox.java
@@ -704,7 +704,7 @@ public class ComboBox extends AbstractSelect implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     * @deprecated As of 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
     @Override
     @Deprecated
@@ -718,7 +718,7 @@ public class ComboBox extends AbstractSelect implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
     @Override
@@ -734,7 +734,7 @@ public class ComboBox extends AbstractSelect implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
     @Override
@@ -749,7 +749,7 @@ public class ComboBox extends AbstractSelect implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
     @Override
@@ -761,7 +761,7 @@ public class ComboBox extends AbstractSelect implements
     /**
      * ComboBox does not support multi select mode.
      * 
-     * @deprecated use {@link ListSelect}, {@link OptionGroup} or
+     * @deprecated As of 7.0, use {@link ListSelect}, {@link OptionGroup} or
      *             {@link TwinColSelect} instead
      * @see com.vaadin.ui.AbstractSelect#setMultiSelect(boolean)
      * @throws UnsupportedOperationException
@@ -778,7 +778,7 @@ public class ComboBox extends AbstractSelect implements
     /**
      * ComboBox does not support multi select mode.
      * 
-     * @deprecated use {@link ListSelect}, {@link OptionGroup} or
+     * @deprecated As of 7.0, use {@link ListSelect}, {@link OptionGroup} or
      *             {@link TwinColSelect} instead
      * 
      * @see com.vaadin.ui.AbstractSelect#isMultiSelect()
diff --git a/server/src/com/vaadin/ui/ComponentContainer.java b/server/src/com/vaadin/ui/ComponentContainer.java
index 5c544ceffb..1da0a7f2bb 100644
--- a/server/src/com/vaadin/ui/ComponentContainer.java
+++ b/server/src/com/vaadin/ui/ComponentContainer.java
@@ -112,28 +112,28 @@ public interface ComponentContainer extends HasComponents,
     public void moveComponentsFrom(ComponentContainer source);
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addComponentAttachListener(ComponentAttachListener)}
      **/
     @Deprecated
     public void addListener(ComponentAttachListener listener);
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeComponentAttachListener(ComponentAttachListener)}
      **/
     @Deprecated
     public void removeListener(ComponentAttachListener listener);
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addComponentDetachListener(ComponentDetachListener)}
      **/
     @Deprecated
     public void addListener(ComponentDetachListener listener);
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeComponentDetachListener(ComponentDetachListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/CssLayout.java b/server/src/com/vaadin/ui/CssLayout.java
index 228624769f..bc27c23488 100644
--- a/server/src/com/vaadin/ui/CssLayout.java
+++ b/server/src/com/vaadin/ui/CssLayout.java
@@ -309,7 +309,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addLayoutClickListener(LayoutClickListener)}
      **/
     @Override
@@ -325,7 +325,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeLayoutClickListener(LayoutClickListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java
index 77f18df304..505886d9fe 100644
--- a/server/src/com/vaadin/ui/DateField.java
+++ b/server/src/com/vaadin/ui/DateField.java
@@ -680,7 +680,7 @@ public class DateField extends AbstractField<Date> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
     @Override
@@ -695,7 +695,7 @@ public class DateField extends AbstractField<Date> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
     @Override
@@ -711,7 +711,7 @@ public class DateField extends AbstractField<Date> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     * @deprecated As of 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
     @Override
     @Deprecated
@@ -725,7 +725,7 @@ public class DateField extends AbstractField<Date> implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java
index a47989ad36..8dd0b3597e 100644
--- a/server/src/com/vaadin/ui/Embedded.java
+++ b/server/src/com/vaadin/ui/Embedded.java
@@ -536,7 +536,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addClickListener(ClickListener)}
      **/
     @Deprecated
@@ -557,7 +557,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeClickListener(ClickListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java
index 62a6de4fe6..68ebb079f9 100644
--- a/server/src/com/vaadin/ui/Form.java
+++ b/server/src/com/vaadin/ui/Form.java
@@ -72,8 +72,8 @@ import com.vaadin.shared.ui.form.FormState;
  * 
  * @author Vaadin Ltd.
  * @since 3.0
- * @deprecated Use {@link FieldGroup} instead of {@link Form} for more
- *             flexibility.
+ * @deprecated As of 7.0, use {@link FieldGroup} instead of {@link Form} for
+ *             more flexibility.
  */
 @Deprecated
 public class Form extends AbstractField<Object> implements Item.Editor,
diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java
index 2504592058..36f4c40a52 100644
--- a/server/src/com/vaadin/ui/GridLayout.java
+++ b/server/src/com/vaadin/ui/GridLayout.java
@@ -1378,7 +1378,7 @@ public class GridLayout extends AbstractLayout implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addLayoutClickListener(LayoutClickListener)}
      **/
     @Override
@@ -1394,7 +1394,7 @@ public class GridLayout extends AbstractLayout implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeLayoutClickListener(LayoutClickListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/Image.java b/server/src/com/vaadin/ui/Image.java
index c1b27704d4..d4da42a8c8 100644
--- a/server/src/com/vaadin/ui/Image.java
+++ b/server/src/com/vaadin/ui/Image.java
@@ -66,7 +66,7 @@ public class Image extends AbstractEmbedded {
     }
 
     /**
-     * @deprecated As of 7.0.0, use {@link #addClickListener(ClickListener)}
+     * @deprecated As of 7.0, use {@link #addClickListener(ClickListener)}
      *             instead
      */
     @Deprecated
@@ -90,7 +90,7 @@ public class Image extends AbstractEmbedded {
     }
 
     /**
-     * @deprecated As of 7.0.0, use {@link #removeClickListener(ClickListener)}
+     * @deprecated As of 7.0, use {@link #removeClickListener(ClickListener)}
      *             instead
      */
     @Deprecated
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index 27145946d8..db5bc2862d 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -56,37 +56,37 @@ public class Label extends AbstractComponent implements Property<String>,
             .getLogger(Label.class.getName());
 
     /**
-     * @deprecated From 7.0, use {@link ContentMode#TEXT} instead
+     * @deprecated As of 7.0, use {@link ContentMode#TEXT} instead
      */
     @Deprecated
     public static final ContentMode CONTENT_TEXT = ContentMode.TEXT;
 
     /**
-     * @deprecated From 7.0, use {@link ContentMode#PREFORMATTED} instead
+     * @deprecated As of 7.0, use {@link ContentMode#PREFORMATTED} instead
      */
     @Deprecated
     public static final ContentMode CONTENT_PREFORMATTED = ContentMode.PREFORMATTED;
 
     /**
-     * @deprecated From 7.0, use {@link ContentMode#HTML} instead
+     * @deprecated As of 7.0, use {@link ContentMode#HTML} instead
      */
     @Deprecated
     public static final ContentMode CONTENT_XHTML = ContentMode.HTML;
 
     /**
-     * @deprecated From 7.0, use {@link ContentMode#XML} instead
+     * @deprecated As of 7.0, use {@link ContentMode#XML} instead
      */
     @Deprecated
     public static final ContentMode CONTENT_XML = ContentMode.XML;
 
     /**
-     * @deprecated From 7.0, use {@link ContentMode#RAW} instead
+     * @deprecated As of 7.0, use {@link ContentMode#RAW} instead
      */
     @Deprecated
     public static final ContentMode CONTENT_RAW = ContentMode.RAW;
 
     /**
-     * @deprecated From 7.0, use {@link ContentMode#TEXT} instead
+     * @deprecated As of 7.0, use {@link ContentMode#TEXT} instead
      */
     @Deprecated
     public static final ContentMode CONTENT_DEFAULT = ContentMode.TEXT;
@@ -205,7 +205,7 @@ public class Label extends AbstractComponent implements Property<String>,
      * Returns the value displayed by this label.
      * 
      * @see java.lang.Object#toString()
-     * @deprecated As of 7.0.0, use {@link #getValue()} to get the value of the
+     * @deprecated As of 7.0, use {@link #getValue()} to get the value of the
      *             label or {@link #getPropertyDataSource()} .getValue() to get
      *             the value of the data source.
      */
@@ -365,7 +365,7 @@ public class Label extends AbstractComponent implements Property<String>,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
     @Override
@@ -388,7 +388,7 @@ public class Label extends AbstractComponent implements Property<String>,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/LegacyComponent.java b/server/src/com/vaadin/ui/LegacyComponent.java
index 32f52eb3eb..f7c5194bfd 100644
--- a/server/src/com/vaadin/ui/LegacyComponent.java
+++ b/server/src/com/vaadin/ui/LegacyComponent.java
@@ -27,8 +27,8 @@ import com.vaadin.server.VariableOwner;
  * {@link #paintContent(PaintTarget)} and
  * {@link #changeVariables(Object, java.util.Map)} just like in Vaadin 6.
  * 
- * @deprecated This class is only intended to ease migration and should not be
- *             used for new projects.
+ * @deprecated As of 7.0. This class is only intended to ease migration and
+ *             should not be used for new projects.
  * 
  * @author Vaadin Ltd
  * @since 7.0.0
diff --git a/server/src/com/vaadin/ui/LegacyWindow.java b/server/src/com/vaadin/ui/LegacyWindow.java
index 79d4d0aedb..3a99d23550 100644
--- a/server/src/com/vaadin/ui/LegacyWindow.java
+++ b/server/src/com/vaadin/ui/LegacyWindow.java
@@ -318,7 +318,7 @@ public class LegacyWindow extends UI {
      * @param script
      *            JavaScript snippet that will be executed.
      * 
-     * @deprecated as of 7.0, use JavaScript.getCurrent().execute(String)
+     * @deprecated As of 7.0, use JavaScript.getCurrent().execute(String)
      *             instead
      */
     @Deprecated
diff --git a/server/src/com/vaadin/ui/Link.java b/server/src/com/vaadin/ui/Link.java
index 883ff40aa3..d3e80f519a 100644
--- a/server/src/com/vaadin/ui/Link.java
+++ b/server/src/com/vaadin/ui/Link.java
@@ -34,19 +34,19 @@ import com.vaadin.shared.ui.link.LinkConstants;
 public class Link extends AbstractComponent implements LegacyComponent {
 
     /**
-     * @deprecated from 7.0, use {@link BorderStyle#NONE} instead
+     * @deprecated As of 7.0, use {@link BorderStyle#NONE} instead
      */
     @Deprecated
     public static final BorderStyle TARGET_BORDER_NONE = BorderStyle.NONE;
 
     /**
-     * @deprecated from 7.0, use {@link BorderStyle#MINIMAL} instead
+     * @deprecated As of 7.0, use {@link BorderStyle#MINIMAL} instead
      */
     @Deprecated
     public static final BorderStyle TARGET_BORDER_MINIMAL = BorderStyle.MINIMAL;
 
     /**
-     * @deprecated from 7.0, use {@link BorderStyle#DEFAULT} instead
+     * @deprecated As of 7.0, use {@link BorderStyle#DEFAULT} instead
      */
     @Deprecated
     public static final BorderStyle TARGET_BORDER_DEFAULT = BorderStyle.DEFAULT;
diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java
index 8e35b0b2ac..15c917e454 100644
--- a/server/src/com/vaadin/ui/LoginForm.java
+++ b/server/src/com/vaadin/ui/LoginForm.java
@@ -47,9 +47,9 @@ import com.vaadin.shared.ApplicationConstants;
  * default component tries to guess the right place for theme css.
  * 
  * @since 5.3
- * @deprecated as of Vaadin 7.0. This component no longer fulfills its duty
- *             reliably in the supported browsers and a {@link VerticalLayout}
- *             with two {@link TextField}s can be used instead.
+ * @deprecated As of 7.0. This component no longer fulfills its duty reliably in
+ *             the supported browsers and a {@link VerticalLayout} with two
+ *             {@link TextField}s can be used instead.
  */
 @Deprecated
 public class LoginForm extends CustomComponent {
@@ -240,7 +240,7 @@ public class LoginForm extends CustomComponent {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addLoginListener(LoginListener)}
      **/
     @Deprecated
@@ -258,7 +258,7 @@ public class LoginForm extends CustomComponent {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeLoginListener(LoginListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/OptionGroup.java b/server/src/com/vaadin/ui/OptionGroup.java
index 8a9e7f101d..a7bf02201c 100644
--- a/server/src/com/vaadin/ui/OptionGroup.java
+++ b/server/src/com/vaadin/ui/OptionGroup.java
@@ -95,7 +95,7 @@ public class OptionGroup extends AbstractSelect implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     * @deprecated As of 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
     @Override
     @Deprecated
@@ -109,7 +109,7 @@ public class OptionGroup extends AbstractSelect implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
     @Override
@@ -125,7 +125,7 @@ public class OptionGroup extends AbstractSelect implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
     @Override
@@ -141,7 +141,7 @@ public class OptionGroup extends AbstractSelect implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java
index 472aefd5e0..fc47377093 100644
--- a/server/src/com/vaadin/ui/Panel.java
+++ b/server/src/com/vaadin/ui/Panel.java
@@ -275,7 +275,7 @@ public class Panel extends AbstractSingleComponentContainer implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addClickListener(ClickListener)}
      **/
     @Deprecated
@@ -296,7 +296,7 @@ public class Panel extends AbstractSingleComponentContainer implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeClickListener(ClickListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java
index 843f306d2a..f393de575b 100644
--- a/server/src/com/vaadin/ui/PopupView.java
+++ b/server/src/com/vaadin/ui/PopupView.java
@@ -273,7 +273,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addPopupVisibilityListener(PopupVisibilityListener)}
      **/
     @Deprecated
@@ -296,7 +296,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removePopupVisibilityListener(PopupVisibilityListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java
index ef8ba6d307..4f52d85c1a 100644
--- a/server/src/com/vaadin/ui/Select.java
+++ b/server/src/com/vaadin/ui/Select.java
@@ -35,7 +35,7 @@ import com.vaadin.data.Container;
  * 
  * @author Vaadin Ltd.
  * @since 3.0
- * @deprecated as of 7.0. Use {@link ComboBox} instead.
+ * @deprecated As of 7.0. Use {@link ComboBox} instead.
  */
 @Deprecated
 public class Select extends ComboBox {
diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java
index 1a76aa88bc..995db5092e 100644
--- a/server/src/com/vaadin/ui/TabSheet.java
+++ b/server/src/com/vaadin/ui/TabSheet.java
@@ -796,7 +796,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addSelectedTabChangeListener(SelectedTabChangeListener)}
      **/
     @Deprecated
@@ -817,7 +817,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeSelectedTabChangeListener(SelectedTabChangeListener)}
      **/
     @Deprecated
@@ -1235,7 +1235,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     * @deprecated As of 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
     @Override
     @Deprecated
@@ -1249,7 +1249,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
     @Override
@@ -1265,7 +1265,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
     @Override
@@ -1280,7 +1280,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index f224e13dfd..91740673c4 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -168,19 +168,19 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated from 7.0, use {@link Align#LEFT} instead
+     * @deprecated As of 7.0, use {@link Align#LEFT} instead
      */
     @Deprecated
     public static final Align ALIGN_LEFT = Align.LEFT;
 
     /**
-     * @deprecated from 7.0, use {@link Align#CENTER} instead
+     * @deprecated As of 7.0, use {@link Align#CENTER} instead
      */
     @Deprecated
     public static final Align ALIGN_CENTER = Align.CENTER;
 
     /**
-     * @deprecated from 7.0, use {@link Align#RIGHT} instead
+     * @deprecated As of 7.0, use {@link Align#RIGHT} instead
      */
     @Deprecated
     public static final Align ALIGN_RIGHT = Align.RIGHT;
@@ -210,25 +210,25 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated from 7.0, use {@link ColumnHeaderMode#HIDDEN} instead
+     * @deprecated As of 7.0, use {@link ColumnHeaderMode#HIDDEN} instead
      */
     @Deprecated
     public static final ColumnHeaderMode COLUMN_HEADER_MODE_HIDDEN = ColumnHeaderMode.HIDDEN;
 
     /**
-     * @deprecated from 7.0, use {@link ColumnHeaderMode#ID} instead
+     * @deprecated As of 7.0, use {@link ColumnHeaderMode#ID} instead
      */
     @Deprecated
     public static final ColumnHeaderMode COLUMN_HEADER_MODE_ID = ColumnHeaderMode.ID;
 
     /**
-     * @deprecated from 7.0, use {@link ColumnHeaderMode#EXPLICIT} instead
+     * @deprecated As of 7.0, use {@link ColumnHeaderMode#EXPLICIT} instead
      */
     @Deprecated
     public static final ColumnHeaderMode COLUMN_HEADER_MODE_EXPLICIT = ColumnHeaderMode.EXPLICIT;
 
     /**
-     * @deprecated from 7.0, use {@link ColumnHeaderMode#EXPLICIT_DEFAULTS_ID}
+     * @deprecated As of 7.0, use {@link ColumnHeaderMode#EXPLICIT_DEFAULTS_ID}
      *             instead
      */
     @Deprecated
@@ -286,50 +286,50 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated from 7.0, use {@link RowHeaderMode#HIDDEN} instead
+     * @deprecated As of 7.0, use {@link RowHeaderMode#HIDDEN} instead
      */
     @Deprecated
     public static final RowHeaderMode ROW_HEADER_MODE_HIDDEN = RowHeaderMode.HIDDEN;
 
     /**
-     * @deprecated from 7.0, use {@link RowHeaderMode#ID} instead
+     * @deprecated As of 7.0, use {@link RowHeaderMode#ID} instead
      */
     @Deprecated
     public static final RowHeaderMode ROW_HEADER_MODE_ID = RowHeaderMode.ID;
 
     /**
-     * @deprecated from 7.0, use {@link RowHeaderMode#ITEM} instead
+     * @deprecated As of 7.0, use {@link RowHeaderMode#ITEM} instead
      */
     @Deprecated
     public static final RowHeaderMode ROW_HEADER_MODE_ITEM = RowHeaderMode.ITEM;
 
     /**
-     * @deprecated from 7.0, use {@link RowHeaderMode#INDEX} instead
+     * @deprecated As of 7.0, use {@link RowHeaderMode#INDEX} instead
      */
     @Deprecated
     public static final RowHeaderMode ROW_HEADER_MODE_INDEX = RowHeaderMode.INDEX;
 
     /**
-     * @deprecated from 7.0, use {@link RowHeaderMode#EXPLICIT_DEFAULTS_ID}
+     * @deprecated As of 7.0, use {@link RowHeaderMode#EXPLICIT_DEFAULTS_ID}
      *             instead
      */
     @Deprecated
     public static final RowHeaderMode ROW_HEADER_MODE_EXPLICIT_DEFAULTS_ID = RowHeaderMode.EXPLICIT_DEFAULTS_ID;
 
     /**
-     * @deprecated from 7.0, use {@link RowHeaderMode#EXPLICIT} instead
+     * @deprecated As of 7.0, use {@link RowHeaderMode#EXPLICIT} instead
      */
     @Deprecated
     public static final RowHeaderMode ROW_HEADER_MODE_EXPLICIT = RowHeaderMode.EXPLICIT;
 
     /**
-     * @deprecated from 7.0, use {@link RowHeaderMode#ICON_ONLY} instead
+     * @deprecated As of 7.0, use {@link RowHeaderMode#ICON_ONLY} instead
      */
     @Deprecated
     public static final RowHeaderMode ROW_HEADER_MODE_ICON_ONLY = RowHeaderMode.ICON_ONLY;
 
     /**
-     * @deprecated from 7.0, use {@link RowHeaderMode#PROPERTY} instead
+     * @deprecated As of 7.0, use {@link RowHeaderMode#PROPERTY} instead
      */
     @Deprecated
     public static final RowHeaderMode ROW_HEADER_MODE_PROPERTY = RowHeaderMode.PROPERTY;
@@ -1656,7 +1656,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * this method has been called. See {@link #refreshRowCache()} for forcing
      * an update of the contents.
      * 
-     * @deprecated As of 7.0.0, use {@link #markAsDirty()} instead
+     * @deprecated As of 7.0, use {@link #markAsDirty()} instead
      */
 
     @Deprecated
@@ -4632,7 +4632,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemClickListener(ItemClickListener)}
      **/
     @Override
@@ -4648,7 +4648,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeItemClickListener(ItemClickListener)}
      **/
     @Override
@@ -5004,7 +5004,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addHeaderClickListener(HeaderClickListener)}
      **/
     @Deprecated
@@ -5024,7 +5024,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeHeaderClickListener(HeaderClickListener)}
      **/
     @Deprecated
@@ -5050,7 +5050,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFooterClickListener(FooterClickListener)}
      **/
     @Deprecated
@@ -5070,7 +5070,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFooterClickListener(FooterClickListener)}
      **/
     @Deprecated
@@ -5236,7 +5236,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addColumnResizeListener(ColumnResizeListener)}
      **/
     @Deprecated
@@ -5256,7 +5256,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeColumnResizeListener(ColumnResizeListener)}
      **/
     @Deprecated
@@ -5319,7 +5319,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addColumnReorderListener(ColumnReorderListener)}
      **/
     @Deprecated
@@ -5339,7 +5339,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeColumnReorderListener(ColumnReorderListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java
index 1ba011dd00..c1b7009509 100644
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/com/vaadin/ui/Tree.java
@@ -910,7 +910,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addExpandListener(ExpandListener)}
      **/
     @Deprecated
@@ -930,7 +930,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeExpandListener(ExpandListener)}
      **/
     @Deprecated
@@ -1014,7 +1014,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addCollapseListener(CollapseListener)}
      **/
     @Deprecated
@@ -1034,7 +1034,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeCollapseListener(CollapseListener)}
      **/
     @Deprecated
@@ -1203,7 +1203,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addItemClickListener(ItemClickListener)}
      **/
     @Override
@@ -1219,7 +1219,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeItemClickListener(ItemClickListener)}
      **/
     @Override
diff --git a/server/src/com/vaadin/ui/TreeTable.java b/server/src/com/vaadin/ui/TreeTable.java
index 8bf72c2db1..1a08767c8e 100644
--- a/server/src/com/vaadin/ui/TreeTable.java
+++ b/server/src/com/vaadin/ui/TreeTable.java
@@ -757,7 +757,7 @@ public class TreeTable extends Table implements Hierarchical {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addExpandListener(ExpandListener)}
      **/
     @Deprecated
@@ -777,7 +777,7 @@ public class TreeTable extends Table implements Hierarchical {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeExpandListener(ExpandListener)}
      **/
     @Deprecated
@@ -807,7 +807,7 @@ public class TreeTable extends Table implements Hierarchical {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addCollapseListener(CollapseListener)}
      **/
     @Deprecated
@@ -827,7 +827,7 @@ public class TreeTable extends Table implements Hierarchical {
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeCollapseListener(CollapseListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 89a36e198e..d8e440a0bf 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -701,7 +701,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addClickListener(ClickListener)}
      **/
     @Deprecated
@@ -734,7 +734,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeClickListener(ClickListener)}
      **/
     @Deprecated
@@ -779,7 +779,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
      * Setting the caption of a UI is not supported. To set the title of the
      * HTML page, use Page.setTitle
      * 
-     * @deprecated as of 7.0.0, use {@link Page#setTitle(String)}
+     * @deprecated As of 7.0, use {@link Page#setTitle(String)}
      */
     @Override
     @Deprecated
diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java
index 47b4684c32..12138bd9bc 100644
--- a/server/src/com/vaadin/ui/Upload.java
+++ b/server/src/com/vaadin/ui/Upload.java
@@ -574,7 +574,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addStartedListener(StartedListener)}
      **/
     @Deprecated
@@ -593,7 +593,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeStartedListener(StartedListener)}
      **/
     @Deprecated
@@ -612,7 +612,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFinishedListener(FinishedListener)}
      **/
     @Deprecated
@@ -631,7 +631,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFinishedListener(FinishedListener)}
      **/
     @Deprecated
@@ -650,7 +650,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFailedListener(FailedListener)}
      **/
     @Deprecated
@@ -669,7 +669,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFailedListener(FailedListener)}
      **/
     @Deprecated
@@ -688,7 +688,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addSucceededListener(SucceededListener)}
      **/
     @Deprecated
@@ -707,7 +707,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeSucceededListener(SucceededListener)}
      **/
     @Deprecated
@@ -729,7 +729,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addProgressListener(ProgressListener)}
      **/
     @Deprecated
@@ -750,7 +750,7 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeProgressListener(ProgressListener)}
      **/
     @Deprecated
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index 338c77239a..b6f45db86a 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -348,7 +348,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addCloseListener(CloseListener)}
      **/
     @Deprecated
@@ -371,7 +371,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeCloseListener(CloseListener)}
      **/
     @Deprecated
@@ -442,7 +442,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addResizeListener(ResizeListener)}
      **/
     @Deprecated
@@ -460,7 +460,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeResizeListener(ResizeListener)}
      **/
     @Deprecated
@@ -771,7 +771,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #addFocusListener(FocusListener)}
      **/
     @Override
@@ -786,7 +786,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeFocusListener(FocusListener)}
      **/
     @Override
@@ -810,7 +810,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     * @deprecated As of 7.0, replaced by {@link #addBlurListener(BlurListener)}
      **/
     @Override
     @Deprecated
@@ -824,7 +824,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     }
 
     /**
-     * @deprecated Since 7.0, replaced by
+     * @deprecated As of 7.0, replaced by
      *             {@link #removeBlurListener(BlurListener)}
      **/
     @Override