You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2017/05/08 23:28:46 UTC

[1/3] beam-site git commit: Remove README.md references from the website

Repository: beam-site
Updated Branches:
  refs/heads/asf-site 84468bdf4 -> 6f7717841


Remove README.md references from the website


Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/d56bbc8f
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/d56bbc8f
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/d56bbc8f

Branch: refs/heads/asf-site
Commit: d56bbc8f4f699be5f83f640fee4083fa01999760
Parents: 84468bd
Author: Ahmet Altay <al...@google.com>
Authored: Mon May 8 16:12:32 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Mon May 8 16:12:32 2017 -0700

----------------------------------------------------------------------
 src/get-started/quickstart-py.md     | 2 +-
 src/get-started/wordcount-example.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam-site/blob/d56bbc8f/src/get-started/quickstart-py.md
----------------------------------------------------------------------
diff --git a/src/get-started/quickstart-py.md b/src/get-started/quickstart-py.md
index efaa9dc..06e0b2e 100644
--- a/src/get-started/quickstart-py.md
+++ b/src/get-started/quickstart-py.md
@@ -94,7 +94,7 @@ For example, to run `wordcount.py`, run:
 
 {:.runner-direct}
 ```
-python -m apache_beam.examples.wordcount --input README.md --output counts
+python -m apache_beam.examples.wordcount --input MANIFEST.in --output counts
 ```
 
 {:.runner-dataflow}

http://git-wip-us.apache.org/repos/asf/beam-site/blob/d56bbc8f/src/get-started/wordcount-example.md
----------------------------------------------------------------------
diff --git a/src/get-started/wordcount-example.md b/src/get-started/wordcount-example.md
index b6e1985..3572e76 100644
--- a/src/get-started/wordcount-example.md
+++ b/src/get-started/wordcount-example.md
@@ -31,7 +31,7 @@ Each WordCount example introduces different concepts in the Beam programming mod
 
 Minimal WordCount demonstrates a simple pipeline that can read from a text file, apply transforms to tokenize and count the words, and write the data to an output text file. This example hard-codes the locations for its input and output files and doesn't perform any error checking; it is intended to only show you the "bare bones" of creating a Beam pipeline. This lack of parameterization makes this particular pipeline less portable across different runners than standard Beam pipelines. In later examples, we will parameterize the pipeline's input and output sources and show other best practices.
 
-To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[MinimalWordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java).**
+To run this example, follow the instructions in the Quickstart [java]({{ site.baseurl }}/get-started/quickstart-java) or [python]({{ site.baseurl }}/get-started/quickstart-py). To view the full code, see **[MinimalWordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java).**
 
 **Key Concepts:**
 
@@ -184,7 +184,7 @@ This WordCount example introduces a few recommended programming practices that c
 
 This section assumes that you have a good understanding of the basic concepts in building a pipeline. If you feel that you aren't at that point yet, read the above section, [Minimal WordCount](#minimalwordcount).
 
-To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[WordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/WordCount.java).**
+To run this example, follow the instructions in the Quickstart [java]({{ site.baseurl }}/get-started/quickstart-java) or [python]({{ site.baseurl }}/get-started/quickstart-py). To view the full code, see **[WordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/WordCount.java).**
 
 **New Concepts:**
 
