You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2020/03/20 07:09:56 UTC

[myfaces-tobago] branch master updated (bfd23a2 -> 332fd97)

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.


    from bfd23a2  fix checkstyle
     new 0cd6d39  check demo for misspellings and links
     new 332fd97  fix button label margin for i-tag

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 tobago-core/src/main/resources/scss/_tobago.scss     |  3 +++
 .../10-getting-started/Getting_Started.xhtml         |  2 +-
 .../30-whats-new/70-new-in-4-0/Tobago_4.xhtml        |  2 +-
 .../30-whats-new/80-new-in-3-0/Tobago_3.xhtml        |  2 +-
 .../50-migration/95-migration/4.0_to_5.0.xhtml       |  4 ++--
 .../50-migration/96-migration/3.0_to_4.0.xhtml       |  4 ++--
 .../main/webapp/content/10-intro/70-faq/FAQ.xhtml    |  2 +-
 .../content/10-intro/85-download/Download.xhtml      |  2 +-
 .../src/main/webapp/content/10-intro/Intro.xhtml     |  2 +-
 .../content/20-component/010-input/10-in/In.xhtml    | 20 ++++++++++----------
 .../20-component/010-input/20-suggest/Suggest.xhtml  |  2 +-
 .../010-input/30-textarea/Textarea.xhtml             |  3 ++-
 .../20-component/010-input/40-date/Date.xhtml        |  9 +++++----
 .../content/20-component/020-output/10-out/Out.xhtml |  2 +-
 .../20-component/020-output/20-label/Label.xhtml     |  2 +-
 .../10-selectBooleanCheckbox/Checkbox.xhtml          |  8 ++++----
 .../030-select/15-selectBooleanToggle/Toggle.xhtml   |  8 ++++----
 .../030-select/20-selectOneChoice/Dropdown.xhtml     | 10 +++++-----
 .../030-select/40-selectOneListbox/Listbox.xhtml     |  4 ++--
 .../50-selectManyCheckbox/Multi_Checkbox.xhtml       |  4 ++--
 .../60-selectManyListbox/Multi_Listbox.xhtml         |  4 ++--
 .../030-select/70-selectManyShuttle/Shuttle.xhtml    |  4 ++--
 .../040-command/00-button-link/Button_and_Link.xhtml |  2 +-
 .../040-command/10-default/Default_Command.xhtml     |  6 +++---
 .../20-component/050-container/20-panel/Panel.xhtml  |  8 ++++----
 .../content/20-component/060-popup/Popup.xhtml       |  4 ++--
 .../20-component/070-tab/00-client/Tab_Client.xhtml  |  2 +-
 .../20-component/070-tab/01-ajax/Tab_Ajax.xhtml      |  6 +++---
 .../20-component/070-tab/02-server/Tab_Server.xhtml  |  6 +++---
 .../20-selector/Sheet_Column_Selector.xhtml          |  2 +-
 .../080-sheet/50-filter/Sheet_Filter.xhtml           |  4 ++--
 .../60-multiheader/Sheet_Multi_Header.xhtml          |  2 +-
 .../080-sheet/80-editable/Sheet_Editable.xhtml       |  2 +-
 .../content/20-component/080-sheet/Sheet.xhtml       |  2 +-
 .../20-component/090-tree/03-menu/Tree_Menu.xhtml    |  2 +-
 .../090-tree/04-listbox/Tree_Listbox.xhtml           |  2 +-
 .../main/webapp/content/20-component/Component.xhtml |  4 ++--
 .../06-validation/00/Content_Validation.xhtml        |  2 +-
 .../06-validation/30-messages/Messages.xhtml         |  2 +-
 .../30-concept/06-validation/Validation.xhtml        |  2 +-
 .../30-concept/16-layout/10-flow/Flow_Layout.xhtml   |  2 +-
 .../16-layout/40-labeled/Labeled_Layout.xhtml        |  2 +-
 .../30-concept/16-layout/50-grid/Grid_Layout.xhtml   |  2 +-
 .../content/30-concept/18-websocket/WebSocket.xhtml  |  2 +-
 .../00-collapsible-box/Collapsible_Box.xhtml         |  6 +++---
 .../10-collapsible-popup/Collapsible_Popup.xhtml     |  4 ++--
 .../20-collapsible-panel/Collapsible_Panel.xhtml     |  6 +++---
 .../30-collapsible-section/Collapsible_Section.xhtml |  4 ++--
 .../30-concept/53-collapsible/Collapsible.xhtml      |  2 +-
 .../content/30-concept/65-accessKey/AccessKey.xhtml  |  2 +-
 .../30-concept/80-security/20-roles/Roles.xhtml      |  2 +-
 51 files changed, 101 insertions(+), 96 deletions(-)


[myfaces-tobago] 02/02: fix button label margin for i-tag

Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit 332fd9785107746d8dd68526cab2e923402b0348
Author: Jasmin Kroeger <ja...@irian.eu>
AuthorDate: Thu Mar 19 17:56:54 2020 +0100

    fix button label margin for i-tag
    
    A tobago-behavior is now rendered inside a button. Because of that, the old CSS rule was leading to an unwanted margin-left on the button label.
    The CSS rule is now adjusted for i-tag with a span
---
 tobago-core/src/main/resources/scss/_tobago.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tobago-core/src/main/resources/scss/_tobago.scss b/tobago-core/src/main/resources/scss/_tobago.scss
index 8976f1e..e792703 100644
--- a/tobago-core/src/main/resources/scss/_tobago.scss
+++ b/tobago-core/src/main/resources/scss/_tobago.scss
@@ -174,6 +174,9 @@ $form-disabled-alpha: 0.5;
   > img + span {
     margin-left: .4em;
   }
+  > i + span {
+    margin-left: .4em;
+  }
 }
 
 /* button -------------------------------------------------------------- */


[myfaces-tobago] 01/02: check demo for misspellings and links

Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit 0cd6d3919fcb9b73eb3db54a16348ba671f92dc9
Author: Jasmin Kroeger <ja...@irian.eu>
AuthorDate: Thu Mar 19 17:52:45 2020 +0100

    check demo for misspellings and links
