flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mbala...@apache.org
Subject [2/3] flink git commit: [docs] Updated legacy references containing 'incubator' substring
Date Fri, 06 Feb 2015 17:47:36 GMT
[docs] Updated legacy references containing 'incubator' substring

Also dumped the stable release version in the docs config

Conflicts:
	docs/_config.yml


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

Branch: refs/heads/release-0.8
Commit: a44c721ee1b9d2a7bcdd1467e40208f440056b1f
Parents: d40fe0a
Author: mbalassi <mbalassi@apache.org>
Authored: Fri Feb 6 17:12:29 2015 +0100
Committer: mbalassi <mbalassi@apache.org>
Committed: Fri Feb 6 17:25:39 2015 +0100

----------------------------------------------------------------------
 docs/README.md                                                 | 4 ++--
 docs/_config.yml                                               | 2 +-
 docs/building.md                                               | 2 +-
 docs/example_connectors.md                                     | 2 +-
 docs/how_to_contribute.md                                      | 2 +-
 docs/java_api_quickstart.md                                    | 4 ++--
 docs/scala_api_quickstart.md                                   | 6 +++---
 flink-dist/src/deb/control/control                             | 2 +-
 .../flink/examples/java/misc/CollectionExecutionExample.java   | 2 +-
 .../main/resources/archetype-resources/src/main/java/Job.java  | 4 ++--
 .../resources/archetype-resources/src/main/scala/Job.scala     | 6 +++---
 pom.xml                                                        | 4 ++--
 12 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 6dc76f2..5ab0f2f 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -3,7 +3,7 @@ documentation of Apache Flink.
 
 The documentation is included with the source of Apache Flink in order to ensure
 that you always have docs corresponding to your checked out version. The online
-documentation at http://flink.incubator.apache.org/ is also generated from the
+documentation at http://flink.apache.org/ is also generated from the
 files found here.
 
 # Requirements
@@ -57,4 +57,4 @@ automatically generated for each page.
 ### Level-3 heading
 #### Level-4 heading
 ##### Level-5 heading
-```
\ No newline at end of file
+```

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 0c6a429..74967e9 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -36,7 +36,7 @@ FLINK_DOWNLOAD_URL: http://flink.apache.org/downloads.html
 FLINK_DOWNLOAD_URL_HADOOP1_STABLE: http://www.apache.org/dyn/closer.cgi/flink/flink-0.8.0/flink-0.8.0-bin-hadoop1.tgz
 FLINK_DOWNLOAD_URL_HADOOP2_STABLE: http://www.apache.org/dyn/closer.cgi/flink/flink-0.8.0/flink-0.8.0-bin-hadoop2.tgz
 FLINK_DOWNLOAD_URL_YARN_STABLE: http://www.apache.org/dyn/closer.cgi/flink/flink-0.8.0/flink-0.8.0-bin-hadoop2-yarn.tgz
-FLINK_WGET_URL_YARN_STABLE: http://mirror.23media.de/apache/flink/flink-0.8.0/flink-0.8.0-bin-hadoop2-yarn.tgz
+FLINK_WGET_URL_YARN_STABLE: http://artfiles.org/apache.org/flink/flink-0.8.0/flink-0.8.0-bin-hadoop2-yarn.tgz
 
 #------------------------------------------------------------------------------
 # BUILD CONFIG

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/docs/building.md
----------------------------------------------------------------------
diff --git a/docs/building.md b/docs/building.md
index 54238b9..0172209 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -31,7 +31,7 @@ git clone {{ site.FLINK_GITHUB_URL }}
 The simplest way of building Flink is by running:
 
 ~~~bash
-cd incubator-flink
+cd flink
 mvn clean install -DskipTests
 ~~~
 

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/docs/example_connectors.md
----------------------------------------------------------------------
diff --git a/docs/example_connectors.md b/docs/example_connectors.md
index dfd43da..28f35bb 100644
--- a/docs/example_connectors.md
+++ b/docs/example_connectors.md
@@ -88,7 +88,7 @@ Execute the following commands:
 2. Setup a new Flink project using the quickstarts:
 
    ~~~bash
