Repository: flink-web Updated Branches: refs/heads/asf-site 0c8713c21 -> 8d02e41db
[FLINK-4479] Add registered trademark to website This closes #32 Project: http://git-wip-us.apache.org/repos/asf/flink-web/repo Commit: http://git-wip-us.apache.org/repos/asf/flink-web/commit/f2053d28 Tree: http://git-wip-us.apache.org/repos/asf/flink-web/tree/f2053d28 Diff: http://git-wip-us.apache.org/repos/asf/flink-web/diff/f2053d28 Branch: refs/heads/asf-site Commit: f2053d28b12390539275af8d3a6e14941baeba98 Parents: 0c8713c Author: Robert Metzger <[email protected]> Authored: Thu Aug 25 18:35:39 2016 +0200 Committer: Robert Metzger <[email protected]> Committed: Tue Aug 30 11:26:56 2016 +0200 ---------------------------------------------------------------------- _config.yml | 3 +++ _layouts/base.html | 4 ++-- downloads.md | 14 +++++++------- index.md | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink-web/blob/f2053d28/_config.yml ---------------------------------------------------------------------- diff --git a/_config.yml b/_config.yml index 3cad0cc..1fda479 100644 --- a/_config.yml +++ b/_config.yml @@ -90,6 +90,9 @@ redcarpet: exclude: flink-src-repo +gems: [jekyll-paginate] + # News Posts paginate: 10 paginate_path: "blog/page:num" + http://git-wip-us.apache.org/repos/asf/flink-web/blob/f2053d28/_layouts/base.html ---------------------------------------------------------------------- diff --git a/_layouts/base.html b/_layouts/base.html index 44872b2..cc967a0 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -44,8 +44,8 @@ <hr /> <div class="footer text-center"> - <p>Copyright © 2014-2015 <a href="http://apache.org";>The Apache Software Foundation</a>. All Rights Reserved.</p> - <p>Apache Flink, Apache, and the Apache feather logo are trademarks of The Apache Software Foundation.</p> + <p>Copyright © 2014-2016 <a href="http://apache.org";>The Apache Software Foundation</a>. All Rights Reserved.</p> + <p>Apache Flink, Apache, and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation.</p> <p><a href="{{ site.baseurl }}/privacy-policy.html">Privacy Policy</a> · <a href="{{ site.baseurl }}/blog/feed.xml">RSS feed</a></p> </div> http://git-wip-us.apache.org/repos/asf/flink-web/blob/f2053d28/downloads.md ---------------------------------------------------------------------- diff --git a/downloads.md b/downloads.md index bf8106e..ed2452c 100644 --- a/downloads.md +++ b/downloads.md @@ -18,7 +18,7 @@ $( document ).ready(function() { ## Latest stable release (v{{ site.FLINK_VERSION_STABLE }}) -Apache Flink {{ site.FLINK_VERSION_STABLE }} is our latest stable release. +Apache Flink® {{ site.FLINK_VERSION_STABLE }} is our latest stable release. You [don't have to install Hadoop](faq.html#do-i-have-to-install-apache-hadoop-to-use-flink) @@ -36,31 +36,31 @@ pick the Hadoop 1 version. </thead> <tbody> <tr> - <th>Hadoop 1.2.1</th> + <th>Hadoop® 1.2.1</th> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_1_STABLE }}" class="ga-track" id="download-hadoop1">Download</a></td> <td></td> </tr> <tr> - <th>Hadoop 2.3.0</th> + <th>Hadoop® 2.3.0</th> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_2_STABLE }}" class="ga-track" id="download-hadoop2">Download</a></td> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_2_SCALA_211_STABLE }}" class="ga-track" id="download-hadoop2_211">Download</a></td> </tr> <tr> - <th>Hadoop 2.4.1</th> + <th>Hadoop® 2.4.1</th> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_24_STABLE }}" class="ga-track" id="download-hadoop24">Download</a></td> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_24_SCALA_211_STABLE }}" class="ga-track" id="download-hadoop24_211">Download</a></td> </tr> <tr> - <th>Hadoop 2.6.0</th> + <th>Hadoop® 2.6.0</th> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_26_STABLE }}" class="ga-track" id="download-hadoop26">Download</a></td> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_26_SCALA_211_STABLE }}" class="ga-track" id="download-hadoop26_211">Download</a></td> </tr> <tr> - <th>Hadoop 2.7.0</th> + <th>Hadoop® 2.7.0</th> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_27_STABLE }}" class="ga-track" id="download-hadoop27">Download</a></td> <td><a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_27_SCALA_211_STABLE }}" class="ga-track" id="download-hadoop27_211">Download</a></td> </tr> @@ -74,7 +74,7 @@ pick the Hadoop 1 version. <div class="list-group"> <!-- Source --> <a href="{{ site.FLINK_DOWNLOAD_URL_SOURCE }}" class="list-group-item ga-track" id="download-source"> - <h4><span class="glyphicon glyphicon-download" aria-hidden="true"></span> <strong>Flink {{ site.FLINK_VERSION_STABLE }}</strong> Source Release</h4> + <h4><span class="glyphicon glyphicon-download" aria-hidden="true"></span> <strong>Apache Flink® {{ site.FLINK_VERSION_STABLE }}</strong> Source Release</h4> <p>Review the source code or build Flink on your own, using this package</p> </a> </div> http://git-wip-us.apache.org/repos/asf/flink-web/blob/f2053d28/index.md ---------------------------------------------------------------------- diff --git a/index.md b/index.md index 2e08023..c129baf 100644 --- a/index.md +++ b/index.md @@ -4,7 +4,7 @@ layout: base --- <div class="row"> - <div class="col-sm-12"><p class="lead" markdown="span">**Apache Flink** is an open source platform for distributed stream and batch data processing.</p></div> + <div class="col-sm-12"><p class="lead" markdown="span">**Apache Flink®** is an open source platform for distributed stream and batch data processing.</p></div> </div> <div class="row"> @@ -63,8 +63,8 @@ You can **integrate** Flink easily with other well-known open source systems bot Download the **latest stable release** and run Flink on your machine, cluster, or cloud: <div class="text-center download-button"> - <a href="downloads.html" class="btn btn-primary" markdown="1">**Download** Apache Flink {{ site.stable }}</a> - <a href="{{ site.github }}" class="btn btn-info" markdown="1">Apache Flink on **GitHub**</a> + <a href="downloads.html" class="btn btn-primary" markdown="1">**Download** Apache Flink® {{ site.stable }}</a> + <a href="{{ site.github }}" class="btn btn-info" markdown="1">Apache Flink® on **GitHub**</a> </div> The documentation contains a [setup guide]({{ site.docs-snapshot }}/setup/building.html) for all deployment options.
