Merge branch 'documentation-in-release' of https://github.com/PramodSSImmaneni/incubator-apex-site
diff --git a/src/md/community.md b/src/md/community.md
index ffd869a..21003cd 100644
--- a/src/md/community.md
+++ b/src/md/community.md
@@ -9,12 +9,22 @@
- [commits@apex.apache.org](http://mail-archives.apache.org/mod_mbox/apex-commits/) is for commit messages and patches to Apex. [subscribe](mailto:commits-subscribe@apex.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:commits-unsubscribe@apex.apache.org?subject=send%20this%20email%20to%20unsubscribe), [ponymail](https://lists.apache.org/list.html?commits@apex.apache.org), [nabble](https://s.apache.org/apex-commits), [archives](http://mail-archives.apache.org/mod_mbox/apex-commits/)
- [security@apex.apache.org](mailto:security@apex.apache.org) is for reporting security related issues with Apex. It is a private list to discuss security related issues. Please post potential security vulnerabilities to this list so that they can be investigated and fixed before the vulnerabilities are published to the public. You can post to the list without subscribing to it.
+## Meetup Groups
+
+To see upcoming meetup events, please visit the [announcements page](/announcements.html). Full list of Apache Apex meetup groups is available at [Apache Apex Meetup Groups](http://apache-apex.meetup.com/)
+
## People
[List of committers](/people.html)
-## Contributing
+## Powered By Apex
+
+List of organizations using Apache Apex is available at [Powered by Apex](/powered-by-apex.html).
+
+
+
+# Contributing
**To learn more about how we use Github to accept contributions to the project, [check out the contributing guidelines](/contributing.html).**
@@ -48,9 +58,3 @@
- [Apex Roadmap](roadmap.html) comprises key features planned for the future releases
-## Meetup Groups
-
-Full list of Apache Apex meetup groups is available at [Apache Apex Meetup Groups](http://apache-apex.meetup.com/)
-
-
-To see upcoming meetup events, please visit [announcements page](/announcements.html).
diff --git a/src/md/contributing.md b/src/md/contributing.md
index d0ae543..2a37a26 100644
--- a/src/md/contributing.md
+++ b/src/md/contributing.md
@@ -27,7 +27,7 @@
## Code Style
Apache Apex follows coding style that is closest to K & R style and uses [Checkstyle](http://checkstyle.sourceforge.net/) tool to enforce these standards. Travis CI will fail for any pull request that introduces any style violations.
-The checkstyle configuration that Apache Apex projects use is present here : https://github.com/apache/apex-core/blob/master/apex_checks.xml
+The checkstyle configuration that Apache Apex projects use is present here : https://github.com/apache/apex-core/blob/master/codestyle-config/src/main/resources/apex_checks.xml
To make it easier for the users to set up their development environment, settings for the following common IDEs are provided in the Apache Apex Core repository with instructions.
- [IntelliJ](https://github.com/apache/apex-core/tree/master/misc/ide-templates/intellij)
diff --git a/src/md/powered-by-apex.md b/src/md/powered-by-apex.md
new file mode 100644
index 0000000..eeeaabf
--- /dev/null
+++ b/src/md/powered-by-apex.md
@@ -0,0 +1,64 @@
+# Powered by Apache Apex
+
+This page lists organizations and software projects which work with Apache Apex. To be added to this page email users@apex.apache.org mailing list, or send a message to the @ApacheApex twitter account.
+
+
+## Companies
+
+Apache Apex powers
+
+* GE
+* Capital One
+* Silver Spring Networks
+* PubMatic
+* ThreatMetrix
+* FacilitiesSupplies
+* DataTorrent
+* Royal Bank of Canada
+* Infosys
+* TechMahindra
+* MammothData
+* CloudWick
+* Synerzip
+
+
+## Software Integrations
+
+Apache Apex integrates with
+
+* Apache Beam
+* Apache SAMOA
+* Apache Calcite
+* Apache Nifi
+* Apache Geode (GemFire)
+* Apache Cassandra
+* Apache Kafka
+* Apache Hive
+* Apache Bigtop
+* Apache HBase
+* Apache ActiveMQ
+* Apache CouchDB
+* AWS S3
+* Couchbase
+* Memsql
+* Redis
+* MongoDB
+* JDBC (MySQL, PostgreSQL, Oracle)
+* Memcache
+* AWS Kinesis
+* RabbitMQ
+* ZeroMQ
+* Solace
+* H2O
+* Solr
+* ElasticSearch
+
+
+## Universities & Research Institutes
+
+Apache Apex is under research at
+
+* University of California San Diego
+* Dresden University of Technology
+* Delft University of Technology
+* Pune Institute of Computer Technology
diff --git a/src/md/upcoming-meetups.md b/src/md/upcoming-meetups.md
index c8256a9..649cda8 100644
--- a/src/md/upcoming-meetups.md
+++ b/src/md/upcoming-meetups.md
@@ -1,5 +1,7 @@
## Upcoming Meetups
+[July 19, 2016 - München, Germany](http://www.meetup.com/Hadoop-User-Group-Munich/events/230313355/) - Apache Apex: Stream Processing Architecture and Applications
+
<div id="1466739839082"></div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>jQuery.noConflict();</script>
@@ -16,9 +18,5 @@
});
</script>
-[July 14, 2016 - Berlin, Germany](http://www.meetup.com/Big-Data-Berlin/events/231884102/) - Big Data, Berlin v 8.0
-
-[July 19, 2016 - München, Germany](http://www.meetup.com/Hadoop-User-Group-Munich/events/230313355/) - Apache Apex: Stream Processing Architecture and Applications
-
[Propose future meetups in one of the Apache Apex groups!](http://apache-apex.meetup.com/)
diff --git a/src/pages/powered-by-apex.html b/src/pages/powered-by-apex.html
new file mode 100644
index 0000000..97b60df
--- /dev/null
+++ b/src/pages/powered-by-apex.html
@@ -0,0 +1,9 @@
+{{> header}}
+
+<div class="container">
+
+ {{> powered-by-apex}}
+
+</div>
+
+{{> footer}}