---
 .../10-getting-started/Getting_Started.xhtml         |  2 +-
 .../30-whats-new/70-new-in-4-0/Tobago_4.xhtml        |  2 +-
 .../30-whats-new/80-new-in-3-0/Tobago_3.xhtml        |  2 +-
 .../50-migration/95-migration/4.0_to_5.0.xhtml       |  4 ++--
 .../50-migration/96-migration/3.0_to_4.0.xhtml       |  4 ++--
 .../main/webapp/content/10-intro/70-faq/FAQ.xhtml    |  2 +-
 .../content/10-intro/85-download/Download.xhtml      |  2 +-
 .../src/main/webapp/content/10-intro/Intro.xhtml     |  2 +-
 .../content/20-component/010-input/10-in/In.xhtml    | 20 ++++++++++----------
 .../20-component/010-input/20-suggest/Suggest.xhtml  |  2 +-
 .../010-input/30-textarea/Textarea.xhtml             |  3 ++-
 .../20-component/010-input/40-date/Date.xhtml        |  9 +++++----
 .../content/20-component/020-output/10-out/Out.xhtml |  2 +-
 .../20-component/020-output/20-label/Label.xhtml     |  2 +-
 .../10-selectBooleanCheckbox/Checkbox.xhtml          |  8 ++++----
 .../030-select/15-selectBooleanToggle/Toggle.xhtml   |  8 ++++----
 .../030-select/20-selectOneChoice/Dropdown.xhtml     | 10 +++++-----
 .../030-select/40-selectOneListbox/Listbox.xhtml     |  4 ++--
 .../50-selectManyCheckbox/Multi_Checkbox.xhtml       |  4 ++--
 .../60-selectManyListbox/Multi_Listbox.xhtml         |  4 ++--
 .../030-select/70-selectManyShuttle/Shuttle.xhtml    |  4 ++--
 .../040-command/00-button-link/Button_and_Link.xhtml |  2 +-
 .../040-command/10-default/Default_Command.xhtml     |  6 +++---
 .../20-component/050-container/20-panel/Panel.xhtml  |  8 ++++----
 .../content/20-component/060-popup/Popup.xhtml       |  4 ++--
 .../20-component/070-tab/00-client/Tab_Client.xhtml  |  2 +-
 .../20-component/070-tab/01-ajax/Tab_Ajax.xhtml      |  6 +++---
 .../20-component/070-tab/02-server/Tab_Server.xhtml  |  6 +++---
 .../20-selector/Sheet_Column_Selector.xhtml          |  2 +-
 .../080-sheet/50-filter/Sheet_Filter.xhtml           |  4 ++--
 .../60-multiheader/Sheet_Multi_Header.xhtml          |  2 +-
 .../080-sheet/80-editable/Sheet_Editable.xhtml       |  2 +-
 .../content/20-component/080-sheet/Sheet.xhtml       |  2 +-
 .../20-component/090-tree/03-menu/Tree_Menu.xhtml    |  2 +-
 .../090-tree/04-listbox/Tree_Listbox.xhtml           |  2 +-
 .../main/webapp/content/20-component/Component.xhtml |  4 ++--
 .../06-validation/00/Content_Validation.xhtml        |  2 +-
 .../06-validation/30-messages/Messages.xhtml         |  2 +-
 .../30-concept/06-validation/Validation.xhtml        |  2 +-
 .../30-concept/16-layout/10-flow/Flow_Layout.xhtml   |  2 +-
 .../16-layout/40-labeled/Labeled_Layout.xhtml        |  2 +-
 .../30-concept/16-layout/50-grid/Grid_Layout.xhtml   |  2 +-
 .../content/30-concept/18-websocket/WebSocket.xhtml  |  2 +-
 .../00-collapsible-box/Collapsible_Box.xhtml         |  6 +++---
 .../10-collapsible-popup/Collapsible_Popup.xhtml     |  4 ++--
 .../20-collapsible-panel/Collapsible_Panel.xhtml     |  6 +++---
 .../30-collapsible-section/Collapsible_Section.xhtml |  4 ++--
 .../30-concept/53-collapsible/Collapsible.xhtml      |  2 +-
 .../content/30-concept/65-accessKey/AccessKey.xhtml  |  2 +-
 .../30-concept/80-security/20-roles/Roles.xhtml      |  2 +-
 50 files changed, 98 insertions(+), 96 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
index 8effc06..09bbf9f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
@@ -30,7 +30,7 @@
 
     <pre><code class="language-bash">$ git clone https://github.com/apache/myfaces-tobago tobago</code></pre>
 
-    You can check out older versions like 2.x by using the git remote branch (tobaog-2.x) running:
+    You can check out older versions like 2.x by using the git remote branch (tobago-2.x) running:
 
     <pre><code
         class="language-bash">$ git clone -b tobaog-2.x https://github.com/apache/myfaces-tobago tobago-2.x</code></pre>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
index c21f478..a1adbe0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
@@ -188,7 +188,7 @@
         <li><code>security-annotation</code> added<br/>
           It determines what happen to the according component if - for example - @RolesAllowed()
           is not 'true'.
-          Posible values are 'hide', 'disable' and 'ignore'.
+          Possible values are 'hide', 'disable' and 'ignore'.
         </li>
         <li><code>renderers</code>, <code>renderer</code>, <code>supported-markup-type</code> removed<br/>
           It is not longer needed to specify which markups are allowed on specific components.<br/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
index 3d6bb14..39ca9a9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
@@ -108,7 +108,7 @@
     <b>Internal Refactoring</b>
     <ul>
       <li>Using standard ajax mechanism.</li>
-      <li>The clientId will be now rendered to the rool element in HTML of a component.</li>
+      <li>The clientId will be now rendered to the root element in HTML of a component.</li>
       <li>Change the icon format from GIF to PNG.</li>
     </ul>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml
index a36bbaf..9927f19 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml
@@ -55,8 +55,8 @@
     <tc:section id="components" label="UI Components">
 
       <tc:section id="suggest" label="Suggest">
-        For local menu for the suggest box use localMenu="true" in tc:suggest instead of markup="localMenu" in the
-        tc:in.
+        For local menu for the suggest box use <code class="language-markup">localMenu="true"</code> in <code class="language-markup">&lt;tc:suggest></code> instead of <code class="language-markup">markup="localMenu"</code> in the
+        <code class="language-markup">&lt;tc:in></code>.
       </tc:section>
 
     </tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml
index fa3d7c5..81278b0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml
@@ -62,7 +62,7 @@
             <p>
               Here you need to add the contextPath which might not be an empty string:
               <code class="language-markup">link="\#{request.contextPath}/image/alps.png"</code>.
-              So, this is now the same like resouces used over other attributes.
+              So, this is now the same like resources used over other attributes.
             </p>
           </li>
           <li>
@@ -137,7 +137,7 @@
           <li>Result in Tobago3: The first child of the segment layout spans 3 columns, the second 4 columns,
             the third 5 columns (filled up) and the fourth 3 columns again.
           </li>
-          <li>Result in Tobago4: The first child spans 3 columns, the second 4 columns, the third 3columns again and the
+          <li>Result in Tobago4: The first child spans 3 columns, the second 4 columns, the third 3 columns again and the
             fourth 4 columns.
           </li>
         </ul>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
index 794e3f7..9a2773e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
@@ -353,7 +353,7 @@ mvn clean jetty:run</code></pre>
     </ol>
   </tc:section>
 
