merge

11 files changed, 19 insertions, 18 deletions

diff --git a/doc/dw-usage.doc b/doc/dw-usage.doc
index a2e89d8e..2680a234 100644
--- a/doc/dw-usage.doc
+++ b/doc/dw-usage.doc
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 {
 \endcode
 
-As the first object, the platform is instanciated:
+As the first object, the platform is instantiated:
 
 \code
    dw::fltk::FltkPlatform *platform = new dw::fltk::FltkPlatform ();
diff --git a/doc/uml-legend.doc b/doc/uml-legend.doc
index 14a64e7d..90294ef6 100644
--- a/doc/uml-legend.doc
+++ b/doc/uml-legend.doc
@@ -119,10 +119,10 @@ In this example,
 </ul>
 
 
-<h2>Template Instanciations</h2>
+<h2>Template Instantiations</h2>
 
-Template instanciations are shown as own classes/interfaces, the
-instanciation by the template is shown by a yellow dashed arrow:
+Template instantiations are shown as own classes/interfaces, the
+instantiation by the template is shown by a yellow dashed arrow:
 
 \dot
 digraph G {
diff --git a/dw/findtext.hh b/dw/findtext.hh
index 3a4ab2a7..8ef953e3 100644
--- a/dw/findtext.hh
+++ b/dw/findtext.hh
@@ -59,9 +59,9 @@ private:
     */
    CharIterator *hlIterator;
 
-   static const char* rev(const char* _str); /* Function to reverse a C-string */
+   static const char* rev(const char* _str); /* reverse a C string */
 
-   static int *createNexttab (const char *needle, bool caseSens, bool backwards);
+   static int *createNexttab (const char *needle,bool caseSens,bool backwards);
    bool unhighlight ();
    bool search0 (bool backwards, bool firstTrial);
 
diff --git a/dw/iterator.hh b/dw/iterator.hh
index 1d4c2f98..f8fb4d31 100644
--- a/dw/iterator.hh
+++ b/dw/iterator.hh
@@ -66,9 +66,9 @@ public:
     * \brief Shrink highlighted region to no longer contain the
     *    current content.
     *
-    * The direction parameter indicates whether the highlighted region should be
-    * reduced from the start (direction > 0) or from the end (direction < 0).
-    * If direction is 0 all content is unhighlighted.
+    * The direction parameter indicates whether the highlighted region should
+    * be reduced from the start (direction > 0) or from the end
+    * (direction < 0). If direction is 0 all content is unhighlighted.
     */
    virtual void unhighlight (int direction, HighlightLayer layer) = 0;
 
diff --git a/dw/layout.hh b/dw/layout.hh
index a4214220..b910ac20 100644
--- a/dw/layout.hh
+++ b/dw/layout.hh
@@ -255,7 +255,8 @@ public:
       emitter.connectLayout (receiver); }
 
    /** \brief See dw::core::FindtextState::search. */
-   inline FindtextState::Result search (const char *str, bool caseSens, int backwards)
+   inline FindtextState::Result search (const char *str, bool caseSens,
+                                        int backwards)
       { return findtextState.search (str, caseSens, backwards); }
 
    /** \brief See dw::core::FindtextState::resetSearch. */
diff --git a/dw/ui.hh b/dw/ui.hh
index 7cc45129..b8ed61a5 100644
--- a/dw/ui.hh
+++ b/dw/ui.hh
@@ -120,7 +120,7 @@ namespace core {
  *
  * <table>
  * <tr><th>Attribute <th>Implementation
- * <tr><td>type      <td>This defines the resource you have to instanciate.
+ * <tr><td>type      <td>This defines the resource you have to instantiate.
  * <tr><td>name      <td>Not needed within Dw.
  * <tr><td>value     <td>The initial value is treated differently by different
  *                       resources.
diff --git a/lout/container.hh b/lout/container.hh
index 52c5019f..68a15da4 100644
--- a/lout/container.hh
+++ b/lout/container.hh
@@ -8,7 +8,7 @@
  *    members are instances of object::Object.
  *
  * A common problem in languanges without garbage collection is, where the
- * children belong to, and so, who is responsible to delete them (instanciation
+ * children belong to, and so, who is responsible to delete them (instantiation
  * is always done by the caller). This information is here told to the
  * collections, each container has a constructor with the parameter
  * "ownerOfObjects" (HashTable has two such parameters, for keys and values).
@@ -70,7 +70,7 @@ class Iterator
 private:
    Collection0::AbstractIterator *impl;
 
-   // Should not instanciated directly.
+   // Should not instantiated directly.
    inline Iterator(Collection0::AbstractIterator *impl) { this->impl = impl; }
 
 public:
diff --git a/lout/identity.hh b/lout/identity.hh
index 544656fc..6102933d 100644
--- a/lout/identity.hh
+++ b/lout/identity.hh
@@ -53,7 +53,7 @@ namespace identity {
  * </ul>
  *
  * After this, <i>class</i>::CLASS_ID refers to a number, which denotes the
- * class. (If this is still -1, since the class has not yet been instanciated,
+ * class. (If this is still -1, since the class has not yet been instantiated,
  * any test will fail, which is correct.)
  *
  * <h3>Notes on implementation</h3>
diff --git a/lout/signal.hh b/lout/signal.hh
index 9a5635d0..6b332203 100644
--- a/lout/signal.hh
+++ b/lout/signal.hh
@@ -23,7 +23,7 @@
  *
  * Typically, signals are grouped. To define a signal group \em bar for your
  * class \em Foo, you have to define two classes, the emitter and the
- * receiver (BarEmitter and BarReceiver), and instanciate the emitter:
+ * receiver (BarEmitter and BarReceiver), and instantiate the emitter:
  *
  * \dot
  * digraph G {
@@ -130,7 +130,7 @@
  *
  * <h4>Emitters</h4>
  *
- * Emitters are typically instanciated one, for one object emitting the
+ * Emitters are typically instantiated one, for one object emitting the
  * signals. In the example above, the class Foo will contain a field
  * "BarEmitter barEmitter" (not as a pointer, "BarEmitter *barEmitter").
  *
diff --git a/test/dw_ui_test.cc b/test/dw_ui_test.cc
index 7b1fe205..c65f76f9 100644
--- a/test/dw_ui_test.cc
+++ b/test/dw_ui_test.cc
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
 
    // Note on complex buttons: before any operations on the widget, which
    // need a layout, the complex button resource should be created, since
-   // then, a layout and a platform are instanciated.
+   // then, a layout and a platform are instantiated.
    Textblock *cbuttontext = new Textblock(false);
    ComplexButtonResource *cbuttonres =
       layout->getResourceFactory()->createComplexButtonResource (cbuttontext,
diff --git a/test/form.hh b/test/form.hh
index 4d0481c7..72f0164b 100644
--- a/test/form.hh
+++ b/test/form.hh
@@ -55,7 +55,7 @@ private:
    /**
     * \brief Decorates instances of dw::core::ui::RadioButtonResource.
     *
-    * This class has to be instanciated only once for a group of radio
+    * This class has to be instantiated only once for a group of radio
     * buttons.
     */
    class RadioButtonResourceDecorator: public ResourceDecorator