[beam] branch master updated: Fix grammar for Flatten in section 4.2.5

[scott]

This is an automated email from the ASF dual-hosted git repository.

scott pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 2acfa71  Fix grammar for Flatten in section 4.2.5
     new 6d6385f  Merge pull request #7833: Fix grammar for Flatten in section 
4.2.5 of Programming Guide
2acfa71 is described below

commit 2acfa7189490ecf50893cdcce466df3bd656452e
Author: ttanay <ttanay...@gmail.com>
AuthorDate: Thu Feb 14 02:22:35 2019 +0530

    Fix grammar for Flatten in section 4.2.5
    
    The section about Flatten had "`Flatten` and is a Beam transform...".
    It should be "`Flatten` is a Beam transform...".
---
 website/src/documentation/programming-guide.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/src/documentation/programming-guide.md 
b/website/src/documentation/programming-guide.md
index 45fb6ee..a322001 100644
--- a/website/src/documentation/programming-guide.md
+++ b/website/src/documentation/programming-guide.md
@@ -1194,7 +1194,7 @@ player_accuracies = ...
 #### 4.2.5. Flatten {#flatten}
 
 <span 
class="language-java">[`Flatten`](https://beam.apache.org/releases/javadoc/{{ 
site.release_latest 
}}/index.html?org/apache/beam/sdk/transforms/Flatten.html)</span>
-<span 
class="language-py">[`Flatten`](https://github.com/apache/beam/blob/master/sdks/python/apache_beam/transforms/core.py)</span>
 and
+<span 
class="language-py">[`Flatten`](https://github.com/apache/beam/blob/master/sdks/python/apache_beam/transforms/core.py)</span>
 is a Beam transform for `PCollection` objects that store the same data type.
 `Flatten` merges multiple `PCollection` objects into a single logical
 `PCollection`.
@@ -1524,7 +1524,7 @@ together.
 #### 4.5.2. Emitting to multiple outputs in your DoFn {#multiple-outputs-dofn}
 
 ```java
-// Inside your ParDo's DoFn, you can emit an element to a specific output 
PCollection by providing a 
+// Inside your ParDo's DoFn, you can emit an element to a specific output 
PCollection by providing a
 // MultiOutputReceiver to your process method, and passing in the appropriate 
TupleTag to obtain an OutputReceiver.
 // After your ParDo, extract the resulting output PCollections from the 
returned PCollectionTuple.
 // Based on the previous example, this shows the DoFn emitting to the main 
output and two additional outputs.
@@ -1616,7 +1616,7 @@ The `PipelineOptions` for the current pipeline can always 
be accessed in a proce
 `@OnTimer` methods can also access many of these parameters. Timestamp, 
window, `PipelineOptions`, `OutputReceiver`, and
 `MultiOutputReceiver` parameters can all be accessed in an `@OnTimer` method. 
In addition, an `@OnTimer` method can take
 a parameter of type `TimeDomain` which tells whether the timer is based on 
event time or processing time.
-Timers are explained in more detail in the 
+Timers are explained in more detail in the
 [Timely (and Stateful) Processing with Apache Beam]({{ site.baseurl 
}}/blog/2017/08/28/timely-processing.html) blog post.
 
 ### 4.6. Composite transforms {#composite-transforms}