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

aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft-website.git


The following commit(s) were added to refs/heads/master by this push:
     new fe8aa8d  WIP.
fe8aa8d is described below

commit fe8aa8d318acc258840a96b43ee674dc5d1d4158
Author: Aaron Radzinski <[email protected]>
AuthorDate: Sat Jan 30 22:09:39 2021 -0800

    WIP.
---
 blogs/composable_named_entities.html   |   2 +-
 blogs/quick_intro_apache_nlpcraft.html |   6 +-
 blogs/short_term_memory.html           |   2 +-
 cheat-sheet.html                       | 764 ++++++++++++++++++---------------
 data-model.html                        |  12 +-
 download.html                          |  12 +-
 examples/alarm_clock.html              |   8 +-
 examples/light_switch.html             |  10 +-
 examples/sql_model.html                |   4 +-
 examples/weather_bot.html              |   8 +-
 first-example.html                     |  24 +-
 getting-started.html                   |  14 +-
 images/java2-h20.png                   | Bin 0 -> 2496 bytes
 integrations.html                      |   8 +-
 intent-matching.html                   |   4 +-
 metrics-and-tracing.html               |   2 +-
 server-and-probe.html                  |  26 +-
 tools/script.html                      |   2 +-
 tools/sql_model_gen.html               |   4 +-
 tools/syn_tool.html                    |   8 +-
 tools/test_framework.html              |   4 +-
 21 files changed, 491 insertions(+), 433 deletions(-)

diff --git a/blogs/composable_named_entities.html 
b/blogs/composable_named_entities.html
index d011d37..199d292 100644
--- a/blogs/composable_named_entities.html
+++ b/blogs/composable_named_entities.html
@@ -120,7 +120,7 @@ publish_date: January 20, 2021
         The biggest gripe is the usage of <a target="_blank" 
href="https://www.wikiwand.com/ru/GNU_General_Public_License";>GNU GPL</a> 
license which is all but shun away these days due its viral
         nature and business unfriendliness. In other words - it is not free 
and you have to buy a commercial
         license if you intend to use it in any serious way. Documentation is 
adequate at best and can be a
-        frustrating experience (just like most other academically driven 
software projects).
+        frustrating experience (like many academically driven software 
projects).
     </p>
     <h3 class="section-sub-title">Google Language API</h3>
     <img class="img-title" src="/images/google-cloud-logo-small.png" 
height="56px" alt="">
diff --git a/blogs/quick_intro_apache_nlpcraft.html 
b/blogs/quick_intro_apache_nlpcraft.html
index 14ddfbd..4c62a0e 100644
--- a/blogs/quick_intro_apache_nlpcraft.html
+++ b/blogs/quick_intro_apache_nlpcraft.html
@@ -254,7 +254,7 @@ publish_date: November 16, 2020
     </ul>
     <p>
         Notice that macros and Synonym DSL allow you to define hundreds and 
often thousands of synonyms for each model
-        element with just a few lines of YAML (or JSON). In the above model, 
for example, the three elements have <b>over
+        element with only a few lines of YAML (or JSON). In the above model, 
for example, the three elements have <b>over
         7,700 unique synonyms</b> after all macros and Synonym DSL expansions.
     </p>
     <p>
@@ -329,7 +329,7 @@ publish_date: November 16, 2020
 
                 // Add HomeKit, Arduino or other integration here.
 
-                // By default - just return a descriptive action string.
+                // By default - return a descriptive action string.
                 NCResult.text(s"Lights are [$status] in 
[${locations.toLowerCase}].")
             }
         }
@@ -369,7 +369,7 @@ publish_date: November 16, 2020
 <section>
     <h2 class="section-title">Conclusion</h2>
     <p>
-        In just a couple dozen lines of code we’ve created a non-trivial 
application that understands free-speech
+        In a couple dozen lines of code we’ve created a non-trivial 
application that understands free-speech
         natural language interface to operate a simple lightswitch. You can 
ask it many things like:
     </p>
     <ul>
diff --git a/blogs/short_term_memory.html b/blogs/short_term_memory.html
index 6deee19..b0eff75 100644
--- a/blogs/short_term_memory.html
+++ b/blogs/short_term_memory.html
@@ -135,7 +135,7 @@ publish_date: July 26, 2019
         </li>
         <li>
             <code>"What about tomorrow?"</code><br/>
-            Just like above we automatically assume the weather subject but
+            Like above we automatically assume the weather subject but
             use <code>Kyoto</code> as the location since it was mentioned the 
last.
         </li>
     </ul>
diff --git a/cheat-sheet.html b/cheat-sheet.html
index 06c493d..2a3f8fa 100644
--- a/cheat-sheet.html
+++ b/cheat-sheet.html
@@ -23,18 +23,418 @@ id: cheat_sheet
 
 <div id="cheat-sheet" class="col-md-8 second-column">
     <section>