-  <tc:section id="testQUnit" label="Howto create QUnit tests? (Tobago 4.2.1)">
+  <tc:section id="testQUnit" label="How to create QUnit tests? (Tobago 4.2.1)">
 
     Howto create QUnit tests for Tobago Demo 3.0 or higher
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml
index d84a889..9cd8011 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml
@@ -26,7 +26,7 @@
   <tc:section id="download" label="Download Tobago source- and binary packages">
 
     <p>
-      Most commen Tobago will be used in a Maven project, so an explicit download is not needed.
+      Most common Tobago will be used in a Maven project, so an explicit download is not needed.
       Nevertheless here are the artifacts to download.
     </p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml
index 035b918..4eb1486 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml
@@ -25,7 +25,7 @@
     It shows the components and concepts of Tobago and is also a main part of the documentation.</p>
   <p>If you want to migrate from an older version, you'll find further information in the
     <tc:link label="migration guide" outcome="/content/10-intro/50-migration/Migration.xhtml"/>.</p>
-  <p>If you want to start this demo on you local machine, have a look at the section 'Local Demo'.</p>
+  <p>If you want to start this demo on your local machine, have a look at the section 'Local Demo'.</p>
   <tc:section label="Description">
     <p>Tobago is a user interface framework for developing web applications.
       The technical basis of the framework is JavaServer Faces. The main core represents a theme oriented
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml
index 3640356..249598e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml
@@ -23,10 +23,10 @@
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
 
-  <p>The <code class="language-markup">&lt;tc:in/&gt;</code> tag create a classic inputfield.</p>
+  <p>The <code class="language-markup">&lt;tc:in/&gt;</code> tag create a classic input field.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png" link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/in.html"/>
   <tc:section label="Basics">
-    <p>In most cases, a label should be placed in front of every inputfield. Use the attribute
+    <p>In most cases, a label should be placed in front of every input field. Use the attribute
       <code>label</code>.</p>
     <pre><code class="language-markup">&lt;tc:in label="Input" value="Some Text"/&gt;</code></pre>
     <tc:in id="iNormal" label="Input" value="Some Text"/>
@@ -36,15 +36,15 @@
   </tc:section>
 
   <tc:section label="Focus">
-    <p>The following inputfield should be selected after reloading the page. Use the <code>focus</code> attribute.</p>
+    <p>The following input field should be selected after reloading the page. Use the <code>focus</code> attribute.</p>
     <pre><code class="language-markup">&lt;tc:in label="Input (focus)" focus="true" value="Some Text"/&gt;</code></pre>
     <tc:in id="i5" label="Input (focus)" focus="true" value="Some Text"/>
   </tc:section>
 
   <tc:section label="Required">
-    <p>An inputfield can be set as required with the <code>required</code> attribute.
-      Such an inputfield must contain a value, otherwise a submit is not possible.
-      Leave the field blank and press 'submit' to see the errormessage.</p>
+    <p>An input field can be set as required with the <code>required</code> attribute.
+      Such an input field must contain a value, otherwise a submit is not possible.
+      Leave the field blank and press 'submit' to see the error message.</p>
     <pre><code class="language-markup">&lt;tc:in label="Input (required)" required="true"/></code></pre>
     <tc:in id="ireq" label="Input (required)" required="true" value="#{inController.requiredValue}"/>
     <tc:button label="Submit"/>
@@ -57,7 +57,7 @@
   </tc:section>
 
   <tc:section label="Password">
-    <p>To create an inputfield for passwords, set the
+    <p>To create an input field for passwords, set the
       <code>password</code> attribute to 'true'. It will hide the text as shown in the following example.</p>
         <pre><code id="c3"
                    class="language-markup">&lt;tc:in label="Password" password="true" value="password"/&gt;</code></pre>
@@ -72,13 +72,13 @@
   </tc:section>
 
   <tc:section label="Ajax">
-    <p>The outputfield in this example, displays the given value on the server.
+    <p>The output field in this example, displays the given value on the server.
       With <code class="language-markup">&lt;f:ajax render="outputAjax" listener="\#{inController.update}"/></code>,
-      the outputfield will be rerendered, after the value has been changed.
+      the output field will be rerendered, after the value has been changed.
       This is because <code>outputAjax</code> is the id of the <code>&lt;tc:out/></code> tag.
       and the default event for <code class="language-markup">&lt;tc:in/></code> is <code>change</code>.
 
-      Additional, the <code>listener</code> attribute is set. The given method is called after the inputfield
+      Additional, the <code>listener</code> attribute is set. The given method is called after the input field
       loose focus.</p>
     <tc:in id="inputAjax" label="On Change" value="#{inController.changeValue}">
       <f:facet name="before">AJAX</f:facet>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml
index 8459a0a..76bf770 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml
@@ -22,7 +22,7 @@
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
 
-  <p>A <code class="language-markup">&lt;tc:suggest/></code> tag can be added to an inputfield to make
+  <p>A <code class="language-markup">&lt;tc:suggest/></code> tag can be added to an input field to make
     suggestions based on the already entered text.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:suggest/>" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml
index 2e5b249..e8a8ed1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml
@@ -28,7 +28,8 @@
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png" link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/textarea.html"/>
   <tc:section label="Basics">
     <p>The textarea should always have a label attached. For this, use the <code>label</code> attribute.</p>
-    <p>Unlike the inputfield TODO:linkToIn there is no placeholder attribute to describe the meaning of a textarea, when no label is set.</p>
+    <p>Unlike the input field <tc:link label="In"
+                                      outcome="/content/20-component/010-input/10-in/In.xhtml"/> there is no placeholder attribute to describe the meaning of a textarea, when no label is set.</p>
     <pre><code class="language-markup">&lt;tc:textarea label="Text Area" value="Some text, some text, ..."/&gt;</code></pre>
     <tc:textarea id="t1" label="Text Area"
                  value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
index 6805b45..47a2d11 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
@@ -24,7 +24,7 @@
                 xmlns:f="http://java.sun.com/jsf/core">
 
   <p>The <code class="language-markup">&lt;tc:date/&gt;</code>
-    tag create an inputfield with a button to open a calendar to edit the date.
+    tag create an input field with a button to open a calendar to edit the date.
     The date can also be edited in the textfield.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:date/>" image="#{request.contextPath}/image/feather-leaf.png" link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/date.html"/>
@@ -69,7 +69,7 @@
   <tc:section label="Required">
     <p>A date can be set as required with the <code>required</code> attribute.
       Such a date must contain a value, otherwise a submit is not possible.
-      Leave the field blank and press 'submit' to see the errormessage.</p>
+      Leave the field blank and press 'submit' to see the error message.</p>
     <pre><code class="language-markup">&lt;tc:date label="Date (required)" required="true"
     value="\#{dateController.once}"></code></pre>
     <tc:form>
