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/20 02:26:56 UTC
[1/3] incubator-geode git commit: Edits to community/index.html (the
Mailing Lists page) and to website/README.md (environment build
instructions). These are the 'non-conflicted' parts of the now-withdrawn pull
request #36, with a few small improvements.
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-53 1f20c3c61 -> d0b593c98
Edits to community/index.html (the Mailing Lists page) and to website/README.md (environment build instructions).
These are the 'non-conflicted' parts of the now-withdrawn pull request #36, with a few small improvements.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7292b233
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7292b233
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7292b233
Branch: refs/heads/feature/GEODE-53
Commit: 7292b23335520926a2e3f25dca2189b242603e21
Parents: 55ea0fe
Author: Dave Barnes <db...@pivotal.io>
Authored: Thu Nov 19 12:03:33 2015 -0800
Committer: Dave Barnes <db...@pivotal.io>
Committed: Thu Nov 19 12:03:33 2015 -0800
----------------------------------------------------------------------
gemfire-site/content/community/index.html | 12 ++++++------
gemfire-site/website/README.md | 7 ++++---
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7292b233/gemfire-site/content/community/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/content/community/index.html b/gemfire-site/content/community/index.html
index 6492b8f..bf10e0a 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, 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>
@@ -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 ongoing 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/7292b233/gemfire-site/website/README.md
----------------------------------------------------------------------
diff --git a/gemfire-site/website/README.md b/gemfire-site/website/README.md
index 770804d..93d74e4 100644
--- a/gemfire-site/website/README.md
+++ b/gemfire-site/website/README.md
@@ -16,13 +16,14 @@ Install Pandoc (Haskell-based markup format converter):
http://johnmacfarlane.net/pandoc/installing.html
-Install Pygments (Python-basd syntax coloring library):
+Install Pygments (Python-based syntax coloring library):
$ sudo easy_install Pygments
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
@@ -42,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
[2/3] incubator-geode git commit: Merge PR #39 into feature/GEODE-53
Posted by ma...@apache.org.
Merge PR #39 into feature/GEODE-53
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1c5fb685
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1c5fb685
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1c5fb685
Branch: refs/heads/feature/GEODE-53
Commit: 1c5fb68512fb63970d44855057090089ff53e3f1
Parents: 1f20c3c 7292b23
Author: William Markito <wm...@pivotal.io>
Authored: Thu Nov 19 17:09:20 2015 -0800
Committer: William Markito <wm...@pivotal.io>
Committed: Thu Nov 19 17:09:20 2015 -0800
----------------------------------------------------------------------
gemfire-site/content/community/index.html | 9 +++++----
gemfire-site/website/README.md | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1c5fb685/gemfire-site/content/community/index.html
----------------------------------------------------------------------
diff --cc gemfire-site/content/community/index.html
index f28a4a7,bf10e0a..6ae7977
--- a/gemfire-site/content/community/index.html
+++ b/gemfire-site/content/community/index.html
@@@ -20,7 -20,7 +20,7 @@@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
<link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
--
++
<script type="text/javascript"
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBYSxyIKS22zC4wSLFXZGR8QKXbGWLFwYw&sensor=false">
</script>
@@@ -189,7 -189,7 +189,7 @@@
}
};
</script>
--
++
<!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
<!--[if lt IE 9]>
@@@ -317,7 -317,7 +317,8 @@@
</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 Clubhouse. All meetings are recorded and videos 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 ongoing 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>
[3/3] incubator-geode git commit: Solved conflicts after PR #39
Posted by ma...@apache.org.
Solved conflicts after PR #39
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d0b593c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d0b593c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d0b593c9
Branch: refs/heads/feature/GEODE-53
Commit: d0b593c98907a92d0be46dfa74d98453faa9acfe
Parents: 1c5fb68
Author: William Markito <wm...@pivotal.io>
Authored: Thu Nov 19 17:24:40 2015 -0800
Committer: William Markito <wm...@pivotal.io>
Committed: Thu Nov 19 17:24:40 2015 -0800
----------------------------------------------------------------------
gemfire-site/content/community/index.html | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d0b593c9/gemfire-site/content/community/index.html
----------------------------------------------------------------------
diff --git a/gemfire-site/content/community/index.html b/gemfire-site/content/community/index.html
index 6ae7977..f28a4a7 100644
--- a/gemfire-site/content/community/index.html
+++ b/gemfire-site/content/community/index.html
@@ -20,7 +20,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
<link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
-
+
<script type="text/javascript"
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBYSxyIKS22zC4wSLFXZGR8QKXbGWLFwYw&sensor=false">
</script>
@@ -189,7 +189,7 @@
}
};
</script>
-
+
<!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
<!--[if lt IE 9]>
@@ -244,7 +244,7 @@
<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, 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, 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>
@@ -317,8 +317,7 @@
</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 ongoing 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>
+ <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>