-        <h2 class="section-title">Frequent Operations</h2>
-        <div style="display: flex">
-            <div>
-                <a href="#cs1">Quick Install</a><br/>
-                <a href="#cs2">Start <span class="amp">&amp;</span> Stop REST 
Server</a><br/>
-                <a href="#cs3">Start <span class="amp">&amp;</span> Stop 
Probe</a><br/>
-                <a href="#cs4">Model Auto-Test</a>
+        <div class="accordion" id="cheats">
+            <div class="card">
+                <div class="card-header" id="q1">
+                    <h2 class="mb-0">
+                        <button class="btn btn-link btn-block text-left" 
type="button" data-toggle="collapse" data-target="#cheat1">
+                            Quick Install
+                        </button>
+                    </h2>
+                </div>
+                <div id="cheat1" class="collapse" data-parent="#cheats">
+                    <div class="card-body">
+                        <nav>
+                            <div class="nav nav-tabs" role="tablist">
+                                <a class="nav-item nav-link active" 
data-toggle="tab" href="#nav-install-src" role="tab">Source</a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-bin" role="tab">Binary</a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-github" role="tab">GitHub <i class="fab fa-fw 
fa-github"></i></a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-maven" role="tab">Maven <img src="/images/java2-h20.png" 
alt=""></a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-grape" role="tab" aria-controls="nav-profile" 
aria-selected="false">Grape <img src="/images/groovy.png" height="18px" 
alt=""></a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-gradle" role="tab" aria-controls="nav-profile" 
aria-selected="false">Gradle <img src="/images/kotlin.png" height="18px" 
alt=""></a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-sbt" role="tab" aria-controls="nav-contact" 
aria-selected="false">SBT <img src="/images/scala-logo.png" height="16px" 
alt=""></a>
+                            </div>
+                        </nav>
+                        <div class="tab-content">
+                            <div class="tab-pane fade show active" 
id="nav-install-src" role="tabpanel">
+                                <p></p>
+                                <p>
+                                    <a href="/download.html#src">Download</a> 
latest (<code><b>{{site.latest_version}}</b></code>) source release.
+                                </p>
+                                <pre class="brush: bash">
+                                    $ unzip -q 
apache-nlpcraft-incubating-{{site.latest_version}}.zip
+                                    $ cd 
apache-nlpcraft-incubating-{{site.latest_version}}
+                                    $ mvn clean package -DskipTests
+                                </pre>
+                                <p>
+                                    Built JARs and Javadoc will be located in 
<code>target</code> sub-folder.
+                                </p>
+                            </div>
+                            <div class="tab-pane fade show" 
id="nav-install-bin" role="tabpanel">
+                                <p></p>
+                                <p>
+                                    <a href="/download.html#zip">Download</a> 
latest (<code><b>{{site.latest_version}}</b></code>) binary release.
+                                </p>
+                                <pre class="brush: bash">
+                                    $ unzip -q 
apache-nlpcraft-incubating-bin-{{site.latest_version}}.zip
+                                </pre>
+                            </div>
+                            <div class="tab-pane fade show" 
id="nav-install-github" role="tabpanel">
+                                <pre class="brush: bash">
+                                    $ git clone 
https://github.com/apache/incubator-nlpcraft.git
+                                    $ mvn clean package
+                                </pre>
+                            </div>
+                            <div class="tab-pane fade show" 
id="nav-install-maven" role="tabpanel">
+                                <pre class="brush: xml">
+                                    &lt;dependency&gt;
+                                        
&lt;groupId&gt;org.apache.nlpcraft&lt;/groupId&gt;
+                                        
&lt;artifactId&gt;nlpcraft&lt;/artifactId&gt;
+                                        
&lt;version&gt;{{site.latest_version}}&lt;/version&gt;
+                                    &lt;/dependency&gt;
+                                </pre>
+                                <p>
+                                    <b>NOTE:</b> to get <a 
href="/tools/script.html">NLPCraft CLI script</a> you still need to
+                                    download <a 
href="/download.html#zip">binary</a> ZIP or <a 
href="/download.html#build">build</a> from <a 
href="/download.html#src">source</a>.
+                                </p>
+                            </div>
+                            <div class="tab-pane fade" id="nav-install-grape" 
role="tabpanel">
+                                <pre class="brush: java">
+                                    @Grab 
('org.apache.nlpcraft:nlpcraft:{{site.latest_version}}')
+                                </pre>
+                                <p>
+                                    <b>NOTE:</b> to get <a 
href="/tools/script.html">NLPCraft CLI script</a> you still need to
+                                    download <a 
href="/download.html#zip">binary</a> ZIP or <a 
href="/download.html#build">build</a> from <a 
href="/download.html#src">source</a>.
+                                </p>
+                            </div>
+                            <div class="tab-pane fade" id="nav-install-gradle" 
role="tabpanel">
+                                <pre class="brush: java">
+                                    dependencies {
+                                        runtime group: 'org.apache.nlpcraft', 
name: 'nlpcraft', version: '{{site.latest_version}}'
+                                    }
+                                </pre>
+                                <p>
+                                    <b>NOTE:</b> to get <a 
href="/tools/script.html">NLPCraft CLI script</a> you still need to
+                                    download <a 
href="/download.html#zip">binary</a> ZIP or <a 
href="/download.html#build">build</a> from <a 
href="/download.html#src">source</a>.
+                                </p>
+                            </div>
+                            <div class="tab-pane fade" id="nav-install-sbt" 
role="tabpanel">
+                                <pre class="brush: scala">
+                                    libraryDependencies += 
"org.apache.nlpcraft" % "nlpcraft" % "{{site.latest_version}}"
+                                </pre>
+                                <p>
+                                    <b>NOTE:</b> to get <a 
href="/tools/script.html">NLPCraft CLI script</a> you still need to
+                                    download <a 
href="/download.html#zip">binary</a> ZIP or <a 
href="/download.html#build">build</a> from <a 
href="/download.html#src">source</a>.
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div style="margin-left: 30px">
-                <a href="#cs5">New Project Stub</a><br/>
-                <a href="#cs6">New Model Stub</a><br/>
-                <a href="#cs7">Testing with REST</a><br/>
+            <div class="card">
+                <div class="card-header" id="q2">
+                    <h2 class="mb-0">
+                        <button class="btn btn-link btn-block text-left" 
type="button" data-toggle="collapse" data-target="#cheat2">
+                            Start <span class="amp">&amp;</span> Stop REST 
Server
+                        </button>
+                    </h2>
+                </div>
+                <div id="cheat2" class="collapse" data-parent="#cheats">
+                    <div class="card-body">
+                        <nav>
+                            <div class="nav nav-tabs" role="tablist">
+                                <a class="nav-item nav-link active" 
data-toggle="tab" href="#nav-srv-script" role="tab">NLPCraft CLI</a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-class" role="tab">Java Class <img src="/images/java2-h20.png" 
alt=""></a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-docker" role="tab"><i class="fab fa-docker"></i> Docker</a>
+                            </div>
+                        </nav>
+                        <div class="tab-content">
+                        <div class="tab-pane fade show active" 
id="nav-srv-script" role="tabpanel">
+                            <pre class="brush: bash">
+                                $ bin/nlpcraft.sh start-server # Start server.
+                            </pre>
+                            <pre class="brush: bash">
+                                $ bin/nlpcraft.sh stop-server # Stop server.
+                                $ bin/nlpcraft.sh stop # Stop both server and 
probe.
+                            </pre>
+                        </div>
+                        <div class="tab-pane fade show" id="nav-srv-class" 
role="tabpanel">
+                            <p></p>
+                            <p>
+                                If using executable JAR:
+                            </p>
+                            <pre class="brush: bash">
+                                $ java -Xms1024m -jar 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar -server
+                            </pre>
+                            <p>
+                                If specifying additional classpath components 
and need <code>-cp</code> parameter:
+                            </p>
+                            <pre class="brush: bash">
+                                $ java -Xms1024m -cp 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar 
org.apache.nlpcraft.NCStart -server
+                            </pre>
+                            <p>
+                                <b>NOTES:</b>
+                            </p>
+                            <ul>
+                                <li>
+                                    Make sure to provide correct path to 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file.
+                                </li>
+                                <li>
+                                    Class 
<code>org.apache.nlpcraft.NCStart</code> is a common entry point for all 
NLPCraft runtime components.
+                                </li>
+                                <li>
+                                    Class 
<code>org.apache.nlpcraft.NCStart</code> should be used to star REST server 
from IDE.
+                                </li>
+                            </ul>
+                            <p>
+                                Parameters:
+                            </p>
+                            <dl>
+                                <dt>
+                                    <code>-server</code>
+                                </dt>
+                                <dd>
+                                    <em>Mandatory</em> parameter to indicate 
that you are starting the REST server.
+                                </dd>
+                                <dt><code>-config=path</code></dt>
+                                <dd>
+                                    <em>Optional</em> parameter to provide 
configuration file path.
+                                    Server will automatically look for 
<code>nlpcraft.conf</code> configuration file in the same directory
+                                    as 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file. If the configuration
+                                    file has different name or in different 
location use <code>-config=path</code> parameter
+                                    where <code>path</code> is an absolute 
path to the configuration file. Note that the server and the data
+                                    probe can use the same file for their 
configuration (like the
+                                    default <code>nlpcraft.conf</code> 
contains configuration for both the server and the data probe).
+                                </dd>
+                                <dt><code>-igniteConfig=path</code></dt>
+                                <dd>
+                                    <em>Optional</em> parameter to provide <a 
target=_ href="https://ignite.apache.org/";>Apache Ignite</a> configuration file 
path.
+                                    Note that Apache Ignite is used as a 
cluster computing plane and a default distributed storage.
+                                    Server will automatically look for 
<code>ignite.xml</code>
+                                    configuration file in the same directory 
as <code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file.
+                                    If the configuration file has different 
name or in different location use <code>-igniteConfig=path</code> parameter
+                                    where <code>path</code> is an absolute 
path to the Ignite configuration file.
+                                </dd>
+                            </dl>
+                        </div>
+                        <div class="tab-pane fade show" id="nav-srv-docker" 
role="tabpanel">
+                            <p></p>
+                            <p>
+                                If Docker image is available for given version 
you can start REST server as follows:
+                            </p>
+                            <pre class="brush: bash">
+                                $ docker run -m 8G -p 8081:8081 -p 8201:8201 
-p 8202:8202 nlpcraftserver/server:{{site.latest_version}}
+                            </pre>
+                        </div>
+                    </div>
+                    </div>
+                </div>
+            </div>
+            <div class="card">
+                <div class="card-header" id="q3">
+                    <h2 class="mb-0">
+                        <button class="btn btn-link btn-block text-left" 
type="button" data-toggle="collapse" data-target="#cheat3">
+                            Start <span class="amp">&amp;</span> Stop REST 
Probe
+                        </button>
+                    </h2>
+                </div>
+                <div id="cheat3" class="collapse" data-parent="#cheats">
+                    <div class="card-body">
+                        <nav>
+                            <div class="nav nav-tabs" role="tablist">
+                                <a class="nav-item nav-link active" 
data-toggle="tab" href="#nav-probe-script" role="tab">NLPCraft CLI</a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-probe-class" role="tab">Java Class <img src="/images/java2-h20.png" 
alt=""></a>
+                            </div>
+                        </nav>
+                        <div class="tab-content">
+                            <div class="tab-pane fade show active" 
id="nav-probe-script" role="tabpanel">
+                                <pre class="brush: bash">
+                                    $ bin/nlpcraft.sh start-probe # Start 
probe with default config.
+                                    $ bin/nlpcraft.sh start-probe 
--cfg=~/myapp/nlpcraft.conf --mdls=my.package.Model --cp=~/myapp/target/classes 
--jmvOpts="-ea -Xms2048m" --timeoutMins=5
+                                </pre>
+                                                <pre class="brush: bash">
+                                    $ bin/nlpcraft.sh stop-probe # Stop probe.
+                                    $ bin/nlpcraft.sh stop # Stop server and 
probe.
+                                </pre>
+                            </div>
+                            <div class="tab-pane fade show" 
id="nav-probe-class" role="tabpanel">
+                                <p></p>
+                                <p>
+                                    If using executable JAR:
+                                </p>
+                                <pre class="brush: bash">
+                                    $ java -jar 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar -probe
+                                </pre>
+                                <p>
+                                    If specifying additional classpath 
components and need <code>-cp</code> parameter:
+                                </p>
+                                <pre class="brush: bash">
+                                    java -cp 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar:/my/project/classes
 org.apache.nlpcraft.NCStart -probe -config=/my/project/probe.conf