@@ -116,7 +116,8 @@
     </tc:section>
   </tc:section>
   <tc:section label="Pattern And Button">
-    <p>Here are some examples for different pattern. The format is used from java.text.SimpleDateFormat. TODO:setlink</p>
+    <p>Here are some examples for different pattern. The format is used from
+      <tc:link label="java.text.SimpleDateFormat" link="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/SimpleDateFormat.html"/>.</p>
     <p>Also the type of the button changed with the <code>type</code> attribute.</p>
     <tc:section label="Month">
             <pre><code class="language-markup">&lt;tc:date label="Month" value="\#{dateController.today}"&gt;
@@ -187,7 +188,7 @@
     </tc:form>
   </tc:section>
   <tc:section label="Ajax">
-    <p>The outputfield in this example, display the given date.
+    <p>The output field in this example, display the given date.
       With <code class="language-markup">&lt;f:ajax render="outputfield"/></code>,
       the <code class="language-markup">&lt;tc:out id="outputfield" .../></code> will be rerendered,
       after the date changed.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml
index 3a8f4fa..72c66da 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml
@@ -58,7 +58,7 @@
     </tc:segmentLayout>
   </tc:section>
   <tc:section label="Escape">
-    <p>If the given string to the outputfield is HTML/XML code, it will be escaped by default.
+    <p>If the given string to the output field is HTML/XML code, it will be escaped by default.
       But you can turn it off with the <code>escape</code> attribute.</p>
     <tc:section label="Escape on (default)">
       <pre><code
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml
index 2ed8101..26bdc14 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml
@@ -42,7 +42,7 @@
 
   <tc:section label="Input Field">
     <p>With <code class="language-markup">&lt;tc:flexLayout columns="250px 1fr 200px"></code> a label is set
-      in front and after an inputfield. The <code>label</code> attribute is not used for
+      in front and after an input field. The <code>label</code> attribute is not used for
       <code class="language-markup">&lt;tc:in/></code>.</p>
     <tc:flexLayout columns="250px 1fr 200px">
       <tc:label id="l2" value="Label in front of inputfield"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
index b1ecb78..0e5b021 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
@@ -44,7 +44,7 @@
   </tc:section>
 
   <tc:section label="Simple Usage">
-    <p>In this example, the selected items are displayed in an outputfield after the submit-button is pressed.</p>
+    <p>In this example, the selected items are displayed in an output field after the submit-button is pressed.</p>
     <pre><code class="language-markup">&lt;tc:selectBooleanCheckbox label="A" value="\#{selectBooleanCheckboxController.a}"/>
 &lt;tc:out label="Selected items: " value="\#{selectBooleanCheckboxController.selectedItems}"/></code></pre>
     <tc:selectBooleanCheckbox id="selectA" label="A" value="#{selectBooleanCheckboxController.a}"/>
@@ -55,11 +55,11 @@
   </tc:section>
 
   <tc:section label="Ajax">
-    <p>The outputfields always shows the current value of the checkbox.
-      With <code class="language-markup">&lt;f:ajax render="output"/></code>, the outputfield will be rerendered,
+    <p>The output fields always shows the current value of the checkbox.
+      With <code class="language-markup">&lt;f:ajax render="output"/></code>, the output field will be rerendered,
       after the value changed in the
       <code class="language-markup">&lt;tc:selectBooleanCheckbox label="Character" value="#{selectBooleanCheckboxController.d}"/></code>.
-      The ID of the outputfield and the value in the <code>render</code> attribute of the ajax tag
+      The ID of the output field and the value in the <code>render</code> attribute of the ajax tag
       has to be the same.</p>
     <tc:selectBooleanCheckbox id="selectD" label="D" value="#{selectBooleanCheckboxController.d}">
       <f:ajax render="outputD"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml
index a4af1cb..ed0de9a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml
@@ -44,7 +44,7 @@
   </tc:section>
 
   <tc:section label="Simple Usage">
-    <p>In this example, the selected items are displayed in an outputfield after the submit-button is pressed.</p>
+    <p>In this example, the selected items are displayed in an output field after the submit-button is pressed.</p>
     <pre><code class="language-markup">&lt;tc:selectBooleanToggle label="A" value="\#{selectBooleanToggleController.a}"/>
 &lt;tc:out label="Selected items: " value="\#{selectBooleanToggleController.selectedItems}"/></code></pre>
     <tc:selectBooleanToggle id="selectA" label="A" value="#{selectBooleanToggleController.a}"/>
@@ -55,11 +55,11 @@
   </tc:section>
 
   <tc:section label="Ajax">
-    <p>The outputfields always shows the current value of the toggle.
-      With <code class="language-markup">&lt;f:ajax render="output"/></code>, the outputfield will be rerendered,
+    <p>The output fields always shows the current value of the toggle.
+      With <code class="language-markup">&lt;f:ajax render="output"/></code>, the output field will be rerendered,
       after the value changed in the
       <code class="language-markup">&lt;tc:selectBooleanToggle label="Character" value="#{selectBooleanToggleController.d}"/></code>.
-      The ID of the outputfield and the value in the <code>render</code> attribute of the ajax tag
+      The ID of the output field and the value in the <code>render</code> attribute of the ajax tag
       has to be the same.</p>
     <tc:selectBooleanToggle id="selectD" label="D" value="#{selectBooleanToggleController.d}">
       <f:ajax render="outputD"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
index e034a90..f25ef7c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
@@ -23,7 +23,7 @@
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
 
-  <p>The tag <code class="language-markup">&lt;tc:selectOneChoice/&gt;</code> create a dropdownbox,
+  <p>The tag <code class="language-markup">&lt;tc:selectOneChoice/&gt;</code> create a dropdown box,
     which contain<br/>
     <code class="language-markup">&lt;tc:selectItem/></code> for static entries or<br/>
     <code class="language-markup">&lt;tc:selectItems value="\#{controller.list}"/></code> for entries from
@@ -39,7 +39,7 @@
              link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/selectItems.html"/></p>
 
   <tc:section label="Basics">
-    <p>Dropdown Box with hardcoded items. The second item is disabled.
+    <p>Dropdown box with hardcoded items. The second item is disabled.
       To disable an item, use the <code>itemDisable</code> attribute.</p>
     <pre><code class="language-markup">&lt;tc:selectOneChoice label="Dropdown Box"/></code></pre>
     <tc:selectOneChoice id="s1" label="Dropdown Box">
@@ -57,9 +57,9 @@
   </tc:section>
 
   <tc:section label="Simple Usage">