-   curl https://raw.githubusercontent.com/apache/incubator-flink/master/flink-quickstart/quickstart.sh
| bash
+   curl https://raw.githubusercontent.com/apache/flink/master/flink-quickstart/quickstart.sh
| bash
    ~~~
 
 3. Set the the version of Flink to `{{site.FLINK_VERSION_HADOOP2_STABLE}}` in the `pom.xml`
file. The quickstart.sh script sets the version to the `hadoop1` version of Flink. Since the
`microsoft-hadoop-azure` has been written for Hadoop 2.2 (mapreduce-API) version, we need
to use the appropriate Flink version. 

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/docs/how_to_contribute.md
----------------------------------------------------------------------
diff --git a/docs/how_to_contribute.md b/docs/how_to_contribute.md
index 4f71ad5..86ef780 100644
--- a/docs/how_to_contribute.md
+++ b/docs/how_to_contribute.md
@@ -20,4 +20,4 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-The "How to contribute"-guide is now located [on the project website](http://flink.incubator.apache.org/how-to-contribute.html).
\ No newline at end of file
+The "How to contribute"-guide is now located [on the project website](http://flink.apache.org/how-to-contribute.html).

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/docs/java_api_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/java_api_quickstart.md b/docs/java_api_quickstart.md
index f84d656..de01b3f 100644
--- a/docs/java_api_quickstart.md
+++ b/docs/java_api_quickstart.md
@@ -41,7 +41,7 @@ Use one of the following commands to __create a project__:
 <div class="tab-content">
     <div class="tab-pane active" id="quickstart-script">
     {% highlight bash %}
-    $ curl https://raw.githubusercontent.com/apache/incubator-flink/master/flink-quickstart/quickstart.sh
| bash
+    $ curl https://raw.githubusercontent.com/apache/flink/master/flink-quickstart/quickstart.sh
| bash
     {% endhighlight %}
     </div>
     <div class="tab-pane" id="maven-archetype">
@@ -147,5 +147,5 @@ public class LineSplitter implements FlatMapFunction<String, Tuple2<String,
Inte
 
 {% gh_link /flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/wordcount/WordCount.java
"Check GitHub" %} for the full example code.
 
-For a complete overview over our API, have a look at the [Programming Guide](programming_guide.html)
and [further example programs](examples.html). If you have any trouble, ask on our [Mailing
List](http://mail-archives.apache.org/mod_mbox/incubator-flink-dev/). We are happy to provide
help.
+For a complete overview over our API, have a look at the [Programming Guide](programming_guide.html)
and [further example programs](examples.html). If you have any trouble, ask on our [Mailing
List](http://mail-archives.apache.org/mod_mbox/flink-dev/). We are happy to provide help.
 

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/docs/scala_api_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/scala_api_quickstart.md b/docs/scala_api_quickstart.md
index db315e5..2472aa9 100644
--- a/docs/scala_api_quickstart.md
+++ b/docs/scala_api_quickstart.md
@@ -41,7 +41,7 @@ Use one of the following commands to __create a project__:
 <div class="tab-content">
     <div class="tab-pane active" id="quickstart-script">
 {% highlight bash %}
-$ curl https://raw.githubusercontent.com/apache/incubator-flink/master/flink-quickstart/quickstart-scala.sh
| bash
+$ curl https://raw.githubusercontent.com/apache/flink/master/flink-quickstart/quickstart-scala.sh
| bash
 {% endhighlight %}
     </div>
     <div class="tab-pane" id="maven-archetype">
@@ -49,7 +49,7 @@ $ curl https://raw.githubusercontent.com/apache/incubator-flink/master/flink-qui
 $ mvn archetype:generate                             \
   -DarchetypeGroupId=org.apache.flink              \
   -DarchetypeArtifactId=flink-quickstart-scala           \
-  -DarchetypeVersion={{site.FLINK_VERSION_SHORT}}                  
+  -DarchetypeVersion={{site.FLINK_VERSION_SHORT}}
 {% endhighlight %}
     This allows you to <strong>name your newly created project</strong>. It will
interactively ask you for the groupId, artifactId, and package name.
     </div>
@@ -131,6 +131,6 @@ object WordCountJob {
 
 {% gh_link /flink-examples/flink-scala-examples/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCount.scala
"Check GitHub" %} for the full example code.
 
-For a complete overview over our API, have a look at the [Programming Guide](programming_guide.html)
and [further example programs](examples.html). If you have any trouble, ask on our [Mailing
List](http://mail-archives.apache.org/mod_mbox/incubator-flink-dev/). We are happy to provide
help.
+For a complete overview over our API, have a look at the [Programming Guide](programming_guide.html)
and [further example programs](examples.html). If you have any trouble, ask on our [Mailing
List](http://mail-archives.apache.org/mod_mbox/flink-dev/). We are happy to provide help.
 
 

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/flink-dist/src/deb/control/control
----------------------------------------------------------------------
diff --git a/flink-dist/src/deb/control/control b/flink-dist/src/deb/control/control
index 3603ae4..11265f8 100644
--- a/flink-dist/src/deb/control/control
+++ b/flink-dist/src/deb/control/control
@@ -23,4 +23,4 @@ Depends: default-jre
 Priority: low
 Architecture: all
 Description: Flink is a distributed parallel data processing system
-Maintainer: Flink team <dev@flink.incubator.apache.org>
\ No newline at end of file
+Maintainer: Flink team <dev@flink.apache.org>

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java
----------------------------------------------------------------------
diff --git a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java
b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java
index ff1a413..43d818d 100644
--- a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java
+++ b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java
@@ -35,7 +35,7 @@ import org.apache.flink.api.java.tuple.Tuple2;
  * DataSet transformations are executed on Java collections.
  * 
  * See the "Local Execution" section in the documentation for more details: 
- * 	http://flink.incubator.apache.org/docs/0.7-incubating/local_execution.html
+ * 	http://flink.apache.org/docs/latest/local_execution.html
  * 
  */
 public class CollectionExecutionExample {

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java
b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java
index 840b948..603fc80 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/src/main/java/Job.java
@@ -57,11 +57,11 @@ public class Job {
 		 * and many more.
 		 * Have a look at the programming guide for the Java API:
 		 *
-		 * http://flink.incubator.apache.org/docs/0.6-SNAPSHOT/java_api_guide.html
+		 * http://flink.apache.org/docs/latest/programming_guide.html
 		 *
 		 * and the examples
 		 *
-		 * http://flink.incubator.apache.org/docs/0.6-SNAPSHOT/java_api_examples.html
+		 * http://flink.apache.org/docs/latest/examples.html
 		 *
 		 */
 

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala
----------------------------------------------------------------------
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala
b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala
index 7cdd1c2..3c34b0a 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/src/main/scala/Job.scala
@@ -54,13 +54,13 @@ object Job {
      *   .group()
      *
      * and many more.
-     * Have a look at the programming guide for the Scala API:
+     * Have a look at the programming guide:
      *
-     * http://flink.incubator.apache.org/docs/0.6-SNAPSHOT/java_api_guide.html
+     * http://flink.apache.org/docs/latest/programming_guide.html
      *
      * and the examples
      *
-     * http://flink.incubator.apache.org/docs/0.6-SNAPSHOT/java_api_examples.html
+     * http://flink.apache.org/docs/latest/examples.html
      *
      */
 

http://git-wip-us.apache.org/repos/asf/flink/blob/a44c721e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f4ae120..b729e17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,9 +46,9 @@ under the License.
 	</licenses>
 
 	<scm>
-		<url>https://github.com/apache/incubator-flink</url>
+		<url>https://github.com/apache/flink</url>
 		<connection>git@github.com:apache/flink.git</connection>
-		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-flink.git</developerConnection>
+		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flink.git</developerConnection>
 	</scm>
 
 	<modules>


Mime
View raw message