+                                </pre>
+                                <p>
+                                    <b>NOTES:</b>
+                                </p>
+                                <ul>
+                                    <li>
+                                        <code>/my/project</code> directory 
contains user-defined model implementation
+                                    </li>
+                                    <li>
+                                        Make sure to provide correct path to 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file.
+                                    </li>
+                                    <li>
+                                        Class 
<code>org.apache.nlpcraft.NCStart</code> is a common entry point for all 
NLPCraft runtime components.
+                                    </li>
+                                    <li>
+                                        Class 
<code>org.apache.nlpcraft.NCStart</code> should be used to star data probe from 
IDE.
+                                    </li>
+                                </ul>
+                                <p>
+                                    Parameters:
+                                </p>
+                                <dl>
+                                    <dt>
+                                        <code>-probe</code>
+                                    </dt>
+                                    <dd>
+                                        <em>Mandatory</em> parameter to 
indicate that you are starting a data probe.
+                                    </dd>
+                                    <dt><code>-config=path</code></dt>
+                                    <dd>
+                                        <p>
+                                            <em>Optional</em> parameter to 
provide probe configuration file path.
+                                            Data probe will automatically look 
for <code>nlpcraft.conf</code> configuration file in the same directory
+                                            as 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file. If the configuration
+                                            file has different name or in 
different location use <code>-config=path</code> parameter
+                                            where <code>path</code> is an 
absolute path to the data probe configuration file. Note that the server and 
the data
+                                            probe can use the same file for 
their configuration (like the
+                                            default <code>nlpcraft.conf</code> 
contains configuration for both the server and the data probe).
+                                        </p>
+                                    </dd>
+                                </dl>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="card">
+                <div class="card-header" id="q4">
+                    <h2 class="mb-0">
+                        <button class="btn btn-link btn-block text-left" 
type="button" data-toggle="collapse" data-target="#cheat4">
+                            Model Auto-Test
+                        </button>
+                    </h2>
+                </div>
+                <div id="cheat4" class="collapse" data-parent="#cheats">
+                    <div class="card-body">
+                        <nav>
+                            <div class="nav nav-tabs" role="tablist">
+                                <a class="nav-item nav-link active" 
data-toggle="tab" href="#nav-script" role="tab">NLPCraft CLI</a>
+                                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-class" role="tab">Java Class <img src="/images/java2-h20.png" 
alt=""></a>
+                            </div>
+                        </nav>
+                        <div class="tab-content">
+                            <div class="tab-pane fade show active" 
id="nav-script" role="tabpanel">
+                                <pre class="brush: bash">
+                                    $ bin/nlpcraft.sh test-model # All default 
parameters.
+                                    $ bin/nlpcraft.sh test-model 
--mdls=my.package.Model --cp=~/myapp/target/classes --jmvOpts="-ea -Xms2048m"
+                                </pre>
+                            </div>
+                            <div class="tab-pane fade show" id="nav-class" 
role="tabpanel">
+                                <pre class="brush: bash">
+                                    java -cp 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar 
-DNLPCRAFT_TEST_MODELS=my.package.Model 
org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
+                                </pre>
+                                <p>
+                                    <b>NOTES:</b>
+                                </p>
+                                <ul>
+                                    <li>
+                                        Make sure to add necessary classpath 
components.
+                                    </li>
+                                    <li>
+                                        <code>NLPCRAFT_TEST_MODELS</code> 
system property that should contain comma separate list of the data model 
classes to test.
+                                    </li>
+                                    <li>
+                                        You can also use 
<code>org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator</code> class
+                                        directly to call it programmatically 
from the code or from IDE.
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="card">
+                <div class="card-header" id="q5">
+                    <h2 class="mb-0">
+                        <button class="btn btn-link btn-block text-left" 
type="button" data-toggle="collapse" data-target="#cheat5">
+                            New Project Stub
+                        </button>
+                    </h2>
+                </div>
+                <div id="cheat5" class="collapse" data-parent="#cheats">
+                    <div class="card-body">
+                        <nav>
+                            <div class="nav nav-tabs" role="tablist">
+                                <a class="nav-item nav-link active" 
data-toggle="tab" href="#nav-prj-script" role="tab">NLPCraft CLI</a>
+                            </div>
+                        </nav>
+                        <div class="tab-content">
+                            <div class="tab-pane fade show active" 
id="nav-prj-script" role="tabpanel">
+                                <pre class="brush: bash">
+                                    $ bin/nlpcraft.sh gen-project -n=MyProject 
-l=scala -b=sbt # Scala/SBT project stub.
+                                    $ bin/nlpcraft.sh gen-project -n=MyProject 
-l=kotlin -p=com.mycompany.nlp -o # Kotlin/Maven project stub.
+                                </pre>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="card">
+                <div class="card-header" id="q6">
+                    <h2 class="mb-0">
+                        <button class="btn btn-link btn-block text-left" 
type="button" data-toggle="collapse" data-target="#cheat6">
+                            New Model Stub
+                        </button>
+                    </h2>
+                </div>
+                <div id="cheat6" class="collapse" data-parent="#cheats">
+                    <div class="card-body">
+                        <nav>
+                            <div class="nav nav-tabs" role="tablist">
+                                <a class="nav-item nav-link active" 
data-toggle="tab" href="#nav-mdl-script" role="tab">NLPCraft CLI</a>
+                            </div>
+                        </nav>
+                        <div class="tab-content">
+                            <div class="tab-pane fade show active" 
id="nav-mdl-script" role="tabpanel">
+                                <pre class="brush: bash">
+                                    $ bin/nlpcraft.sh gen-model 
--filePath=~/myapp/myModel.json --mdlId=my.model.id # JSON model stub.
+                                    $ bin/nlpcraft.sh gen-model 
-f=c:/tmp/myModel.yaml -m=my.model.id -o # YAML model stub.
+                                </pre>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="card">
+                <div class="card-header" id="q7">
+                    <h2 class="mb-0">
+                        <button class="btn btn-link btn-block text-left" 
type="button" data-toggle="collapse" data-target="#cheat7">
+                            Testing With REST
+                        </button>
+                    </h2>
+                </div>
+                <div id="cheat7" class="collapse" data-parent="#cheats">
+                    <div class="card-body">
+                        <nav>
+                            <div class="nav nav-tabs" role="tablist">
+                                <a class="nav-item nav-link active" 
data-toggle="tab" href="#nav-rest-script" role="tab">NLPCraft CLI</a>
+                            </div>
+                        </nav>
+                        <div class="tab-content">
+                            <div class="tab-pane fade show active" 
id="nav-rest-script" role="tabpanel">
+                                <pre class="brush: bash">
+                                    $ bin/nlpcraft.sh ask --txt="User request" 
--mdlId=my.model.id # REST 'ask/sync' call.
+
+                                    $ bin/nlpcraft.sh call -p=signin 
[email protected] --passwd=admin
+                                    $ bin/nlpcraft.sh call --path=ask/sync 
--acsTok=qwerty123456 --txt="User request" --mdlId=my.model.id  
--data='{"data1": true, "data2": 123, "data3": "some text"}' --enableLog=false
+
+                                    $ bin/nlpcraft.sh rest -p=signin 
-j='{"email": "[email protected]", "passwd": "admin"}' # Linux/Unix/MacOS REST 
call.
+                                    $ bin/nlpcraft.cmd rest --path=signin 
--json='{\"email\": \"[email protected]\", \"passwd\": \"admin\"}' # Window REST 
call.
+                                </pre>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="bq success">
@@ -53,348 +453,6 @@ id: cheat_sheet
             </ul>
         </div>
     </section>
