oops, worked on branch, merging back into trunk

4 files changed, 6 insertions, 6 deletions

diff --git a/src/swing/scala/swing/Action.scala b/src/swing/scala/swing/Action.scala
index c3a94ed65e..4b56f7ce51 100644
--- a/src/swing/scala/swing/Action.scala
+++ b/src/swing/scala/swing/Action.scala
@@ -18,7 +18,7 @@ object Action {
   }
 
   /**
-   * Anything that triggers an action.
+   * Something that triggers an action.
    */
   trait Trigger {
     def action: Action
diff --git a/src/swing/scala/swing/Publisher.scala b/src/swing/scala/swing/Publisher.scala
index 4b26e9e74e..e6f990418c 100644
--- a/src/swing/scala/swing/Publisher.scala
+++ b/src/swing/scala/swing/Publisher.scala
@@ -8,11 +8,11 @@ import event.Event
  * reactors and listen to themselves per default as a convenience.
  *
  * In order to reduce memory leaks, reactions are weakly referenced by default,
- * unless they implement <code>Reactions.StronglyReferenced</code>. This way,
+ * unless they implement <code>Reactions.StronglyReferenced</code>. That way,
  * the lifetime of reactions are more easily bound to the registering object,
  * which are reactors in common client code and hold strong references to their
  * reactions. As a result, reactors can be garbage collected even though they
- * still have reactions registered at some publisher, but usually not vice versa
+ * still have reactions registered at some publisher, but not vice versa
  * since reactors (strongly) reference publishers they are interested in.
  */
 trait Publisher extends Reactor {
diff --git a/src/swing/scala/swing/ScrollPane.scala b/src/swing/scala/swing/ScrollPane.scala
index a3eea8a715..0228ae6361 100644
--- a/src/swing/scala/swing/ScrollPane.scala
+++ b/src/swing/scala/swing/ScrollPane.scala
@@ -3,7 +3,7 @@ package scala.swing
 import javax.swing.JScrollPane
 
 /**
- * Can have at most a single child component. It display it inside a canvas (the viewport)
+ * Can have at most a single child component, which will be put inside a canvas (the viewport)
  * that can be scrolled.
  *
  * @see javax.swing.JScrollPane
diff --git a/src/swing/scala/swing/UIElement.scala b/src/swing/scala/swing/UIElement.scala
index c1a887269b..6635772027 100644
--- a/src/swing/scala/swing/UIElement.scala
+++ b/src/swing/scala/swing/UIElement.scala
@@ -3,8 +3,8 @@ package scala.swing
 import java.awt.{Color, Cursor, Font, Dimension}
 
 /**
- * The base trait of all user interface elements. Subclasses can be divided
- * into two groups, top-level elements such as windows and dialogs, and
+ * The base trait of all user interface elements. Subclasses belong to one
+ * of two groups: top-level elements such as windows and dialogs, or
  * <code>Component</code>s.
  *
  * @see java.awt.Component