You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by mw...@apache.org on 2016/06/29 14:48:54 UTC
[7/7] incubator-fluo-website git commit: Jekyll build from
gh-pages:d255fc0
Jekyll build from gh-pages:d255fc0
Merge branch 'repo-updates' into gh-pages
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/commit/db16e29d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/db16e29d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/db16e29d
Branch: refs/heads/asf-site
Commit: db16e29d5118d942a476fb5b23b953d09b4bda98
Parents: 07d50f5
Author: Mike Walch <mw...@gmail.com>
Authored: Wed Jun 29 10:45:40 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 10:45:40 2016 -0400
----------------------------------------------------------------------
README.md | 14 +++++++-------
apidocs/index.html | 2 +-
docs/index.html | 2 +-
download/index.html | 4 ++--
feed.xml | 4 ++--
getinvolved/index.html | 4 ++--
how-to-contribute/index.html | 8 ++++----
release-process/index.html | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e871fbd..ab87b21 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Fluo website
============
-Code powering the Fluo project website ([https://fluo.incubator.apache.org](https://fluo.incubator.apache.org)).
+Code powering the Fluo project website ([https://fluo.apache.org](https://fluo.apache.org)).
Contributions
-------------
@@ -27,9 +27,9 @@ Below are the steps required to update the Fluo project website for a new releas
your Fluo repo to this repo:
```bash
- cd fluo-io.github.io
+ cd fluo-website/
mkdir -p docs/1.0.0-beta-1
- ./_scripts/convert-docs.py /path/to/fluo/docs/ /path/to/fluo-io.github.io/docs/fluo/1.0.0-beta-1/
+ ./_scripts/convert-docs.py /path/to/fluo/docs/ /path/to/fluo-website/docs/fluo/1.0.0-beta-1/
```
2. Modify `docs/index.md` to point to new release and update the `latest_fluo_release`
@@ -40,7 +40,7 @@ Below are the steps required to update the Fluo project website for a new releas
repo named after your release version (i.e 1.0.0-beta-1):
```bash
- ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo/modules/api /path/to/fluo-io.github.io/apidocs/fluo
+ ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo/modules/api /path/to/fluo-website/apidocs/fluo
```
4. Modify `apidocs/index.md` to point to the new javadocs that you just generated.
@@ -55,9 +55,9 @@ Steps to update website for new Fluo Recipes release:
1. Run the commands below to copy and convert documentation in your release tag.
```bash
- cd fluo-io.github.io
+ cd fluo-website
mkdir -p docs/1.0.0-beta-1
- ./_scripts/convert-recipes.py /path/to/fluo-recipes/docs/ /path/to/fluo-io.github.io/docs/fluo-recipes/1.0.0-beta-1/
+ ./_scripts/convert-recipes.py /path/to/fluo-recipes/docs/ /path/to/fluo-website/docs/fluo-recipes/1.0.0-beta-1/
```
2. Modify `docs/index.md` to point to new release and update the `latest_recipes_release` variable in `_config.yml`.
@@ -67,7 +67,7 @@ Steps to update website for new Fluo Recipes release:
repo named after your release version (i.e 1.0.0-beta-1):
```bash
- ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo-recipes /path/to/fluo-io.github.io/apidocs/fluo-recipes
+ ./_scripts/gen-javadoc.sh 1.0.0-beta-1 /path/to/repo/fluo-recipes /path/to/fluo-website/apidocs/fluo-recipes
```
4. Modify `apidocs/index.md` to point to the new javadocs that you just generated.
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/apidocs/index.html
----------------------------------------------------------------------
diff --git a/apidocs/index.html b/apidocs/index.html
index aa43b91..25323e9 100644
--- a/apidocs/index.html
+++ b/apidocs/index.html
@@ -77,7 +77,7 @@
</header>
<article id="page-content">
- <p><a href="https://github.com/fluo-io/fluo">Fluo</a> and <a href="https://github.com/fluo-io/fluo-recipes">Fluo Recipes</a> have seperate API documentation as they are different repositories with their own release cycle.</p>
+ <p><a href="https://github.com/apache/fluo">Fluo</a> and <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a> have seperate API documentation as they are different repositories with their own release cycle.</p>
<ul>
<li>Fluo API documentation - <a href="/apidocs/fluo/1.0.0-beta-2/">Latest</a> | <a href="/apidocs/fluo/">Archive</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/docs/index.html
----------------------------------------------------------------------
diff --git a/docs/index.html b/docs/index.html
index 337b7a1..9d517ff 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -77,7 +77,7 @@
</header>
<article id="page-content">
- <p><a href="https://github.com/apache/incubator-fluo">Fluo</a> and <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a> have seperate documentation as they are different repositories with their own release cycle.</p>
+ <p><a href="https://github.com/apache/fluo">Fluo</a> and <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a> have seperate documentation as they are different repositories with their own release cycle.</p>
<h2 id="fluo">Fluo</h2>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/download/index.html
----------------------------------------------------------------------
diff --git a/download/index.html b/download/index.html
index 710e271..37c5e56 100644
--- a/download/index.html
+++ b/download/index.html
@@ -80,8 +80,8 @@
<p>Fluo tarball distributions are available on GitHub for download using the links below:</p>
<ul>
- <li><a href="https://github.com/apache/incubator-fluo/releases/latest">Latest Release</a></li>
- <li><a href="https://github.com/apache/incubator-fluo/releases">All Releases</a></li>
+ <li><a href="https://github.com/apache/fluo/releases/latest">Latest Release</a></li>
+ <li><a href="https://github.com/apache/fluo/releases">All Releases</a></li>
</ul>
<p>Before downloading a distribution, consider running Fluo using <a href="https://github.com/fluo-io/fluo-dev">fluo-dev</a> (which sets up Fluo for development)
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 7c56e4b..217c073 100644
--- a/feed.xml
+++ b/feed.xml
@@ -5,8 +5,8 @@
<description></description>
<link>http://fluo.io/</link>
<atom:link href="http://fluo.io/feed.xml" rel="self" type="application/rss+xml" />
- <pubDate>Wed, 29 Jun 2016 10:43:16 -0400</pubDate>
- <lastBuildDate>Wed, 29 Jun 2016 10:43:16 -0400</lastBuildDate>
+ <pubDate>Wed, 29 Jun 2016 10:45:37 -0400</pubDate>
+ <lastBuildDate>Wed, 29 Jun 2016 10:45:37 -0400</lastBuildDate>
<generator>Jekyll v3.0.3</generator>
<item>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/getinvolved/index.html
----------------------------------------------------------------------
diff --git a/getinvolved/index.html b/getinvolved/index.html
index 32324df..2856147 100644
--- a/getinvolved/index.html
+++ b/getinvolved/index.html
@@ -81,7 +81,7 @@
<h3 id="mailing-list">Mailing list</h3>
-<p>Join our public mailing list by sending an email to <code class="highlighter-rouge">dev-subscribe@fluo.incubator.apache.org</code>. Discussions regarding issues and pull requests should remain on our GitHub pages (<a href="https://github.com/apache/incubator-fluo">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/fluo/fluo-io.github.io">Fluo website</a>). Our email list is for announcing releases, organizing meet ups, or any discussion that does not make sense for GitHub.</p>
+<p>Join our public mailing list by sending an email to <code class="highlighter-rouge">dev-subscribe@fluo.incubator.apache.org</code>. Discussions regarding issues and pull requests should remain on our GitHub pages (<a href="https://github.com/apache/fluo">Fluo</a>, <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/fluo/fluo-io.github.io">Fluo website</a>). Our email list is for announcing releases, organizing meet ups, or any discussion that does not make sense for GitHub.</p>
<h3 id="irc">IRC</h3>
@@ -92,7 +92,7 @@
<p>Users can provide feedback by:</p>
<ul>
- <li>Creating an issue on our GitHub pages: <a href="https://github.com/apache/incubator-fluo/issues">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes/issues">Fluo Recipes</a>, <a href="https://github.com/fluo/fluo-io.github.io/issues">Fluo website</a></li>
+ <li>Creating an issue on our GitHub pages: <a href="https://github.com/apache/fluo/issues">Fluo</a>, <a href="https://github.com/apache/fluo-recipes/issues">Fluo Recipes</a>, <a href="https://github.com/fluo/fluo-io.github.io/issues">Fluo website</a></li>
<li>Sending an email to our mailing list at <code class="highlighter-rouge">dev@fluo.incubator.apache.org</code></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/how-to-contribute/index.html
----------------------------------------------------------------------
diff --git a/how-to-contribute/index.html b/how-to-contribute/index.html
index 0ed530e..5fea7be 100644
--- a/how-to-contribute/index.html
+++ b/how-to-contribute/index.html
@@ -77,14 +77,14 @@
</header>
<article id="page-content">
- <p>Contributions are welcome to all Fluo repositories (<a href="https://github.com/apache/incubator-fluo">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a>) and the <a href="https://github.com/fluo-io/fluo-io.github.io">Fluo project website</a>. All repositories follow a <a href="http://www.apache.org/foundation/glossary.html#ReviewThenCommit">review-then-commit</a> process.
+ <p>Contributions are welcome to all Fluo repositories (<a href="https://github.com/apache/fluo">Fluo</a>, <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a>) and the <a href="https://github.com/apache/incubator-fluo-website">Fluo project website</a>. All repositories follow a <a href="http://www.apache.org/foundation/glossary.html#ReviewThenCommit">review-then-commit</a> process.
This means that all contributions must pass any integration tests and be reviewed before being committed. Code reviews are done by commenting on a GitHub pull request.</p>
<h3 id="contribution-workflow">Contribution workflow</h3>
<ol>
- <li>Make sure you have a fork of the repository (<a href="https://github.com/apache/incubator-fluo">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/fluo-io/fluo-io.github.io">Fluo Website</a>) that you want contribute to.</li>
- <li>Create an issue that describes the work. Each Fluo repository has its own issue tracker: <a href="https://github.com/apache/incubator-fluo/issues">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes/issues">Fluo Recipes</a>, <a href="https://github.com/fluo-io/fluo-io.github.io/issues">Fluo Website</a></li>
+ <li>Make sure you have a fork of the repository (<a href="https://github.com/apache/fluo">Fluo</a>, <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/apache/incubator-fluo-website">Fluo Website</a>) that you want contribute to.</li>
+ <li>Create an issue that describes the work. Each Fluo repository has its own issue tracker: <a href="https://github.com/apache/fluo/issues">Fluo</a>, <a href="https://github.com/apache/fluo-recipes/issues">Fluo Recipes</a>, <a href="https://github.com/apache/incubator-fluo-website/issues">Fluo Website</a></li>
<li>
<p>Create a branch in the local clone of your fork. An example branch name is <code class="highlighter-rouge">fluo-301</code> which describes the repo and issue number.</p>
@@ -120,7 +120,7 @@ git push origin fluo-301
</code></pre>
</div>
</li>
- <li>Create a pull request on the GitHub page of the repo (e.g. <a href="https://github.com/apache/incubator-fluo">Fluo</a>, <a href="https://github.com/apache/incubator-fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/fluo-io/fluo-io.github.io">Fluo Website</a>) that you want to contribute to. The pull request should merge your branch (e.g. <code class="highlighter-rouge">fluo-301</code>) in your fork into the master branch of the repo.</li>
+ <li>Create a pull request on the GitHub page of the repo (e.g. <a href="https://github.com/apache/fluo">Fluo</a>, <a href="https://github.com/apache/fluo-recipes">Fluo Recipes</a>, <a href="https://github.com/apache/incubator-fluo-website">Fluo Website</a>) that you want to contribute to. The pull request should merge your branch (e.g. <code class="highlighter-rouge">fluo-301</code>) in your fork into the master branch of the repo.</li>
<li>At least one committer (and others in the community) will review your pull request and add any comments to your code.</li>
<li>Reviewers should make comments at bottom of the pull request or in \u201cFiles Changed\u201d. Avoid commenting on commits as these comments will disappear if the branch is rebased as rebasing generates new commits for the pull request.</li>
<li>Push any changes from the review to the branch as new commits so the reviewer only needs to review new changes.</li>
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/db16e29d/release-process/index.html
----------------------------------------------------------------------
diff --git a/release-process/index.html b/release-process/index.html
index 52dd214..3d2604e 100644
--- a/release-process/index.html
+++ b/release-process/index.html
@@ -194,7 +194,7 @@ git push --delete origin 1.0.0-beta-1-RC1
</div>
</li>
<li>
- <p>View the <a href="https://github.com/fluo-io/fluo-io.github.io/blob/master/README.md">website README</a> for instructions on how to generate Javadocs and documentation using the released tag. Submit PR to the website repo to publish.</p>
+ <p>View the <a href="https://github.com/apache/incubator-fluo-website/blob/master/README.md">website README</a> for instructions on how to generate Javadocs and documentation using the released tag. Submit PR to the website repo to publish.</p>
</li>
<li>
<p>Send an email to <code class="highlighter-rouge">dev@fluo.incubator.apache.org</code> announcing new release.</p>