-    <section id="cs1">
-        <h2 class="section-title">Quick Install</h2>
-        <nav>
-            <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-install-src" role="tab" aria-controls="nav-home" 
aria-selected="true">Source</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-bin" role="tab" aria-controls="nav-home" 
aria-selected="true">Binary</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-github" role="tab" aria-controls="nav-home" 
aria-selected="true">GitHub <i class="fab fa-fw fa-github"></i></a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-maven" role="tab" aria-controls="nav-home" 
aria-selected="true">Maven <img src="/images/java2.png" height="20px" 
alt=""></a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-grape" role="tab" aria-controls="nav-profile" 
aria-selected="false">Grape <img src="/images/groovy.png" height="18px" 
alt=""></a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-gradle" role="tab" aria-controls="nav-profile" 
aria-selected="false">Gradle <img src="/images/kotlin.png" height="18px" 
alt=""></a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-install-sbt" role="tab" aria-controls="nav-contact" 
aria-selected="false">SBT <img src="/images/scala-logo.png" height="16px" 
alt=""></a>
-            </div>
-        </nav>
-        <div class="tab-content">
-            <div class="tab-pane fade show active" id="nav-install-src" 
role="tabpanel">
-                <p></p>
-                <p>
-                    <a href="/download.html#src">Download</a> latest 
(<code><b>{{site.latest_version}}</b></code>) source release.
-                </p>
-                <pre class="brush: bash">
-                    $ unzip -q 
apache-nlpcraft-incubating-{{site.latest_version}}.zip
-                    $ cd apache-nlpcraft-incubating-{{site.latest_version}}
-                    $ mvn clean package -DskipTests
-                </pre>
-                <p>
-                    Built JARs and Javadoc will be located in 
<code>target</code> sub-folder.
-                </p>
-            </div>
-            <div class="tab-pane fade show" id="nav-install-bin" 
role="tabpanel">
-                <p></p>
-                <p>
-                    <a href="/download.html#zip">Download</a> latest 
(<code><b>{{site.latest_version}}</b></code>) binary release.
-                </p>
-                <pre class="brush: bash">
-                    $ unzip -q 
apache-nlpcraft-incubating-bin-{{site.latest_version}}.zip
-                </pre>
-            </div>
-            <div class="tab-pane fade show" id="nav-install-github" 
role="tabpanel">
-                <pre class="brush: bash">
-                    $ git clone 
https://github.com/apache/incubator-nlpcraft.git
-                    $ mvn clean package
-                </pre>
-            </div>
-            <div class="tab-pane fade show" id="nav-install-maven" 
role="tabpanel">
-                    <pre class="brush: xml">
-                        &lt;dependency&gt;
-                            &lt;groupId&gt;org.apache.nlpcraft&lt;/groupId&gt;
-                            &lt;artifactId&gt;nlpcraft&lt;/artifactId&gt;
-                            
&lt;version&gt;{{site.latest_version}}&lt;/version&gt;
-                        &lt;/dependency&gt;
-                    </pre>
-                    <p>
-                        <b>NOTE:</b> to get <a 
href="/tools/script.html">NLPCraft CLI script</a> you still need to
-                        download <a href="/download.html#zip">binary</a> ZIP 
or <a href="/download.html#build">build</a> from <a 
href="/download.html#src">source</a>.
-                    </p>
-            </div>
-            <div class="tab-pane fade" id="nav-install-grape" role="tabpanel">
-                <pre class="brush: java">
-                    @Grab 
('org.apache.nlpcraft:nlpcraft:{{site.latest_version}}')
-                </pre>
-                <p>
-                    <b>NOTE:</b> to get <a href="/tools/script.html">NLPCraft 
CLI script</a> you still need to
-                    download <a href="/download.html#zip">binary</a> ZIP or <a 
href="/download.html#build">build</a> from <a 
href="/download.html#src">source</a>.
-                </p>
-            </div>
-            <div class="tab-pane fade" id="nav-install-gradle" role="tabpanel">
-                <pre class="brush: java">
-                    dependencies {
-                        runtime group: 'org.apache.nlpcraft', name: 
'nlpcraft', version: '{{site.latest_version}}'
-                    }
-                </pre>
-                <p>
-                    <b>NOTE:</b> to get <a href="/tools/script.html">NLPCraft 
CLI script</a> you still need to
-                    download <a href="/download.html#zip">binary</a> ZIP or <a 
href="/download.html#build">build</a> from <a 
href="/download.html#src">source</a>.
-                </p>
-            </div>
-            <div class="tab-pane fade" id="nav-install-sbt" role="tabpanel">
-                <pre class="brush: scala">
-                    libraryDependencies += "org.apache.nlpcraft" % "nlpcraft" 
% "{{site.latest_version}}"
-                </pre>
-                <p>
-                    <b>NOTE:</b> to get <a href="/tools/script.html">NLPCraft 
CLI script</a> you still need to
-                    download <a href="/download.html#zip">binary</a> ZIP or <a 
href="/download.html#build">build</a> from <a 
href="/download.html#src">source</a>.
-                </p>
-            </div>
-        </div>
-    </section>
-    <section id="cs2">
-        <h2 class="section-title">Start <span class="amp">&amp;</span> Stop 
REST Server</h2>
-        <nav>
-            <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-class" role="tab" aria-controls="nav-home" 
aria-selected="true">Java Class</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-docker" role="tab" aria-controls="nav-home" 
aria-selected="true"><i class="fab fa-docker"></i> Docker</a>
-            </div>
-        </nav>
-        <div class="tab-content">
-            <div class="tab-pane fade show active" id="nav-srv-script" 
role="tabpanel">
-                <pre class="brush: bash">
-                    $ bin/nlpcraft.sh start-server # Start server.
-                </pre>
-                <pre class="brush: bash">
-                    $ bin/nlpcraft.sh stop-server # Stop server.
-                    $ bin/nlpcraft.sh stop # Stop both server and probe.
-                </pre>
-            </div>
-            <div class="tab-pane fade show" id="nav-srv-class" role="tabpanel">
-                <p></p>
-                <p>
-                    If using just executable JAR:
-                </p>
-                <pre class="brush: bash">
-                    $ java -Xms1024m -jar 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar -server
-                </pre>
-                <p>
-                    If specifying additional classpath components and need 
<code>-cp</code> parameter:
-                </p>
-                <pre class="brush: bash">
-                    $ java -Xms1024m -cp 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar 
org.apache.nlpcraft.NCStart -server
-                </pre>
-                <p>
-                    <b>NOTES:</b>
-                </p>
-                <ul>
-                    <li>
-                        Make sure to provide correct path to 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file.
-                    </li>
-                    <li>
-                        Class <code>org.apache.nlpcraft.NCStart</code> is a 
common entry point for all NLPCraft runtime components.
-                    </li>
-                    <li>
-                        Class <code>org.apache.nlpcraft.NCStart</code> should 
be used to star REST server from IDE.
-                    </li>
-                </ul>
-                <p>
-                    Parameters:
-                </p>
-                <dl>
-                    <dt>
-                        <code>-server</code>
-                    </dt>
-                    <dd>
-                        <em>Mandatory</em> parameter to indicate that you are 
starting the REST server.
-                    </dd>
-                    <dt><code>-config=path</code></dt>
-                    <dd>
-                        <em>Optional</em> parameter to provide configuration 
file path.
-                        Server will automatically look for 
<code>nlpcraft.conf</code> configuration file in the same directory
-                        as 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file. If the configuration
-                        file has different name or in different location use 
<code>-config=path</code> parameter
-                        where <code>path</code> is an absolute path to the 
configuration file. Note that the server and the data
-                        probe can use the same file for their configuration 
(just like the
-                        default <code>nlpcraft.conf</code> contains 
configuration for both the server and the data probe).
-                    </dd>
-                    <dt><code>-igniteConfig=path</code></dt>
-                    <dd>
-                        <em>Optional</em> parameter to provide <a target=_ 
href="https://ignite.apache.org/";>Apache Ignite</a> configuration file path.
-                        Note that Apache Ignite is used as a cluster computing 
plane and a default distributed storage.
-                        Server will automatically look for 
<code>ignite.xml</code>
-                        configuration file in the same directory as 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file.
-                        If the configuration file has different name or in 
different location use <code>-igniteConfig=path</code> parameter
-                        where <code>path</code> is an absolute path to the 
Ignite configuration file.
-                    </dd>
-                </dl>
-            </div>
-            <div class="tab-pane fade show" id="nav-srv-docker" 
role="tabpanel">
-                <p></p>
-                <p>
-                    If Docker image is available for given version you can 
start REST server as follows:
-                </p>
-                <pre class="brush: bash">
-                    $ docker run -m 8G -p 8081:8081 -p 8201:8201 -p 8202:8202 
nlpcraftserver/server:{{site.latest_version}}
-                </pre>
-            </div>
-        </div>
-    </section>
-    <section id="cs3">
-        <h2 class="section-title">Start <span class="amp">&amp;</span> Stop 
Probe</h2>
-        <nav>
-            <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-probe-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-probe-class" role="tab" aria-controls="nav-home" 
aria-selected="true">Java Class</a>
-            </div>
-        </nav>
-        <div class="tab-content">
-            <div class="tab-pane fade show active" id="nav-probe-script" 
role="tabpanel">
-                <pre class="brush: bash">
-                    $ bin/nlpcraft.sh start-probe # Start probe with default 
config.
-                    $ bin/nlpcraft.sh start-probe --cfg=~/myapp/nlpcraft.conf 
--mdls=my.package.Model --cp=~/myapp/target/classes --jmvOpts="-ea -Xms2048m" 
--timeoutMins=5
-                </pre>
-                <pre class="brush: bash">
-                    $ bin/nlpcraft.sh stop-probe # Stop probe.
-                    $ bin/nlpcraft.sh stop # Stop server and probe.
-                </pre>
-            </div>
-            <div class="tab-pane fade show" id="nav-probe-class" 
role="tabpanel">
-                <p></p>
-                <p>
-                    If using just executable JAR:
-                </p>
-                <pre class="brush: bash">
-                    $ java -jar 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar -probe
-                </pre>
-                <p>
-                    If specifying additional classpath components and need 
<code>-cp</code> parameter:
-                </p>
-                <pre class="brush: bash">
-                    java -cp 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar:/my/project/classes
 org.apache.nlpcraft.NCStart -probe -config=/my/project/probe.conf