-    <p>Select a person. The label of the item is shown in the dropdownbox.
-      After submitting, the value of the item is shown in the outputfield.
-      So, if 'Alice' is selected, the text in the outputfield is 'Alice Anderson'.</p>
+    <p>Select a person. The label of the item is shown in the dropdown box.
+      After submitting, the value of the item is shown in the output field.
+      So, if 'Alice' is selected, the text in the output field is 'Alice Anderson'.</p>
     <pre><code class="language-markup">&lt;tc:selectItem itemLabel="Alice" itemValue="Alice Anderson"/></code></pre>
     <tc:selectOneChoice id="selectPerson" label="Person" value="#{selectOneChoiceController.person}">
       <tc:selectItem itemLabel="Alice" itemValue="Alice Anderson"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml
index 9c4d89d..bfc0030 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml
@@ -67,7 +67,7 @@
 
   <tc:section label="Simple Usage">
     <p>Select a river in the list. After pressing the submit-button, the length of the river is shown in the
-      outputfield.</p>
+      output field.</p>
     <p>Items are added with
       <code class="language-markup">&lt;tc:selectItem itemLabel="Nile" itemValue="6853 km"/></code>.</p>
     <tc:selectOneListbox id="riverList" label="River" value="#{selectOneListboxController.river}">
@@ -85,7 +85,7 @@
     <p>Select a mountain in the list. The height will be displayed by
       <code class="language-markup">&lt;tc:out id="selectedMountain" .../></code>. The
       <code class="language-markup">&lt;tc:selectOneListbox/></code> contain a
-      <code class="language-markup">&lt;f:ajax render="selectedMountain"/></code>, which rerender the outputfield.</p>
+      <code class="language-markup">&lt;f:ajax render="selectedMountain"/></code>, which rerender the output field.</p>
     <tc:selectOneListbox id="mountainList" label="Mountains" value="#{selectOneListboxController.mountain}">
       <tc:selectItems value="#{selectOneListboxController.mountains}" var="mountain"
                       itemLabel="#{mountain.label}" itemValue="#{mountain.value}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
index c72dbcd..2de2a7c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
@@ -74,7 +74,7 @@
   </tc:section>
 
   <tc:section label="Simple Usage">
-    <p>Select an animal. The selection is shown in the outputfield, after pressing 'Submit'.</p>
+    <p>Select an animal. The selection is shown in the output field, after pressing 'Submit'.</p>
     <p><code
             class="language-markup">&lt;tc:selectManyCheckbox label="Checkbox Group" value="\#{selectManyCheckboxController.animals}"></code>
       save the selected value in the controller.
@@ -96,7 +96,7 @@
     <p>Select a number. Those numbers are added and displayed in the
       <code class="language-markup">&lt;tc:out id="resultOutput" .../></code>.
       <code class="language-markup">&lt;tc:selectManyCheckbox .../></code> contain a
-      <code class="language-markup">&lt;f:ajax render="resultOutput"/></code>, which rerenders the outputfield after
+      <code class="language-markup">&lt;f:ajax render="resultOutput"/></code>, which rerenders the output field after
       check/uncheck a checkbox.</p>
     <tc:selectManyCheckbox id="numbers" label="Checkbox Group" value="#{selectManyCheckboxController.numbers}">
       <tc:selectItem itemLabel="One" itemValue="1"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml
index 186aadc..0599bee 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml
@@ -58,7 +58,7 @@
   </tc:section>
 
   <tc:section label="Simple Usage">
-    <p>Select an entry and press the submit-button. The text in the outputfield depends on the selection.</p>
+    <p>Select an entry and press the submit-button. The text in the output field depends on the selection.</p>
     <pre><code class="language-markup">&lt;tc:selectManyListbox label="List" value="\#{selectManyListboxController.celestials}">
   &lt;tc:selectItem itemLabel="Sun" itemValue="The sun, "/>
   ...
@@ -76,7 +76,7 @@
   <tc:section label="Ajax" id="ajax">
     <p>The selected deserts from the list, are shown in the
       <code class="language-markup">&lt;tc:out id="desertOutput" .../></code>.
-      The value in the outputfield will be rerendered, after the selection in the list changed. For that,
+      The value in the output field will be rerendered, after the selection in the list changed. For that,
       <code class="language-markup">&lt;tc:selectManyListbox label="Deserts" size="4" ...></code> contain a
       <code class="language-markup">&lt;f:ajax render="desertOutput"/></code> tag.</p>
     <p>The number of rows is set to four by the <code>size</code> attribute. Is no size set, the height of the list
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml
index aaf990e..9180503 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml
@@ -86,7 +86,7 @@
   </tc:section>
 
   <tc:section label="Simple Usage">
-    <p>After a submit, the entries in the right list are shown in the outputfield with name and distance from the
+    <p>After a submit, the entries in the right list are shown in the output field with name and distance from the
       sun.</p>
     <p>A label is added to the left list via the <code>unselectedLabel</code> attribute and to the right list
       via <code>selectedLabel</code>. The label for the whole component is set on top by
@@ -113,7 +113,7 @@
       <code class="language-markup">&lt;tc:out id="outputStars" .../></code>.
       <code class="language-markup">&lt;tc:selectManyShuttle .../></code> contain
       <code class="language-markup">&lt;f:ajax render="outputStars"/></code>. Every time, the value in the shuttle list
-      change, the outputfield is rerendered.</p>
+      change, the output field is rerendered.</p>
     <tc:selectManyShuttle id="ajaxExample" label="Stars" labelLayout="top" value="#{selectManyShuttleController.selectedStars}">
       <tc:selectItems value="#{selectManyShuttleController.stars}"/>
       <f:ajax render="outputStars"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml
index bab4b63..d6dead1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml
@@ -183,7 +183,7 @@
   <tc:section label="Confirmation">
     <p>A confirmation dialog can be added to a link or a button via
       <code class="language-markup">&lt;f:facet name="confirmation"></code>.
-      The messagetext is added with <code class="language-markup">&lt;tc:out/></code>.</p>
+      The message text is added with <code class="language-markup">&lt;tc:out/></code>.</p>
     <tc:link id="l6" label="apache.org" link="https://www.apache.org/" confirmation="Are you sure?"/>
     <tc:button id="b6" label="apache.org" link="https://www.apache.org/">
       <f:facet name="confirmation">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml
index ba215fb..9cea93c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml
@@ -24,7 +24,7 @@
 
   <p>A normal button, created with <code class="language-markup">&lt;tc:button/></code>, must be actively pressed,
     to run the action. A default-button can be activated, even if not selected.
-    For example, the cursor is in an inputfield and the enter key is pressed.</p>
+    For example, the cursor is in an input field and the enter key is pressed.</p>
   <p>A button can be made to a default button with the <code>defaultCommand</code> attribute.
     The default button is highlighted by another color.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
