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:52 UTC
[5/7] incubator-fluo-website git commit: Minor updates due to move to
Apache
Minor updates due to move to Apache
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/83eba45d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/83eba45d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/83eba45d
Branch: refs/heads/gh-pages
Commit: 83eba45dbec449a84cd65de645767cf03f843d3f
Parents: 1b071da
Author: Mike Walch <mw...@gmail.com>
Authored: Mon Jun 27 11:33:23 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Wed Jun 29 10:44:45 2016 -0400
----------------------------------------------------------------------
README.md | 14 +++++++-------
_scripts/convert-docs.py | 2 +-
_scripts/convert-recipes.py | 2 +-
apidocs/index.md | 4 ++--
docs/index.md | 4 ++--
pages/download.md | 4 ++--
pages/getinvolved.md | 8 ++++----
pages/how-to-contribute.md | 12 ++++++------
pages/release-process.md | 2 +-
9 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/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/83eba45d/_scripts/convert-docs.py
----------------------------------------------------------------------
diff --git a/_scripts/convert-docs.py b/_scripts/convert-docs.py
index e20e5c9..dc9a766 100755
--- a/_scripts/convert-docs.py
+++ b/_scripts/convert-docs.py
@@ -15,7 +15,7 @@ output_dir = sys.argv[2]
args = output_dir.rpartition("/docs")
url_prefix = args[1] + args[2]
release_ver = url_prefix.split("/")[3]
-github_prefix = "https://github.com/fluo-io/fluo/blob/{0}/modules/".format(release_ver)
+github_prefix = "https://github.com/apache/fluo/blob/{0}/modules/".format(release_ver)
apidocs_prefix = "/apidocs/fluo/{0}/".format(release_ver)
resources_prefix = "/docs/fluo/{0}/resources/".format(release_ver)
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/_scripts/convert-recipes.py
----------------------------------------------------------------------
diff --git a/_scripts/convert-recipes.py b/_scripts/convert-recipes.py
index ad05e0a..bb901b9 100755
--- a/_scripts/convert-recipes.py
+++ b/_scripts/convert-recipes.py
@@ -15,7 +15,7 @@ output_dir = sys.argv[2]
args = output_dir.rpartition("/docs")
url_prefix = args[1] + args[2]
release_ver = url_prefix.split("/")[3]
-github_prefix = "https://github.com/fluo-io/fluo-recipes/blob/{0}/modules/".format(release_ver)
+github_prefix = "https://github.com/apache/fluo-recipes/blob/{0}/modules/".format(release_ver)
apidocs_prefix = "/apidocs/fluo-recipes/{0}/".format(release_ver)
def path_to_url(path):
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/apidocs/index.md
----------------------------------------------------------------------
diff --git a/apidocs/index.md b/apidocs/index.md
index 65b004b..c68f954 100644
--- a/apidocs/index.md
+++ b/apidocs/index.md
@@ -8,8 +8,8 @@ title: API Documentation
* Fluo API documentation - [Latest][fluo-api-latest] \| [Archive][fluo-api-archive]
* Fluo Recipes API docoumentation - [Latest][recipes-api-latest] \| [Archive][recipes-api-archive]
-[Fluo]: https://github.com/fluo-io/fluo
-[Fluo Recipes]: https://github.com/fluo-io/fluo-recipes
+[Fluo]: https://github.com/apache/fluo
+[Fluo Recipes]: https://github.com/apache/fluo-recipes
[fluo-api-latest]: /apidocs/fluo/{{ site.latest_fluo_release }}/
[recipes-api-latest]: /apidocs/fluo-recipes/{{ site.latest_recipes_release }}/
[fluo-api-archive]: /apidocs/fluo/
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index 215d113..dcc27a9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -21,8 +21,8 @@ Latest release is `{{ site.latest_recipes_release }}` made on {{ site.latest_rec
* Fluo Recipes documentation - [Latest][recipes-docs-latest] \| [Archive][recipes-docs-archive]
* Fluo Recipes API - [Latest][recipes-api-latest] \| [Archive][recipes-api-archive]
-[Fluo]: https://github.com/apache/incubator-fluo
-[Fluo Recipes]: https://github.com/apache/incubator-fluo-recipes
+[Fluo]: https://github.com/apache/fluo
+[Fluo Recipes]: https://github.com/apache/fluo-recipes
[fluo-docs-latest]: /docs/fluo/{{ site.latest_fluo_release }}/
[fluo-api-latest]: /apidocs/fluo/{{ site.latest_fluo_release }}/
[fluo-sum-latest]: /release-summaries/{{ site.latest_fluo_release }}/
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/pages/download.md
----------------------------------------------------------------------
diff --git a/pages/download.md b/pages/download.md
index f07d856..8141c0c 100644
--- a/pages/download.md
+++ b/pages/download.md
@@ -14,8 +14,8 @@ or [Zetten] (which sets up Fluo on a cluster). Both will download and install F
If you would rather install and run Fluo on your own, follow these [installation instructions][install].
-[latest]: https://github.com/apache/incubator-fluo/releases/latest
-[all]: https://github.com/apache/incubator-fluo/releases
+[latest]: https://github.com/apache/fluo/releases/latest
+[all]: https://github.com/apache/fluo/releases
[fluo-dev]: https://github.com/fluo-io/fluo-dev
[Zetten]: https://github.com/fluo-io/zetten
[install]: /docs/fluo/{{ site.latest_fluo_release}}/prod-fluo-setup/
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/pages/getinvolved.md
----------------------------------------------------------------------
diff --git a/pages/getinvolved.md b/pages/getinvolved.md
index 165d004..2f8ed5c 100644
--- a/pages/getinvolved.md
+++ b/pages/getinvolved.md
@@ -25,11 +25,11 @@ Users can provide feedback by:
Contributions are welcome to all Fluo projects! All projects follow a [review-then-commit][rtc] process. If you are interested in contributing, read our [How To Contribute][htc] page.
-[f]: https://github.com/apache/incubator-fluo
-[r]: https://github.com/apache/incubator-fluo-recipes
+[f]: https://github.com/apache/fluo
+[r]: https://github.com/apache/fluo-recipes
[w]: https://github.com/fluo/fluo-io.github.io
-[fi]: https://github.com/apache/incubator-fluo/issues
-[ri]: https://github.com/apache/incubator-fluo-recipes/issues
+[fi]: https://github.com/apache/fluo/issues
+[ri]: https://github.com/apache/fluo-recipes/issues
[wi]: https://github.com/fluo/fluo-io.github.io/issues
[fnf]: irc://chat.freenode.net/fluo
[fn]: https://freenode.net/
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/pages/how-to-contribute.md
----------------------------------------------------------------------
diff --git a/pages/how-to-contribute.md b/pages/how-to-contribute.md
index b1bb991..2dd8480 100644
--- a/pages/how-to-contribute.md
+++ b/pages/how-to-contribute.md
@@ -67,12 +67,12 @@ This can be configured by common IDEs:
* Eclipse: ```Window -> Preferences -> Java -> Organize Imports```
* Intelli-J: ```Preferences -> Code Style -> Java -> Imports```
-[f]: https://github.com/apache/incubator-fluo
-[r]: https://github.com/apache/incubator-fluo-recipes
-[w]: https://github.com/fluo-io/fluo-io.github.io
-[fi]: https://github.com/apache/incubator-fluo/issues
-[ri]: https://github.com/apache/incubator-fluo-recipes/issues
-[wi]: https://github.com/fluo-io/fluo-io.github.io/issues
+[f]: https://github.com/apache/fluo
+[r]: https://github.com/apache/fluo-recipes
+[w]: https://github.com/apache/incubator-fluo-website
+[fi]: https://github.com/apache/fluo/issues
+[ri]: https://github.com/apache/fluo-recipes/issues
+[wi]: https://github.com/apache/incubator-fluo-website/issues
[tutorial]: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
[stackoverflow]: http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git
[rtc]: http://www.apache.org/foundation/glossary.html#ReviewThenCommit
http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/83eba45d/pages/release-process.md
----------------------------------------------------------------------
diff --git a/pages/release-process.md b/pages/release-process.md
index 597f50e..f45c7bc 100644
--- a/pages/release-process.md
+++ b/pages/release-process.md
@@ -103,7 +103,7 @@ When consensus has been reached on a release candidate, follow the steps below t
7. Send an email to `dev@fluo.incubator.apache.org` announcing new release.
-[website README]: https://github.com/fluo-io/fluo-io.github.io/blob/master/README.md
+[website README]: https://github.com/apache/incubator-fluo-website/blob/master/README.md
[documentation]: http://central.sonatype.org/pages/apache-maven.html
[sonatype account]: https://issues.sonatype.org/
[Release the artifacts]: http://central.sonatype.org/pages/releasing-the-deployment.html