-                </pre>
-                <p>
-                    <b>NOTES:</b>
-                </p>
-                <ul>
-                    <li>
-                        <code>/my/project</code> directory contains 
user-defined model implementation
-                    </li>
-                    <li>
-                        Make sure to provide correct path to 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file.
-                    </li>
-                    <li>
-                        Class <code>org.apache.nlpcraft.NCStart</code> is a 
common entry point for all NLPCraft runtime components.
-                    </li>
-                    <li>
-                        Class <code>org.apache.nlpcraft.NCStart</code> should 
be used to star data probe from IDE.
-                    </li>
-                </ul>
-                <p>
-                    Parameters:
-                </p>
-                <dl>
-                    <dt>
-                        <code>-probe</code>
-                    </dt>
-                    <dd>
-                        <em>Mandatory</em> parameter to indicate that you are 
starting a data probe.
-                    </dd>
-                    <dt><code>-config=path</code></dt>
-                    <dd>
-                        <p>
-                            <em>Optional</em> parameter to provide probe 
configuration file path.
-                            Data probe will automatically look for 
<code>nlpcraft.conf</code> configuration file in the same directory
-                            as 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file. If the configuration
-                            file has different name or in different location 
use <code>-config=path</code> parameter
-                            where <code>path</code> is an absolute path to the 
data probe configuration file. Note that the server and the data
-                            probe can use the same file for their 
configuration (just like the
-                            default <code>nlpcraft.conf</code> contains 
configuration for both the server and the data probe).
-                        </p>
-                    </dd>
-                </dl>
-            </div>
-        </div>
-    </section>
-    <section id="cs4">
-        <h2 class="section-title">Model Auto-Test</h2>
-        <nav>
-            <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-class" role="tab" aria-controls="nav-home" aria-selected="true">Java 
Class</a>
-            </div>
-        </nav>
-        <div class="tab-content">
-            <div class="tab-pane fade show active" id="nav-script" 
role="tabpanel">
-                <pre class="brush: bash">
-                    $ bin/nlpcraft.sh test-model # All default parameters.
-                    $ bin/nlpcraft.sh test-model --mdls=my.package.Model 
--cp=~/myapp/target/classes --jmvOpts="-ea -Xms2048m"
-                </pre>
-            </div>
-            <div class="tab-pane fade show" id="nav-class" role="tabpanel">
-                <pre class="brush: bash">
-                    java -cp 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar 
-DNLPCRAFT_TEST_MODELS=my.package.Model 
org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
-                </pre>
-                <p>
-                    <b>NOTES:</b>
-                </p>
-                <ul>
-                    <li>
-                        Make sure to add necessary classpath components.
-                    </li>
-                    <li>
-                        <code>NLPCRAFT_TEST_MODELS</code> system property that 
should contain comma separate list of the data model classes to test.
-                    </li>
-                    <li>
-                        You can also use 
<code>org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator</code> class
-                        directly to call it programmatically from the code or 
from IDE.
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </section>
-    <section id="cs5">
-        <h2 class="section-title">New Project Stub</h2>
-        <nav>
-            <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-prj-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-            </div>
-        </nav>
-        <div class="tab-content">
-            <div class="tab-pane fade show active" id="nav-prj-script" 
role="tabpanel">
-                <pre class="brush: bash">
-                    $ bin/nlpcraft.sh gen-project -n=MyProject -l=scala -b=sbt 
# Scala/SBT project stub.
-                    $ bin/nlpcraft.sh gen-project -n=MyProject -l=kotlin 
-p=com.mycompany.nlp -o # Kotlin/Maven project stub.
-                </pre>
-            </div>
-        </div>
-    </section>
-    <section id="cs6">
-        <h2 class="section-title">New Model Stub</h2>
-        <nav>
-            <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-mdl-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-            </div>
-        </nav>
-        <div class="tab-content">
-            <div class="tab-pane fade show active" id="nav-mdl-script" 
role="tabpanel">
-                <pre class="brush: bash">
-                    $ bin/nlpcraft.sh gen-model 
--filePath=~/myapp/myModel.json --mdlId=my.model.id # JSON model stub.
-                    $ bin/nlpcraft.sh gen-model -f=c:/tmp/myModel.yaml 
-m=my.model.id -o # YAML model stub.
-                </pre>
-            </div>
-        </div>
-    </section>
-    <section id="cs7">
-        <h2 class="section-title">Testing with REST</h2>
-        <nav>
-            <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-rest-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-            </div>
-        </nav>
-        <div class="tab-content">
-            <div class="tab-pane fade show active" id="nav-rest-script" 
role="tabpanel">
-                <pre class="brush: bash">
-                    $ bin/nlpcraft.sh ask --txt="User request" 
--mdlId=my.model.id # REST 'ask/sync' call.
-
-                    $ bin/nlpcraft.sh call -p=signin [email protected] 
--passwd=admin
-                    $ bin/nlpcraft.sh call --path=ask/sync 
--acsTok=qwerty123456 --txt="User request" --mdlId=my.model.id  
--data='{"data1": true, "data2": 123, "data3": "some text"}' --enableLog=false
-
-                    $ bin/nlpcraft.sh rest -p=signin -j='{"email": 
"[email protected]", "passwd": "admin"}' # Linux/Unix/MacOS REST call.
-                    $ bin/nlpcraft.cmd rest --path=signin --json='{\"email\": 
\"[email protected]\", \"passwd\": \"admin\"}' # Window REST call.
-                </pre>
-            </div>
-        </div>
-    </section>
 </div>
 <div class="col-md-2 third-column">
     <ul class="side-nav">
