This is an automated email from the ASF dual-hosted git repository. kenn pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit bef6e3266336a2dd0dc5b67c7719eda647a0fd9e Author: Kenneth Knowles <[email protected]> AuthorDate: Tue May 8 21:26:52 2018 -0700 Add top-level Community section --- src/_includes/header.html | 3 + src/_includes/section-menu/community.html | 14 ++++ src/_includes/section-menu/contribute.html | 11 ---- src/_includes/section-menu/get-started.html | 1 - src/community/contact-us.md | 26 ++++++++ src/{contribute => community}/logos.md | 5 +- .../presentation-materials.md | 8 ++- src/get-started/quickstart-java.md | 4 +- src/get-started/quickstart-py.md | 4 +- src/get-started/support.md | 75 ---------------------- 10 files changed, 55 insertions(+), 96 deletions(-) diff --git a/src/_includes/header.html b/src/_includes/header.html index d74c28f..3e9077b 100644 --- a/src/_includes/header.html +++ b/src/_includes/header.html @@ -31,6 +31,9 @@ <li> <a href="{{ site.baseurl }}/contribute/">Contribute</a> </li> + <li> + <a href="{{ site.baseurl }}/community/contact-us/">Community</a> + </li> <li><a href="{{ site.baseurl }}/blog">Blog</a></li> </ul> <ul class="nav navbar-nav navbar-right"> diff --git a/src/_includes/section-menu/community.html b/src/_includes/section-menu/community.html new file mode 100644 index 0000000..8e7cec4 --- /dev/null +++ b/src/_includes/section-menu/community.html @@ -0,0 +1,14 @@ +<li><span class="section-nav-list-main-title">Community</span></li> +<li><a href="{{ site.baseurl }}/community/contact-us">Contact Us</a></li> +<li> + <span class="section-nav-list-title">Promotion</span> + + <ul class="section-nav-list"> + <li><a href="{{ site.baseurl }}/community/presentation-materials/">Presentation materials</a></li> + <li><a href="{{ site.baseurl }}/community/logos/">Logos</a></li> + </ul> +</li> +<li><a href="https://projects.apache.org/committee.html?beam"; target="_blank">Team <img src="{{ site.baseurl }}/images/external-link-icon.png" + width="14" height="14" + alt="External link to Beam roster"> + </a></li> diff --git a/src/_includes/section-menu/contribute.html b/src/_includes/section-menu/contribute.html index 5955d9b..7870b16 100644 --- a/src/_includes/section-menu/contribute.html +++ b/src/_includes/section-menu/contribute.html @@ -15,9 +15,6 @@ <ul class="section-nav-list"> <li><a href="{{ site.baseurl }}/contribute/become-a-committer/">Become a committer</a></li> <li><a href="{{ site.baseurl }}/contribute/committer-guide/">Committer guide</a></li> - <li><a href="https://projects.apache.org/committee.html?beam"; target="_blank">Team <img src="{{ site.baseurl }}/images/external-link-icon.png" - width="14" height="14" - alt="External link."></a> </ul> </li> <li> @@ -49,12 +46,4 @@ <li><a href="{{ site.baseurl }}/contribute/docker-images/">Docker images</a></li> </ul> </li> -<li> - <span class="section-nav-list-title">Promotion</span> - - <ul class="section-nav-list"> - <li><a href="{{ site.baseurl }}/contribute/presentation-materials/">Presentation materials</a></li> - <li><a href="{{ site.baseurl }}/contribute/logos/">Logos and design</a></li> - </ul> -</li> <li><a href="{{ site.baseurl }}/contribute/maturity-model/">Maturity Model</a></li> diff --git a/src/_includes/section-menu/get-started.html b/src/_includes/section-menu/get-started.html index 9abafe8..e60ebd9 100644 --- a/src/_includes/section-menu/get-started.html +++ b/src/_includes/section-menu/get-started.html @@ -16,5 +16,4 @@ </ul> </li> <li><a href="{{ site.baseurl }}/get-started/downloads">Downloads</a></li> -<li><a href="{{ site.baseurl }}/get-started/support">Support</a></li> diff --git a/src/community/contact-us.md b/src/community/contact-us.md new file mode 100644 index 0000000..2b61115 --- /dev/null +++ b/src/community/contact-us.md @@ -0,0 +1,26 @@ +--- +layout: section +title: "Contact Us" +permalink: /community/contact-us/ +section_menu: section-menu/community.html +redirect_from: + - /use/issue-tracking/ + - /use/mailing-lists/ + - /get-started/support/ +--- + +# Contact Us + +There are many ways to reach the Beam user and developer communities - use +whichever one seems best! + +| How to contact us | When to use it | +| ----------------- | ---------------| +| [user@](https://lists.apache.org/[email protected]) mailing list | User support and questions ([Subscribe](mailto:[email protected])) | +| [dev@](https://lists.apache.org/[email protected]) mailing list | Development discussions ([Subscribe](mailto:[email protected])) | +| [commits@](https://lists.apache.org/[email protected]) mailing list | Firehose of commits, bugs, pull requests, etc. ([Subscribe](mailto:[email protected])) | +| [JIRA bug tracker](https://issues.apache.org/jira/browse/BEAM) | Report bugs / discover known issues | +| [StackOverflow](http://stackoverflow.com/questions/tagged/apache-beam) | Ask and answer user support questions | +| [Slack](https://s.apache.org/beam-slack-channel) | Chat with users and developers ([Join](https://s.apache.org/slack-invite)) | +{:.table} + diff --git a/src/contribute/logos.md b/src/community/logos.md similarity index 95% rename from src/contribute/logos.md rename to src/community/logos.md index c4a98c3..cb24371 100644 --- a/src/contribute/logos.md +++ b/src/community/logos.md @@ -1,11 +1,12 @@ --- layout: section title: "Beam Logos" -section_menu: section-menu/contribute.html -permalink: /contribute/logos/ +section_menu: section-menu/community.html +permalink: /community/logos/ redirect_from: - /project/logos/ - /material/ + - /contribute/logos/ --- # Apache Beam Logos diff --git a/src/contribute/presentation-materials.md b/src/community/presentation-materials.md similarity index 93% rename from src/contribute/presentation-materials.md rename to src/community/presentation-materials.md index cac43a6..b278a23 100644 --- a/src/contribute/presentation-materials.md +++ b/src/community/presentation-materials.md @@ -1,9 +1,11 @@ --- layout: section title: "Beam Presentation Materials" -section_menu: section-menu/contribute.html -permalink: /contribute/presentation-materials/ -redirect_from: /learn/presentation-materials/ +section_menu: section-menu/community.html +permalink: /community/presentation-materials/ +redirect_from: + - /learn/presentation-materials/ + - /contribute/presentation-materials/ --- # Apache Beam Presentation Materials diff --git a/src/get-started/quickstart-java.md b/src/get-started/quickstart-java.md index bf21b60..c80576f 100644 --- a/src/get-started/quickstart-java.md +++ b/src/get-started/quickstart-java.md @@ -234,6 +234,6 @@ barrenly: 1 and look through the [Java SDK API reference]({{ site.baseurl }}/documentation/sdks/javadoc). * Walk through these WordCount examples in the [WordCount Example Walkthrough]({{ site.baseurl }}/get-started/wordcount-example). * Dive in to some of our favorite [articles and presentations]({{ site.baseurl }}/documentation/resources). -* Join the Beam [users@]({{ site.baseurl }}/get-started/support#mailing-lists) mailing list. +* Join the Beam [users@]({{ site.baseurl }}/community/contact-us) mailing list. -Please don't hesitate to [reach out]({{ site.baseurl }}/get-started/support) if you encounter any issues! +Please don't hesitate to [reach out]({{ site.baseurl }}/community/contact-us) if you encounter any issues! diff --git a/src/get-started/quickstart-py.md b/src/get-started/quickstart-py.md index cca95a0..5d16f2e 100644 --- a/src/get-started/quickstart-py.md +++ b/src/get-started/quickstart-py.md @@ -161,6 +161,6 @@ sequentially in the format `counts-0000-of-0001`. and look through the [Python SDK API reference]({{ site.baseurl }}/documentation/sdks/pydoc). * Walk through these WordCount examples in the [WordCount Example Walkthrough]({{ site.baseurl }}/get-started/wordcount-example). * Dive in to some of our favorite [articles and presentations]({{ site.baseurl }}/documentation/resources). -* Join the Beam [users@]({{ site.baseurl }}/get-started/support#mailing-lists) mailing list. +* Join the Beam [users@]({{ site.baseurl }}/community/contact-us) mailing list. -Please don't hesitate to [reach out]({{ site.baseurl }}/get-started/support) if you encounter any issues! +Please don't hesitate to [reach out]({{ site.baseurl }}/community/contact-us) if you encounter any issues! diff --git a/src/get-started/support.md b/src/get-started/support.md deleted file mode 100644 index 3b17d74..0000000 --- a/src/get-started/support.md +++ /dev/null @@ -1,75 +0,0 @@ ---- -layout: section -title: "Support" -permalink: /get-started/support/ -section_menu: section-menu/get-started.html -redirect_from: - - /use/issue-tracking/ - - /use/mailing-lists/ ---- - -# Support - -You can find different means of support in the sections below. - -## Mailing Lists - -The following are the mailing lists that have been established for the Apache Beam project. - -<table class="table table-hover"> - <thead> - <tr> - <th>Name</th> - <th>Purpose</th> - <th>Subscribe</th> - <th>Unsubscribe</th> - <th>Post</th> - <th>Archive</th> - </tr> - </thead> - <tbody> - <tr> - <th scope="row">user@</th> - <td>User support and questions</td> - <td><a href="mailto:[email protected]";>Subscribe</a></td> - <td><a href="mailto:[email protected]";>Unsubscribe</a></td> - <td><a href="mailto:[email protected]";>Post</a></td> - <td><a href="https://lists.apache.org/[email protected]";>Archives</a></td> - </tr> - <tr> - <th scope="row">dev@</th> - <td>Development-related discussions</td> - <td><a href="mailto:[email protected]";>Subscribe</a></td> - <td><a href="mailto:[email protected]";>Unsubscribe</a></td> - <td><a href="mailto:[email protected]";>Post</a></td> - <td><a href="https://lists.apache.org/[email protected]";>Archives</a></td> - </tr> - <tr> - <th scope="row">commits@</th> - <td>JIRA updates, pull requests, etc.</td> - <td><a href="mailto:[email protected]";>Subscribe</a></td> - <td><a href="mailto:[email protected]";>Unsubscribe</a></td> - <td><a href="mailto:[email protected]";>Post</a></td> - <td><a href="https://lists.apache.org/[email protected]";>Archives</a></td> - </tr> -</tbody> -</table> - -## Issue Tracking - -Apache Beam project uses [JIRA](http://www.atlassian.com/software/jira) for issue tracking. - -Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project. - -<code> -<a href="https://issues.apache.org/jira/browse/BEAM";>https://issues.apache.org/jira/browse/BEAM</a> -</code> - -## Beam on Stack Overflow - -You can find answers to many questions about [Beam on Stack Overflow](http://stackoverflow.com/questions/tagged/apache-beam). - -## Beam Slack Channel - -You can participate in discussions and ask questions on the [Beam Slack Channel](https://s.apache.org/beam-slack-channel). -[Join](https://s.apache.org/slack-invite) the discussion now. -- To stop receiving notification emails like this one, please contact [email protected].