@@ -287,7 +287,7 @@ public static void main(String[] args) {
 
 The Debugging WordCount example demonstrates some best practices for instrumenting your pipeline code.
 
-To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[DebuggingWordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java).**
+To run this example, follow the instructions in the Quickstart [java]({{ site.baseurl }}/get-started/quickstart-java) or [python]({{ site.baseurl }}/get-started/quickstart-py). To view the full code, see **[DebuggingWordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java).**
 
 **New Concepts:**
 


[2/3] beam-site git commit: Regenerate website

Posted by al...@apache.org.
Regenerate website


Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/35d4d4f3
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/35d4d4f3
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/35d4d4f3

Branch: refs/heads/asf-site
Commit: 35d4d4f35af03418d1b9609aebeed005f0cfd729
Parents: d56bbc8
Author: Ahmet Altay <al...@google.com>
Authored: Mon May 8 16:26:38 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Mon May 8 16:26:38 2017 -0700

----------------------------------------------------------------------
 content/documentation/programming-guide/index.html | 4 ++--
 content/get-started/quickstart-py/index.html       | 2 +-
 content/get-started/wordcount-example/index.html   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam-site/blob/35d4d4f3/content/documentation/programming-guide/index.html
----------------------------------------------------------------------
diff --git a/content/documentation/programming-guide/index.html b/content/documentation/programming-guide/index.html
index bc71346..1e6e9a7 100644
--- a/content/documentation/programming-guide/index.html
+++ b/content/documentation/programming-guide/index.html
@@ -244,7 +244,7 @@
 </div>
 
 <div class="language-py highlighter-rouge"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">apache_beam</span> <span class="kn">as</span> <span class="nn">beam</span>
-<span class="kn">from</span> <span class="nn">apache_beam.utils.pipeline_options</span> <span class="kn">import</span> <span class="n">PipelineOptions</span>
+<span class="kn">from</span> <span class="nn">apache_beam.options.pipeline_options</span> <span class="kn">import</span> <span class="n">PipelineOptions</span>
 
 <span class="n">p</span> <span class="o">=</span> <span class="n">beam</span><span class="o">.</span><span class="n">Pipeline</span><span class="p">(</span><span class="n">options</span><span class="o">=</span><span class="n">PipelineOptions</span><span class="p">())</span>
 
@@ -268,7 +268,7 @@
 </div>
 
 <div class="language-py highlighter-rouge"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">apache_beam</span> <span class="kn">as</span> <span class="nn">beam</span>
-<span class="kn">from</span> <span class="nn">apache_beam.utils.pipeline_options</span> <span class="kn">import</span> <span class="n">PipelineOptions</span>
+<span class="kn">from</span> <span class="nn">apache_beam.options.pipeline_options</span> <span class="kn">import</span> <span class="n">PipelineOptions</span>
 
 <span class="n">p</span> <span class="o">=</span> <span class="n">beam</span><span class="o">.</span><span class="n">Pipeline</span><span class="p">(</span><span class="n">options</span><span class="o">=</span><span class="n">PipelineOptions</span><span class="p">())</span>
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/35d4d4f3/content/get-started/quickstart-py/index.html
----------------------------------------------------------------------
diff --git a/content/get-started/quickstart-py/index.html b/content/get-started/quickstart-py/index.html
index 7c8f2d3..ac498d9 100644
--- a/content/get-started/quickstart-py/index.html
+++ b/content/get-started/quickstart-py/index.html
@@ -268,7 +268,7 @@ environment’s directories.</p>
 
 <p>For example, to run <code class="highlighter-rouge">wordcount.py</code>, run:</p>
 
-<div class="runner-direct highlighter-rouge"><pre class="highlight"><code>python -m apache_beam.examples.wordcount --input README.md --output counts
+<div class="runner-direct highlighter-rouge"><pre class="highlight"><code>python -m apache_beam.examples.wordcount --input MANIFEST.in --output counts
 </code></pre>
 </div>
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/35d4d4f3/content/get-started/wordcount-example/index.html
----------------------------------------------------------------------
diff --git a/content/get-started/wordcount-example/index.html b/content/get-started/wordcount-example/index.html
index 030c3e2..5cc32f3 100644
--- a/content/get-started/wordcount-example/index.html
+++ b/content/get-started/wordcount-example/index.html
@@ -210,7 +210,7 @@
 
 <p>Minimal WordCount demonstrates a simple pipeline that can read from a text file, apply transforms to tokenize and count the words, and write the data to an output text file. This example hard-codes the locations for its input and output files and doesn’t perform any error checking; it is intended to only show you the “bare bones” of creating a Beam pipeline. This lack of parameterization makes this particular pipeline less portable across different runners than standard Beam pipelines. In later examples, we will parameterize the pipeline’s input and output sources and show other best practices.</p>
 
-<p>To run this example, follow the instructions in the <a href="https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running">Beam Examples README</a>. To view the full code, see <strong><a href="https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java">MinimalWordCount</a>.</strong></p>
+<p>To run this example, follow the instructions in the Quickstart <a href="/get-started/quickstart-java">java</a> or <a href="/get-started/quickstart-py">python</a>. To view the full code, see <strong><a href="https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java">MinimalWordCount</a>.</strong></p>
 
 <p><strong>Key Concepts:</strong></p>
 
@@ -380,7 +380,7 @@ Figure 1: The pipeline data flow.</p>
 
 <p>This section assumes that you have a good understanding of the basic concepts in building a pipeline. If you feel that you aren’t at that point yet, read the above section, <a href="#minimalwordcount">Minimal WordCount</a>.</p>
 
-<p>To run this example, follow the instructions in the <a href="https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running">Beam Examples README</a>. To view the full code, see <strong><a href="https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/WordCount.java">WordCount</a>.</strong></p>
+<p>To run this example, follow the instructions in the Quickstart <a href="/get-started/quickstart-java">java</a> or <a href="/get-started/quickstart-py">python</a>. To view the full code, see <strong><a href="https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/WordCount.java">WordCount</a>.</strong></p>
 
 <p><strong>New Concepts:</strong></p>
 
@@ -511,7 +511,7 @@ Figure 1: The pipeline data flow.</p>
 
 <p>The Debugging WordCount example demonstrates some best practices for instrumenting your pipeline code.</p>
 
-<p>To run this example, follow the instructions in the <a href="https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running">Beam Examples README</a>. To view the full code, see <strong><a href="https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java">DebuggingWordCount</a>.</strong></p>
+<p>To run this example, follow the instructions in the Quickstart <a href="/get-started/quickstart-java">java</a> or <a href="/get-started/quickstart-py">python</a>. To view the full code, see <strong><a href="https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java">DebuggingWordCount</a>.</strong></p>
 
 <p><strong>New Concepts:</strong></p>
 


[3/3] beam-site git commit: This closes #233

Posted by al...@apache.org.
This closes #233


Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/6f771784
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/6f771784
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/6f771784

Branch: refs/heads/asf-site
Commit: 6f77178418df3b61ab810d9cdef32e936491813d
Parents: 84468bd 35d4d4f
Author: Ahmet Altay <al...@google.com>
Authored: Mon May 8 16:26:38 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Mon May 8 16:26:38 2017 -0700

----------------------------------------------------------------------
 content/documentation/programming-guide/index.html | 4 ++--
 content/get-started/quickstart-py/index.html       | 2 +-
 content/get-started/wordcount-example/index.html   | 6 +++---
 src/get-started/quickstart-py.md                   | 2 +-
 src/get-started/wordcount-example.md               | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------