diff --git a/data-model.html b/data-model.html
index cc9fb7a..3d0f0f1 100644
--- a/data-model.html
+++ b/data-model.html
@@ -51,8 +51,8 @@ id: data_model
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#scala-model-ex" role="tab" aria-controls="nav-home" 
aria-selected="true"><code>LightSwitchModel.scala</code></a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#java-model-ex" role="tab" aria-controls="nav-home" 
aria-selected="true"><code>AlarmModel.java</code></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#scala-model-ex" role="tab"><code>LightSwitchModel.scala</code></a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#java-model-ex" role="tab"><code>AlarmModel.java</code></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -92,7 +92,7 @@ class LightSwitchModel extends 
NCModelFileAdapter("org/apache/nlpcraft/examples/
 
         // Add HomeKit, Arduino or other integration here.
 
-        // By default - just return a descriptive action string.
+        // By default - return a descriptive action string.
         NCResult.text(s"Lights are [$status] in [${locations.toLowerCase}].")
     }
 }
@@ -406,8 +406,8 @@ public class AlarmModel extends NCModelFileAdapter {
 
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#model-json" role="tab" aria-controls="nav-home" 
aria-selected="true">JSON</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#model-yaml" role="tab" aria-controls="nav-home" 
aria-selected="true">YAML</a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#model-json" role="tab">JSON</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#model-yaml" role="tab">YAML</a>
             </div>
         </nav>
         <div class="tab-content">
@@ -641,7 +641,7 @@ intents:
             <a target="javadoc" 
href="/apis/latest/org/apache/nlpcraft/model/NCModelView.html#getMacros()">getMacros()</a>
 method on
             <a target="javadoc" 
href="/apis/latest/org/apache/nlpcraft/model/NCModelView.html">NCModelView</a> 
interface. Each macro
             has a name in a form of <code>&lt;X&gt;</code> where <code>X</code>
-            is just any string, and a string value. Note that macros can be 
nested (but not recursive), i.e. macro value can include
+            is any string, and a string value. Note that macros can be nested 
(but not recursive), i.e. macro value can include
             references to other macros. When macro name <code>X</code> is 
encountered in the synonym it gets recursively
             replaced with its value.
         </p>
diff --git a/download.html b/download.html
index 6c6bd1e..681747d 100644
--- a/download.html
+++ b/download.html
@@ -205,8 +205,8 @@ layout: interior
             <h3 class="section-sub-title">Mac OS</h3>
             <nav>
                 <div class="nav nav-tabs" role="tablist">
-                    <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-macos-sha256" role="tab" aria-controls="nav-home" 
aria-selected="true">SHA256</a>
-                    <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-macos-pgp" role="tab" aria-controls="nav-home" 
aria-selected="true">PGP</a>
+                    <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-macos-sha256" role="tab">SHA256</a>
+                    <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-macos-pgp" role="tab">PGP</a>
                 </div>
             </nav>
             <div class="tab-content">
@@ -227,8 +227,8 @@ layout: interior
             <h3 class="section-sub-title">Linux</h3>
             <nav>
                 <div class="nav nav-tabs" role="tablist">
-                    <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-linux-sha256" role="tab" aria-controls="nav-home" 
aria-selected="true">SHA256</a>
-                    <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-linux-pgp" role="tab" aria-controls="nav-home" 
aria-selected="true">PGP</a>
+                    <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-linux-sha256" role="tab">SHA256</a>
+                    <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-linux-pgp" role="tab">PGP</a>
                 </div>
             </nav>
             <div class="tab-content">
@@ -252,7 +252,7 @@ layout: interior
             </p>
             <nav>
                 <div class="nav nav-tabs" role="tablist">
-                    <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-maven" role="tab">Maven <img src="/images/java2.png" height="20px" 
alt=""></a>
+                    <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-maven" role="tab">Maven <img src="/images/java2-h20.png" alt=""></a>
                     <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-grape" role="tab">Grape <img src="/images/groovy.png" height="18px" 
alt=""></a>
                     <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-gradle" role="tab">Gradle <img src="/images/kotlin.png" 
height="18px" alt=""></a>
                     <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-sbt" role="tab">SBT <img src="/images/scala-logo.png" height="16px" 
alt=""></a>
@@ -330,7 +330,7 @@ layout: interior
             </p>
             <nav>
                 <div class="nav nav-tabs" role="tablist">
-                    <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-java-client-maven" role="tab">Maven <img src="/images/java2.png" 
height="20px" alt=""></a>
+                    <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-java-client-maven" role="tab">Maven <img src="/images/java2-h20.png" 
alt=""></a>
                     <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-java-client-grape" role="tab">Grape <img src="/images/groovy.png" 
height="18px" alt=""></a>
                     <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-java-client-gradle" role="tab">Gradle <img src="/images/kotlin.png" 
height="18px" alt=""></a>
                     <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-java-client-sbt" role="tab">SBT <img src="/images/scala-logo.png" 
height="16px" alt=""></a>
diff --git a/examples/alarm_clock.html b/examples/alarm_clock.html
index 633ea07..24f2882 100644
--- a/examples/alarm_clock.html
+++ b/examples/alarm_clock.html
@@ -43,8 +43,8 @@ id: alarm_clock
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-prj-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-prj-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-prj-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-prj-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -279,8 +279,8 @@ public class AlarmClock extends NCModelFileAdapter {
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
diff --git a/examples/light_switch.html b/examples/light_switch.html
index 8f63838..5b986a5 100644
--- a/examples/light_switch.html
+++ b/examples/light_switch.html
@@ -43,8 +43,8 @@ id: light_switch
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-prj-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-prj-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-prj-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-prj-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -186,7 +186,7 @@ class LightSwitch extends 
NCModelFileAdapter("light_switch.yaml") {
 
         // Add HomeKit, Arduino or other integration here.
 
-        // By default - just return a descriptive action string.
+        // By default - return a descriptive action string.
         NCResult.text(s"Lights '$status' in '${locations.toLowerCase}'.")
     }
 }
@@ -240,8 +240,8 @@ class LightSwitch extends 
NCModelFileAdapter("light_switch.yaml") {
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
diff --git a/examples/sql_model.html b/examples/sql_model.html
index df2c228..385234e 100644
--- a/examples/sql_model.html
+++ b/examples/sql_model.html
@@ -175,8 +175,8 @@ id: sql_model
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
diff --git a/examples/weather_bot.html b/examples/weather_bot.html
index 8ab0292..4a9c8ea 100644
--- a/examples/weather_bot.html
+++ b/examples/weather_bot.html
@@ -42,8 +42,8 @@ id: weather_bot
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-prj-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-prj-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-prj-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-prj-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -388,8 +388,8 @@ public class Weather extends NCModelFileAdapter {
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
diff --git a/first-example.html b/first-example.html
index 229658e..2d66920 100644
--- a/first-example.html
+++ b/first-example.html
@@ -40,8 +40,8 @@ id: first_example
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" href="#nav-out" 
role="tab" aria-controls="nav-home" aria-selected="true">Output <i class="fa 
fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" href="#nav-out" 
role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -153,9 +153,9 @@ id: first_example
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-scala" role="tab" aria-controls="nav-home" 
aria-selected="true">Scala <img src="/images/scala-logo.png" height="20px" 
alt=""></a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-java" role="tab" aria-controls="nav-home" aria-selected="true">Java 
<img src="/images/java2.png" height="20px" alt=""></a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-kotlin" role="tab" aria-controls="nav-home" 
aria-selected="true">Kotlin <img src="/images/kotlin.png" height="20px" 
alt=""></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-scala" role="tab">Scala <img src="/images/scala-logo.png" 
height="20px" alt=""></a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-java" role="tab">Java <img src="/images/java2-h20.png" alt=""></a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-kotlin" role="tab">Kotlin <img src="/images/kotlin.png" 
height="20px" alt=""></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -194,7 +194,7 @@ class LightSwitchModel extends 
NCModelFileAdapter("light_switch.yaml") {
 
         // Add HomeKit, Arduino or other integration here.
 
-        // By default - just return a descriptive action string.
+        // By default - return a descriptive action string.
         NCResult.text(s"Lights '$status' in '${locations.toLowerCase}'.")
     }
 }
@@ -243,7 +243,7 @@ public class LightSwitchJavaModel extends 
NCModelFileAdapter {
 
         // Add HomeKit, Arduino or other integration here.
 
-        // By default - just return a descriptive action string.
+        // By default - return a descriptive action string.
         return NCResult.text("Lights are [" + status + "] in [" + 
locations.toLowerCase() + "].");
     }
 }
@@ -286,7 +286,7 @@ class LightSwitchKotlinModel : 
NCModelFileAdapter("lightswitch_model.yaml") {
 
         // Add HomeKit, Arduino or other integration here.
 
-        // By default - just return a descriptive action string.
+        // By default - return a descriptive action string.
         return NCResult.text("Lights are [" + status + "] in [" + 
locations.toLowerCase() + "].")
     }
 }