@@ -32,7 +32,7 @@
 
   <tc:section label="Last Active Button ID">
     <p>To make the examples more clear, the ID of the last active button is displayed in the
-      following outputfield.</p>
+      following output field.</p>
     <tc:out id="o1" label="Id" value="#{defaultCommandController.lastActiveButtonId}"/>
   </tc:section>
 
@@ -50,7 +50,7 @@
     <p>The related default-button is searched in the current <code class="language-markup">&lt;tc:form/></code>.
       If there no default-button could found, the search is continued in the parent form and so on.
       If no default-button found on this way, the button is search outside of a form.</p>
-    <p>In this example, the 'Submit A'-button is in a form together with a intputfield and outputfield.
+    <p>In this example, the 'Submit A'-button is in a form together with a intputfield and output field.
       The 'Submit B'-button is outside a form.</p>
     <p>Now, if the cursor is in 'Textfield A' and the enter key is pressed, the 'Submit A'-button is activated.
       Therefor only the 'Textfield A'-value will be submitted.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml
index 97e1b83..e4ed296 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml
@@ -44,7 +44,7 @@
   <tc:section label="Reload">
     <p>To reload the panel in a dedicated frequency, you can use the
       <code class="language-markup">&lt;f:facet name="reload"></code> tag.
-      The content of the panel is an outputtext, which display the current time.</p>
+      The content of the panel is an output text, which display the current time.</p>
     <pre><code class="language-markup">&lt;tc:panel>
   &lt;f:facet name="reload">
     &lt;tc:reload frequency="1000" update="true"/>
@@ -62,7 +62,7 @@
   <tc:section label="Reload with update control">
     <p>To reload the panel in a dedicated frequency, you can use the
       <code class="language-markup">&lt;f:facet name="reload"></code> tag.
-      The content of the panel is an outputtext, which display the current time.</p>
+      The content of the panel is an output text, which display the current time.</p>
     <pre><code class="language-markup">&lt;tc:panel>
   &lt;f:facet name="reload">
     &lt;tc:reload frequency="1000" update="\#{panelController.oddDecaSecond}"/>
@@ -82,8 +82,8 @@
       A component for rerendering can be set with the <code>render</code> attribute in the
       <code class="language-markup">&lt;f:ajax/></code> tag.
       In this example, 'Outputfield One' and 'Outputfield Two' should be rerendered.
-      To do so, the outputfields are wrapped in a panel.
-      After the inputfield loosing the focus, the given text is shown by the outputfields.</p>
+      To do so, the output fields are wrapped in a panel.
+      After the input field loosing the focus, the given text is shown by the output fields.</p>
     <tc:in id="i1" label="Inputfield" value="#{panelController.text}">
       <f:ajax render="outputfields"/>
     </tc:in>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
index 1677c49..d9c9bc5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
@@ -68,13 +68,13 @@
           <tc:panel id="clientPopupMessages">
             <tc:messages id="messages"/>
           </tc:panel>
-          <p>This is a popup dialog with an inputfield.</p>
+          <p>This is a popup dialog with an input field.</p>
 
           <b>Submit</b>
           <pre><code class="language-markup">&lt;tc:button label="Submit">
   &lt;f:ajax execute="in" render="in :::out clientPopupMessages"/>
 &lt;/tc:button></code></pre>
-          <p>The 'Submit'-button send an ajax request to submit the value in the inputfield.
+          <p>The 'Submit'-button send an ajax request to submit the value in the input field.
           </p>
 
           <b>Submit &amp; Close</b>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml
index ea64cdc..681e951 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml
@@ -36,7 +36,7 @@
              link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/tabChangeListener.html"/></p>
 
   <tc:section label="Basics">
-    <p>A simple tabgroup. The second tab is disabled.</p>
+    <p>A simple tab group. The second tab is disabled.</p>
     <tc:tabGroup id="tg1">
       <tc:tab id="t11" label="One">
         First tab.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml
index 15c5da0..7103cca 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml
@@ -27,7 +27,7 @@
     <code class="language-markup">&lt;tc:tabGroup></code>.
     Within a tab, content can be added like in a section or a panel.</p>
   <p>To activate Ajax, the <code>switchType</code> attribute must have the value "reloadTab".
-    On all tabgroups on this page, Ajax is activated.</p>
+    On all tab groups on this page, Ajax is activated.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:tabGroup/>" image="#{request.contextPath}/image/feather-leaf.png" link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/tabGroup.html"/>
     |
@@ -37,7 +37,7 @@
              link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/tabChangeListener.html"/></p>
 
   <tc:section label="Basics">
-    <p>A simple tabgroup. The second tab is disabled.</p>
+    <p>A simple tab group. The second tab is disabled.</p>
     <tc:tabGroup id="tg1" switchType="reloadTab">
       <tc:tab id="t11" label="One">
         First tab.
@@ -72,7 +72,7 @@
       </tc:tab>
       <tc:tab id="tabHead4">
         <p>Neither a label or an image are set. In this case the header gets a label with the indexnumber of the tab in
-          the tabgroup.</p>
+          the tab group.</p>
       </tc:tab>
     </tc:tabGroup>
   </tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml
index 854047f..f28038c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml
@@ -27,7 +27,7 @@
     Within a tab, content can be added like in a section or a panel.</p>
   <p>Changing tabs is client side by default.
     To change them server side, the <code>switchType</code> attribute must have the value "reloadPage".
-    All tabgroups on this page are server side.</p>
+    All tab groups on this page are server side.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:tabGroup/>" image="#{request.contextPath}/image/feather-leaf.png" link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/tabGroup.html"/>
     |
@@ -37,7 +37,7 @@
              link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/tabChangeListener.html"/></p>
 
   <tc:section label="Basics">
-    <p>A simple tabgroup. The second tab is disabled.</p>
+    <p>A simple tab group. The second tab is disabled.</p>
     <tc:tabGroup id="tg1" switchType="reloadPage">
       <tc:tab id="t11" label="One">
         First tab.
@@ -69,7 +69,7 @@
       </tc:tab>
       <tc:tab id="t24">
         <p>Neither a label or an image are set. In this case the header gets a label with the indexnumber of the tab in
-          the tabgroup.</p>
+          the tab group.</p>
       </tc:tab>
     </tc:tabGroup>
   </tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml
index fda20df..7f12b73 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml
@@ -35,7 +35,7 @@
 
   <tc:section label="Column Selector">
     <p>The first column in this sheet contain radio buttons.
-      After clicking the submit button, the number of the selected row is displayed in the outputfield.</p>
+      After clicking the submit button, the number of the selected row is displayed in the output field.</p>
     <pre><code class="language-markup">&lt;tc:sheet value="\#{sheetController.solarList}"
     var="solarobject" selectable="singleOrNone" rows="2"
     state="\#{sheetController.sheetState}">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml
