[1/2] flink git commit: [FLINK-6616] [docs] Clarify provenance of official Docker images

[gr...@apache.org]

Repository: flink
Updated Branches:
  refs/heads/release-1.3 979228b3e -> 45923ffb8


[FLINK-6616] [docs] Clarify provenance of official Docker images

Note that the official Docker images for Flink are community supported
and not an official release of the Apache Flink PMC.

This closes #3932


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/45923ffb
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/45923ffb
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/45923ffb

Branch: refs/heads/release-1.3
Commit: 45923ffb8e5fcc98c569e55137e52a495cc7635f
Parents: 5420687
Author: Greg Hogan <co...@greghogan.com>
Authored: Wed May 17 12:27:34 2017 -0400
Committer: Greg Hogan <co...@greghogan.com>
Committed: Thu May 18 16:01:17 2017 -0400

----------------------------------------------------------------------
 docs/setup/docker.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/45923ffb/docs/setup/docker.md
----------------------------------------------------------------------
diff --git a/docs/setup/docker.md b/docs/setup/docker.md
index c8da06b..4986f2a 100644
--- a/docs/setup/docker.md
+++ b/docs/setup/docker.md
@@ -24,15 +24,15 @@ under the License.
 -->
 
 [Docker](https://www.docker.com) is a popular container runtime. There are
-official Flink Docker images available on Docker Hub which can be used directly
-or extended to better integrate into a production environment.
+official Docker images for Apache Flink available on Docker Hub which can be
+used directly or extended to better integrate into a production environment.
 
 * This will be replaced by the TOC
 {:toc}
 
-## Official Flink Docker Images
+## Official Docker Images
 
-The [official Flink Docker repository](https://hub.docker.com/_/flink/) is
+The [official Docker repository](https://hub.docker.com/_/flink/) is
 hosted on Docker Hub and serves images of Flink version 1.2.1 and later.
 
 Images for each supported combination of Hadoop and Scala are available, and
@@ -60,6 +60,9 @@ For example:
 * `flink:1.2-scala_2.10-alpine`
 -->
 
+**Note:** The docker images are provided as a community project by individuals
+on a best-effort basis. They are not official releases by the Apache Flink PMC.
+
 ## Flink with Docker Compose
 
 [Docker Compose](https://docs.docker.com/compose/) is a convenient way to run a

[2/2] flink git commit: [hotfix] [docs] Fix link to docker-compose.yml

[gr...@apache.org]

[hotfix] [docs] Fix link to docker-compose.yml

This closes #3887


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

Branch: refs/heads/release-1.3
Commit: 542068760901cba2fd6f2b3f3ff6a980aee0e23e
Parents: 979228b
Author: Patrick Lucas <me...@patricklucas.com>
Authored: Fri May 12 18:26:28 2017 +0200
Committer: Greg Hogan <co...@greghogan.com>
Committed: Thu May 18 16:01:17 2017 -0400

----------------------------------------------------------------------
 docs/setup/docker.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/54206876/docs/setup/docker.md
----------------------------------------------------------------------
diff --git a/docs/setup/docker.md b/docs/setup/docker.md
index 29e696f..c8da06b 100644
--- a/docs/setup/docker.md
+++ b/docs/setup/docker.md
@@ -65,8 +65,8 @@ For example:
 [Docker Compose](https://docs.docker.com/compose/) is a convenient way to run a
 group of Docker containers locally.
 
-An [example config file](https://github.com/docker-flink/examples) is available
-on GitHub.
+An [example config file](https://github.com/docker-flink/examples/blob/master/docker-compose.yml)
+is available on GitHub.
 
 ### Usage