You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flagon.apache.org by po...@apache.org on 2019/06/29 01:24:02 UTC
[incubator-flagon] 01/01: big merge from master
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch asf-site-copy
in repository https://gitbox.apache.org/repos/asf/incubator-flagon.git
commit 4e76f8afd03ff2badaa72ed7d75f87c39d33e434
Merge: ca72f4a 84f9126
Author: poorejc <po...@apache.org>
AuthorDate: Fri Jun 28 21:23:45 2019 -0400
big merge from master
.gitignore | 3 +
KEYS => KEYS/KEYS_msbeard | 0
KEYS/KEYS_poorejc | 84 +++
LICENSE | 2 +-
README.md | 2 +-
content/_config.yml | 8 +-
content/community/index.html | 88 ++-
content/distill/index.html | 54 +-
content/docs/contributing/index.html | 108 ++++
content/docs/distill/analytics.html | 72 ++-
content/docs/distill/api.html | 80 ++-
content/docs/distill/changelog.html | 72 ++-
content/docs/distill/http.html | 74 ++-
content/docs/distill/index.html | 83 ++-
content/docs/distill/models.html | 72 ++-
content/docs/distill/start.html | 72 ++-
content/docs/distill/utilities.html | 72 ++-
content/docs/index.html | 78 ++-
content/docs/stack/index.html | 393 +++++++++++++
content/docs/stack/scaling/index.html | 618 +++++++++++++++++++++
content/docs/stout/index.html | 72 ++-
content/docs/stout/start.html | 72 ++-
content/docs/system/index.html | 26 +-
content/docs/tap/index.html | 78 ++-
content/docs/userale/index.html | 80 ++-
content/docs/useralejs/API.html | 468 ++++++++++++++++
.../docs/useralejs/build.html | 182 ++++--
.../changelog.html => useralejs/dataschema.html} | 115 ++--
content/docs/useralejs/index.html | 205 +++++--
content/docs/useralejs/modifying.html | 457 +++++++++++++++
content/docs/useralejs/testing.html | 26 +
content/docs/useralejs/troubleshooting.html | 76 ++-
content/docs/useralepy/api.html | 87 +++
content/docs/useralepy/changelog.html | 87 +++
content/docs/useralepy/index.html | 91 +++
content/docs/useralepy/start.html | 87 +++
content/feed.xml | 4 +
content/images/incubator-logo-white.jpg | Bin 0 -> 11267 bytes
content/images/metricBeat.png | Bin 0 -> 124599 bytes
content/images/mouseOverBench1.png | Bin 0 -> 93193 bytes
content/images/mouseOverBench2.png | Bin 0 -> 87554 bytes
site/images/system.png => content/images/stack.png | Bin
content/index.html | 82 ++-
content/releases/index.html | 149 ++++-
{site/_site/system => content/stack}/index.html | 68 ++-
content/stout/index.html | 56 +-
content/tap/index.html | 56 +-
content/userale/index.html | 58 +-
docker/README.md | 224 +++++---
docker/_WIP_builds/README.md | 321 +++++++++++
docker/_WIP_builds/docker-compose.cluster.yml | 182 ++++++
docker/beats/metricbeat/metricbeat.yml | 24 +
docker/beats/metricbeat/modules.d/docker.yml | 6 +
.../beats/metricbeat/modules.d/elasticsearch.yml | 6 +
docker/beats/metricbeat/modules.d/kafka.yml | 9 +
docker/beats/metricbeat/modules.d/kibana.yml | 6 +
docker/beats/metricbeat/modules.d/kubernetes.yml | 30 +
docker/beats/metricbeat/modules.d/logstash.yml | 6 +
docker/beats/metricbeat/modules.d/postgresql.yml | 17 +
docker/beats/metricbeat/modules.d/system.yml | 24 +
docker/beats/metricbeat/modules.d/zookeeper.yml | 6 +
docker/docker-compose-5.6.3.yml | 114 ++++
docker/docker-compose-6.2.2.yml | 163 ++++++
docker/docker-compose-6.5.4.yml | 163 ++++++
docker/docker-compose.yml | 163 +++---
docker/docs/images/DockerBeats_Dashboard.png | Bin 0 -> 132578 bytes
docker/{ => docs}/images/configure_index.png | Bin
docker/{ => docs}/images/confirmation.png | Bin
docker/docs/images/dashboard.png | Bin 0 -> 114906 bytes
docker/docs/images/kibana_Discover.png | Bin 0 -> 266169 bytes
docker/{ => docs}/images/management.png | Bin
docker/docs/images/viz_import.png | Bin 0 -> 183110 bytes
docker/elasticsearch/.env | 8 +
docker/elasticsearch/{ => 5.6.3}/Dockerfile | 0
.../{ => 5.6.3}/config/elasticsearch.yml | 7 +-
.../{ => 5.6.3}/config/log4j2.properties | 0
docker/elasticsearch/{ => 6.2.2}/Dockerfile | 3 +-
.../{ => 6.2.2}/config/elasticsearch.yml | 30 +-
.../{ => 6.2.2}/config/log4j2.properties | 0
docker/elasticsearch/{ => 6.5.4}/Dockerfile | 3 +-
.../{ => 6.5.4}/config/elasticsearch.yml | 30 +-
.../{ => 6.5.4}/config/log4j2.properties | 2 +-
docker/elasticsearch/{ => 6.6.2}/Dockerfile | 5 +-
.../{ => 6.6.2}/config/elasticsearch.yml | 30 +-
.../{ => 6.6.2}/config/log4j2.properties | 2 +-
docker/images/dashboard.png | Bin 172635 -> 0 bytes
docker/kibana/{ => 5.6.3}/Dockerfile | 1 +
.../Apache SensSoft Page Usage Dashboard.json | 18 +
.../Apache SensSoft User Access Dashboard.json | 18 +
.../Apache SensSoft Visualizations.json | 226 ++++++++
.../5.6.3/Saved Objects/Drill-Down Search.json | 22 +
docker/kibana/{ => 5.6.3}/config/kibana.yml | 7 +
.../kibana/{config/kibana.yml => 6.2.2/Dockerfile} | 8 +-
.../Apache SensSoft Page Usage Dashboard.json | 18 +
.../Apache SensSoft User Access Dashboard.json | 18 +
.../Apache SensSoft Visualizations.json | 226 ++++++++
.../6.2.2/Saved Objects/Drill-Down Search.json | 22 +
docker/kibana/{ => 6.2.2}/config/kibana.yml | 0
.../kibana/{config/kibana.yml => 6.5.4/Dockerfile} | 8 +-
...ache SensSoft Business Analytics Dashboard.json | 18 +
.../Apache SensSoft Page Usage Dashboard.json | 18 +
.../Apache SensSoft User Access Dashboard.json | 18 +
.../Apache SensSoft Visualizations.json | 359 ++++++++++++
.../6.5.4/Saved Objects/Drill-Down Search.json | 22 +
docker/kibana/{ => 6.5.4}/config/kibana.yml | 0
.../kibana/{config/kibana.yml => 6.6.2/Dockerfile} | 8 +-
...Apache Flagon Business Analytics Dashboard.json | 18 +
.../Apache Flagon Page Usage Dashboard.json | 18 +
.../Apache Flagon User Access Dashboard.json | 18 +
.../Apache Flagon Visualizations.json | 359 ++++++++++++
.../6.6.2/Saved Objects/Drill-Down Search.json | 22 +
docker/kibana/{ => 6.6.2}/config/kibana.yml | 0
docker/kibana/dashboard.json | 19 -
docker/kibana/visualizations.json | 58 --
docker/logstash/{ => 5.6.3}/Dockerfile | 3 +-
.../{ => 5.6.3}/config/logstash-userale.conf | 0
docker/logstash/{ => 5.6.3}/templates/userale.json | 0
docker/logstash/{ => 6.2.2}/Dockerfile | 19 +-
.../pipeline}/logstash-userale.conf | 3 +-
docker/logstash/{ => 6.2.2}/templates/userale.json | 11 +-
docker/logstash/{ => 6.5.4}/Dockerfile | 19 +-
.../pipeline}/logstash-userale.conf | 3 +-
docker/logstash/{ => 6.5.4}/templates/userale.json | 11 +-
docker/logstash/{ => 6.6.2}/Dockerfile | 21 +-
.../pipeline}/logstash-userale.conf | 3 +-
docker/logstash/{ => 6.6.2}/templates/userale.json | 11 +-
docker/requirements.txt | 1 -
docker/startup/Dockerfile | 8 +-
kubernetes/6.2.2/elasticsearch/es-client-svc.yaml | 43 ++
kubernetes/6.2.2/elasticsearch/es-client.yaml | 78 +++
kubernetes/6.2.2/elasticsearch/es-data.yaml | 65 +++
kubernetes/6.2.2/elasticsearch/es-master-svc.yaml | 38 ++
kubernetes/6.2.2/elasticsearch/es-master.yaml | 74 +++
kubernetes/6.2.2/kibana/kibana-svc.yaml | 15 +
kubernetes/6.2.2/kibana/kibana.yaml | 39 ++
kubernetes/6.2.2/logstash/logstash-svc.yaml | 19 +
kubernetes/6.2.2/logstash/logstash.yaml | 52 ++
kubernetes/README.md | 293 ++++++++++
kubernetes/configure.sh | 225 ++++++++
release/README.md | 9 +-
release/clone-and-configure-repos.sh | 18 +-
release/make-release-artifacts.sh | 25 +-
site/.dockerignore | 1 +
site/Dockerfile | 2 +-
site/README.md | 6 +-
site/_config.yml | 8 +-
site/_copy/index_landingPage_copy | 13 +
site/_docs/contributing.md | 12 +-
site/_docs/distill/api.md | 8 +-
site/_docs/distill/http.md | 2 +-
site/_docs/distill/index.md | 11 +-
site/_docs/index.md | 4 +-
site/_docs/stack/index.md | 70 +++
site/_docs/stack/scaling.md | 276 +++++++++
site/_docs/system/index.md | 45 --
site/_docs/tap/index.md | 4 +-
site/_docs/userale/index.md | 4 +-
site/_docs/useralejs/API.md | 163 ++++++
site/_docs/useralejs/build.md | 116 ++++
site/_docs/useralejs/dataschema.md | 294 ++++++++++
site/_docs/useralejs/index.md | 84 ++-
site/_docs/useralejs/modifying.md | 143 +++++
site/_docs/useralejs/testing.md | 26 -
site/_docs/useralejs/troubleshooting.md | 4 +-
site/_docs/useralepy/index.md | 2 +-
site/_includes/doc_sidebar.html | 20 +-
site/_includes/footer.html | 41 +-
site/_includes/header.html | 8 +-
site/_includes/useralejsDemo.html | 2 +-
site/_pages/community.html | 27 +-
site/_pages/releases.html | 47 +-
site/_pages/stack.html | 38 ++
site/_pages/stout.html | 2 +-
site/_pages/system.html | 38 --
site/_pages/tap.html | 2 +-
site/_pages/userale.html | 2 +-
site/_sass/{_senssoft.scss => _flagon.scss} | 0
site/_site/community/index.html | 80 +--
site/_site/distill/index.html | 53 +-
site/_site/docs/contributing/index.html | 81 ++-
site/_site/docs/distill/analytics.html | 69 ++-
site/_site/docs/distill/api.html | 77 ++-
site/_site/docs/distill/changelog.html | 69 ++-
site/_site/docs/distill/http.html | 71 ++-
site/_site/docs/distill/index.html | 80 +--
site/_site/docs/distill/models.html | 69 ++-
site/_site/docs/distill/start.html | 69 ++-
site/_site/docs/distill/utilities.html | 69 ++-
site/_site/docs/index.html | 73 ++-
site/_site/docs/stack/index.html | 393 +++++++++++++
site/_site/docs/stack/scaling/index.html | 618 +++++++++++++++++++++
site/_site/docs/stout/index.html | 69 ++-
site/_site/docs/stout/start.html | 69 ++-
site/_site/docs/system/index.html | 26 +-
site/_site/docs/tap/index.html | 75 ++-
site/_site/docs/userale/index.html | 75 ++-
site/_site/docs/useralejs/API.html | 468 ++++++++++++++++
.../docs/useralejs/{testing.html => build.html} | 182 ++++--
.../_site/docs/useralejs/dataschema.html | 115 ++--
site/_site/docs/useralejs/index.html | 198 ++++---
site/_site/docs/useralejs/modifying.html | 457 +++++++++++++++
site/_site/docs/useralejs/testing.html | 26 +-
site/_site/docs/useralejs/troubleshooting.html | 71 ++-
site/_site/docs/useralepy/api.html | 69 ++-
site/_site/docs/useralepy/changelog.html | 69 ++-
site/_site/docs/useralepy/index.html | 71 ++-
site/_site/docs/useralepy/start.html | 69 ++-
site/_site/feed.xml | 4 +
site/_site/images/incubator-logo-white.jpg | Bin 0 -> 11267 bytes
site/_site/images/metricBeat.png | Bin 0 -> 124599 bytes
site/_site/images/mouseOverBench1.png | Bin 0 -> 93193 bytes
site/_site/images/mouseOverBench2.png | Bin 0 -> 87554 bytes
site/{images/system.png => _site/images/stack.png} | Bin
site/_site/index.html | 79 +--
site/_site/releases/index.html | 83 +--
{content/system => site/_site/stack}/index.html | 67 ++-
site/_site/stout/index.html | 55 +-
site/_site/tap/index.html | 55 +-
site/_site/userale/index.html | 57 +-
site/assets/main.scss | 2 +-
site/images/incubator-logo-white.jpg | Bin 0 -> 11267 bytes
site/images/{system.png => stack.png} | Bin
site/index.html | 22 +-
site/package.json | 8 +-
224 files changed, 12791 insertions(+), 2100 deletions(-)
diff --cc content/community/index.html
index 15d8000,bdd134c..3ab6b97
--- a/content/community/index.html
+++ b/content/community/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/community/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/community/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -69,7 -69,7 +74,11 @@@
<div class="page-content">
<div class="ui vertical segment">
<p>
++<<<<<<< HEAD
+ The Apache SensSoft team happily welcomes contributors and supporters of our work. Contributions, bug reports, and suggestions are welcome for the core products, website, documentation, and everything else! See our <a href="/docs/contributing">docs</a> for more information on submitting effective contributions and bug reports.
++=======
+ The Apache Flagon team happily welcomes contributors and supporters of our work. Contributions, bug reports, and suggestions are welcome for the core products, website, documentation, and everything else! See our <a href="/docs/contributing">docs</a> for more information on submitting effective contributions and bug reports.
++>>>>>>> master
</p>
</div>
@@@ -80,8 -80,8 +89,13 @@@
<div class="content">Users</div>
</h3>
<p>
++<<<<<<< HEAD
+ For users of Apache SensSoft who want to keep up to date with new releases and community highlights. To subscribe, email <a href="mailto:user-subscribe@senssoft.incubator.apache.org">user-subscribe@senssoft.incubator.apache.org</a>.
+ <a class="ui yellow button" href="mailto:users-subscribe@senssoft.incubator.apache.org">User List</a>
++=======
+ For users of Apache Flagon who want to keep up to date with new releases and community highlights. To subscribe, email <a href="mailto:user-subscribe@flagon.incubator.apache.org">user-subscribe@flagon.incubator.apache.org</a>.
+ <a class="ui yellow button" href="mailto:users-subscribe@flagon.incubator.apache.org">User List</a>
++>>>>>>> master
</p>
<h3 class="ui header">
@@@ -89,16 -89,16 +103,26 @@@
<div class="content">Dev</div>
</h3>
<p>
++<<<<<<< HEAD
+ For contributors to Apache SensSoft or those interested in ongoing design and development efforts. To subscribe, email <a href="mailto:dev-subscribe@senssoft.incubator.apache.org">dev-subscribe@senssoft.incubator.apache.org</a>.
+ <a class="ui blue button" href="mailto:dev-subscribe@senssoft.incubator.apache.org">Dev List</a>
++=======
+ For contributors to Apache Flagon or those interested in ongoing design and development efforts. To subscribe, email <a href="mailto:dev-subscribe@flagon.incubator.apache.org">dev-subscribe@flagon.incubator.apache.org</a>.
+ <a class="ui blue button" href="mailto:dev-subscribe@flagon.incubator.apache.org">Dev List</a>
++>>>>>>> master
</p>
<h3 class="ui header">
<i class="upload icon"></i>
<div class="content">Commits</div>
</h3>
<p>
++<<<<<<< HEAD
+ For emails-on-commit across all Apache SensSoft products. To subscribe, email <a href="mailto:commits-subscribe@senssoft.incubator.apache.org">commits-subscribe@senssoft.incubator.apache.org</a>.
+ <a class="ui blue button" href="mailto:commits-subscribe@senssoft.incubator.apache.org">Commits List</a>
++=======
+ For emails-on-commit across all Apache Flagon products. To subscribe, email <a href="mailto:commits-subscribe@flagon.incubator.apache.org">commits-subscribe@flagon.incubator.apache.org</a>.
+ <a class="ui blue button" href="mailto:commits-subscribe@flagon.incubator.apache.org">Commits List</a>
++>>>>>>> master
</p>
</div>
@@@ -130,7 -130,7 +154,11 @@@
<div class="content">Issues and Bugs</div>
</h3>
<p>
++<<<<<<< HEAD
+ Visit our <a href="https://issues.apache.org/jira/browse/SENSSOFT">JIRA Issue Tracker</a> for full information on current developments, bugs, etc.
++=======
+ Visit our <a href="https://issues.apache.org/jira/browse/FLAGON">JIRA Issue Tracker</a> for full information on current developments, bugs, etc.
++>>>>>>> master
</p>
<h3 class="ui header">
<i class="sticky note icon"></i>
@@@ -219,12 -220,23 +248,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/distill/index.html
index 07bd745,32e1e74..cd9e2de
--- a/content/distill/index.html
+++ b/content/distill/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/distill/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/distill/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -208,12 -208,23 +213,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/contributing/index.html
index b637e53,24d6254..b4d2ead
--- a/content/docs/contributing/index.html
+++ b/content/docs/contributing/index.html
@@@ -7,7 -7,7 +7,11 @@@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Contributing</title>
++<<<<<<< HEAD
+ <meta name="description" content="First, thank you for contributing to Apache SensSoft!">
++=======
+ <meta name="description" content="First, thank you for contributing to Apache Flagon!">
++>>>>>>> master
<link rel="stylesheet" type="text/css" href="/semantic/dist/semantic.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
@@@ -16,8 -16,8 +20,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/contributing/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/contributing/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -28,14 -28,14 +37,22 @@@
<div class="site-header">
<div id="main-menu" class="ui inverted padded fixed top borderless menu">
<a class="site-title" href="/">
++<<<<<<< HEAD
+ <h3 class="ui inverted header item">Apache SensSoft</h3>
++=======
+ <h3 class="ui inverted header item">Apache Flagon</h3>
++>>>>>>> master
</a>
<div class="right menu">
<div class="ui dropdown item">
Components
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -45,7 -45,7 +62,11 @@@
<div class="ui dropdown item">
<a href="/docs">Docs</a>
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserALE.js</a>
<a class="item" href="/docs/useralepy">UserALE.py</a>
@@@ -81,7 -81,7 +102,11 @@@
<div class="active title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ Apache SensSoft
++=======
+ Apache Flagon
++>>>>>>> master
</div>
<div class="active content">
@@@ -100,14 -100,16 +125,24 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ System
++=======
+ Stack
++>>>>>>> master
</div>
<div class="content">
<div class="ui inverted bulleted list docs-list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system/">Getting Started</a>
++=======
+ <a class="item" href="/docs/stack/">Getting Started</a>
+
+ <a class="item" href="/docs/stack/scaling/">Scaling Considerations</a>
++>>>>>>> master
</div>
</div>
@@@ -141,9 -143,15 +176,21 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -238,7 -246,7 +285,11 @@@
</div>
<div class="docs-content">
<h2 class="ui header">Contributing</h2>
++<<<<<<< HEAD
+ <p>First, thank you for contributing to Apache SensSoft!</p>
++=======
+ <p>First, thank you for contributing to Apache Flagon!</p>
++>>>>>>> master
<p>There are certain procedures that must be followed for all contributions. These procedures are necessary to allow us to allocate resources for reviewing and testing your contribution, as well as to communicate effectively with you during the review process.</p>
@@@ -248,14 -256,16 +299,27 @@@
<h4 id="1-create-an-issue-in-jira">1. Create an issue in JIRA</h4>
++<<<<<<< HEAD
+<p>All changes to Apache SensSoft must have a corresponding issue in <a href="https://issues.apache.org/jira/browse/SENSSOFT">JIRA</a> so the change can be properly tracked. If you do not already have an account on JIRA, you will need to create one before creating your new issue.</p>
+
+<h4 id="2-make-and-test-your-changes-locally">2. Make and test your changes locally</h4>
+
+<p>The Apache SensSoft source code is maintained in <a href="https://git-wip-us.apache.org/repos/asf?s=senssoft">several git repositories</a> hosted by Apache. These repositories are mirrored and more easily available <a href="https://github.com/apache?q=senssoft">on GitHub</a>. To make your changes, fork the appropriate GitHub repository and make commits to a topic branch in your fork. Commits should be made in logical units and must reference the JIRA issue number:</p>
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code> git commit -m <span class="s2">"#SENSSOFT-123: High-level message describing the changes."</span>
+</code></pre>
+</div>
++=======
+ <p>All changes to Apache Flagon must have a corresponding issue in <a href="https://issues.apache.org/jira/browse/FLAGON">JIRA</a> so the change can be properly tracked. If you do not already have an account on JIRA, you will need to create one before creating your new issue.</p>
+
+ <h4 id="2-make-and-test-your-changes-locally">2. Make and test your changes locally</h4>
+
+ <p>The Apache Flagon source code is maintained in <a href="https://gitbox.apache.org/repos/asf?s=flagon">several git repositories</a> hosted by Apache. These repositories are mirrored and more easily available <a href="https://github.com/apache?q=flagon">on GitHub</a>. To make your changes, fork the appropriate GitHub repository and make commits to a topic branch in your fork. Commits should be made in logical units and must reference the JIRA issue number:</p>
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code> git commit -S -m <span class="s2">"[FLAGON-123] High-level message describing the changes."</span>
+ </code></pre>
+ </div>
+ <p>Note that your commits should be verifiable; each commit should be verified with a PGP certificate. The easiest way to do this is to create a PGP signature with <a href="https://www.gnupg.org/">GnuPG</a>, register it with you GitHub account and <a href="https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work">configure git</a> to use this signature when committing.</p>
+
++>>>>>>> master
<p>Avoid commits which cover multiple, distinct goals that could (and should) be handled separately. If you do not already have an account on JIRA, you will need to create one to claim an issue, discuss development, or report results.</p>
<h4 id="3-submit-your-changes-via-a-pull-request-on-github">3. Submit your changes via a pull request on GitHub</h4>
@@@ -273,7 -283,7 +337,11 @@@
<div class="column">
<h4 class="ui inverted header">About</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -283,7 -293,7 +351,11 @@@
<div class="column">
<h4 class="ui inverted header">Docs</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserAle.js</a>
<a class="item" href="/docs/useralepy">UserAle.py</a>
@@@ -295,21 -305,21 +367,37 @@@
<div class="column">
<h4 class="ui inverted header">Community</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="https://github.com/apache?q=senssoft">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-senssoft">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/SENSSOFT">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/SENSSOFT">Project Wiki</a>
+ <a class="item" href="https://twitter.com/apachesenssoft">Twitter</a>
++=======
+ <a class="item" href="https://github.com/apache?q=flagon">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-flagon">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/FLAGON">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/FLAGON">Project Wiki</a>
+ <a class="item" href="https://twitter.com/ApacheFlagon">Twitter</a>
++>>>>>>> master
</div>
</div>
<div class="column">
<h4 class="ui inverted header">Apache</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://incubator.apache.org/">Apache Incubator</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsor Apache</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thank you</a>
++=======
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://www.apache.org/licenses/">License</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thanks</a>
+ <a class="item" href="http://www.apache.org/security/">Security</a>
++>>>>>>> master
</div>
</div>
</div>
@@@ -317,12 -327,23 +405,32 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
++<<<<<<< HEAD
+ Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ </div>
+ <div class="center aligned column">
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
+ </div>
+ <div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/distill/analytics.html
index e2fdc2a,90bc760..4cb0a32
--- a/content/docs/distill/analytics.html
+++ b/content/docs/distill/analytics.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/distill/analytics.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/distill/analytics.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -387,12 -395,23 +404,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/distill/api.html
index cff7575,cc7e1a9..133e2a4
--- a/content/docs/distill/api.html
+++ b/content/docs/distill/api.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/distill/api.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/distill/api.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -318,12 -326,23 +335,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/distill/changelog.html
index 2399876,39c543f..af5f4e2
--- a/content/docs/distill/changelog.html
+++ b/content/docs/distill/changelog.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/distill/changelog.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/distill/changelog.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -322,12 -330,23 +339,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/distill/http.html
index 980532f,80d94f5..711bae6
--- a/content/docs/distill/http.html
+++ b/content/docs/distill/http.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/distill/http.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/distill/http.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -621,12 -629,23 +638,29 @@@ testing/?stat<span class="o">=</span>te
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/distill/index.html
index 6e0edfd,dcc37bd..f5b16ea
--- a/content/docs/distill/index.html
+++ b/content/docs/distill/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/distill/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/distill/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -462,12 -467,23 +476,29 @@@ When the package is installed via easy_
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
+ </div>
+ <div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
</div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/distill/models.html
index e09004c,1ec0761..25b405c
--- a/content/docs/distill/models.html
+++ b/content/docs/distill/models.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/distill/models.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/distill/models.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -606,12 -614,23 +623,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/distill/start.html
index 0fa950c,d4562fe..1c25f70
--- a/content/docs/distill/start.html
+++ b/content/docs/distill/start.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/distill/start.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/distill/start.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -305,12 -313,23 +322,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/distill/utilities.html
index 52b9c90,e688eac..698c6da
--- a/content/docs/distill/utilities.html
+++ b/content/docs/distill/utilities.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/distill/utilities.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/distill/utilities.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -392,12 -400,23 +409,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/index.html
index 5fa2c46,4b5be6e..9dfc4c6
--- a/content/docs/index.html
+++ b/content/docs/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -238,7 -246,7 +255,11 @@@
</div>
<div class="docs-content">
<h2 class="ui header">About the Docs</h2>
++<<<<<<< HEAD
+ <p>The Apache SensSoft docs are organized by product. Each product’s documentation includes information like quick start guides, tutorials, full API descriptions, and contribution guides.</p>
++=======
+ <p>The Apache Flagon docs are organized by product. Each product’s documentation includes information like quick start guides, tutorials, full API descriptions, and contribution guides.</p>
++>>>>>>> master
</div>
</div>
@@@ -295,12 -303,23 +316,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/stout/index.html
index a2c4bec,13b6ac9..d0fb7a8
--- a/content/docs/stout/index.html
+++ b/content/docs/stout/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/stout/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/stout/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -315,12 -323,23 +332,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/stout/start.html
index 6a17091,137e72c..dde9fa8
--- a/content/docs/stout/start.html
+++ b/content/docs/stout/start.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/stout/start.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/stout/start.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -395,12 -403,23 +412,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/system/index.html
index e2e1640,88b8c60..36b9484
--- a/content/docs/system/index.html
+++ b/content/docs/system/index.html
@@@ -335,9 -335,21 +335,27 @@@
Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2018 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache SensSoft, SensSoft, Apache, the Apache feather logo, the Apache SensSoft logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/tap/index.html
index a3ece38,091d3cd..e8ce443
--- a/content/docs/tap/index.html
+++ b/content/docs/tap/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/tap/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/tap/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -297,12 -305,23 +314,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/userale/index.html
index 96469a5,377e683..ece7a67
--- a/content/docs/userale/index.html
+++ b/content/docs/userale/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/userale/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/userale/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -242,7 -250,7 +259,11 @@@
<h3 id="about-userale">About UserALE</h3>
++<<<<<<< HEAD
+<p>The User Analytic Logging Engine (UserALE) is part of Apache SensSoft. UserALE is for Software Developers, HCI/UX researchers, and project managers who develop user facing software tools—applications that are used for manipulating, analyzing, or visualizing data or other systems.</p>
++=======
+ <p>The User Analytic Logging Engine (UserALE) is part of Apache Flagon. UserALE is for Software Developers, HCI/UX researchers, and project managers who develop user facing software tools—applications that are used for manipulating, analyzing, or visualizing data or other systems.</p>
++>>>>>>> master
<p>UserALE provides an API for instrumenting software tools, turning them into a human usability sensors. With every user interaction User ALE will transmit specially structured messages (JSON) from software tools to an activity logging server (<a href="http://elastic.co">Elasticsearch™</a>). These messages not only report user activities and their timing, but provide sufficient context to understand how those activities are related to the functional organization of the software tool. T [...]
@@@ -307,12 -315,23 +328,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/useralejs/index.html
index 4fdcc39,cb63071..74ec3e8
--- a/content/docs/useralejs/index.html
+++ b/content/docs/useralejs/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/useralejs/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/useralejs/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -238,23 -246,26 +255,36 @@@
</div>
<div class="docs-content">
<h2 class="ui header">Getting Started</h2>
- <p>Apache UserALE.js is the UserALE client for DOM and JavaScript-based applications. It automatically attaches event handlers, is configurable through HTML5 data parameters or a JS API, and logs every user interaction on a web page, including rich JS single-page apps.</p>
-
- <p><em>Note:</em> Work on UserALE.js’ documentation is ongoing. The most notable undocumented feature is the JS API. To get involved, see our <a href="/docs/contributing">Contributing</a> guide.</p>
+ <p><a href="https://github.com/apache/incubator-flagon-useralejs">Apache UserALE.js</a> is the UserALE client for DOM and JavaScript-based applications. It automatically attaches event handlers, is configurable through HTML5 data parameters or a JS API, and logs every user interaction on a web page, including rich JS single-page apps. You can choose to include UserALE.js directly in your project to track how users engage with it, or if you’re interested in generating logs from any [...]
+ <p><em>Note:</em> Work on UserALE.js’ documentation is ongoing. Contributions are welcome. To get involved, see our <a href="/docs/contributing">Contributing</a> guide.</p>
<h3 id="include-useralejs-in-your-project">Include UserALE.js in your project</h3>
++<<<<<<< HEAD
+<p>To include UserALE.js in your project with default configuration, simply include the script tag below:</p>
+
+<div class="language-html highlighter-rouge"><pre class="highlight"><code> <span class="nt"><script </span><span class="na">src=</span><span class="s">"<userale-0.1.0.js>"</span><span class="nt">></script></span>
++=======
+ <p>To start logging with Apache UserALE.js, you can include our script directly in your project. More details can be found in our <a href="https://github.com/apache/incubator-flagon-useralejs/blob/master/README.md">README</a>. You can use our <a href="/docs/useralejs/build">build process</a> to create our script, or just use a sample in our <a href="https://github.com/apache/incubator-flagon-useralejs/tree/master/build">repos</a>.</p>
+
+ <p>To include UserALE.js in a specific project, you’ll need to deploy a version of our minified UserALE.js script in an accessible location (e.g., webserver), and simply include this script tag on the page:</p>
+
+ <div class="language-html highlighter-rouge"><pre class="highlight"><code><span class="nt"><script </span><span class="na">src=</span><span class="s">"/path/to/userale-2.0.0.min.js"</span><span class="nt">></script></span>
++>>>>>>> master
</code></pre>
</div>
- <h3 id="configure-useralejs">Configure UserALE.js</h3>
+ <p>This tag will execute the UserALE.js script in your, with no other modifications to your project needed!</p>
+
+ <p><strong>Configure UserALE.js through the Script Tag</strong></p>
- <p>HTML5 Data Parameters are used to configure UserALE.js. For example, to set the logging URL:</p>
+ <p>UserALE.js is designed to be easily configured to fit your use case. We use HTML data parameters to pass configuration options to the library. For example, one thing you’ll need to do is set the URL (location) of your minified UserALE.js script:</p>
++<<<<<<< HEAD
+<div class="language-html highlighter-rouge"><pre class="highlight"><code> <span class="nt"><script </span><span class="na">src=</span><span class="s">"userale-0.1.0.js"</span> <span class="na">data-url=</span><span class="s">"http://server:port"</span><span class="nt">></script></span>
++=======
+ <div class="language-html highlighter-rouge"><pre class="highlight"><code><span class="nt"><script </span><span class="na">src=</span><span class="s">"/path/to/userale-2.0.0.min.js"</span> <span class="na">data-url=</span><span class="s">"http://yourLoggingUrl"</span><span class="nt">></script></span>
++>>>>>>> master
</code></pre>
</div>
@@@ -377,12 -432,23 +451,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/useralejs/testing.html
index 8449075,4900299..5b7df44
--- a/content/docs/useralejs/testing.html
+++ b/content/docs/useralejs/testing.html
@@@ -302,11 -302,11 +302,19 @@@
<div class="column">
<h4 class="ui inverted header">Apache</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://incubator.apache.org/">Apache Incubator</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsor Apache</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thank you</a>
++=======
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://www.apache.org/licenses/">License</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thanks</a>
+ <a class="item" href="http://www.apache.org/security/">Security</a>
++>>>>>>> master
</div>
</div>
</div>
@@@ -317,9 -317,21 +325,27 @@@
Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2018 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache SensSoft, SensSoft, Apache, the Apache feather logo, the Apache SensSoft logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/useralejs/troubleshooting.html
index 88d4960,a4a3b7e..e1009c4
--- a/content/docs/useralejs/troubleshooting.html
+++ b/content/docs/useralejs/troubleshooting.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/useralejs/troubleshooting.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/useralejs/troubleshooting.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -141,9 -143,15 +148,19 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
- <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -240,7 -248,7 +257,11 @@@
<h2 class="ui header">Troubleshooting</h2>
<h3 id="enable-cross-origin-resource-sharing-cors">Enable Cross-Origin Resource Sharing (CORS)</h3>
++<<<<<<< HEAD
+<p>The logs generated by UserALE is sent to a logging server which is configured in the script tag. Your client may send out failure logs because of a CORS (cross-origin resource sharing) issue. You will need to configure your backend server to enable CORS.</p>
++=======
+ <p>The logs generated by <a href="https://github.com/apache/incubator-flagon-useralejs">Apache UserALE.js</a> are sent to a logging server which is configured in the script tag. Your client may send out failure logs because of a CORS (cross-origin resource sharing) issue. You will need to configure your backend server to enable CORS.</p>
++>>>>>>> master
<p>For more information and examples on how to enable CORS on your server, please visit <a href="http://enable-cors.org/index.html">enable-cors.org</a>.</p>
@@@ -299,12 -307,23 +320,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/useralepy/api.html
index 34da6ab,cde7315..9e2a1b3
--- a/content/docs/useralepy/api.html
+++ b/content/docs/useralepy/api.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/useralepy/api.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/useralepy/api.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -28,14 -28,14 +33,22 @@@
<div class="site-header">
<div id="main-menu" class="ui inverted padded fixed top borderless menu">
<a class="site-title" href="/">
++<<<<<<< HEAD
+ <h3 class="ui inverted header item">Apache SensSoft</h3>
++=======
+ <h3 class="ui inverted header item">Apache Flagon</h3>
++>>>>>>> master
</a>
<div class="right menu">
<div class="ui dropdown item">
Components
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -45,7 -45,7 +58,11 @@@
<div class="ui dropdown item">
<a href="/docs">Docs</a>
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserALE.js</a>
<a class="item" href="/docs/useralepy">UserALE.py</a>
@@@ -81,7 -81,7 +98,11 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ Apache SensSoft
++=======
+ Apache Flagon
++>>>>>>> master
</div>
<div class="content">
@@@ -100,14 -100,16 +121,24 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ System
++=======
+ Stack
++>>>>>>> master
</div>
<div class="content">
<div class="ui inverted bulleted list docs-list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system/">Getting Started</a>
++=======
+ <a class="item" href="/docs/stack/">Getting Started</a>
+
+ <a class="item" href="/docs/stack/scaling/">Scaling Considerations</a>
++>>>>>>> master
</div>
</div>
@@@ -141,9 -143,15 +172,21 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -531,7 -539,7 +574,11 @@@
<div class="column">
<h4 class="ui inverted header">About</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -541,7 -549,7 +588,11 @@@
<div class="column">
<h4 class="ui inverted header">Docs</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserAle.js</a>
<a class="item" href="/docs/useralepy">UserAle.py</a>
@@@ -553,21 -561,21 +604,37 @@@
<div class="column">
<h4 class="ui inverted header">Community</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="https://github.com/apache?q=senssoft">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-senssoft">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/SENSSOFT">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/SENSSOFT">Project Wiki</a>
+ <a class="item" href="https://twitter.com/apachesenssoft">Twitter</a>
++=======
+ <a class="item" href="https://github.com/apache?q=flagon">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-flagon">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/FLAGON">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/FLAGON">Project Wiki</a>
+ <a class="item" href="https://twitter.com/ApacheFlagon">Twitter</a>
++>>>>>>> master
</div>
</div>
<div class="column">
<h4 class="ui inverted header">Apache</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://incubator.apache.org/">Apache Incubator</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsor Apache</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thank you</a>
++=======
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://www.apache.org/licenses/">License</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thanks</a>
+ <a class="item" href="http://www.apache.org/security/">Security</a>
++>>>>>>> master
</div>
</div>
</div>
@@@ -575,12 -583,23 +642,32 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
++<<<<<<< HEAD
+ Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ </div>
+ <div class="center aligned column">
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
+ </div>
+ <div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/useralepy/changelog.html
index 5f0dff0,47b7e6c..131727c
--- a/content/docs/useralepy/changelog.html
+++ b/content/docs/useralepy/changelog.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/useralepy/changelog.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/useralepy/changelog.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -28,14 -28,14 +33,22 @@@
<div class="site-header">
<div id="main-menu" class="ui inverted padded fixed top borderless menu">
<a class="site-title" href="/">
++<<<<<<< HEAD
+ <h3 class="ui inverted header item">Apache SensSoft</h3>
++=======
+ <h3 class="ui inverted header item">Apache Flagon</h3>
++>>>>>>> master
</a>
<div class="right menu">
<div class="ui dropdown item">
Components
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -45,7 -45,7 +58,11 @@@
<div class="ui dropdown item">
<a href="/docs">Docs</a>
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserALE.js</a>
<a class="item" href="/docs/useralepy">UserALE.py</a>
@@@ -81,7 -81,7 +98,11 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ Apache SensSoft
++=======
+ Apache Flagon
++>>>>>>> master
</div>
<div class="content">
@@@ -100,14 -100,16 +121,24 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ System
++=======
+ Stack
++>>>>>>> master
</div>
<div class="content">
<div class="ui inverted bulleted list docs-list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system/">Getting Started</a>
++=======
+ <a class="item" href="/docs/stack/">Getting Started</a>
+
+ <a class="item" href="/docs/stack/scaling/">Scaling Considerations</a>
++>>>>>>> master
</div>
</div>
@@@ -141,9 -143,15 +172,21 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -318,7 -326,7 +361,11 @@@
<div class="column">
<h4 class="ui inverted header">About</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -328,7 -336,7 +375,11 @@@
<div class="column">
<h4 class="ui inverted header">Docs</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserAle.js</a>
<a class="item" href="/docs/useralepy">UserAle.py</a>
@@@ -340,21 -348,21 +391,37 @@@
<div class="column">
<h4 class="ui inverted header">Community</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="https://github.com/apache?q=senssoft">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-senssoft">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/SENSSOFT">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/SENSSOFT">Project Wiki</a>
+ <a class="item" href="https://twitter.com/apachesenssoft">Twitter</a>
++=======
+ <a class="item" href="https://github.com/apache?q=flagon">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-flagon">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/FLAGON">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/FLAGON">Project Wiki</a>
+ <a class="item" href="https://twitter.com/ApacheFlagon">Twitter</a>
++>>>>>>> master
</div>
</div>
<div class="column">
<h4 class="ui inverted header">Apache</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://incubator.apache.org/">Apache Incubator</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsor Apache</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thank you</a>
++=======
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://www.apache.org/licenses/">License</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thanks</a>
+ <a class="item" href="http://www.apache.org/security/">Security</a>
++>>>>>>> master
</div>
</div>
</div>
@@@ -362,12 -370,23 +429,32 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
++<<<<<<< HEAD
+ Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ </div>
+ <div class="center aligned column">
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
+ </div>
+ <div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/useralepy/index.html
index ef1c2b2,d6dcfcd..240d241
--- a/content/docs/useralepy/index.html
+++ b/content/docs/useralepy/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/useralepy/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/useralepy/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -28,14 -28,14 +33,22 @@@
<div class="site-header">
<div id="main-menu" class="ui inverted padded fixed top borderless menu">
<a class="site-title" href="/">
++<<<<<<< HEAD
+ <h3 class="ui inverted header item">Apache SensSoft</h3>
++=======
+ <h3 class="ui inverted header item">Apache Flagon</h3>
++>>>>>>> master
</a>
<div class="right menu">
<div class="ui dropdown item">
Components
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -45,7 -45,7 +58,11 @@@
<div class="ui dropdown item">
<a href="/docs">Docs</a>
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserALE.js</a>
<a class="item" href="/docs/useralepy">UserALE.py</a>
@@@ -81,7 -81,7 +98,11 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ Apache SensSoft
++=======
+ Apache Flagon
++>>>>>>> master
</div>
<div class="content">
@@@ -100,14 -100,16 +121,24 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ System
++=======
+ Stack
++>>>>>>> master
</div>
<div class="content">
<div class="ui inverted bulleted list docs-list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system/">Getting Started</a>
++=======
+ <a class="item" href="/docs/stack/">Getting Started</a>
+
+ <a class="item" href="/docs/stack/scaling/">Scaling Considerations</a>
++>>>>>>> master
</div>
</div>
@@@ -141,9 -143,15 +172,21 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -252,7 -260,7 +295,11 @@@
<p>The first step is to install Apache UserALE.PyQt5. First, checkout the latest version of Apache UserALE.PyQt5 from our Git repository.</p>
++<<<<<<< HEAD
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code> <span class="nv">$ </span>git clone https://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5.git
++=======
+ <div class="language-shell highlighter-rouge"><pre class="highlight"><code> <span class="nv">$ </span>git clone https://gitbox.apache.org/repos/asf/incubator-flagon-userale-pyqt5.git
++>>>>>>> master
</code></pre>
</div>
@@@ -362,7 -370,7 +409,11 @@@ When the package is installed via easy_
<div class="column">
<h4 class="ui inverted header">About</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -372,7 -380,7 +423,11 @@@
<div class="column">
<h4 class="ui inverted header">Docs</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserAle.js</a>
<a class="item" href="/docs/useralepy">UserAle.py</a>
@@@ -384,21 -392,21 +439,37 @@@
<div class="column">
<h4 class="ui inverted header">Community</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="https://github.com/apache?q=senssoft">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-senssoft">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/SENSSOFT">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/SENSSOFT">Project Wiki</a>
+ <a class="item" href="https://twitter.com/apachesenssoft">Twitter</a>
++=======
+ <a class="item" href="https://github.com/apache?q=flagon">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-flagon">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/FLAGON">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/FLAGON">Project Wiki</a>
+ <a class="item" href="https://twitter.com/ApacheFlagon">Twitter</a>
++>>>>>>> master
</div>
</div>
<div class="column">
<h4 class="ui inverted header">Apache</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://incubator.apache.org/">Apache Incubator</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsor Apache</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thank you</a>
++=======
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://www.apache.org/licenses/">License</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thanks</a>
+ <a class="item" href="http://www.apache.org/security/">Security</a>
++>>>>>>> master
</div>
</div>
</div>
@@@ -406,12 -414,23 +477,32 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
++<<<<<<< HEAD
+ Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ </div>
+ <div class="center aligned column">
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
+ </div>
+ <div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/docs/useralepy/start.html
index 583e807,4e1feaa..8967a4f
--- a/content/docs/useralepy/start.html
+++ b/content/docs/useralepy/start.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/docs/useralepy/start.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/docs/useralepy/start.html">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -28,14 -28,14 +33,22 @@@
<div class="site-header">
<div id="main-menu" class="ui inverted padded fixed top borderless menu">
<a class="site-title" href="/">
++<<<<<<< HEAD
+ <h3 class="ui inverted header item">Apache SensSoft</h3>
++=======
+ <h3 class="ui inverted header item">Apache Flagon</h3>
++>>>>>>> master
</a>
<div class="right menu">
<div class="ui dropdown item">
Components
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -45,7 -45,7 +58,11 @@@
<div class="ui dropdown item">
<a href="/docs">Docs</a>
<div class="menu">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserALE.js</a>
<a class="item" href="/docs/useralepy">UserALE.py</a>
@@@ -81,7 -81,7 +98,11 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ Apache SensSoft
++=======
+ Apache Flagon
++>>>>>>> master
</div>
<div class="content">
@@@ -100,14 -100,16 +121,24 @@@
<div class="title">
<i class="dropdown icon"></i>
++<<<<<<< HEAD
+ System
++=======
+ Stack
++>>>>>>> master
</div>
<div class="content">
<div class="ui inverted bulleted list docs-list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system/">Getting Started</a>
++=======
+ <a class="item" href="/docs/stack/">Getting Started</a>
+
+ <a class="item" href="/docs/stack/scaling/">Scaling Considerations</a>
++>>>>>>> master
</div>
</div>
@@@ -141,9 -143,15 +172,21 @@@
<a class="item" href="/docs/useralejs/">Getting Started</a>
++<<<<<<< HEAD
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
+
+ <a class="item" href="/docs/useralejs/testing.html">Build and Test</a>
++=======
+ <a class="item" href="/docs/useralejs/build.html">UserALE.js Build and Test</a>
+
+ <a class="item" href="/docs/useralejs/API.html">UserALE.js API</a>
+
+ <a class="item" href="/docs/useralejs/modifying.html">Modifying UserALE.js</a>
+
+ <a class="item" href="/docs/useralejs/dataschema.html">UserALE.js Data Schema</a>
+
+ <a class="item" href="/docs/useralejs/troubleshooting.html">Troubleshooting</a>
++>>>>>>> master
</div>
</div>
@@@ -303,7 -311,7 +346,11 @@@
<div class="column">
<h4 class="ui inverted header">About</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/system">System</a>
++=======
+ <a class="item" href="/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/userale">UserALE</a>
<a class="item" href="/distill">Distill</a>
<a class="item" href="/tap">Tap</a>
@@@ -313,7 -321,7 +360,11 @@@
<div class="column">
<h4 class="ui inverted header">Docs</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="/docs/system">System</a>
++=======
+ <a class="item" href="/docs/stack">Stack</a>
++>>>>>>> master
<a class="item" href="/docs/userale">UserALE</a>
<a class="item" href="/docs/useralejs">UserAle.js</a>
<a class="item" href="/docs/useralepy">UserAle.py</a>
@@@ -325,21 -333,21 +376,37 @@@
<div class="column">
<h4 class="ui inverted header">Community</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="https://github.com/apache?q=senssoft">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-senssoft">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/SENSSOFT">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/SENSSOFT">Project Wiki</a>
+ <a class="item" href="https://twitter.com/apachesenssoft">Twitter</a>
++=======
+ <a class="item" href="https://github.com/apache?q=flagon">GitHub</a>
+ <a class="item" href="http://stackoverflow.com/questions/tagged/apache-flagon">StackOverflow</a>
+ <a class="item" href="https://issues.apache.org/jira/browse/FLAGON">Jira Issue Tracker</a>
+ <a class="item" href="https://cwiki.apache.org/confluence/display/FLAGON">Project Wiki</a>
+ <a class="item" href="https://twitter.com/ApacheFlagon">Twitter</a>
++>>>>>>> master
</div>
</div>
<div class="column">
<h4 class="ui inverted header">Apache</h4>
<div class="ui inverted link list">
++<<<<<<< HEAD
+ <a class="item" href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://incubator.apache.org/">Apache Incubator</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsor Apache</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thank you</a>
++=======
+ <a class="item" href="http://www.apache.org/">Apache Software Foundation</a>
+ <a class="item" href="http://www.apache.org/licenses/">License</a>
+ <a class="item" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+ <a class="item" href="http://www.apache.org/foundation/thanks.html">Thanks</a>
+ <a class="item" href="http://www.apache.org/security/">Security</a>
++>>>>>>> master
</div>
</div>
</div>
@@@ -347,12 -355,23 +414,32 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
++<<<<<<< HEAD
+ Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ </div>
+ <div class="center aligned column">
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
+ </div>
+ <div class="center aligned column">
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/feed.xml
index 768498b,d0e8baf..54e7a39
--- a/content/feed.xml
+++ b/content/feed.xml
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="http://senssoft.incubator.apache.org/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="http://jekyllrb.com" version="3.3.1">Jekyll</generator><link href="http://senssoft.incubator.apache.org/feed.xml" rel="self" type="application/atom+xml" /><link href="http://senssoft.incubator.apache.org/" rel="alternate" type="text/html" /><updated>2018-03-13T03:48:27+00:00</updated><id>http://senssof [...]
++=======
+ <?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="http://flagon.incubator.apache.org/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="http://jekyllrb.com" version="3.3.1">Jekyll</generator><link href="http://flagon.incubator.apache.org/feed.xml" rel="self" type="application/atom+xml" /><link href="http://flagon.incubator.apache.org/" rel="alternate" type="text/html" /><updated>2019-06-27T03:26:21+00:00</updated><id>http://flagon.incuba [...]
++>>>>>>> master
diff --cc content/index.html
index a046b36,90343d7..de26865
--- a/content/index.html
+++ b/content/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -384,7 -384,7 +389,11 @@@
<div class="ui text container">
<h2 class="ui inverted header">About the Project</h2>
<p>
++<<<<<<< HEAD
+ Apache SensSoft is a user activity logging and analytics system that enables developers to instrument and extract design and user insights from their applications. It was originally developed at <a href="draper.com">Draper</a> for DARPA's XDATA program as a means of evaluating and improving tools for big data analysis and exploration. Commercially available as Draper's Software as a Sensor™, Apache SensSoft aims to provide a more complete and customizable user analytics platform.
++=======
+ Apache Flagon is a free and open-source, thin-client behavioral logging solution for business analytics, usage analytics, usability testing and scientific research. Formerly named Apache SensSoft, Flagon had its start at Draper for DARPA's XDATA program and represents the hard-work and innovations of an interdisciplinary team of data scientists, psychologists, developers and system architects. Apache Flagon is maintained by the people that love it under the mentorship and guidance [...]
++>>>>>>> master
</p>
</div>
</div>
@@@ -441,12 -441,23 +450,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/releases/index.html
index e2184b8,7c28df5..07a0e5b
--- a/content/releases/index.html
+++ b/content/releases/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/releases/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/releases/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -68,102 -68,102 +73,197 @@@
</h1>
<div class="page-content">
<p>
++<<<<<<< HEAD
+ Below you can find the official SensSoft release distrbution artifacts. Older releases can be found at the <a heref="http://archive.apache.org/dist/incubator/senssoft/">Apache SensSoft Archives</a>.
++=======
+ Below you can find the official Apache Flagon release distrbution artifacts. Older releases can be found at the <a heref="http://archive.apache.org/dist/incubator/flagon/">Apache Flagon Archives</a>.
++>>>>>>> master
For ongoing development and future release announcements, stay tuned and sign up for our <a href="./community.html">mailing lists</a> to keep up to date!
</p>
<p>
++<<<<<<< HEAD
+ Please Note all SensSoft artifacts are released as source code and binary artifacts and additional packages can be found on packaging platforms such as UserALE .js which we make available through <a href="https://www.npmjs.com/package/useralejs">the NPM useralejs package</a>.
+
+ The CHANGELOG file shipped with each artifact can be consulted for more information on the list of updates in each release.
+
+ SensSoft artifacts are always distributed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, version 2.0</a>.
+</p>
+
+<h1>SensSoft UserALE.js</h1>
+
+Please note, that for convenience, we make UserALE .js available through <a href="https://www.npmjs.com/package/useralejs">the NPM useralejs package</a>.
+
+<h2>Downloads</h2>
+The link in the 'Download Artifact' column below should display a default mirror selection based on your inferred location. If (when you browse to it) you do not see that page, try a different browser. The SHA512 checksum and ASCII armoured detached signatures are links to the originals on the main distribution server.
+
+<table class="table">
+ <thead>
+ <tr>
+ <th align="left">Version</th>
+ <th align="left">Download Artifact</th>
+ <th align="left">ASCII signature</th>
+ <th align="left">SHA512 Checksum</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Apache SensSoft UserALE.js 1.0.0 (binary tar.gz)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz">apache-senssoft-useralejs-1.0.0-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc">apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc</a> </td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512</a> </td>
+ </tr>
+ <tr>
+ <td>Apache SensSoft UserALE.js 1.0.0(binary zip)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip">apache-senssoft-useralejs-1.0.0-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.asc">apache-senssoft-useralejs-1.0.0-bin.zip.asc</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.sha512">apache-senssoft-useralejs-1.0.0-bin.zip.sha512</a></td>
+ </tr>
+ <tr>
+ <td>Apache SensSoft UserALE.js 1.0.0 (source tar.gz)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz">apache-senssoft-useralejs-1.0.0-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.asc">apache-senssoft-useralejs-1.0.0-src.tar.gz.asc</a> </td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512</a> </td>
+ </tr>
+ <tr>
+ <td>Apache SensSoft UserALE.js 1.0.0(source zip)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip">apache-senssoft-useralejs-1.0.0-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.asc">apache-senssoft-useralejs-1.0.0-src.zip.asc</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.sha512">apache-senssoft-useralejs-1.0.0-src.zip.sha512</a></td>
+ </tr>
+ </tbody>
+</table>
+
+<h1>Verify Releases</h1>
+<p>
+ It is essential that you verify the integrity of the downloaded files using the PGP, and/or SHA signatures. published with every Gora release.
+
+ Please read <a href="http://httpd.apache.org/dev/verification.html">Verifying Apache HTTP Server Releases</a> for more information on why you should verify our releases.
+
+ We strongly recommend you verify your downloads with at least PGP. Guidance for doing so is provided below.
+</p>
+
+<h2>PGP Signatures</h2>
+<p>
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="https://www.apache.org/dist/incubator/senssoft/KEYS">KEYS</a> as well as the asc signature file for the relevant distribution.
+
+ <b>N.B.</b> Make sure you get these files from the main distribution directory, rather than from a mirror. Then verify the signatures using the following example</p>
+
+<p>
+ <code>
+ $ gpg --import KEYS
+ </code>
+</p>
+<p>
+ <code>
+ $ gpg --verify apache-senssoft-useralejs-1.0.0-src.zip.asc apache-senssoft-useralejs-1.0.0-src.zip
+ </code>
+</p>
+
+<p>
+ The files in the most recent release are signed by Lewis John McGibbney (CODE SIGNING KEY) lewismc@apache.org 48BAEBF6
+</p>
+
++=======
+ Please Note all Apache Flagon artifacts are released as source code and binary artifacts and additional packages can be found on packaging platforms such as UserALE.js which we make available through <a href="https://www.npmjs.com/package/useralejs">the NPM useralejs package</a>.
+
+ The CHANGELOG file shipped with each artifact can be consulted for more information on the list of updates in each release.
+
+ Apache Flagon artifacts are always distributed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, version 2.0</a>.
+ </p>
+
+ <h1>Flagon UserALE.js</h1>
+
+ Please note, that for convenience, we make UserALE.js available through <a href="https://www.npmjs.com/package/useralejs">the NPM useralejs package</a>.
+
+ <h2>Downloads</h2>
+ The link in the 'Download Artifact' column below should display a default mirror selection based on your inferred location. If (when you browse to it) you do not see that page, try a different browser. The SHA512 checksum and ASCII armoured detached signatures are links to the originals on the main distribution server.
+
+ <table class="table">
+ <thead>
+ <tr>
+ <th align="left">Version</th>
+ <th align="left">Download Artifact</th>
+ <th align="left">ASCII signature</th>
+ <th align="left">SHA512 Checksum</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Apache Flagon UserALE.js 1.0.0 (binary tar.gz)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz">apache-senssoft-useralejs-1.0.0-bin.tar.gz</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc">apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc</a> </td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512</a> </td>
+ </tr>
+ <tr>
+ <td>Apache Flagon UserALE.js 1.0.0(binary zip)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip">apache-senssoft-useralejs-1.0.0-bin.zip</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.asc">apache-senssoft-useralejs-1.0.0-bin.zip.asc</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.sha512">apache-senssoft-useralejs-1.0.0-bin.zip.sha512</a></td>
+ </tr>
+ <tr>
+ <td>Apache Flagon UserALE.js 1.0.0 (source tar.gz)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz">apache-senssoft-useralejs-1.0.0-src.tar.gz</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.asc">apache-senssoft-useralejs-1.0.0-src.tar.gz.asc</a> </td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512</a> </td>
+ </tr>
+ <tr>
+ <td>Apache Flagon UserALE.js 1.0.0(source zip)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip">apache-senssoft-useralejs-1.0.0-src.zip</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.asc">apache-senssoft-useralejs-1.0.0-src.zip.asc</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.sha512">apache-senssoft-useralejs-1.0.0-src.zip.sha512</a></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <h1>Verify Releases</h1>
+ <p>
+ It is essential that you verify the integrity of the downloaded files using the PGP, and/or SHA signatures. published with every Gora release.
+
+ Please read <a href="http://httpd.apache.org/dev/verification.html">Verifying Apache HTTP Server Releases</a> for more information on why you should verify our releases.
+
+ We strongly recommend you verify your downloads with at least PGP. Guidance for doing so is provided below.
+ </p>
+
+ <h2>PGP Signatures</h2>
+ <p>
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/incubator/flagon/KEYS">KEYS</a> as well as the asc signature file for the relevant distribution.
+
+ <b>N.B.</b> Make sure you get these files from the main distribution directory, rather than from a mirror. Then verify the signatures using the following example</p>
+
+ <p>
+ <code>
+ $ gpg --import KEYS
+ </code>
+ </p>
+ <p>
+ <code>
+ $ gpg --verify apache-flagon-useralejs-1.0.0-src.zip.asc
+ </code>
+ </p>
+
+ <p>
+ The files in the most recent release are signed by Lewis John McGibbney (CODE SIGNING KEY) lewismc@apache.org 48BAEBF6
+ </p>
+
++>>>>>>> master
<h2>SHA512 Signatures</h2>
<p>
Alternatively, you can verify the SHA512 signatures on the files. A unix program called md5 or md5sum is included in many unix distributions. Use the following example
</p>
<p>
++<<<<<<< HEAD
+ <code>$ sha512sum apache-senssoft-useralejs-1.0.0-src.zip</code>
+</p>
+<p>
+ ... output should match the string in apache-senssoft-useralejs-1.0.0-src.zip.sha512
++=======
+ <code>$ sha512sum apache-flagon-useralejs-1.0.0-src.zip</code>
+ </p>
+ <p>
+ ... output should match the string in apache-flagon-useralejs-1.0.0-src.zip.sha512
++>>>>>>> master
</p>
</div>
</div>
@@@ -220,12 -220,23 +320,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/stack/index.html
index 10e19be,1e38857..fdd91b4
--- a/content/stack/index.html
+++ b/content/stack/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD:content/system/index.html
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/system/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/stack/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master:content/stack/index.html
</head>
@@@ -204,12 -204,23 +209,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD:content/system/index.html
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master:content/stack/index.html
</div>
</div>
</div>
diff --cc content/stout/index.html
index 8b3d970,91ff65e..a288b6d
--- a/content/stout/index.html
+++ b/content/stout/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/stout/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/stout/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -222,12 -222,23 +227,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/tap/index.html
index 6e86bef,1af098d..0ff3dba
--- a/content/tap/index.html
+++ b/content/tap/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/tap/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/tap/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -288,12 -288,23 +293,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc content/userale/index.html
index ecd7898,81656ec..21428d8
--- a/content/userale/index.html
+++ b/content/userale/index.html
@@@ -16,8 -16,8 +16,13 @@@
<script src="/js/main.js"></script>
<link rel="stylesheet" href="/assets/main.css">
++<<<<<<< HEAD
+ <link rel="canonical" href="http://senssoft.incubator.apache.org/userale/">
+ <link rel="alternate" type="application/rss+xml" title="Apache SensSoft" href="/feed.xml">
++=======
+ <link rel="canonical" href="http://flagon.incubator.apache.org/userale/">
+ <link rel="alternate" type="application/rss+xml" title="Apache Flagon" href="/feed.xml">
++>>>>>>> master
</head>
@@@ -371,12 -371,23 +376,29 @@@
<div class="ui inverted vertical segment">
<div class="ui two column middle aligned grid">
<div class="column">
- Apache SensSoft is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that t [...]
+ Apache Flagon is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the [...]
</div>
<div class="center aligned column">
++<<<<<<< HEAD
+ <img class="component-image" src="/images/incubator-logo-white.png">
+ <br>
+ Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, and the Apache Incubator logo are trademarks of The Apache Software Foundation. Software as a Sensor is a trademark of the Charles Stark Draper Laboratory, Inc.
++=======
+ Copyright © 2019 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>
+ Apache Flagon, Flagon, Apache, the Apache feather logo, the Apache Flagon logo and the Apache Incubator logo are trademarks of The Apache Software Foundation.
+ </div>
+ </div>
+ </div>
+ <div class="ui inverted vertical segment">
+ <div class="ui one column middle aligned grid">
+ <div class="center aligned column">
+ <a href="http://incubator.apache.org/">
+ <img src="/images/incubator-logo-white.jpg">
+ </a>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png" alt="ASF Current Event">
+ </a>
++>>>>>>> master
</div>
</div>
</div>
diff --cc site/README.md
index 5f5c98e,575e010..1ca0979
--- a/site/README.md
+++ b/site/README.md
@@@ -13,11 -13,9 +13,11 @@@ How to Build and Deploy Sit
4. (Optional): To update the site, can copy the files from the container to _site.
```
# First grab container id
- CID=$(docker create -p 8000:8000 -it senssoft:site python -m SimpleHTTPServer)
+ CID=$(docker create -p 8000:8000 -it flagon:site python -m SimpleHTTPServer)
# Reference container id to grab built contents
docker cp $CID:/app/_site .
+ # Copy the Website source to the deploy directory
+ cp -r _site/* ../content/
```
5. N.B. Make sure that any Website changes which are to be deployed to production are pushed
- to the **asf-site** branch.
+ to the **asf-site** branch.
diff --cc site/_pages/releases.html
index 34eb32a,d2a05c8..cc43e1e
--- a/site/_pages/releases.html
+++ b/site/_pages/releases.html
@@@ -36,28 -36,28 +36,53 @@@ The link in the 'Download Artifact' col
</thead>
<tbody>
<tr>
++<<<<<<< HEAD
+ <td>Apache SensSoft UserALE.js 1.0.0 (binary tar.gz)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz">apache-senssoft-useralejs-1.0.0-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc">apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc</a> </td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512</a> </td>
+ </tr>
+ <tr>
+ <td>Apache SensSoft UserALE.js 1.0.0(binary zip)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip">apache-senssoft-useralejs-1.0.0-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.asc">apache-senssoft-useralejs-1.0.0-bin.zip.asc</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.sha512">apache-senssoft-useralejs-1.0.0-bin.zip.sha512</a></td>
+ </tr>
+ <tr>
+ <td>Apache SensSoft UserALE.js 1.0.0 (source tar.gz)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz">apache-senssoft-useralejs-1.0.0-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.asc">apache-senssoft-useralejs-1.0.0-src.tar.gz.asc</a> </td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512</a> </td>
+ </tr>
+ <tr>
+ <td>Apache SensSoft UserALE.js 1.0.0(source zip)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip">apache-senssoft-useralejs-1.0.0-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.asc">apache-senssoft-useralejs-1.0.0-src.zip.asc</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.sha512">apache-senssoft-useralejs-1.0.0-src.zip.sha512</a></td>
++=======
+ <td>Apache Flagon UserALE.js 1.0.0 (binary tar.gz)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-bin.tar.gz">apache-flagon-useralejs-incubating-1.0.0-bin.tar.gz</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-bin.tar.gz.asc">apache-flagon-useralejs-incubating-1.0.0-bin.tar.gz.asc</a> </td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-bin.tar.gz.sha512">apache-flagon-useralejs-incubating-1.0.0-bin.tar.gz.sha512</a> </td>
+ </tr>
+ <tr>
+ <td>Apache Flagon UserALE.js 1.0.0(binary zip)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-bin.zip">apache-flagon-useralejs-incubating-1.0.0-bin.zip</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-bin.zip.asc">apache-flagon-useralejs-incubating-1.0.0-bin.zip.asc</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-bin.zip.sha512">apache-flagon-useralejs-incubating-1.0.0-bin.zip.sha512</a></td>
+ </tr>
+ <tr>
+ <td>Apache Flagon UserALE.js 1.0.0 (source tar.gz)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-src.tar.gz">apache-flagon-useralejs-incubating-1.0.0-src.tar.gz</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-src.tar.gz.asc">apache-flagon-useralejs-incubating-1.0.0-src.tar.gz.asc</a> </td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-src.tar.gz.sha512">apache-flagon-useralejs-incubating-1.0.0-src.tar.gz.sha512</a> </td>
+ </tr>
+ <tr>
+ <td>Apache Flagon UserALE.js 1.0.0(source zip)</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-src.zip">apache-flagon-useralejs-incubating-1.0.0-src.zip</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-src.zip.asc">apache-flagon-useralejs-incubating-1.0.0-src.zip.asc</a></td>
+ <td><a href="https://dist.apache.org/repos/dist/release/incubator/flagon/apache-flagon-useralejs-incubating-1.0.0/apache-flagon-useralejs-incubating-1.0.0-src.zip.sha512">apache-flagon-useralejs-incubating-1.0.0-src.zip.sha512</a></td>
++>>>>>>> master
</tr>
</tbody>
</table>
@@@ -73,7 -73,7 +98,11 @@@
<h2>PGP Signatures</h2>
<p>
++<<<<<<< HEAD
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="https://www.apache.org/dist/incubator/senssoft/KEYS">KEYS</a> as well as the asc signature file for the relevant distribution.
++=======
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/incubator/flagon/KEYS">KEYS</a> as well as the asc signature file for the relevant distribution.
++>>>>>>> master
<b>N.B.</b> Make sure you get these files from the main distribution directory, rather than from a mirror. Then verify the signatures using the following example</p>
@@@ -84,7 -84,7 +113,11 @@@
</p>
<p>
<code>
++<<<<<<< HEAD
+ $ gpg --verify apache-senssoft-useralejs-1.0.0-src.zip.asc apache-senssoft-useralejs-1.0.0-src.zip
++=======
+ $ gpg --verify apache-flagon-{product}-{version}-src.zip.asc
++>>>>>>> master
</code>
</p>
diff --cc site/_site/feed.xml
index 768498b,d0e8baf..54e7a39
--- a/site/_site/feed.xml
+++ b/site/_site/feed.xml
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="http://senssoft.incubator.apache.org/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="http://jekyllrb.com" version="3.3.1">Jekyll</generator><link href="http://senssoft.incubator.apache.org/feed.xml" rel="self" type="application/atom+xml" /><link href="http://senssoft.incubator.apache.org/" rel="alternate" type="text/html" /><updated>2018-03-13T03:48:27+00:00</updated><id>http://senssof [...]
++=======
+ <?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="http://flagon.incubator.apache.org/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="http://jekyllrb.com" version="3.3.1">Jekyll</generator><link href="http://flagon.incubator.apache.org/feed.xml" rel="self" type="application/atom+xml" /><link href="http://flagon.incubator.apache.org/" rel="alternate" type="text/html" /><updated>2019-06-27T03:26:21+00:00</updated><id>http://flagon.incuba [...]
++>>>>>>> master
diff --cc site/_site/releases/index.html
index e2184b8,7c28df5..eb9707a
--- a/site/_site/releases/index.html
+++ b/site/_site/releases/index.html
@@@ -99,28 -99,28 +99,28 @@@ The link in the 'Download Artifact' col
</thead>
<tbody>
<tr>
- <td>Apache SensSoft UserALE.js 1.0.0 (binary tar.gz)</td>
+ <td>Apache Flagon UserALE.js 1.0.0 (binary tar.gz)</td>
<td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz">apache-senssoft-useralejs-1.0.0-bin.tar.gz</a></td>
- <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc">apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc</a> </td>
- <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512</a> </td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc">apache-senssoft-useralejs-1.0.0-bin.tar.gz.asc</a> </td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-bin.tar.gz.sha512</a> </td>
</tr>
<tr>
- <td>Apache SensSoft UserALE.js 1.0.0(binary zip)</td>
+ <td>Apache Flagon UserALE.js 1.0.0(binary zip)</td>
<td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip">apache-senssoft-useralejs-1.0.0-bin.zip</a></td>
- <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.asc">apache-senssoft-useralejs-1.0.0-bin.zip.asc</a></td>
- <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.sha512">apache-senssoft-useralejs-1.0.0-bin.zip.sha512</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.asc">apache-senssoft-useralejs-1.0.0-bin.zip.asc</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-bin.zip.sha512">apache-senssoft-useralejs-1.0.0-bin.zip.sha512</a></td>
</tr>
<tr>
- <td>Apache SensSoft UserALE.js 1.0.0 (source tar.gz)</td>
+ <td>Apache Flagon UserALE.js 1.0.0 (source tar.gz)</td>
<td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz">apache-senssoft-useralejs-1.0.0-src.tar.gz</a></td>
- <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.asc">apache-senssoft-useralejs-1.0.0-src.tar.gz.asc</a> </td>
- <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512</a> </td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.asc">apache-senssoft-useralejs-1.0.0-src.tar.gz.asc</a> </td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512">apache-senssoft-useralejs-1.0.0-src.tar.gz.sha512</a> </td>
</tr>
<tr>
- <td>Apache SensSoft UserALE.js 1.0.0(source zip)</td>
+ <td>Apache Flagon UserALE.js 1.0.0(source zip)</td>
<td><a href="http://www.apache.org/dyn/closer.cgi/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip">apache-senssoft-useralejs-1.0.0-src.zip</a></td>
- <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.asc">apache-senssoft-useralejs-1.0.0-src.zip.asc</a></td>
- <td><a href="https://dist.apache.org/repos/dist/release/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.sha512">apache-senssoft-useralejs-1.0.0-src.zip.sha512</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.asc">apache-senssoft-useralejs-1.0.0-src.zip.asc</a></td>
+ <td><a href="https://www.apache.org/dist/incubator/senssoft/apache-senssoft-useralejs-1.0.0/apache-senssoft-useralejs-1.0.0-src.zip.sha512">apache-senssoft-useralejs-1.0.0-src.zip.sha512</a></td>
</tr>
</tbody>
</table>
@@@ -136,7 -136,7 +136,11 @@@
<h2>PGP Signatures</h2>
<p>
++<<<<<<< HEAD
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="https://www.apache.org/dist/incubator/senssoft/KEYS">KEYS</a> as well as the asc signature file for the relevant distribution.
++=======
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/incubator/flagon/KEYS">KEYS</a> as well as the asc signature file for the relevant distribution.
++>>>>>>> master
<b>N.B.</b> Make sure you get these files from the main distribution directory, rather than from a mirror. Then verify the signatures using the following example</p>
@@@ -147,7 -147,7 +151,11 @@@
</p>
<p>
<code>
++<<<<<<< HEAD
+ $ gpg --verify apache-senssoft-useralejs-1.0.0-src.zip.asc apache-senssoft-useralejs-1.0.0-src.zip
++=======
+ $ gpg --verify apache-flagon-useralejs-1.0.0-src.zip.asc
++>>>>>>> master
</code>
</p>