@@ -350,8 +350,8 @@ class LightSwitchKotlinModel : 
NCModelFileAdapter("lightswitch_model.yaml") {
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -391,8 +391,8 @@ class LightSwitchKotlinModel : 
NCModelFileAdapter("lightswitch_model.yaml") {
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-test-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-test-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-test-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-test-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
diff --git a/getting-started.html b/getting-started.html
index b78a767..80f07bb 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -57,9 +57,9 @@ id: getting_started
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-start-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-start" role="tab" aria-controls="nav-home" 
aria-selected="true">REST Server Output <i class="fa fa-desktop output"></i></a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-probe-start" role="tab" aria-controls="nav-home" 
aria-selected="true">Data Probe Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-start-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-start" role="tab">REST Server Output <i class="fa fa-desktop 
output"></i></a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-probe-start" role="tab">Data Probe Output <i class="fa fa-desktop 
output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -99,8 +99,8 @@ id: getting_started
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-repl-cmd" role="tab" aria-controls="nav-home" 
aria-selected="true">Command</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-repl-out" role="tab" aria-controls="nav-home" 
aria-selected="true">Output <i class="fa fa-desktop output"></i></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-repl-cmd" role="tab">Command</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-repl-out" role="tab">Output <i class="fa fa-desktop output"></i></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -149,7 +149,7 @@ id: getting_started
                         </button>
                     </h2>
                 </div>
-                <div id="a1" class="collapse" aria-labelledby="q1" 
data-parent="#questions">
+                <div id="a1" class="collapse" data-parent="#questions">
                     <div class="card-body">
                         <p>
                             <img class="img-fluid" 
src="/images/getting_started_fig4.png" alt="">
@@ -168,7 +168,7 @@ id: getting_started
                         </button>
                     </h2>
                 </div>
-                <div id="a2" class="collapse" aria-labelledby="q2" 
data-parent="#questions">
+                <div id="a2" class="collapse" data-parent="#questions">
                     <div class="card-body">
                         <p>
                             <img class="img-fluid" 
src="/images/getting_started_fig5.png" alt="">
diff --git a/images/java2-h20.png b/images/java2-h20.png
new file mode 100644
index 0000000..3688816
Binary files /dev/null and b/images/java2-h20.png differ
diff --git a/integrations.html b/integrations.html
index b87dded..0557476 100644
--- a/integrations.html
+++ b/integrations.html
@@ -471,7 +471,7 @@ id: integrations
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-stanfordnlp-maven" role="tab" aria-controls="nav-home" 
aria-selected="true">Maven <sup>Java</sup></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-stanfordnlp-maven" role="tab">Maven <sup>Java</sup></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-stanfordnlp-grape" role="tab" aria-controls="nav-profile" 
aria-selected="false">Grape <sup>Groovy</sup></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-stanfordnlp-gradle" role="tab" aria-controls="nav-profile" 
aria-selected="false">Gradle <sup>Kotlin</sup></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-stanfordnlp-sbt" role="tab" aria-controls="nav-contact" 
aria-selected="false">SBT <sup>Scala</sup></a>
@@ -705,7 +705,7 @@ if __name__ == '__main__':
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-mysql-maven" role="tab">Maven <img src="/images/java2.png" 
height="20px" alt=""></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-mysql-maven" role="tab">Maven <img src="/images/java2-h20.png" 
alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-mysql-grape" role="tab">Grape <img src="/images/groovy.png" 
height="18px" alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-mysql-gradle" role="tab">Gradle <img src="/images/kotlin.png" 
height="18px" alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-mysql-sbt" role="tab">SBT <img src="/images/scala-logo.png" 
height="16px" alt=""></a>
@@ -768,7 +768,7 @@ if __name__ == '__main__':
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-postgres-maven" role="tab">Maven <img src="/images/java2.png" 
height="20px" alt=""></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-postgres-maven" role="tab">Maven <img src="/images/java2-h20.png" 
alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-postgres-grape" role="tab">Grape <img src="/images/groovy.png" 
height="18px" alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-postgres-gradle" role="tab">Gradle <img src="/images/kotlin.png" 
height="18px" alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-postgres-sbt" role="tab">SBT <img src="/images/scala-logo.png" 
height="16px" alt=""></a>
@@ -831,7 +831,7 @@ if __name__ == '__main__':
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-oracle-maven" role="tab">Maven <img src="/images/java2.png" 
height="20px" alt=""></a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-oracle-maven" role="tab">Maven <img src="/images/java2-h20.png" 
alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-oracle-grape" role="tab">Grape <img src="/images/groovy.png" 
height="18px" alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-oracle-gradle" role="tab">Gradle <img src="/images/kotlin.png" 
height="18px" alt=""></a>
                 <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-oracle-sbt" role="tab">SBT <img src="/images/scala-logo.png" 
height="16px" alt=""></a>
diff --git a/intent-matching.html b/intent-matching.html
index aa5284f..0e14f6c 100644
--- a/intent-matching.html
+++ b/intent-matching.html
@@ -585,7 +585,7 @@ id: intent_matching
             matched the next best matching intent will be selected and its 
callback will be called.
         <p>
         <p>
-            This exception becomes useful when it is hard or impossible to 
encode the entire matching logic using just
+            This exception becomes useful when it is hard or impossible to 
encode the entire matching logic using only
             declarative intent DSL. In these cases the intent definition can 
be relaxed and the "last mile" of intent
             matching can happen inside of the intent callback's user logic. If 
it is determined that intent in fact does
             not match then throwing this exception allows to try next best 
matching intent, if any.
@@ -603,7 +603,7 @@ id: intent_matching
             </p>
             <p>
                 Note that usage of <code>NCIntentSkip</code> exception (as 
well as model's life-cycle callbacks) is a
-                required technique when you cannot express the desired 
matching logic with just intent DSL alone.
+                required technique when you cannot express the desired 
matching logic with only intent DSL alone.
                 Intent DSL is a high-level declarative language and it does
                 not support programmable logic or other types of complex 
matching algorithms. In such cases, you can
                 define a broad intent that would <em>broadly match</em> and 
then define the rest of the more complex matching logic in the callback
diff --git a/metrics-and-tracing.html b/metrics-and-tracing.html
index 9535f00..976ad7b 100644
--- a/metrics-and-tracing.html
+++ b/metrics-and-tracing.html
@@ -125,7 +125,7 @@ id: metrics
         <p>
             All built-in exporters are a simple adaptation of the standard 
OpenCensus <a target=_ 
href="https://opencensus.io/exporters/supported-exporters/java/";>exporters</a>
             to life cycle components for the
-            REST server or the data probe. Each exporter has just a few lines 
of code and you can create your own
+            REST server or the data probe. Each exporter has a few lines of 
code and you can create your own
             exporters for other backends. 
         </p>
     </section>
diff --git a/server-and-probe.html b/server-and-probe.html
index 18aa084..91a6efe 100644
--- a/server-and-probe.html
+++ b/server-and-probe.html
@@ -71,9 +71,9 @@ id: server_and_probe
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-class" role="tab" aria-controls="nav-home" 
aria-selected="true">Java Class</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-docker" role="tab" aria-controls="nav-home" 
aria-selected="true"><i class="fab fa-docker"></i> Docker</a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-srv-script" role="tab">NLPCraft CLI</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-class" role="tab">Java Class <img src="/images/java2-h20.png" 
alt=""></a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-srv-docker" role="tab"><i class="fab fa-docker"></i> Docker</a>
             </div>
         </nav>
         <div class="tab-content">
@@ -98,7 +98,7 @@ id: server_and_probe
             <div class="tab-pane fade show" id="nav-srv-class" role="tabpanel">
                 <p></p>
                 <p>
-                    If using just executable JAR:
+                    If using executable JAR:
                 </p>
                 <pre class="brush: bash">
                     $ java -Xms1024m -jar 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar -server
@@ -140,7 +140,7 @@ id: server_and_probe
                         as 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file. If the configuration
                         file has different name or in different location use 
<code>-config=path</code> parameter
                         where <code>path</code> is an absolute path to the 
configuration file. Note that the server and the data
-                        probe can use the same file for their configuration 
(just like the
+                        probe can use the same file for their configuration 
(like the
                         default <code>nlpcraft.conf</code> contains 
configuration for both the server and the data probe).
                     </dd>
                     <dt><code>-igniteConfig=path</code></dt>
@@ -223,8 +223,8 @@ id: server_and_probe
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-probe-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-probe-class" role="tab" aria-controls="nav-home" 
aria-selected="true">Java Class</a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-probe-script" role="tab" >NLPCraft CLI</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-probe-class" role="tab" >Java Class <img src="/images/java2-h20.png" 
alt=""></a>
             </div>
         </nav>
         <div class="tab-content">
@@ -249,7 +249,7 @@ id: server_and_probe
             <div class="tab-pane fade show" id="nav-probe-class" 
role="tabpanel">
                 <p></p>
                 <p>
-                    If using just executable JAR:
+                    If using executable JAR:
                 </p>
                 <pre class="brush: bash">
                     $ java -jar 
apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar -probe
@@ -295,7 +295,7 @@ id: server_and_probe
                             as 
<code>apache-nlpcraft-incubating-{{site.latest_version}}-all-deps.jar</code> 
file. If the configuration
                             file has different name or in different location 
use <code>-config=path</code> parameter
                             where <code>path</code> is an absolute path to the 
data probe configuration file. Note that the server and the data
-                            probe can use the same file for their 
configuration (just like the
+                            probe can use the same file for their 
configuration (like the
                             default <code>nlpcraft.conf</code> contains 
configuration for both the server and the data probe).
                         </p>
                     </dd>
@@ -327,7 +327,7 @@ id: server_and_probe
         <p>
             Default configuration is available in 
<code>build/<b>nlpcraft.conf</b></code> file and it is extensively documented. 
It has subsections
             for the server and probe configuration. You can also separate 
server and probe configurations into their own
-            separate files. Each file would have just a subsection of 
configuration for either server or data probe.
+            separate files. Each file would have a subsection of configuration 
for either server or data probe.
         </p>
         <p>
             Server configuration file (e.g. <code>server_nlpcraft.conf</code>):
@@ -354,7 +354,7 @@ nlpcraft {
         <h3 class="section-sub-title">Custom Configuration</h3>
         <p>
             While you can change configuration file or files for your own 
needs (and use <code>-config=...</code>
-            parameter described above to provide path to that file) it is 
often more convenient to use the default configuration file and just
+            parameter described above to provide path to that file) it is 
often more convenient to use the default configuration file and
             change one or two properties in it. You can accomplish this by 
using standard
             <a target=_ 
href="https://github.com/lightbend/config#optional-system-or-env-variable-overrides";>HOCON
 overriding</a>
             via environment variables:
@@ -399,7 +399,7 @@ nlpcraft {
             <b>Examples</b>
             <p>
                 Note that all examples that come with NLPCraft have 
instructions that use environment variable overriding
-                for running their data probes. They use default 
<code>nlpcraft.conf</code> file and just override
+                for running their data probes. They use default 
<code>nlpcraft.conf</code> file and override
                 one <code>nlpcraft.probe.models</code> property (see above) to 
specify what model the data probe
                 needs to deploy.
             </p>
@@ -446,7 +446,7 @@ nlpcraft {
             <p>
                 Technically, when a data probe starts up it will initialize, 
load the models, and will automatically wait for the server to get online
                 if it isn't yet (as well as periodically check for it). Once 
server is online the data probe will automatically connect to it. However,
-                if the unit tests don't use data probe and just issue REST 
calls then these tests have to somehow wait for the
+                if the unit tests don't use data probe and only issue REST 
calls then these tests have to somehow wait for the
                 server to get online.
             </p>
             <p>
diff --git a/tools/script.html b/tools/script.html
index f99cd07..a4cbbaf 100644
--- a/tools/script.html
+++ b/tools/script.html
@@ -144,7 +144,7 @@ id: script
         <span class="section-sub-title">Typical Development Workflow</span>
         <p>
             Here's the typical workflow of working with NLPCraft using 
NLPCraft CLI. Note that although all of these
-            steps can be performed from IDE or just a command line - NLPCraft 
CLI in REPL model provides the easiest
+            steps can be performed from IDE or a command line - NLPCraft CLI 
in REPL model provides the easiest
             way to accomplish these tasks:
         </p>
         <ol>
diff --git a/tools/sql_model_gen.html b/tools/sql_model_gen.html
index 50210b9..6455501 100644
--- a/tools/sql_model_gen.html
+++ b/tools/sql_model_gen.html
@@ -42,8 +42,8 @@ id: sql_model_gen
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-class" role="tab" aria-controls="nav-home" aria-selected="true">Java 
Class</a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-script" role="tab">NLPCraft CLI</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-class" role="tab">Java Class <img src="/images/java2-h20.png" 
alt=""></a>
             </div>
         </nav>
         <div class="tab-content">
diff --git a/tools/syn_tool.html b/tools/syn_tool.html
index a264776..ed64105 100644
--- a/tools/syn_tool.html
+++ b/tools/syn_tool.html
@@ -64,8 +64,8 @@ id: syn_tool
                 </p>
                 <nav>
                     <div class="nav nav-tabs" role="tablist">
-                        <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-nix" role="tab" aria-controls="nav-home" 
aria-selected="true">Linux/Unix/MacOS</a>
-                        <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-win" role="tab" aria-controls="nav-home" 
aria-selected="true">Windows</a>
+                        <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-nix" role="tab">Linux/Unix/MacOS</a>
+                        <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-win" role="tab">Windows</a>
                     </div>
                 </nav>
                 <div class="tab-content">
@@ -117,8 +117,8 @@ id: syn_tool
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-rest" role="tab" aria-controls="nav-home" aria-selected="true">REST 
Call</a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-script" role="tab">NLPCraft CLI</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-rest" role="tab">REST Call</a>
             </div>
         </nav>
         <div class="tab-content">
diff --git a/tools/test_framework.html b/tools/test_framework.html
index 8b86c3a..5387dca 100644
--- a/tools/test_framework.html
+++ b/tools/test_framework.html
@@ -184,8 +184,8 @@ public class AlarmModel extends NCModelFileAdapter {
         </p>
         <nav>
             <div class="nav nav-tabs" role="tablist">
-                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-script" role="tab" aria-controls="nav-home" 
aria-selected="true">NLPCraft CLI</a>
-                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-class" role="tab" aria-controls="nav-home" aria-selected="true">Java 
Class</a>
+                <a class="nav-item nav-link active" data-toggle="tab" 
href="#nav-script" role="tab">NLPCraft CLI</a>
+                <a class="nav-item nav-link" data-toggle="tab" 
href="#nav-class" role="tab">Java Class <img src="/images/java2-h20.png" 
alt=""></a>
             </div>
         </nav>
         <div class="tab-content">

Reply via email to