Unified deprecation messages

Change-Id: If3fc2c2d9b251cbc6f2a9da2ede23ff17f7362ef

34 files changed, 165 insertions, 165 deletions

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