Fix typos (#10213)

* Fix typos

* Fix

33 files changed, 57 insertions, 57 deletions

diff --git a/all/src/main/templates/release-notes.html b/all/src/main/templates/release-notes.html
index d9d006d23f..f3852f2671 100644
--- a/all/src/main/templates/release-notes.html
+++ b/all/src/main/templates/release-notes.html
@@ -155,7 +155,7 @@
                 </li>
             </ul>
             </li>
-            <li>The Maven GWT compilation for <tt>Vaadin7WidgetSet</tt> requires at least 1G of memory, when using the <tt>vaadin-client-compability</tt> package. If compiled inside Eclipse, possibly even more.</li>
+            <li>The Maven GWT compilation for <tt>Vaadin7WidgetSet</tt> requires at least 1G of memory, when using the <tt>vaadin-client-compatibility</tt> package. If compiled inside Eclipse, possibly even more.</li>
         </ul>
 
 
@@ -270,7 +270,7 @@
             being part of the non-compatibility modules.
         </p>
         <p>
-        All applications using either <tt>Reindeer</tt>, <tt>Runo</tt>, <tt>Chameleon</tt> or <tt>Base</tt> theme must include the <tt>vaadin-compability-themes</tt> package.
+        All applications using either <tt>Reindeer</tt>, <tt>Runo</tt>, <tt>Chameleon</tt> or <tt>Base</tt> theme must include the <tt>vaadin-compatibility-themes</tt> package.
         </p>
 
         <p>
diff --git a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
index f36a181dd2..af0ca05b65 100644
--- a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
@@ -95,7 +95,7 @@ public class ApplicationConfiguration implements EntryPoint {
          *
          * @param name
          *            name of the configuration parameter
-         * @return boolean value of the configuration paramter, or
+         * @return boolean value of the configuration parameter, or
          *         <code>null</code> if no value is defined
          */
         private native Boolean getConfigBoolean(String name)
@@ -116,7 +116,7 @@ public class ApplicationConfiguration implements EntryPoint {
          *
          * @param name
          *            name of the configuration parameter
-         * @return integer value of the configuration paramter, or
+         * @return integer value of the configuration parameter, or
          *         <code>null</code> if no value is defined
          */
         private native Integer getConfigInteger(String name)
diff --git a/client/src/main/java/com/vaadin/client/ComponentDetail.java b/client/src/main/java/com/vaadin/client/ComponentDetail.java
index a6621ac178..d5dfce955f 100644
--- a/client/src/main/java/com/vaadin/client/ComponentDetail.java
+++ b/client/src/main/java/com/vaadin/client/ComponentDetail.java
@@ -29,7 +29,7 @@ class ComponentDetail {
     }
 
     /**
-     * Returns a TooltipInfo assosiated with Component. If element is given,
+     * Returns a TooltipInfo associated with Component. If element is given,
      * returns an additional TooltipInfo.
      *
      * @param key
diff --git a/client/src/main/java/com/vaadin/client/ComputedStyle.java b/client/src/main/java/com/vaadin/client/ComputedStyle.java
index b54ee64ed4..8b21a006fe 100644
--- a/client/src/main/java/com/vaadin/client/ComputedStyle.java
+++ b/client/src/main/java/com/vaadin/client/ComputedStyle.java
@@ -263,7 +263,7 @@ public class ComputedStyle {
      *
      * @param String
      *            a value starting with a number
-     * @return int the value from the string before any non-numeric characters.
+     * @return the value from the string before any non-numeric characters.
      *         If the value cannot be parsed to a number, returns 0.
      */
     private static native int parseIntNative(final String value)
diff --git a/client/src/main/java/com/vaadin/client/WidgetUtil.java b/client/src/main/java/com/vaadin/client/WidgetUtil.java
index e6304343aa..d9061321ca 100644
--- a/client/src/main/java/com/vaadin/client/WidgetUtil.java
+++ b/client/src/main/java/com/vaadin/client/WidgetUtil.java
@@ -1428,7 +1428,7 @@ public class WidgetUtil {
     /**
      * Wrap a css size value and its unit and translate back and forth to the
      * string representation.<br/>
-     * Eg. 50%, 123px, ...
+     * E.g. 50%, 123px, ...
      *
      * @since 7.2.6
      * @author Vaadin Ltd
diff --git a/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
index 2c2ff5707c..8a79ad9f35 100644
--- a/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
@@ -185,7 +185,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
         List<String> paths = new ArrayList<>();
         int compIdx = 0;
         String basePath = components.get(compIdx).replace("com.vaadin.ui.", "");
-        // Add a basic search for the first element (eg. //Button)
+        // Add a basic search for the first element (e.g. //Button)
         paths.add((components.size() == 1 ? "/" : "//") + basePath);
         while (++compIdx < components.size()) {
             // Loop through the remaining components
diff --git a/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java b/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java
index 01a0146280..133d195f48 100644
--- a/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java
@@ -32,9 +32,9 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.Util;
 
 /**
- * A helper class to implement keyboard shorcut handling. Keeps a list of owners
- * actions and fires actions to server. User class needs to delegate keyboard
- * events to handleKeyboardEvents function.
+ * A helper class to implement keyboard shortcut handling. Keeps a list of
+ * owners actions and fires actions to server. User class needs to delegate
+ * keyboard events to handleKeyboardEvents function.
  *
  * @author Vaadin Ltd
  */
diff --git a/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java b/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java
index 6539103c63..e08a9be18d 100644
--- a/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java
@@ -35,8 +35,8 @@ import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
 
 /**
- * Compared to FocusPanel in GWT this panel does not support eg. accesskeys, but
- * is simpler by its dom hierarchy nor supports focusing via java api.
+ * Compared to FocusPanel in GWT this panel does not support e.g. accesskeys,
+ * but is simpler by its dom hierarchy nor supports focusing via java api.
  */
 public class SimpleFocusablePanel extends SimplePanel
         implements HasFocusHandlers, HasBlurHandlers, HasKeyDownHandlers,
diff --git a/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
index b250d1bb53..62bc4e28f8 100644
--- a/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
@@ -76,12 +76,12 @@ public abstract class VAbstractCalendarPanel<R extends Enum<R>>
 
         /**
          * Called when calendar user triggers a submitting operation in calendar
-         * panel. Eg. clicking on day or hitting enter.
+         * panel. E.g. clicking on day or hitting enter.
          */
         void onSubmit();
 
         /**
-         * On eg. ESC key.
+         * On e.g. ESC key.
          */
         void onCancel();
     }
diff --git a/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java
index 238e8e9284..e2863c449c 100644
--- a/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java
@@ -852,7 +852,7 @@ public abstract class VAbstractSplitPanel extends ComplexPanel {
     }
 
     /**
-     * Ensures the panels are scrollable eg. after style name changes
+     * Ensures the panels are scrollable e.g. after style name changes
      * <p>
      * For internal use only. May be removed or replaced in the future.
      */
diff --git a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java
index 0ef910ac96..abf6bd9164 100644
--- a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java
+++ b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java
@@ -123,7 +123,7 @@ public class VDragAndDropWrapper extends VCustomComponent
                 if (getConnector().isEnabled()
                         && startDrag(event.getNativeEvent())) {
                     /*
-                     * Dont let eg. panel start scrolling.
+                     * Don't let e.g. panel start scrolling.
                      */
                     event.stopPropagation();
                 }
@@ -467,11 +467,11 @@ public class VDragAndDropWrapper extends VCustomComponent
 
         public final native void postFile(VHtml5File file)
         /*-{
-        
+
             this.setRequestHeader('Content-Type', 'multipart/form-data');
             // Seems like IE10 will loose the file if we don't keep a reference to it...
             this.fileBeingUploaded = file;
-        
+
             this.send(file);
         }-*/;
 
@@ -627,19 +627,19 @@ public class VDragAndDropWrapper extends VCustomComponent
     protected native void hookHtml5Events(com.google.gwt.user.client.Element el)
     /*-{
             var me = this;
-    
+
             el.addEventListener("dragenter",  $entry(function(ev) {
                 return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
             }), false);
-    
+
             el.addEventListener("dragleave",  $entry(function(ev) {
                 return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
             }), false);
-    
+
             el.addEventListener("dragover",  $entry(function(ev) {
                 return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
             }), false);
-    
+
             el.addEventListener("drop",  $entry(function(ev) {
                 return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
             }), false);
diff --git a/client/src/main/java/com/vaadin/client/ui/VOverlay.java b/client/src/main/java/com/vaadin/client/ui/VOverlay.java
index 2a74025204..7b6dc85f80 100644
--- a/client/src/main/java/com/vaadin/client/ui/VOverlay.java
+++ b/client/src/main/java/com/vaadin/client/ui/VOverlay.java
@@ -129,7 +129,7 @@ public class VOverlay extends Overlay {
     public static com.google.gwt.user.client.Element getOverlayContainer(
             ApplicationConnection ac) {
         String id = ac.getConfiguration().getRootPanelId();
-        id = id += "-overlays";
+        id += "-overlays";
         Element container = DOM.getElementById(id);
         if (container == null) {
             container = DOM.createDiv();
diff --git a/client/src/main/java/com/vaadin/client/ui/VPanel.java b/client/src/main/java/com/vaadin/client/ui/VPanel.java
index 06c5697a0b..28daf1e6ac 100644
--- a/client/src/main/java/com/vaadin/client/ui/VPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPanel.java
@@ -175,7 +175,7 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
     }
 
     /**
-     * Ensures the panel is scrollable eg. after style name changes.
+     * Ensures the panel is scrollable e.g. after style name changes.
      * <p>
      * For internal use only. May be removed or replaced in the future.
      */
diff --git a/client/src/main/java/com/vaadin/client/ui/VUI.java b/client/src/main/java/com/vaadin/client/ui/VUI.java
index 8fa0308df4..6e3ffd716f 100644
--- a/client/src/main/java/com/vaadin/client/ui/VUI.java
+++ b/client/src/main/java/com/vaadin/client/ui/VUI.java
@@ -354,7 +354,7 @@ public class VUI extends SimplePanel implements ResizeHandler,
     }
 
     /**
-     * Ensures the widget is scrollable eg. after style name changes.
+     * Ensures the widget is scrollable e.g. after style name changes.
      * <p>
      * For internal use only. May be removed or replaced in the future.
      */
diff --git a/client/src/main/java/com/vaadin/client/ui/VUpload.java b/client/src/main/java/com/vaadin/client/ui/VUpload.java
index 5d78a68011..ef66f07467 100644
--- a/client/src/main/java/com/vaadin/client/ui/VUpload.java
+++ b/client/src/main/java/com/vaadin/client/ui/VUpload.java
@@ -147,7 +147,7 @@ public class VUpload extends SimplePanel {
             @Override
             public void onClick(ClickEvent event) {
                 if (isImmediateMode()) {
-                    // fire click on upload (eg. focused button and hit space)
+                    // fire click on upload (e.g. focused button and hit space)
                     fireNativeClick(fu.getElement());
                 } else {
                     submit();
diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java b/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java
index 6f3ca4495a..c0cdeb06b8 100644
--- a/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java
@@ -37,7 +37,7 @@ public class VTransferable {
     private final Map<String, Object> variables = new HashMap<>();
 
     /**
-     * Returns the component from which the transferable is created (eg. a tree
+     * Returns the component from which the transferable is created (e.g. a tree
      * which node is dragged).
      *
      * @return the component
@@ -48,7 +48,7 @@ public class VTransferable {
 
     /**
      * Sets the component currently being dragged or from which the transferable
-     * is created (eg. a tree which node is dragged).
+     * is created (e.g. a tree which node is dragged).
      * <p>
      * The server side counterpart of the component may implement
      * {@link DragSource} interface if it wants to translate or complement the
diff --git a/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java
index b502b89135..35055a746e 100644
--- a/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java
@@ -186,7 +186,7 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
             @Override
             public void uiClosed(final boolean sessionExpired) {
                 Scheduler.get().scheduleDeferred(() -> {
-                    // Only notify user if we're still running and not eg.
+                    // Only notify user if we're still running and not e.g.
                     // navigating away (#12298)
                     if (getConnection().isApplicationRunning()) {
                         if (sessionExpired) {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
index 819248787b..f8c5187280 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
@@ -69,12 +69,12 @@ public class VCalendarPanel extends FocusableFlexTable implements
 
         /**
          * Called when calendar user triggers a submitting operation in calendar
-         * panel. Eg. clicking on day or hitting enter.
+         * panel. E.g. clicking on day or hitting enter.
          */
         void onSubmit();
 
         /**
-         * On eg. ESC key.
+         * On e.g. ESC key.
          */
         void onCancel();
     }
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VUpload.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VUpload.java
index 1a93e04e1e..78d4063cfe 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VUpload.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VUpload.java
@@ -146,7 +146,7 @@ public class VUpload extends SimplePanel {
             @Override
             public void onClick(ClickEvent event) {
                 if (immediate) {
-                    // fire click on upload (eg. focused button and hit space)
+                    // fire click on upload (e.g. focused button and hit space)
                     fireNativeClick(fu.getElement());
                 } else {
                     submit();
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldValueChangeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldValueChangeTest.java
index 4973f2a9d8..01be620225 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldValueChangeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldValueChangeTest.java
@@ -53,7 +53,7 @@ public class TextFieldValueChangeTest
      * but don't fire value change events twice if value has only changed once.
      *
      *
-     * TODO make test field type agnostic (eg. combobox)
+     * TODO make test field type agnostic (e.g. combobox)
      */
     @Test
     public void testValueChangeEventPropagationWithReadThrough() {
@@ -87,7 +87,7 @@ public class TextFieldValueChangeTest
      * Value change events from property should not propagate if read through is
      * false. Execpt when the property is being set.
      *
-     * TODO make test field type agnostic (eg. combobox)
+     * TODO make test field type agnostic (e.g. combobox)
      */
     @Test
     public void testValueChangePropagationWithReadThroughOff() {
diff --git a/documentation/themes/themes-creating.asciidoc b/documentation/themes/themes-creating.asciidoc
index 98fba272da..4eed47018d 100644
--- a/documentation/themes/themes-creating.asciidoc
+++ b/documentation/themes/themes-creating.asciidoc
@@ -165,7 +165,7 @@ Since version 8.0, Vaadin Framework includes only one built-in theme:
 
 * [literal]#++valo++#, the primary theme since Vaadin 7.3
 
-The following legacy themes can be found in the [filename]#vaadin-compability-themes.jar# package
+The following legacy themes can be found in the [filename]#vaadin-compatibility-themes.jar# package
 for easier migrating from framework version 7 to 8:
 
 * [literal]#++reindeer++#, the primary theme in Vaadin 6 and 7
diff --git a/server/src/main/java/com/vaadin/data/HasValue.java b/server/src/main/java/com/vaadin/data/HasValue.java
index be5629f952..636610a974 100644
--- a/server/src/main/java/com/vaadin/data/HasValue.java
+++ b/server/src/main/java/com/vaadin/data/HasValue.java
@@ -296,10 +296,10 @@ public interface HasValue<V> extends Serializable {
     /**
      * Returns a validator that checks the internal state of the HasValue. This
      * should be overridden for components with internal value conversion or
-     * validation, eg. when the user is providing a string that has to be parsed
-     * into a date. An invalid input from user will be exposed to
-     * a {@link Binder} and can be seen as a validation failure.
-     * 
+     * validation, e.g. when the user is providing a string that has to be
+     * parsed into a date. An invalid input from user will be exposed to a
+     * {@link Binder} and can be seen as a validation failure.
+     *
      * @since 8.1
      * @return internal state validator
      * @see Binder#validate()
diff --git a/server/src/main/java/com/vaadin/data/util/BeanUtil.java b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
index a80eb8b151..21331bdf24 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanUtil.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
@@ -87,7 +87,7 @@ public final class BeanUtil implements Serializable {
 
     /**
      * Returns the type of the property with the given name and declaring class.
-     * The property name may refer to a nested property, eg.
+     * The property name may refer to a nested property, e.g.
      * "property.subProperty" or "property.subProperty1.subProperty2". The
      * property must have a public read method (or a chain of read methods in
      * case of a nested property).
@@ -113,7 +113,7 @@ public final class BeanUtil implements Serializable {
 
     /**
      * Returns the property descriptor for the property of the given name and
-     * declaring class. The property name may refer to a nested property, eg.
+     * declaring class. The property name may refer to a nested property, e.g.
      * "property.subProperty" or "property.subProperty1.subProperty2". The
      * property must have a public read method (or a chain of read methods in
      * case of a nested property).
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
index 8002cffca5..8c4b82c0c7 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
@@ -23,7 +23,7 @@ import com.vaadin.ui.Component;
 
 /**
  *
- * A criterion that ensures the drag source is the same as drop target. Eg.
+ * A criterion that ensures the drag source is the same as drop target. E.g.
  * {code Tree} or {@code Table} could support only re-ordering of items, but no
  * {@link Transferable}s coming outside.
  * <p>
diff --git a/server/src/main/java/com/vaadin/server/DownloadStream.java b/server/src/main/java/com/vaadin/server/DownloadStream.java
index b52b2e83a4..b6fe260126 100644
--- a/server/src/main/java/com/vaadin/server/DownloadStream.java
+++ b/server/src/main/java/com/vaadin/server/DownloadStream.java
@@ -134,7 +134,7 @@ public class DownloadStream implements Serializable {
     }
 
     /**
-     * Sets a paramater for download stream. Parameters are optional information
+     * Sets a parameter for download stream. Parameters are optional information
      * about the downloadable stream and their meaning depends on the used
      * adapter. For example in WebAdapter they are interpreted as HTTP response
      * headers.
@@ -197,8 +197,8 @@ public class DownloadStream implements Serializable {
     /**
      * Sets length of cache expiration time. This gives the adapter the
      * possibility cache streams sent to the client. The caching may be made in
-     * adapter or at the client if the client supports caching. Zero or negavive
-     * value disbales the caching of this stream.
+     * adapter or at the client if the client supports caching. Zero or negative
+     * value disables the caching of this stream.
      *
      * @param cacheTime
      *            the cache time in milliseconds.
@@ -210,7 +210,7 @@ public class DownloadStream implements Serializable {
     /**
      * Gets the size of the download buffer.
      *
-     * @return int The size of the buffer in bytes.
+     * @return The size of the buffer in bytes.
      */
     public int getBufferSize() {
         return bufferSize;
diff --git a/server/src/main/java/com/vaadin/server/FileResource.java b/server/src/main/java/com/vaadin/server/FileResource.java
index 9bc37e5f8e..e7a1808775 100644
--- a/server/src/main/java/com/vaadin/server/FileResource.java
+++ b/server/src/main/java/com/vaadin/server/FileResource.java
@@ -124,8 +124,8 @@ public class FileResource implements ConnectorResource {
     /**
      * Sets the length of cache expiration time. This gives the adapter the
      * possibility cache streams sent to the client. The caching may be made in
-     * adapter or at the client if the client supports caching. Zero or negavive
-     * value disbales the caching of this stream.
+     * adapter or at the client if the client supports caching. Zero or negative
+     * value disables the caching of this stream.
      *
      * @param cacheTime
      *            the cache time in milliseconds.
diff --git a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
index bb8d8cd4d5..cebb90a0ad 100644
--- a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
+++ b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
@@ -385,7 +385,7 @@ public class LegacyCommunicationManager implements Serializable {
          * We will use the same APP/* URI space as ApplicationResources but
          * prefix url with UPLOAD
          *
-         * eg. APP/UPLOAD/[UIID]/[PID]/[NAME]/[SECKEY]
+         * e.g. APP/UPLOAD/[UIID]/[PID]/[NAME]/[SECKEY]
          *
          * SECKEY is created on each paint to make URL's unpredictable (to
          * prevent CSRF attacks).
diff --git a/server/src/main/java/com/vaadin/server/PaintTarget.java b/server/src/main/java/com/vaadin/server/PaintTarget.java
index 8ef05a7abd..a5df8947f2 100644
--- a/server/src/main/java/com/vaadin/server/PaintTarget.java
+++ b/server/src/main/java/com/vaadin/server/PaintTarget.java
@@ -187,7 +187,7 @@ public interface PaintTarget extends Serializable {
     public void addAttribute(String name, Resource value) throws PaintException;
 
     /**
-     * Adds details about {@link StreamVariable} to the UIDL stream. Eg. in web
+     * Adds details about {@link StreamVariable} to the UIDL stream. E.g. in web
      * terminals Receivers are typically rendered for the client side as URLs,
      * where the client side implementation can do an http post request.
      * <p>
@@ -282,7 +282,7 @@ public interface PaintTarget extends Serializable {
      * before any content is written.
      *
      * TODO: specify how the map is added
-     * 
+     *
      * @param name
      * @param value
      * @throws PaintException
diff --git a/server/src/main/java/com/vaadin/server/StreamVariable.java b/server/src/main/java/com/vaadin/server/StreamVariable.java
index 5252a207fc..4c42c6c703 100644
--- a/server/src/main/java/com/vaadin/server/StreamVariable.java
+++ b/server/src/main/java/com/vaadin/server/StreamVariable.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
  * browsers to the server without consuming large amounts of memory.
  * <p>
  * Note, writing to the {@link OutputStream} is not synchronized by the terminal
- * (to avoid stalls in other operations when eg. streaming to a slow network
+ * (to avoid stalls in other operations when e.g. streaming to a slow network
  * service or file system). If UI is changed as a side effect of writing to the
  * output stream, developer must handle synchronization manually.
  * <p>
diff --git a/server/src/main/java/com/vaadin/server/VaadinRequest.java b/server/src/main/java/com/vaadin/server/VaadinRequest.java
index 28dda963de..4b441f0b21 100644
--- a/server/src/main/java/com/vaadin/server/VaadinRequest.java
+++ b/server/src/main/java/com/vaadin/server/VaadinRequest.java
@@ -52,7 +52,7 @@ public interface VaadinRequest extends Serializable {
      *
      * @param parameter
      *            the name of the parameter
-     * @return The paramter value, or <code>null</code> if no parameter with the
+     * @return The parameter value, or {@code null} if no parameter with the
      *         given name is present
      */
     public String getParameter(String parameter);
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java
index c0fa46469c..11ed3c259b 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java
@@ -140,7 +140,7 @@ public class DesignResourceConverter implements Converter<String, Resource> {
             @Override
             public Resource parse(String value) {
                 // Deprecated, 7.4 syntax is
-                // font://"+FontAwesome.valueOf(foo) eg. "font://AMBULANCE"
+                // font://"+FontAwesome.valueOf(foo) e.g. "font://AMBULANCE"
                 final String iconName = value.split("://", 2)[1];
                 return FontAwesome.valueOf(iconName);
             }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
index 4c4da64495..70ee69d5d9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
@@ -54,7 +54,7 @@ public class PropertyValueChange extends TestBase {
             l.setValue(String.valueOf(getMultipliedValue(integer)));
 
             // we must hook value change listener to ensure updates in all use
-            // cases (eg. edit mode)
+            // cases (e.g. edit mode)
             if (integer instanceof Property.ValueChangeNotifier) {
                 Property.ValueChangeNotifier notifier = (Property.ValueChangeNotifier) integer;
                 notifier.addListener(new ValueChangeListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
index 97ec3ce616..ef53b94285 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
@@ -32,7 +32,7 @@ public class SimpleLoginView extends CustomComponent
         user = new TextField("User:");
         user.setWidth("300px");
         user.setRequired(true);
-        user.setInputPrompt("Your username (eg. joe@email.com)");
+        user.setInputPrompt("Your username (e.g. joe@email.com)");
         user.addValidator(
                 new EmailValidator("Username must be an email address"));
         user.setInvalidAllowed(false);