You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2017/06/22 10:15:39 UTC
[1/2] flink git commit: [FLINK-6952] [docs] Add link to Javadocs
Repository: flink
Updated Branches:
refs/heads/release-1.2 c709dce63 -> bd6277b10
[FLINK-6952] [docs] Add link to Javadocs
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bb7f08b6
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bb7f08b6
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bb7f08b6
Branch: refs/heads/release-1.2
Commit: bb7f08b690ea96ef3c4b422a4ed14bf5566b85ee
Parents: c709dce
Author: Ufuk Celebi <uc...@apache.org>
Authored: Tue Jun 20 12:19:07 2017 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Thu Jun 22 11:50:53 2017 +0200
----------------------------------------------------------------------
docs/_includes/sidenav.html | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/bb7f08b6/docs/_includes/sidenav.html
----------------------------------------------------------------------
diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html
index e3bb2d7..9a49484 100644
--- a/docs/_includes/sidenav.html
+++ b/docs/_includes/sidenav.html
@@ -126,6 +126,7 @@ level is determined by 'nav-pos'.
{% endif %}
{% endfor %}
<li class="divider"></li>
+ <li><a href="https://ci.apache.org/projects/flink/flink-docs-release-{{site.version_short}}/api/java"><i class="fa fa-external-link title" aria-hidden="true"></i> Javadocs</a></li>
<li><a href="http://flink.apache.org"><i class="fa fa-external-link title" aria-hidden="true"></i> Project Page</a></li>
</ul>
[2/2] flink git commit: [FLINK-6985] [docs] Remove bugfix version
from title
Posted by uc...@apache.org.
[FLINK-6985] [docs] Remove bugfix version from title
Removes the bugfix version from title and other places where it
can potentially be confusing.
For snapshot release, version and version_short should be the
same, e.g. 1.4-SNAPSHOT. For stable releases, version should be
the full version string (e.g. 1.2.1) whereas version_short
should skip the bugfix version (e.g. 1.2):.
This closes #4164.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bd6277b1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bd6277b1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bd6277b1
Branch: refs/heads/release-1.2
Commit: bd6277b101f60e17e50f1ac7765aa06f63b9f885
Parents: bb7f08b
Author: Ufuk Celebi <uc...@apache.org>
Authored: Thu Jun 22 11:37:54 2017 +0200
Committer: Ufuk Celebi <uc...@apache.org>
Committed: Thu Jun 22 12:15:20 2017 +0200
----------------------------------------------------------------------
docs/_config.yml | 7 +++++--
docs/_includes/sidenav.html | 2 +-
docs/_layouts/base.html | 2 +-
docs/index.md | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/bd6277b1/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 91a8de5..7b86ee3 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -26,8 +26,11 @@
# to reference a specific Flink version, because this is the only place where
# we change the version for the complete docs when forking of a release branch
# etc.
-version: "1.2.0"
-version_short: "1.2" # Used for the top navbar w/o snapshot suffix
+# The full version string as referenced in Maven (e.g. 1.2.1)
+version: "1.2.1"
+# For stable releases, leave the bugfix version out (e.g. 1.2). For snapshot
+# release this should be the same as the regular version
+version_short: "1.2"
is_snapshot_version: false
# This suffix is appended to the Scala-dependent Maven artifact names
http://git-wip-us.apache.org/repos/asf/flink/blob/bd6277b1/docs/_includes/sidenav.html
----------------------------------------------------------------------
diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html
index 9a49484..89e79ad 100644
--- a/docs/_includes/sidenav.html
+++ b/docs/_includes/sidenav.html
@@ -72,7 +72,7 @@ level is determined by 'nav-pos'.
{% assign pos = 0 %}
<div class="sidenav-logo">
- <p><a href="{{ site.baseurl }}"><img class="bottom" alt="Apache Flink" src="{{ site.baseurl }}/page/img/navbar-brand-logo.jpg"></a> v{{ site.version }}</p>
+ <p><a href="{{ site.baseurl }}"><img class="bottom" alt="Apache Flink" src="{{ site.baseurl }}/page/img/navbar-brand-logo.jpg"></a> v{{ site.version_short }}</p>
</div>
<ul id="sidenav">
{% for i in (1..10000) %}
http://git-wip-us.apache.org/repos/asf/flink/blob/bd6277b1/docs/_layouts/base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index 35499cd..66e3a14 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -23,7 +23,7 @@ under the License.
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
- <title>Apache Flink {{ site.version}} Documentation: {{ page.title }}</title>
+ <title>Apache Flink {{ site.version_short }} Documentation: {{ page.title }}</title>
<link rel="shortcut icon" href="{{ site.baseurl }}/page/favicon.ico" type="image/x-icon">
<link rel="icon" href="{{ site.baseurl }}/page/favicon.ico" type="image/x-icon">
http://git-wip-us.apache.org/repos/asf/flink/blob/bd6277b1/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index a74f880..907275f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -25,7 +25,7 @@ under the License.
-This documentation is for Apache Flink version {{ site.version }}. These pages have been built at: {% build_time %}.
+This documentation is for Apache Flink version {{ site.version_short }}. These pages have been built at: {% build_time %}.
Apache Flink is an open source platform for distributed stream and batch data processing. Flink’s core is a streaming dataflow engine that provides data distribution, communication, and fault tolerance for distributed computations over data streams. Flink also builds batch processing on top of the streaming engine, overlaying native iteration support, managed memory, and program optimization.