index 96ad28f..4599434 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml
@@ -35,8 +35,8 @@
              link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/column.html"/></p>
 
   <tc:section label="Filtering">
-    <p>Add a search string to the inputfield or change the value of the dropdown boxes to filter the sheet.
-      If an inputfield lost focus the filtering will be executed.</p>
+    <p>Add a search string to the input field or change the value of the dropdown boxes to filter the sheet.
+      If an input field lost focus the filtering will be executed.</p>
     <tc:sheet id="sheet" value="#{sheetFilterController.filteredSolarList}" var="object" rows="15">
       <f:facet name="header">
         <tc:form id="headerForm">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
index c64edf4..fd78e84 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
@@ -27,7 +27,7 @@
     <code class="language-markup">&lt;f:facet name="header"></code>in the sheet.
     The facet could be filled with <code class="language-markup">&lt;tc:out/></code> tags
     to set the names of the header.
-    Such an outputfield tag may also contain
+    Such an output field tag may also contain
     <code class="language-markup">&lt;tc:span column="..."/></code>
     or
     <code class="language-markup">&lt;tc:span row="..."/></code>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml
index 07ec451..4e553bf 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml
@@ -23,7 +23,7 @@
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:f="http://java.sun.com/jsf/core">
 
-  <p>Not only a sheet can be used to display data, it may also contain inputfields to edit the data.</p>
+  <p>Not only a sheet can be used to display data, it may also contain input fields to edit the data.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:sheet/>" image="#{request.contextPath}/image/feather-leaf.png"
              link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/sheet.html"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml
index 55e4b70..55e3e1e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml
@@ -39,7 +39,7 @@
   <p>A <code class="language-markup">&lt;tc:sheet/></code> tag can contain any number of
     <code class="language-markup">&lt;tc:column/></code> tags.
     The <code class="language-markup">&lt;tc:column/></code> tag is a container, which may contain
-    outputfields, labels, progress bars or even tab groups.</p>
+    output fields, labels, progress bars or even tab groups.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:sheet/>" image="#{request.contextPath}/image/feather-leaf.png"
              link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/sheet.html"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml
index 931be7b..54f9e9c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml
@@ -32,7 +32,7 @@
     <code class="language-markup">&lt;tc:treeLabel/></code>,
     <code class="language-markup">&lt;tc:treeIcon/></code> and
     <code class="language-markup">&lt;tc:treeIndent/></code> tags.
-    It might be helpful to use cumstom classes here.
+    It might be helpful to use custom classes here.
   </p>
 
   <tc:section label="Example">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml
index 3304530..b002c07 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/plain.xhtml"
+<ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml
index 3c187ed..edbf849 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml
@@ -22,6 +22,6 @@
                 xmlns:ui="http://java.sun.com/jsf/facelets">
 
   <p>The different components of Tobago are shown in this section.
-    There are some classic components like inputfields, outputfields or radiobuttons
-    and some more advanced like a popup dialog, a tabgroup or a sheet.</p>
+    There are some classic components like input fields, output fields or radiobuttons
+    and some more advanced like a popup dialog, a tab group or a sheet.</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml
index 5a2cd4e..4b28ab9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml
@@ -62,7 +62,7 @@
   <tc:section label="Validate Range">
     <p>The range of a number can be validated via <code class="language-markup">&lt;f:validateLongRange/></code>
       or - for floating point numbers - <code class="language-markup">&lt;f:validateDoubleRange/></code>.
-      In the following inputfield numbers from 3 to 77 can be added.</p>
+      In the following input field numbers from 3 to 77 can be added.</p>
     <pre><code class="language-markup">&lt;tc:in label="Number" markup="number">
   &lt;f:validateLongRange minimum="3" maximum="77"/>
 &lt;/tc:in></code></pre>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml
index e1c5fda..b64bfd6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml
@@ -43,7 +43,7 @@
       <tc:button label="Summary/Details" action="#{messagesController.createSummaryDetailMessages}"/>
       </tc:buttons>
 
-      <p>To create messages, press one of the buttons. The message will be displayed in the tabgroup below.</p>
+      <p>To create messages, press one of the buttons. The message will be displayed in the tab group below.</p>
     </tc:box>
     <p>
       <tc:badge value="Hint" markup="warning"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml
index 7c589a1..5797849 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml
@@ -22,7 +22,7 @@
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
 
-  <p>Content validation of inputfields can be made directly in the facelet
+  <p>Content validation of input fields can be made directly in the facelet
     with the <code>required</code> attribute and several validation tags.</p>
   <p>Validation can also be described in the controller via annotations.</p>
   <p>In the context of validation, you may report errors to the user.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/Flow_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/Flow_Layout.xhtml
index 9dc79bd..3ea3486 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/Flow_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/Flow_Layout.xhtml
@@ -30,7 +30,7 @@
   <tc:section label="Basics">
     <p>The buttons are displayed successively at the same line.
       Components which doesn't fit in the current line are moved to the next one.
-      Components like an outputfield or a checkbox are displayed in a separate line.</p>
+      Components like an output field or a checkbox are displayed in a separate line.</p>
     <tc:flowLayout>
       <tc:out id="o1" label="Output" value="Outputvalue"/>
       <tc:button label="Button"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/Labeled_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/Labeled_Layout.xhtml
index 983889a..bd7a8d9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/Labeled_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-labeled/Labeled_Layout.xhtml
@@ -25,7 +25,7 @@
   <p>For many components, a <code>label</code> attribute is available, which place a label in front
     of the according component.
     With the <code>labelLayout</code> you can adjust this label.
-    The following examples use an inputfield to show, how this works.</p>
+    The following examples use an input field to show, how this works.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:in/>" image="#{request.contextPath}/image/feather-leaf.png"
              link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/in.html"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml
index 20c7258..120904f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml
@@ -32,7 +32,7 @@
     For Tobago 3 we have alternative layout managers like <code>&lt;tc:flexLayout></code>
     and <code>&lt;tc:selgmentLayout></code>.
     The <code>&lt;tc:gridLayout></code> was implemented with the help of JavaScript to
-    have a working and quite compatibe version, but it was not recommented to use.
+    have a working and quite compatible version, but it was not recommented to use.
   </p>
   <p>
     The Tobago 4 implementation of the <code>&lt;tc:gridLayout></code> was implemented in CSS
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml
index e57a694..fd97dce 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml
@@ -22,7 +22,7 @@
                 xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
-  <p>Simpe example for WebSockets.</p>
+  <p>Simple example for WebSockets.</p>
 
   <tc:section label="Example">
     <p><tc:badge value="Warning" markup="warning"/>WebSockets are available since JSF 2.3</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
