You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ma...@apache.org on 2015/11/19 03:28:44 UTC
[1/4] incubator-geode git commit: GEODE-53: Text edit to Geode web
pages.
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-53 55ea0fe4e -> 1f20c3c61
GEODE-53: Text edit to Geode web pages.
Fixed various typos, fleshed-out some links and descriptive text.
Modified the README.md instructions for setting up the local webpage environment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d87cae0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d87cae0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d87cae0b
Branch: refs/heads/feature/GEODE-53
Commit: d87cae0ba11d7ab66420f26edaeb232d8f68ffea
Parents: 55ea0fe
Author: Dave Barnes <db...@pivotal.io>
Authored: Tue Nov 17 13:13:57 2015 -0800
Committer: Dave Barnes <db...@pivotal.io>
Committed: Tue Nov 17 13:13:57 2015 -0800
----------------------------------------------------------------------
gemfire-site/content/community/index.html | 8 +++---
gemfire-site/content/index.html | 29 ++++++++++----------
gemfire-site/website/README.md | 3 +-
.../website/content/community/index.html | 12 ++++----
gemfire-site/website/content/index.html | 29 ++++++++++----------
5 files changed, 40 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d87cae0b/gemfire-site/content/community/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/content/community/index.html b/gemfire-site/content/community/index.html
index 6492b8f..8aa29ec 100644
--- a/gemfire-site/content/community/index.html
+++ b/gemfire-site/content/community/index.html
@@ -242,9 +242,9 @@
<div class="col-md-12">
<br/>
<h2>Join Our Community of Contributors!</h2>
- <p>The Apache Geode team welcomes contributors who want to support the Geode technology. Our community builds everything from this website, to the Geode code, to documentation and best practices information.</p>
+ <p>The Apache Geode team welcomes contributors who want to support the Geode technology. Our community builds everything from this website, from the Geode code to documentation and best practices information.</p>
- <p>We especially welcome additions and corrections to the documentation, wiki, and website to improve the user experience. Bug reports, and fixes and additions to the Apache Geode code are welcome. Helping users learn best practices also earns karma in our community.</p>
+ <p>We especially welcome additions and corrections to the documentation, wiki, and website to improve the user experience. Bug reports and fixes and additions to the Apache Geode code are welcome. Helping users learn best practices also earns karma in our community.</p>
</div>
</div>
</div>
@@ -288,8 +288,8 @@
<p>
</div>
<div class="col-md-3 done">
- <h3><a href="#">PJUG Meetup </a> <small>Portland, OR<br /> July 20-24, 2015</small></h3>
- <p>Text text textText text textText text textText text textText text textText text text<p>
+ <h3><a href="http://www.slideshare.net/ApacheGeode/open-sourcing-gemfire-apache-geode">PJUG Meetup </a> <small>Portland, OR<br /> July 20-24, 2015</small></h3>
+ <p>Joint meeting with co-hosted between OSCON, PJUG and PDXScala<p>
</div>
<div class="col-md-3">
<h3> </h3>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d87cae0b/gemfire-site/content/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/content/index.html b/gemfire-site/content/index.html
index afaaa77..e8c8776 100644
--- a/gemfire-site/content/index.html
+++ b/gemfire-site/content/index.html
@@ -73,10 +73,9 @@
<h2 class="tagline"><em>Performance</em> is key. <em>Consistency</em> is a must.</h2>
<p class="description">Solving the hardest data management problems since 2002.<br/>
<br/>Build elastic modern <em>in-memory</em> data intensive applications and <em>scale</em>.<br/>
- Delivery high-performance at cloud scale blending advanced techniques for data replication, partitioning and distributed processing.
+ <br/>Deliver high-performance at cloud scale blending advanced techniques for data replication, partitioning and distributed processing.<br/>
- <br/><br/>
- Offering a database-like consistency model, reliable transaction processing and shared nothing architecture at ease.<br/></p>
+ <br/>Implement a database-like consistency model, reliable transaction processing and shared-nothing architecture with ease.<br/></p>
</div>
<div class="btn-wrapper">
@@ -95,52 +94,52 @@
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-sitemap""></i></div>
<h3>Replication and Partitioning</h3>
- <p>Data can easily be partitioned (sharded) or replicated and resilience is ensured through redundant copies or disk-persistency allowing data to scale however is needed.</p>
+ <p>Data can easily be partitioned (sharded) or replicated and resilience is ensured through redundant copies or disk-persistence allowing data to scale to fit any need.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-hdd"></i></div>
<h3>Persistence</h3>
- <p>Super fast WAL persistence mechanism with shared-nothing architecture and optmized for fast parallel recovery of a cluster or single node.</p>
+ <p>Super fast WAL persistence mechanism with shared-nothing architecture optimized for fast parallel recovery of a cluster or a single node.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i aria-hidden="true" class="icon-rocket"></i></div>
<h3>Performance</h3>
- <p>Predictable low-latency for transactions, reads, writes and query processing on top of index and non-indexed data.</p>
+ <p>Predictable low latency for transactions, reads, writes and query processing over indexed and non-indexed data.</p>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="bf-icon-wrap" style="font-size:40px; vertical-align: 15px;"><i aria-hidden="true" class="icon-fast-forward"></i><i aria-hidden="true" class="icon-dashboard"></i></div>
- <h3>In-Memory</h3>
- <p>Blazing fast in-memory storage optmized for larger heaps, with the option of using off-heap, compression and features such as disk-overflow, eviction and expiration.</p>
+ <h3>In-Memory Storage</h3>
+ <p>Blazing fast in-memory storage optimized for large heaps, with the option of using off-heap storage, compression and features such as disk-overflow, eviction and expiration.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><span style="font-size:60px" aria-hidden="true" class="icon-cogs"></span></div>
<h3>Functions</h3>
- <p>Distributed data-aware processing can be deployed and executed in parallel on a cluster. In the case of failures, processing can be retried on different nodes.</p>
+ <p>Distributed data-aware processing can be deployed and executed in parallel on a cluster. Failed operations can be retried on different nodes.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-credit-card"></i></div>
<h3>Transactions</h3>
- <p>ACID distributed transactions allows for efficient and safe coordinated operations on colocated data. Transactions can be suspended, initiated from a client or a server.</p>
+ <p>ACID distributed transactions support for efficient and safe coordinated operations on colocated data. Transactions can be initiated from a client or a server and can be suspended.</p>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-table"></i></div>
<h3>OQL and Indexes</h3>
- <p>Object Query Language allows distributed query execution on hot and cold data, with SQL-like capabilities, including joins.<br/>
- Multiple option of indexes can be created and consistently maintained across the cluster.</p>
+ <p>Object Query Language supports distributed query execution on hot and cold data, with SQL-like capabilities, including joins.<br/>
+ Multiple indexes can be created and consistently maintained across the cluster.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-bolt"></i></div>
<h3>Events</h3>
- <p>Clients can be notified about server-side data events, and servers can react synchronous or asynchronously with guaranteed delivery of ordered events.</p>
+ <p>Clients can be notified about server-side data events, and servers can react synchronously or asynchronously with guaranteed delivery of ordered events.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-cloud"></i></div>
<h3>Clustering</h3>
- <p>Highly scalable, battle-proof advanced clustering technology, with failure detection, dynamic scale, and network-partition detection algorithms.</p>
+ <p>Highly scalable, robust, advanced clustering technology with failure detection, dynamic scale, and network-partition detection algorithms.</p>
</div>
</div>
</div>
@@ -164,7 +163,7 @@
<h2>About the Project</h2>
<p>Apache Geode is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.</p>
<p>By pooling memory, CPU, network resources, and optionally local disk across multiple processes to manage application objects and behavior, it uses dynamic replication and data partitioning techniques to implement high availability, improved performance, scalability, and fault tolerance. In addition to being a distributed data container, Geode is an in-memory data management system that provides reliable asynchronous event notifications and guaranteed message delivery.</p>
- <p>Apache Geode is an extremely mature and robust product that can trace its legacy all the way back to one of the first Object Databases for Smalltalk: GemStone. Geode (as GemFire™) was first deployed in the financial sector as the transactional, low-latency data engine used by multiple Wall Street trading platforms. Today Geode is used by over 600 enterprise customers for high-scale, 24x7 business critical applications.</p>
+ <p>Apache Geode is a mature mature and robust product that can trace its legacy all the way back to GemStone, one of the first Object Databases for Smalltalk. Geode (as GemFire™) was first deployed in the financial sector as the transactional, low-latency data engine used by multiple Wall Street trading platforms. Today Geode is used by over 600 enterprise customers for high-scale, 24x7 business critical applications.</p>
</div>
<!--
<div class="col-md-4 text-left">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d87cae0b/gemfire-site/website/README.md
----------------------------------------------------------------------
diff --git a/gemfire-site/website/README.md b/gemfire-site/website/README.md
index 770804d..6927081 100644
--- a/gemfire-site/website/README.md
+++ b/gemfire-site/website/README.md
@@ -22,7 +22,8 @@ Install Pygments (Python-basd syntax coloring library):
Install Nanoc and other Ruby Gems needed:
- $ sudo gem install nanoc pygments.rb htmlentities pandoc-ruby nokogiri rack mime-types
+ $ sudo gem install nanoc -v 3.8.0
+ $ sudo gem install pygments.rb htmlentities pandoc-ruby nokogiri rack mime-types
## How to change/update the website
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d87cae0b/gemfire-site/website/content/community/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/website/content/community/index.html b/gemfire-site/website/content/community/index.html
index 7b1adf5..da4b7ed 100644
--- a/gemfire-site/website/content/community/index.html
+++ b/gemfire-site/website/content/community/index.html
@@ -7,9 +7,9 @@
<div class="col-md-12">
<br/>
<h2>Join Our Community of Contributors!</h2>
- <p>The Apache Geode team welcomes contributors who want to support the Geode technology. Our community builds everything from this website, to the Geode code, to documentation and best practices information.</p>
+ <p>The Apache Geode team welcomes contributors who want to support the Geode technology. Our community builds everything from this website, from the Geode code to documentation and best practices information.</p>
- <p>We especially welcome additions and corrections to the documentation, wiki, and website to improve the user experience. Bug reports, and fixes and additions to the Apache Geode code are welcome. Helping users learn best practices also earns karma in our community.</p>
+ <p>We especially welcome additions and corrections to the documentation, wiki, and website to improve the user experience. Bug reports and fixes and additions to the Apache Geode code are welcome. Helping users learn best practices also earns karma in our community.</p>
</div>
</div>
</div>
@@ -53,8 +53,8 @@
<p>
</div>
<div class="col-md-3 done">
- <h3><a href="#">PJUG Meetup </a> <small>Portland, OR<br /> July 20-24, 2015</small></h3>
- <p>Text text textText text textText text textText text textText text textText text text<p>
+ <h3><a href="http://www.slideshare.net/ApacheGeode/open-sourcing-gemfire-apache-geode">PJUG Meetup </a> <small>Portland, OR<br /> July 20-24, 2015</small></h3>
+ <p>Joint meeting with co-hosted between OSCON, PJUG and PDXScala<p>
</div>
<div class="col-md-3">
<h3> </h3>
@@ -78,11 +78,11 @@
</div>
<div class="col-md-3 done">
<h3><a href="http://stackoverflow.com/search?q=Apache%20Geode">StackOverflow</a></h3>
- <p>The Geode team is always answering questions on <a href="http://stackoverflow.com/search?q=Apache%20Geode">StackOverflow</a><p>
+ <p>The Geode team is always ready to answer questions on <a href="http://stackoverflow.com/search?q=Apache%20Geode">StackOverflow</a><p>
</div>
<div class="col-md-3 done">
<h3><a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">Geode ClubHouse</a></h3>
- <p>We meet every 15 days online for discussions around specific features, detailing internals and discuss on-going issues on JIRA at the Geode Clubehouse. All meetings are recorded and video's are availabe in our <a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">YouTube</a> channel.<p>
+ <p>We meet every 15 days online for discussions around specific features, detailing internals and discuss on-going issues on JIRA at the Geode Clubhouse. All meetings are recorded and videos are availabe in our <a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">YouTube</a> channel.<p>
</div>
</div>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d87cae0b/gemfire-site/website/content/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/website/content/index.html b/gemfire-site/website/content/index.html
index dc80254..a132302 100644
--- a/gemfire-site/website/content/index.html
+++ b/gemfire-site/website/content/index.html
@@ -10,10 +10,9 @@ title: Performance is key. Consistency is a must.
<h2 class="tagline"><em>Performance</em> is key. <em>Consistency</em> is a must.</h2>
<p class="description">Solving the hardest data management problems since 2002.<br/>
<br/>Build elastic modern <em>in-memory</em> data intensive applications and <em>scale</em>.<br/>
- Delivery high-performance at cloud scale blending advanced techniques for data replication, partitioning and distributed processing.
+ <br/>Deliver high-performance at cloud scale blending advanced techniques for data replication, partitioning and distributed processing.<br/>
- <br/><br/>
- Offering a database-like consistency model, reliable transaction processing and shared nothing architecture at ease.<br/></p>
+ <br/>Implement a database-like consistency model, reliable transaction processing and shared-nothing architecture with ease.<br/></p>
</div>
<div class="btn-wrapper">
@@ -32,52 +31,52 @@ title: Performance is key. Consistency is a must.
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-sitemap""></i></div>
<h3>Replication and Partitioning</h3>
- <p>Data can easily be partitioned (sharded) or replicated and resilience is ensured through redundant copies or disk-persistency allowing data to scale however is needed.</p>
+ <p>Data can easily be partitioned (sharded) or replicated and resilience is ensured through redundant copies or disk-persistence allowing data to scale to fit any need.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-hdd"></i></div>
<h3>Persistence</h3>
- <p>Super fast WAL persistence mechanism with shared-nothing architecture and optmized for fast parallel recovery of a cluster or single node.</p>
+ <p>Super fast WAL persistence mechanism with shared-nothing architecture optimized for fast parallel recovery of a cluster or a single node.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i aria-hidden="true" class="icon-rocket"></i></div>
<h3>Performance</h3>
- <p>Predictable low-latency for transactions, reads, writes and query processing on top of index and non-indexed data.</p>
+ <p>Predictable low latency for transactions, reads, writes and query processing over indexed and non-indexed data.</p>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="bf-icon-wrap" style="font-size:40px; vertical-align: 15px;"><i aria-hidden="true" class="icon-fast-forward"></i><i aria-hidden="true" class="icon-dashboard"></i></div>
- <h3>In-Memory</h3>
- <p>Blazing fast in-memory storage optmized for larger heaps, with the option of using off-heap, compression and features such as disk-overflow, eviction and expiration.</p>
+ <h3>In-Memory Storage</h3>
+ <p>Blazing fast in-memory storage optimized for large heaps, with the option of using off-heap storage, compression and features such as disk-overflow, eviction and expiration.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><span style="font-size:60px" aria-hidden="true" class="icon-cogs"></span></div>
<h3>Functions</h3>
- <p>Distributed data-aware processing can be deployed and executed in parallel on a cluster. In the case of failures, processing can be retried on different nodes.</p>
+ <p>Distributed data-aware processing can be deployed and executed in parallel on a cluster. Failed operations can be retried on different nodes.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-credit-card"></i></div>
<h3>Transactions</h3>
- <p>ACID distributed transactions allows for efficient and safe coordinated operations on colocated data. Transactions can be suspended, initiated from a client or a server.</p>
+ <p>ACID distributed transactions support for efficient and safe coordinated operations on colocated data. Transactions can be initiated from a client or a server and can be suspended.</p>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-table"></i></div>
<h3>OQL and Indexes</h3>
- <p>Object Query Language allows distributed query execution on hot and cold data, with SQL-like capabilities, including joins.<br/>
- Multiple option of indexes can be created and consistently maintained across the cluster.</p>
+ <p>Object Query Language supports distributed query execution on hot and cold data, with SQL-like capabilities, including joins.<br/>
+ Multiple indexes can be created and consistently maintained across the cluster.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-bolt"></i></div>
<h3>Events</h3>
- <p>Clients can be notified about server-side data events, and servers can react synchronous or asynchronously with guaranteed delivery of ordered events.</p>
+ <p>Clients can be notified about server-side data events, and servers can react synchronously or asynchronously with guaranteed delivery of ordered events.</p>
</div>
<div class="col-md-4">
<div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-cloud"></i></div>
<h3>Clustering</h3>
- <p>Highly scalable, battle-proof advanced clustering technology, with failure detection, dynamic scale, and network-partition detection algorithms.</p>
+ <p>Highly scalable, robust, advanced clustering technology with failure detection, dynamic scale, and network-partition detection algorithms.</p>
</div>
</div>
</div>
@@ -101,7 +100,7 @@ title: Performance is key. Consistency is a must.
<h2>About the Project</h2>
<p>Apache Geode is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.</p>
<p>By pooling memory, CPU, network resources, and optionally local disk across multiple processes to manage application objects and behavior, it uses dynamic replication and data partitioning techniques to implement high availability, improved performance, scalability, and fault tolerance. In addition to being a distributed data container, Geode is an in-memory data management system that provides reliable asynchronous event notifications and guaranteed message delivery.</p>
- <p>Apache Geode is an extremely mature and robust product that can trace its legacy all the way back to one of the first Object Databases for Smalltalk: GemStone. Geode (as GemFire™) was first deployed in the financial sector as the transactional, low-latency data engine used by multiple Wall Street trading platforms. Today Geode is used by over 600 enterprise customers for high-scale, 24x7 business critical applications.</p>
+ <p>Apache Geode is a mature mature and robust product that can trace its legacy all the way back to GemStone, one of the first Object Databases for Smalltalk. Geode (as GemFire™) was first deployed in the financial sector as the transactional, low-latency data engine used by multiple Wall Street trading platforms. Today Geode is used by over 600 enterprise customers for high-scale, 24x7 business critical applications.</p>
</div>
<!--
<div class="col-md-4 text-left">
[2/4] incubator-geode git commit: One more typo...
Posted by ma...@apache.org.
One more typo...
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0f477298
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0f477298
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0f477298
Branch: refs/heads/feature/GEODE-53
Commit: 0f477298f55337912bc5ca3e4cfc34d7db0cfdfe
Parents: d87cae0
Author: Dave Barnes <db...@pivotal.io>
Authored: Tue Nov 17 13:43:35 2015 -0800
Committer: Dave Barnes <db...@pivotal.io>
Committed: Tue Nov 17 13:43:35 2015 -0800
----------------------------------------------------------------------
gemfire-site/content/community/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0f477298/gemfire-site/content/community/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/content/community/index.html b/gemfire-site/content/community/index.html
index 8aa29ec..2ede1a9 100644
--- a/gemfire-site/content/community/index.html
+++ b/gemfire-site/content/community/index.html
@@ -289,7 +289,7 @@
</div>
<div class="col-md-3 done">
<h3><a href="http://www.slideshare.net/ApacheGeode/open-sourcing-gemfire-apache-geode">PJUG Meetup </a> <small>Portland, OR<br /> July 20-24, 2015</small></h3>
- <p>Joint meeting with co-hosted between OSCON, PJUG and PDXScala<p>
+ <p>Joint meeting co-hosted between OSCON, PJUG and PDXScala<p>
</div>
<div class="col-md-3">
<h3> </h3>
[3/4] incubator-geode git commit: Additional tweaks to the website
docs
Posted by ma...@apache.org.
Additional tweaks to the website docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e636a1e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e636a1e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e636a1e0
Branch: refs/heads/feature/GEODE-53
Commit: e636a1e03fce8254d94019a9b4e6e7f908b671be
Parents: 0f47729
Author: Dave Barnes <db...@pivotal.io>
Authored: Wed Nov 18 15:39:36 2015 -0800
Committer: William Markito <wm...@pivotal.io>
Committed: Wed Nov 18 18:27:50 2015 -0800
----------------------------------------------------------------------
gemfire-site/content/community/index.html | 6 +++---
gemfire-site/website/README.md | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e636a1e0/gemfire-site/content/community/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/content/community/index.html b/gemfire-site/content/community/index.html
index 2ede1a9..f28a4a7 100644
--- a/gemfire-site/content/community/index.html
+++ b/gemfire-site/content/community/index.html
@@ -289,7 +289,7 @@
</div>
<div class="col-md-3 done">
<h3><a href="http://www.slideshare.net/ApacheGeode/open-sourcing-gemfire-apache-geode">PJUG Meetup </a> <small>Portland, OR<br /> July 20-24, 2015</small></h3>
- <p>Joint meeting co-hosted between OSCON, PJUG and PDXScala<p>
+ <p>Joint meeting with co-hosted between OSCON, PJUG and PDXScala<p>
</div>
<div class="col-md-3">
<h3> </h3>
@@ -313,11 +313,11 @@
</div>
<div class="col-md-3 done">
<h3><a href="http://stackoverflow.com/search?q=Apache%20Geode">StackOverflow</a></h3>
- <p>The Geode team is always answering questions on <a href="http://stackoverflow.com/search?q=Apache%20Geode">StackOverflow</a><p>
+ <p>The Geode team is always ready to answer questions on <a href="http://stackoverflow.com/search?q=Apache%20Geode">StackOverflow</a><p>
</div>
<div class="col-md-3 done">
<h3><a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">Geode ClubHouse</a></h3>
- <p>We meet every 15 days online for discussions around specific features, detailing internals and discuss on-going issues on JIRA at the Geode Clubehouse. All meetings are recorded and video's are availabe in our <a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">YouTube</a> channel.<p>
+ <p>We meet every 15 days online for discussions around specific features, detailing internals and discuss on-going issues on JIRA at the Geode Clubhouse. All meetings are recorded and videos are availabe in our <a href="https://www.youtube.com/channel/UCaY2q0UlWjAgEGL7uhCLs6A">YouTube</a> channel.<p>
</div>
</div>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e636a1e0/gemfire-site/website/README.md
----------------------------------------------------------------------
diff --git a/gemfire-site/website/README.md b/gemfire-site/website/README.md
index 6927081..6cfe6c8 100644
--- a/gemfire-site/website/README.md
+++ b/gemfire-site/website/README.md
@@ -43,7 +43,7 @@ To test locally, you can use the autocompiler (will build changes on every reque
## 3. Publish your changes to the site
-Run the nanoc compiler to generate the . It is configured via the ``nanoc.yaml`` to place website files into the ``content`` directory at the top
+Run the nanoc compiler to generate the site. It is configured via the ``nanoc.yaml`` to place website files into the ``content`` directory at the top
$ nanoc compile
[4/4] incubator-geode git commit: Merge #36
Posted by ma...@apache.org.
Merge #36
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1f20c3c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1f20c3c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1f20c3c6
Branch: refs/heads/feature/GEODE-53
Commit: 1f20c3c61c989f53156b49385614410d49336e3e
Parents: e636a1e
Author: William Markito <wm...@pivotal.io>
Authored: Wed Nov 18 18:28:17 2015 -0800
Committer: William Markito <wm...@pivotal.io>
Committed: Wed Nov 18 18:28:17 2015 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------