index 3e930ef..9ae06e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
@@ -86,9 +86,9 @@
       <p>This example show a content box which could be opened and closed without a server request.<br/>
         To render the hidden content of the box, <code>collapsedMode="hidden"</code> must be set.
         The content is hidden by CSS display property.</p>
-      <p>Also the content contain a required inputfield.
+      <p>Also the content contain a required input field.
         This field will be also validated if the content is hidden.<br/>
-        To demonstrate that, leave the inputfield blank, hide the content and press the 'Submit'-button.</p>
+        To demonstrate that, leave the input field blank, hide the content and press the 'Submit'-button.</p>
       <p>Notice the <code>omit</code> attribute of the buttons is set to avoid server request.</p>
       <pre><code class="language-markup">&lt;tc:box id="noRequestBox" label="No Request Box"
         collapsed="true" collapsedMode="hidden">
@@ -119,7 +119,7 @@
         Also the attribute <code>immediate="true"</code> is set to execute the transition without validation.</p>
       <p>The mode is set to <code>collapsedMode="absent"</code> (default), so the hidden content won't be rendered
         and therefor not validated.</p>
-      <p>You can press the 'Submit'-button after hiding the blank inputfield.
+      <p>You can press the 'Submit'-button after hiding the blank input field.
         The submit will be executed without validation.
         If the content is shown and the field is empty, a violation occurs after hitting 'Submit'.</p>
       <pre><code class="language-markup">&lt;tc:box id="ajaxBox" label="Collapsible Box (AJAX)" collapsedMode="absent">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
index 0a2900b..eab1422 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
@@ -28,10 +28,10 @@
 
   <tc:section label="Simple Popup">
     <tc:form id="simple">
-      <p>A popup opened with the help of a controller. The popup contain a required inputfield.
+      <p>A popup opened with the help of a controller. The popup contain a required input field.
         The attribute <code>collapsedMode="absent"</code> is set,
         so the 'Submit'-button outside the popup could be executed while popup is hidden.
-        Even if the required inputfield is empty.</p>
+        Even if the required input field is empty.</p>
       <tc:button id="open1" label="Open" action="#{collapsiblePopupController.open}"/>
       <tc:button id="submitOnPage1" label="Submit"/>
       <tc:popup id="controllerPopup" collapsed="#{collapsiblePopupController.collapsed}">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
index 22dc23d..510684b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
@@ -25,12 +25,12 @@
 
   <p>This page show some examples for the collapsible concept of a
     <tc:link label="Panel" outcome="/content/20-component/050-container/20-panel/Panel.xhtml"/>.
-    Every panel contain a required inputfield to see if a validation occur while submitting.
+    Every panel contain a required input field to see if a validation occur while submitting.
     For better visibility every panel has a border.</p>
   <tc:section label="Simple Panel">
     <p>A simple panel using an controller for the collapsible state.
       For the 'hide'-Button is the attribute <code>immediate="true"</code> set to submitting without validation.
-      So the panel could be hide even if the inputfield is empty.</p>
+      So the panel could be hide even if the input field is empty.</p>
     <p>For the panel <code>collapsibleMode="absent"</code> is set.
       The 'Submit'-button can be executed without violation if the panel is in the hidden state.</p>
     <tc:form id="simple">
@@ -75,7 +75,7 @@
     <p>For the panel <code>collapsibleMode="hidden"</code> is set.
       After the 'hide' transition, the panel will be in the 'hidden' state - not the 'absent' state.
       The content of the hidden panel will also be validated.<br/>
-      So, if the inputfield is empty and the panel is hidden, a violation occur when pressing the 'Submit'-button.</p>
+      So, if the input field is empty and the panel is hidden, a violation occur when pressing the 'Submit'-button.</p>
     <tc:form id="client">
       <tc:buttons>
         <tc:button id="showClient" label="show" omit="true">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml
index 0c4ecf6..de39fc8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml
@@ -49,7 +49,7 @@
   <tc:section label="Full Server Request">
     <p>The state is changed by <code class="language-markup">&lt;tc:operation/></code> with a full server request.
       The attribute <code>immediate="true"</code> is set for the 'hide'-button
-      to change the state without validating the inputfield.</p>
+      to change the state without validating the input field.</p>
     <p>The <code>collapsedMode="absent"</code> is set.
       The 'Submit'-button can be executed without violation if the content of section is hidden.</p>
     <tc:form id="server">
@@ -76,7 +76,7 @@
     <p>For the section <code>collapsedMode="hidden"</code> is set.
       After the 'hide' transition, the content of the section will be in the 'hidden' state.
       The hidden content of the section will also be validated.<br/>
-      If the 'Submit'-button is pressed while the inputfield is empty, a violation occurs.</p>
+      If the 'Submit'-button is pressed while the input field is empty, a violation occurs.</p>
     <tc:form id="client">
       <tc:button id="submitClient" label="Submit"/>
       <tc:section id="clientSection" label="Collapsible Section" collapsedMode="hidden">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
index f87ba98..1a85c8d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
@@ -44,7 +44,7 @@
     <p>The 'visible' state show the content of the box like you expected.
       <br/>
       The 'hidden' state hide the content via CSS. You can see is still in the source code.
-      This also means that hidden content would be validated when submitted, e. g. a required inputfield.
+      This also means that hidden content would be validated when submitted, e. g. a required input field.
       <br/>
       The 'absent' state don't even render the content of the box.</p>
     <tc:segmentLayout medium="4seg 4seg 4seg">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml
index 7264624..3686ce8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml
@@ -81,7 +81,7 @@
   <tc:section label="Label">
     <p>For the <code class="language-markup">&lt;tc:label/></code> tag
       an accesskey can be set in combination with the <code>for</code> attribute.</p>
-    <p>The following example show a label which is automatically bound to the inputfield after that.</p>
+    <p>The following example show a label which is automatically bound to the input field after that.</p>
     <pre><code class="language-markup">&lt;tc:label value="Label" accessKey="l" for="@auto"/>
 &lt;tc:in/></code></pre>
     <tc:flowLayout textAlign="right">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/Roles.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/Roles.xhtml
index 76176e1..49bf9ff 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/Roles.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/Roles.xhtml
@@ -61,7 +61,7 @@ admin: admin,demo-admin</code></pre>
       In that case, the guest can read the text added by the admin.</p>
     <tc:segmentLayout medium="6seg 6seg">
       <tc:box label="Admin Box">
-        <p>This is a box only for admins. A text can be added in the inputfield.
+        <p>This is a box only for admins. A text can be added in the input field.
           The submit button is only enabled for admin users.
           Notice, that the method set in the <code>action</code> attribute of the
           <code class="language-markup">&lt;tc:button/></code> have the annotation