fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [52/52] incubator-fluo-website git commit: Fixes #28 - Updated all javadocs links
Date Mon, 17 Oct 2016 19:41:44 GMT
Fixes #28 - Updated all javadocs links

* All javadocs links point to external site
* Updated all historical docs, releases, etc
* Updated scripts that convert documentation


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/22e3a3d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/tree/22e3a3d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/diff/22e3a3d4

Branch: refs/heads/gh-pages
Commit: 22e3a3d49924f829b728fc33f2d719a59792ae1e
Parents: 44df6c3
Author: Mike Walch <mwalch@apache.org>
Authored: Mon Oct 17 12:38:57 2016 -0400
Committer: Mike Walch <mwalch@apache.org>
Committed: Mon Oct 17 12:39:05 2016 -0400

----------------------------------------------------------------------
 README.md                                       |  8 +-
 _config.yml                                     |  6 ++
 _layouts/default.html                           |  2 +-
 _posts/release/2014-10-02-fluo-1.0.0-alpha-1.md |  4 +-
 _posts/release/2015-06-09-fluo-1.0.0-beta-1.md  |  5 +-
 _posts/release/2016-01-12-fluo-1.0.0-beta-2.md  |  4 +-
 .../2016-01-13-fluo-recipes-1.0.0-beta-1.md     | 10 +-
 .../2016-03-29-fluo-recipes-1.0.0-beta-2.md     | 10 +-
 .../release/2016-10-14-fluo-1.0.0-incubating.md |  4 +-
 _scripts/convert-docs.py                        | 98 --------------------
 _scripts/convert-fluo-docs.py                   | 98 ++++++++++++++++++++
 _scripts/convert-recipes-docs.py                | 76 +++++++++++++++
 _scripts/convert-recipes.py                     | 76 ---------------
 apidocs/archive.md                              | 23 -----
 apidocs/index.md                                | 22 -----
 docs/fluo-recipes/1.0.0-beta-1/export-queue.md  |  2 +-
 docs/fluo-recipes/1.0.0-beta-1/serialization.md |  2 +-
 docs/fluo-recipes/1.0.0-beta-1/transient.md     |  4 +-
 .../1.0.0-beta-2/accumulo-export.md             |  4 +-
 docs/fluo-recipes/1.0.0-beta-2/export-queue.md  |  2 +-
 docs/fluo-recipes/1.0.0-beta-2/serialization.md |  2 +-
 docs/fluo-recipes/1.0.0-beta-2/testing.md       |  4 +-
 docs/fluo-recipes/1.0.0-beta-2/transient.md     |  4 +-
 docs/fluo/1.0.0-beta-1/applications.md          | 10 +-
 docs/fluo/1.0.0-beta-2/applications.md          | 10 +-
 docs/index.md                                   |  4 +-
 pages/api-archive.md                            | 20 ++++
 pages/api.md                                    | 24 +++++
 28 files changed, 269 insertions(+), 269 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f1d2897..ecbb3b8 100644
--- a/README.md
+++ b/README.md
@@ -36,13 +36,13 @@ Below are the steps required to update the Fluo project website for a
new releas
     ```bash
     cd fluo-website/
     mkdir -p 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/
+    ./_scripts/convert-fluo-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` 
    variable in `_config.yml`.
 
-3. Confirm that javadocs are hosted externally and modify `apidocs/index.md` to point to
link to them.
+3. Confirm that javadocs are hosted externally and modify `pages/api.md` to point to link
to them.
 
 4. Create a post in `_posts/release` with release notes and resources to announce release.
 
@@ -55,12 +55,12 @@ Steps to update website for new Fluo Recipes release:
     ```bash
     cd fluo-website
     mkdir -p docs/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/
+    ./_scripts/convert-recipes-docs.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`.
 
-3. Confirm that javadocs are hosted externally and modify `apidocs/index.md` to point to
link to them.
+3. Confirm that javadocs are hosted externally and modify `pages/api.md` to point to link
to them.
 
 4. Create a post in `_posts/release` with release notes and resources to announce release.
 

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 92a97f2..6595df7 100644
--- a/_config.yml
+++ b/_config.yml
@@ -47,8 +47,14 @@ latest_fluo_release: "1.0.0-incubating"
 latest_fluo_release_date: "October 4, 2016"
 latest_recipes_release: "1.0.0-beta-2"
 latest_recipes_release_date: "March 29, 2016"
+
+# Sets links to external API
+api_base: "https://javadoc.io/doc/org.apache.fluo"
+api_static: "https://static.javadoc.io/org.apache.fluo"
 fluo_api_base: "https://javadoc.io/doc/org.apache.fluo/fluo-api"
 fluo_api_static: "https://static.javadoc.io/org.apache.fluo/fluo-api"
+old_api_base: "https://javadoc.io/doc/io.fluo"
+old_api_static: "https://static.javadoc.io/io.fluo"
 
 whitelist: [jekyll-redirect-from]
 gems: [jekyll-redirect-from]

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_layouts/default.html
----------------------------------------------------------------------
diff --git a/_layouts/default.html b/_layouts/default.html
index 3f6c618..e93b90a 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -34,7 +34,7 @@
             <li><a href="{{ site.baseurl }}/release/">Releases</a></li>
             <li><a href="{{ site.baseurl }}/tour/">Tour</a></li>
             <li><a href="{{ site.baseurl }}/docs/">Docs</a></li>
-            <li><a href="{{ site.baseurl }}/apidocs/">API</a></li>
+            <li><a href="{{ site.baseurl }}/api/">API</a></li>
             <li class="dropdown">
               <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community<span
class="caret"></span></a>
               <ul class="dropdown-menu">

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_posts/release/2014-10-02-fluo-1.0.0-alpha-1.md
----------------------------------------------------------------------
diff --git a/_posts/release/2014-10-02-fluo-1.0.0-alpha-1.md b/_posts/release/2014-10-02-fluo-1.0.0-alpha-1.md
index 5f04f8e..6fe979f 100644
--- a/_posts/release/2014-10-02-fluo-1.0.0-alpha-1.md
+++ b/_posts/release/2014-10-02-fluo-1.0.0-alpha-1.md
@@ -15,7 +15,7 @@ Below are resources for this release:
 
 * Download the [Fluo binary tarball][release] for 1.0.0-alpha-1 from GitHub.
 * View the [documentation][docs] for this release.
-* Read the [Javadocs][apidocs].
+* Read the [Javadocs][javadocs].
 * The Fluo [jars] have been deploy to Maven Central.
 
 Fluo is an implementation of Google's [percolator paper][percolator], which adds large-scale
incremental processing of data using distributed transactions and notifications. It runs on
[YARN] using [Twill] and stores its data in [Accumulo]. 
@@ -180,7 +180,7 @@ To create an observer, follow these steps:
 [jars]: http://search.maven.org/#search%7Cga%7C1%7Cfluo
 [Twill]: http://twill.incubator.apache.org/
 [percolator]: http://research.google.com/pubs/pub36726.html
-[apidocs]: /apidocs/fluo/1.0.0-alpha-1/
+[javadocs]: {{ site.old_api_base }}/fluo-api/1.0.0-alpha-1/
 [docs]: /docs/fluo/1.0.0-alpha-1/
 [quickstart]: https://github.com/fluo-io/fluo-quickstart
 [Hadoop]: http://hadoop.apache.org/

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_posts/release/2015-06-09-fluo-1.0.0-beta-1.md
----------------------------------------------------------------------
diff --git a/_posts/release/2015-06-09-fluo-1.0.0-beta-1.md b/_posts/release/2015-06-09-fluo-1.0.0-beta-1.md
index 1ccaf09..f783557 100644
--- a/_posts/release/2015-06-09-fluo-1.0.0-beta-1.md
+++ b/_posts/release/2015-06-09-fluo-1.0.0-beta-1.md
@@ -16,7 +16,7 @@ Below are resources for this release:
 
  * Download the [Fluo binary tarball][release] for 1.0.0-beta-1 from GitHub.
  * View the [documentation] for help getting started with Fluo.
- * [Javadocs][apidocs] are available for this release.
+ * [Javadocs][javadocs] are available for this release.
  * A [tag] of Fluo codebase for 1.0.0-beta-1 is available.
  * Fluo [jars] have been deployed to Maven Central.
  * The [Quickstart] and [Phrasecount] applications were updated to work with this release.
@@ -145,9 +145,8 @@ ballpark.
 [Accumulo]: https://accumulo.apache.org/
 [jars]: http://search.maven.org/#search%7Cga%7C1%7Cfluo
 [paper]: http://research.google.com/pubs/pub36726.html
-[javadocs]: /apidocs/fluo/1.0.0-beta-1/
+[javadocs]:  {{ site.old_api_base }}/fluo-api/1.0.0-beta-1/
 [release]: https://github.com/fluo-io/fluo/releases/tag/1.0.0-beta-1
-[apidocs]: /apidocs/fluo/1.0.0-beta-1/
 [documentation]: /docs/fluo/1.0.0-beta-1/
 [tag]: https://github.com/fluo-io/fluo/tree/1.0.0-beta-1
 [Quickstart]: https://github.com/fluo-io/fluo-quickstart

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_posts/release/2016-01-12-fluo-1.0.0-beta-2.md
----------------------------------------------------------------------
diff --git a/_posts/release/2016-01-12-fluo-1.0.0-beta-2.md b/_posts/release/2016-01-12-fluo-1.0.0-beta-2.md
index 714594f..b33f201 100644
--- a/_posts/release/2016-01-12-fluo-1.0.0-beta-2.md
+++ b/_posts/release/2016-01-12-fluo-1.0.0-beta-2.md
@@ -17,7 +17,7 @@ Below are resources for this release:
 
  * Download the [Fluo binary tarball][release] for 1.0.0-beta-2 from GitHub.
  * View the [documentation][docs] for help getting started with Fluo.
- * [Javadocs][apidocs] are available for this release.
+ * [Javadocs][javadocs] are available for this release.
  * A [tag] of Fluo codebase for 1.0.0-beta-2 is available.
  * The [Quickstart] and [Phrasecount] applications were updated to work with this release.
 
@@ -133,7 +133,7 @@ For this release, a long run of the [Webindex][webindex] application was
perform
 [webindex]: https://github.com/fluo-io/webindex
 [fluo-recipes]: https://github.com/fluo-io/fluo-recipes
 [central]: http://search.maven.org/#search|ga|1|fluo-recipes
-[apidocs]: /apidocs/fluo/1.0.0-beta-2/
+[javadocs]: {{ site.old_api_base }}/fluo-api/1.0.0-beta-2/
 [docs]: /docs/fluo/1.0.0-beta-2/
 [tag]: https://github.com/fluo-io/fluo/tree/1.0.0-beta-2
 [Quickstart]: https://github.com/fluo-io/fluo-quickstart

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_posts/release/2016-01-13-fluo-recipes-1.0.0-beta-1.md
----------------------------------------------------------------------
diff --git a/_posts/release/2016-01-13-fluo-recipes-1.0.0-beta-1.md b/_posts/release/2016-01-13-fluo-recipes-1.0.0-beta-1.md
index 682d2b7..cb5e671 100644
--- a/_posts/release/2016-01-13-fluo-recipes-1.0.0-beta-1.md
+++ b/_posts/release/2016-01-13-fluo-recipes-1.0.0-beta-1.md
@@ -7,13 +7,11 @@ historical: true
 
 This is the first release of Fluo Recipes which provides common code for Fluo developers.
 
-The jars for this release of Fluo Recipes are available in [Maven Central][central].
-
 Below are resources for this release:
 
-* [Documentation][docs]
-* [Javadocs][api]
+* View the [documentation][docs]
+* Read the javadocs:  <a href="{{ site.old_api_base }}/fluo-recipes-core/1.0.0-beta-1/"
target="_blank">core</a>, <a href="{{ site.old_api_base }}/fluo-recipes-accumulo/1.0.0-beta-1/"
target="_blank">accumulo</a>
+* Jars are available in [Maven Central][central].
 
-[central]: http://search.maven.org/#search|ga|1|fluo-recipes
 [docs]: /docs/fluo-recipes/1.0.0-beta-1
-[api]: /apidocs/fluo-recipes/1.0.0-beta-1
+[central]: http://search.maven.org/#search|ga|1|fluo-recipes

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_posts/release/2016-03-29-fluo-recipes-1.0.0-beta-2.md
----------------------------------------------------------------------
diff --git a/_posts/release/2016-03-29-fluo-recipes-1.0.0-beta-2.md b/_posts/release/2016-03-29-fluo-recipes-1.0.0-beta-2.md
index 440a086..ccf77bf 100644
--- a/_posts/release/2016-03-29-fluo-recipes-1.0.0-beta-2.md
+++ b/_posts/release/2016-03-29-fluo-recipes-1.0.0-beta-2.md
@@ -7,13 +7,11 @@ historical: true
 
 This is the second release of Fluo Recipes which provides common code for Fluo developers.
 
-The jars for this release of Fluo Recipes are available in [Maven Central][central].
-
 Below are resources for this release:
 
-* [Documentation][docs]
-* [Javadocs][api]
+* View the [documentation][docs]
+* Read the javadocs: <a href="{{ site.old_api_base }}/fluo-recipes-core/1.0.0-beta-2/"
target="_blank">core</a>, <a href="{{ site.old_api_base }}/fluo-recipes-accumulo/1.0.0-beta-2/"
target="_blank">accumulo</a>, <a href="{{ site.old_api_base }}/fluo-recipes-kryo/1.0.0-beta-2/"
target="_blank">kryo</a>, <a href="{{ site.old_api_base }}/fluo-recipes-spark/1.0.0-beta-2/"
target="_blank">spark</a>, <a href="{{ site.old_api_base }}/fluo-recipes-test/1.0.0-beta-2/"
target="_blank">test</a>
+* Jars are available in [Maven Central][central].
 
-[central]: http://search.maven.org/#search|ga|1|fluo-recipes
 [docs]: /docs/fluo-recipes/1.0.0-beta-2
-[api]: /apidocs/fluo-recipes/1.0.0-beta-2
+[central]: http://search.maven.org/#search|ga|1|fluo-recipes

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_posts/release/2016-10-14-fluo-1.0.0-incubating.md
----------------------------------------------------------------------
diff --git a/_posts/release/2016-10-14-fluo-1.0.0-incubating.md b/_posts/release/2016-10-14-fluo-1.0.0-incubating.md
index 6f5eb89..a65641a 100644
--- a/_posts/release/2016-10-14-fluo-1.0.0-incubating.md
+++ b/_posts/release/2016-10-14-fluo-1.0.0-incubating.md
@@ -12,7 +12,7 @@ release for the project. Below are resources for this release:
    | [fluo-1.0.0-incubating-bin.tar.gz][bin-release]            | [ASC][bin-asc] [MD5][md5]
[SHA1][sha1] |
    | [fluo-1.0.0-incubating-source-release.tar.gz][src-release] | [ASC][src-asc] [MD5][md5]
[SHA1][sha1] |
  * View the [documentation][docs] for this release.
- * Read the [Javadocs][apidocs].
+ * Read the [Javadocs][javadocs].
  
 Starting with 1.0.0-incubating, Apache Fluo will follow [semver](http://semver.org/) for
all future API
 changes. The API consists of everything under the `org.apache.fluo.api` package. Code outside
of this
@@ -107,7 +107,7 @@ day run](/blog/2016/05/17/webindex-long-run-2/) of Webindex was conducted.
 [src-asc]: https://www.apache.org/dist/incubator/fluo/fluo/1.0.0-incubating/fluo-1.0.0-incubating-source-release.tar.gz.asc
 [md5]: https://www.apache.org/dist/incubator/fluo/fluo/1.0.0-incubating/MD5SUM
 [sha1]: https://www.apache.org/dist/incubator/fluo/fluo/1.0.0-incubating/SHA1SUM
-[apidocs]: {{ site.fluo_api_base }}/1.0.0-incubating/
+[javadocs]: {{ site.fluo_api_base }}/1.0.0-incubating/
 [docs]: /docs/fluo/1.0.0-incubating/
 [semver]: http://semver.org/
 [commits]: https://github.com/apache/incubator-fluo/compare/1.0.0-beta-2...e1dbc60

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_scripts/convert-docs.py
----------------------------------------------------------------------
diff --git a/_scripts/convert-docs.py b/_scripts/convert-docs.py
deleted file mode 100755
index dc38d40..0000000
--- a/_scripts/convert-docs.py
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/python
-
-import sys
-from os import listdir, makedirs
-from os.path import isfile, join, exists
-import shutil
-
-if len(sys.argv) != 3:
-  print "Usage: ./convert-docs.py <inputDocsDir> <outputDocsDir>"
-  sys.exit(-1)
-
-input_dir = sys.argv[1]
-output_dir = sys.argv[2]
-
-args = output_dir.rpartition("/docs")
-url_prefix = args[1] + args[2]
-print url_prefix
-print args
-release_ver = url_prefix.split("/")[3]
-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)
-
-def path_to_url(path):
-  if path.find("#") != -1:
-    print "WARNING - URL references anchor tag #: ", path.strip()
-  url = url_prefix + path.rpartition("/")[2].replace(".md", "/")
-  if url.endswith("/index/"):
-    return url.replace("/index/", "/")
-  return url
-
-def convert_file(inPath, outPath):
-
-  print "Creating ", outPath
-
-  with open(inPath) as fin:
-    # skip license
-    for x in range(0, 16):
-      fin.readline()
-
-    title = fin.readline().strip()
-    fin.readline()
-
-    if inPath.endswith("README.md"):
-      title = "Fluo {0} Documentation".format(release_ver)
-
-    with open(outPath, "w") as fout:
-      print >> fout, "---" 
-      print >> fout, "layout: fluo-doc" 
-      print >> fout, "title: ", title 
-      print >> fout, "version: ", release_ver
-      print >> fout, "---"
-
-      if inPath.endswith("README.md"):
-        fin.readline()
-        fin.readline()
-
-      for line in fin:
-        if line.startswith("["):
-          if line.find(".md") != -1:
-            for word in line.split(' '):
-              if word.find(".md") != -1:
-                fout.write(path_to_url(word))
-              else:
-                fout.write(word+" ")
-          elif line.find("../modules") != -1:
-            if line.strip().endswith(".java"):
-              start = line.find("../modules/")
-              end = line.find("io/fluo")
-              fout.write(line.replace(line[start:end], apidocs_prefix).replace(".java", ".html"))
-            else:
-              fout.write(line.replace("../modules/", github_prefix))
-          elif line.find("resources/") and any(x in line for x in ('.png','.jpg','.pdf')):
-            fout.write(line.replace("resources/", resources_prefix))
-          else:
-            fout.write(line)
-        else:
-          fout.write(line)
-
-convert_file(join(input_dir,"../README.md"), join(output_dir, "index.md"))
-
-for f in listdir(input_dir):
-  fn = join(input_dir, f)
-  if isfile(fn) and fn.endswith(".md"):
-    convert_file(fn, join(output_dir, f))
-
-src_resources = join(input_dir, 'resources')
-dst_resources = join(output_dir, 'resources')
-
-if not exists(dst_resources):
-  makedirs(dst_resources)
-
-for f in listdir(src_resources):
-  src = join(src_resources, f)
-  dst = join(dst_resources, f)
-
-  if not exists(dst) and isfile(src) and src.endswith(('.png','.jpg','.pdf')):
-    shutil.copy(src, dst_resources)

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_scripts/convert-fluo-docs.py
----------------------------------------------------------------------
diff --git a/_scripts/convert-fluo-docs.py b/_scripts/convert-fluo-docs.py
new file mode 100755
index 0000000..b740cdb
--- /dev/null
+++ b/_scripts/convert-fluo-docs.py
@@ -0,0 +1,98 @@
+#!/usr/bin/python
+
+import sys
+from os import listdir, makedirs
+from os.path import isfile, join, exists
+import shutil
+
+if len(sys.argv) != 3:
+  print "Usage: ./convert-docs.py <inputDocsDir> <outputDocsDir>"
+  sys.exit(-1)
+
+input_dir = sys.argv[1]
+output_dir = sys.argv[2]
+
+args = output_dir.rpartition("/docs")
+url_prefix = args[1] + args[2]
+print url_prefix
+print args
+release_ver = url_prefix.split("/")[3]
+github_prefix = "https://github.com/apache/fluo/blob/{0}/modules/".format(release_ver)
+javadocs_prefix = "{{ site.fluo_api_static }}/" + release_ver + "/"
+resources_prefix = "/docs/fluo/{0}/resources/".format(release_ver)
+
+def path_to_url(path):
+  if path.find("#") != -1:
+    print "WARNING - URL references anchor tag #: ", path.strip()
+  url = url_prefix + path.rpartition("/")[2].replace(".md", "/")
+  if url.endswith("/index/"):
+    return url.replace("/index/", "/")
+  return url
+
+def convert_file(inPath, outPath):
+
+  print "Creating ", outPath
+
+  with open(inPath) as fin:
+    # skip license
+    for x in range(0, 16):
+      fin.readline()
+
+    title = fin.readline().strip()
+    fin.readline()
+
+    if inPath.endswith("README.md"):
+      title = "Fluo {0} Documentation".format(release_ver)
+
+    with open(outPath, "w") as fout:
+      print >> fout, "---" 
+      print >> fout, "layout: fluo-doc" 
+      print >> fout, "title: ", title 
+      print >> fout, "version: ", release_ver
+      print >> fout, "---"
+
+      if inPath.endswith("README.md"):
+        fin.readline()
+        fin.readline()
+
+      for line in fin:
+        if line.startswith("["):
+          if line.find(".md") != -1:
+            for word in line.split(' '):
+              if word.find(".md") != -1:
+                fout.write(path_to_url(word))
+              else:
+                fout.write(word+" ")
+          elif line.find("../modules") != -1:
+            if line.strip().endswith(".java"):
+              start = line.find("../modules/")
+              end = line.find("io/fluo")
+              fout.write(line.replace(line[start:end], javadocs_prefix).replace(".java",
".html"))
+            else:
+              fout.write(line.replace("../modules/", github_prefix))
+          elif line.find("resources/") and any(x in line for x in ('.png','.jpg','.pdf')):
+            fout.write(line.replace("resources/", resources_prefix))
+          else:
+            fout.write(line)
+        else:
+          fout.write(line)
+
+convert_file(join(input_dir,"../README.md"), join(output_dir, "index.md"))
+
+for f in listdir(input_dir):
+  fn = join(input_dir, f)
+  if isfile(fn) and fn.endswith(".md"):
+    convert_file(fn, join(output_dir, f))
+
+src_resources = join(input_dir, 'resources')
+dst_resources = join(output_dir, 'resources')
+
+if not exists(dst_resources):
+  makedirs(dst_resources)
+
+for f in listdir(src_resources):
+  src = join(src_resources, f)
+  dst = join(dst_resources, f)
+
+  if not exists(dst) and isfile(src) and src.endswith(('.png','.jpg','.pdf')):
+    shutil.copy(src, dst_resources)

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_scripts/convert-recipes-docs.py
----------------------------------------------------------------------
diff --git a/_scripts/convert-recipes-docs.py b/_scripts/convert-recipes-docs.py
new file mode 100755
index 0000000..5beae9b
--- /dev/null
+++ b/_scripts/convert-recipes-docs.py
@@ -0,0 +1,76 @@
+#!/usr/bin/python
+
+import sys
+from os import listdir, makedirs
+from os.path import isfile, join, exists
+import shutil
+
+if len(sys.argv) != 3:
+  print "Usage: ./convert-recipes.py <inputDocsDir> <outputDocsDir>"
+  sys.exit(-1)
+
+input_dir = sys.argv[1]
+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/apache/fluo-recipes/blob/{0}/modules/".format(release_ver)
+javadocs_prefix = "{{ site.api_static }}/fluo-recipes-FIXME/" + release_ver + "/"
+
+def path_to_url(path):
+  if path.find("#") != -1:
+    print "WARNING - URL references anchor tag #: ", path.strip()
+  url = url_prefix + path.rpartition("/")[2].replace(".md", "/")
+  if url.endswith("/index/"):
+    return url.replace("/index/", "/")
+  return url
+
+def convert_file(inPath, outPath):
+
+  print "Creating ", outPath
+
+  with open(inPath) as fin:
+    title = fin.readline().lstrip(' #').strip()
+    fin.readline()
+
+    if inPath.endswith("README.md"):
+      title = "Fluo Recipes {0} Documentation".format(release_ver)
+
+    with open(outPath, "w") as fout:
+      print >> fout, "---" 
+      print >> fout, "layout: recipes-doc" 
+      print >> fout, "title:", title 
+      print >> fout, "version:", release_ver
+      print >> fout, "---"
+
+      if inPath.endswith("README.md"):
+        fin.readline()
+        fin.readline()
+
+      for line in fin:
+        if line.startswith("["):
+          if line.find(".md") != -1:
+            for word in line.split(' '):
+              if word.find(".md") != -1:
+                fout.write(path_to_url(word))
+              else:
+                fout.write(word+" ")
+          elif line.find("../modules") != -1:
+            if line.strip().endswith(".java"):
+              start = line.find("../modules/")
+              end = line.find("io/fluo")
+              fout.write(line.replace(line[start:end], javadocs_prefix).replace(".java",
".html"))
+            else:
+              fout.write(line.replace("../modules/", github_prefix))
+          else:
+            fout.write(line)
+        else:
+          fout.write(line)
+
+convert_file(join(input_dir,"../README.md"), join(output_dir, "index.md"))
+
+for f in listdir(input_dir):
+  fn = join(input_dir, f)
+  if isfile(fn) and fn.endswith(".md"):
+    convert_file(fn, join(output_dir, f))

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/_scripts/convert-recipes.py
----------------------------------------------------------------------
diff --git a/_scripts/convert-recipes.py b/_scripts/convert-recipes.py
deleted file mode 100755
index bb901b9..0000000
--- a/_scripts/convert-recipes.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/python
-
-import sys
-from os import listdir, makedirs
-from os.path import isfile, join, exists
-import shutil
-
-if len(sys.argv) != 3:
-  print "Usage: ./convert-recipes.py <inputDocsDir> <outputDocsDir>"
-  sys.exit(-1)
-
-input_dir = sys.argv[1]
-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/apache/fluo-recipes/blob/{0}/modules/".format(release_ver)
-apidocs_prefix = "/apidocs/fluo-recipes/{0}/".format(release_ver)
-
-def path_to_url(path):
-  if path.find("#") != -1:
-    print "WARNING - URL references anchor tag #: ", path.strip()
-  url = url_prefix + path.rpartition("/")[2].replace(".md", "/")
-  if url.endswith("/index/"):
-    return url.replace("/index/", "/")
-  return url
-
-def convert_file(inPath, outPath):
-
-  print "Creating ", outPath
-
-  with open(inPath) as fin:
-    title = fin.readline().lstrip(' #').strip()
-    fin.readline()
-
-    if inPath.endswith("README.md"):
-      title = "Fluo Recipes {0} Documentation".format(release_ver)
-
-    with open(outPath, "w") as fout:
-      print >> fout, "---" 
-      print >> fout, "layout: recipes-doc" 
-      print >> fout, "title:", title 
-      print >> fout, "version:", release_ver
-      print >> fout, "---"
-
-      if inPath.endswith("README.md"):
-        fin.readline()
-        fin.readline()
-
-      for line in fin:
-        if line.startswith("["):
-          if line.find(".md") != -1:
-            for word in line.split(' '):
-              if word.find(".md") != -1:
-                fout.write(path_to_url(word))
-              else:
-                fout.write(word+" ")
-          elif line.find("../modules") != -1:
-            if line.strip().endswith(".java"):
-              start = line.find("../modules/")
-              end = line.find("io/fluo")
-              fout.write(line.replace(line[start:end], apidocs_prefix).replace(".java", ".html"))
-            else:
-              fout.write(line.replace("../modules/", github_prefix))
-          else:
-            fout.write(line)
-        else:
-          fout.write(line)
-
-convert_file(join(input_dir,"../README.md"), join(output_dir, "index.md"))
-
-for f in listdir(input_dir):
-  fn = join(input_dir, f)
-  if isfile(fn) and fn.endswith(".md"):
-    convert_file(fn, join(output_dir, f))

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/apidocs/archive.md
----------------------------------------------------------------------
diff --git a/apidocs/archive.md b/apidocs/archive.md
deleted file mode 100644
index 2ec0f11..0000000
--- a/apidocs/archive.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-layout: page
-title: Pre-ASF API Archive
----
-
-<div class="alert alert-danger" role="alert">Please note - This page links to Javadocs
for non-ASF releases of Fluo.  These releases were made before Apache Fluo became an ASF project
and are not endorsed by the ASF.</div>
-
-#### Fluo API documentation (before Apache)
-
-* [1.0.0-beta-2][fluo-b2] - January 12, 2016
-* [1.0.0-beta-1][fluo-b1] - June 9, 2015
-* [1.0.0-alpha-1][fluo-a1] - October 2, 2014
-
-#### Fluo Recipes API documentation (before Apache)
-
-* [1.0.0-beta-2][recipes-b2] - March 19, 2016
-* [1.0.0-beta-1][recipes-b1] - January 13, 2016
-
-[fluo-b2]: /apidocs/fluo/1.0.0-beta-2/
-[fluo-b1]: /apidocs/fluo/1.0.0-beta-1/
-[fluo-a1]: /apidocs/fluo/1.0.0-alpha-1/
-[recipes-b2]: /apidocs/fluo-recipes/1.0.0-beta-2/
-[recipes-b1]: /apidocs/fluo-recipes/1.0.0-beta-1/

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/apidocs/index.md
----------------------------------------------------------------------
diff --git a/apidocs/index.md b/apidocs/index.md
deleted file mode 100644
index 93de575..0000000
--- a/apidocs/index.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: page
-title: API Documentation
-redirect_from:
-  - /apidocs/fluo/
-  - /apidocs/fluo-recipes/
----
-
-[Apache Fluo] and [Apache Fluo Recipes] have seperate API documentation as they are different
repositories with their own release cycle.
-
-#### Apache Fluo API
-
-* <a href="{{ site.fluo_api_base }}/1.0.0-incubating/" target="_blank">1.0.0-incubating</a>
- September 27, 2016
-
-#### Apache Fluo Recipes API
-
-* The first release of Apache Fluo Recipes has not been made yet.
-
-API Documentation for releases before joining Apache are available in the [Pre-ASF archive](archive).
-
-[Apache Fluo]: https://github.com/apache/fluo
-[Apache Fluo Recipes]: https://github.com/apache/fluo-recipes

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo-recipes/1.0.0-beta-1/export-queue.md
----------------------------------------------------------------------
diff --git a/docs/fluo-recipes/1.0.0-beta-1/export-queue.md b/docs/fluo-recipes/1.0.0-beta-1/export-queue.md
index 01f5b86..bb967ed 100644
--- a/docs/fluo-recipes/1.0.0-beta-1/export-queue.md
+++ b/docs/fluo-recipes/1.0.0-beta-1/export-queue.md
@@ -277,6 +277,6 @@ example of write skew mentioned in the Percolater paper.
  1. TH1 : tx1.set(`rowA`,`fam1:qual2`, val1)
  1. TH2 : tx2.set(`rowB`,`fam1:qual2`, val2)
 
-[1]: /apidocs/fluo-recipes/1.0.0-beta-1/io/fluo/recipes/export/Exporter.html
+[1]: {{ site.old_api_base }}/fluo-recipes-core/1.0.0-beta-1/io/fluo/recipes/export/Exporter.html
 [2]: https://en.wikipedia.org/wiki/Serializability
 

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo-recipes/1.0.0-beta-1/serialization.md
----------------------------------------------------------------------
diff --git a/docs/fluo-recipes/1.0.0-beta-1/serialization.md b/docs/fluo-recipes/1.0.0-beta-1/serialization.md
index 6720389..f27c778 100644
--- a/docs/fluo-recipes/1.0.0-beta-1/serialization.md
+++ b/docs/fluo-recipes/1.0.0-beta-1/serialization.md
@@ -73,6 +73,6 @@ how to do this.
 ```
 
 [1]: https://github.com/EsotericSoftware/kryo
-[2]: /apidocs/fluo-recipes/1.0.0-beta-1/io/fluo/recipes/serialization/SimpleSerializer.html
+[2]: {{ site.old_api_static }}/fluo-recipes-core/1.0.0-beta-1/io/fluo/recipes/serialization/SimpleSerializer.html
 [3]: https://github.com/EsotericSoftware/kryo#registration
 

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo-recipes/1.0.0-beta-1/transient.md
----------------------------------------------------------------------
diff --git a/docs/fluo-recipes/1.0.0-beta-1/transient.md b/docs/fluo-recipes/1.0.0-beta-1/transient.md
index c064669..86fbe37 100644
--- a/docs/fluo-recipes/1.0.0-beta-1/transient.md
+++ b/docs/fluo-recipes/1.0.0-beta-1/transient.md
@@ -64,5 +64,5 @@ If only `<interval>` is specied the command will loop forever calling
 `compactTransient()` sleeping `<interval>` seconds between calls.  If `<count>`
 is additionally specified then the command will only loop `<count>` times.
 
-[1]: /apidocs/fluo-recipes/1.0.0-beta-1/io/fluo/recipes/common/TransientRegistry.html
-[2]: /apidocs/fluo-recipes/1.0.0-beta-1/io/fluo/recipes/accumulo/ops/TableOperations.html
+[1]: {{ site.old_api_static }}/fluo-recipes-core/1.0.0-beta-1/io/fluo/recipes/common/TransientRegistry.html
+[2]: {{ site.old_api_static }}/fluo-recipes-accumulo/1.0.0-beta-1/io/fluo/recipes/accumulo/ops/TableOperations.html

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo-recipes/1.0.0-beta-2/accumulo-export.md
----------------------------------------------------------------------
diff --git a/docs/fluo-recipes/1.0.0-beta-2/accumulo-export.md b/docs/fluo-recipes/1.0.0-beta-2/accumulo-export.md
index d5b53b7..612de96 100644
--- a/docs/fluo-recipes/1.0.0-beta-2/accumulo-export.md
+++ b/docs/fluo-recipes/1.0.0-beta-2/accumulo-export.md
@@ -55,6 +55,6 @@ pattern of deleting old data and inserting new data, consider extending
 [DifferenceExport][3].
 
 [1]: /docs/fluo-recipes/1.0.0-beta-2/export-queue/
-[2]: /apidocs/fluo-recipes/1.0.0-beta-2/io/fluo/recipes/accumulo/export/AccumuloExport.html
-[3]: /apidocs/fluo-recipes/1.0.0-beta-2/io/fluo/recipes/accumulo/export/DifferenceExport.html
+[2]: {{ site.old_api_static }}/fluo-recipes-accumulo/1.0.0-beta-2/io/fluo/recipes/accumulo/export/AccumuloExport.html
+[3]: {{ site.old_api_static }}/fluo-recipes-accumulo/1.0.0-beta-2/io/fluo/recipes/accumulo/export/DifferenceExport.html
 

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo-recipes/1.0.0-beta-2/export-queue.md
----------------------------------------------------------------------
diff --git a/docs/fluo-recipes/1.0.0-beta-2/export-queue.md b/docs/fluo-recipes/1.0.0-beta-2/export-queue.md
index 6a9bf51..aa2ccb0 100644
--- a/docs/fluo-recipes/1.0.0-beta-2/export-queue.md
+++ b/docs/fluo-recipes/1.0.0-beta-2/export-queue.md
@@ -277,7 +277,7 @@ example of write skew mentioned in the Percolater paper.
  1. TH1 : tx1.set(`rowA`,`fam1:qual2`, val1)
  1. TH2 : tx2.set(`rowB`,`fam1:qual2`, val2)
 
-[1]: /apidocs/fluo-recipes/1.0.0-beta-2/io/fluo/recipes/export/Exporter.html
+[1]: {{ site.old_api_static }}/fluo-recipes-core/1.0.0-beta-2/io/fluo/recipes/export/Exporter.html
 [2]: https://en.wikipedia.org/wiki/Serializability
 [3]: /docs/fluo-recipes/1.0.0-beta-2/accumulo-export/
 

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo-recipes/1.0.0-beta-2/serialization.md
----------------------------------------------------------------------
diff --git a/docs/fluo-recipes/1.0.0-beta-2/serialization.md b/docs/fluo-recipes/1.0.0-beta-2/serialization.md
index 32e3354..abd2e88 100644
--- a/docs/fluo-recipes/1.0.0-beta-2/serialization.md
+++ b/docs/fluo-recipes/1.0.0-beta-2/serialization.md
@@ -72,6 +72,6 @@ how to do this.
 ```
 
 [1]: https://github.com/EsotericSoftware/kryo
-[2]: /apidocs/fluo-recipes/1.0.0-beta-2/io/fluo/recipes/serialization/SimpleSerializer.html
+[2]: {{ site.old_api_static }}/fluo-recipes-core/1.0.0-beta-2/io/fluo/recipes/serialization/SimpleSerializer.html
 [3]: https://github.com/EsotericSoftware/kryo#registration
 

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo-recipes/1.0.0-beta-2/testing.md
----------------------------------------------------------------------
diff --git a/docs/fluo-recipes/1.0.0-beta-2/testing.md b/docs/fluo-recipes/1.0.0-beta-2/testing.md
index b84bac0..e2462bd 100644
--- a/docs/fluo-recipes/1.0.0-beta-2/testing.md
+++ b/docs/fluo-recipes/1.0.0-beta-2/testing.md
@@ -10,5 +10,5 @@ code for writing an integration test.
  * [FluoITHelper][1] A class with utility methods for comparing expected data with whats
in Fluo.
  * [AccumuloExportITBase][2] A base class for writing an integration test that exports data
from Fluo to an external Accumulo table.
 
-[1]: /apidocs/fluo-recipes/1.0.0-beta-2/io/fluo/recipes/test/FluoITHelper.html
-[2]: /apidocs/fluo-recipes/1.0.0-beta-2/io/fluo/recipes/test/AccumuloExportITBase.html
+[1]: {{ site.old_api_static }}/fluo-recipes-test/1.0.0-beta-2/io/fluo/recipes/test/FluoITHelper.html
+[2]: {{ site.old_api_static }}/fluo-recipes-test/1.0.0-beta-2/io/fluo/recipes/test/AccumuloExportITBase.html

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo-recipes/1.0.0-beta-2/transient.md
----------------------------------------------------------------------
diff --git a/docs/fluo-recipes/1.0.0-beta-2/transient.md b/docs/fluo-recipes/1.0.0-beta-2/transient.md
index 4121697..4d978fc 100644
--- a/docs/fluo-recipes/1.0.0-beta-2/transient.md
+++ b/docs/fluo-recipes/1.0.0-beta-2/transient.md
@@ -63,5 +63,5 @@ If only `<interval>` is specied the command will loop forever calling
 `compactTransient()` sleeping `<interval>` seconds between calls.  If `<count>`
 is additionally specified then the command will only loop `<count>` times.
 
-[1]: /apidocs/fluo-recipes/1.0.0-beta-2/io/fluo/recipes/common/TransientRegistry.html
-[2]: /apidocs/fluo-recipes/1.0.0-beta-2/io/fluo/recipes/accumulo/ops/TableOperations.html
+[1]: {{ site.old_api_static }}/fluo-recipes-core/1.0.0-beta-2/io/fluo/recipes/common/TransientRegistry.html
+[2]: {{ site.old_api_static }}/fluo-recipes-accumulo/1.0.0-beta-2/io/fluo/recipes/accumulo/ops/TableOperations.html

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo/1.0.0-beta-1/applications.md
----------------------------------------------------------------------
diff --git a/docs/fluo/1.0.0-beta-1/applications.md b/docs/fluo/1.0.0-beta-1/applications.md
index 2f632a2..13106fa 100644
--- a/docs/fluo/1.0.0-beta-1/applications.md
+++ b/docs/fluo/1.0.0-beta-1/applications.md
@@ -140,10 +140,10 @@ shows that a transaction with a start timestamp of `106` and a class
name of
 ```
 
 [phrasecount]: https://github.com/fluo-io/phrasecount
-[FluoFactory]: /apidocs/fluo/1.0.0-beta-1/io/fluo/api/client/FluoFactory.html
-[FluoClient]: /apidocs/fluo/1.0.0-beta-1/io/fluo/api/client/FluoClient.html
-[FluoConfiguration]: /apidocs/fluo/1.0.0-beta-1/io/fluo/api/config/FluoConfiguration.html
-[AbstractObserver]: /apidocs/fluo/1.0.0-beta-1/io/fluo/api/observer/AbstractObserver.html
+[FluoFactory]: {{ site.old_api_static }}/fluo-api/1.0.0-beta-1/io/fluo/api/client/FluoFactory.html
+[FluoClient]: {{ site.old_api_static }}/fluo-api/1.0.0-beta-1/io/fluo/api/client/FluoClient.html
+[FluoConfiguration]: {{ site.old_api_static }}/fluo-api/1.0.0-beta-1/io/fluo/api/config/FluoConfiguration.html
+[AbstractObserver]: {{ site.old_api_static }}/fluo-api/1.0.0-beta-1/io/fluo/api/observer/AbstractObserver.html
 [fluo.properties]: https://github.com/fluo-io/fluo/blob/1.0.0-beta-1/modules/distribution/src/main/config/fluo.properties
-[API]: /apidocs/fluo/1.0.0-beta-1/
+[API]: {{ site.old_api_base }}/fluo-api/1.0.0-beta-1/
 [metrics]: /docs/fluo/1.0.0-beta-1/metrics/

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/fluo/1.0.0-beta-2/applications.md
----------------------------------------------------------------------
diff --git a/docs/fluo/1.0.0-beta-2/applications.md b/docs/fluo/1.0.0-beta-2/applications.md
index f1fd213..fa34aab 100644
--- a/docs/fluo/1.0.0-beta-2/applications.md
+++ b/docs/fluo/1.0.0-beta-2/applications.md
@@ -172,10 +172,10 @@ escaped using hex.  The convention used it `\xDD`  where D is a hex
digit. Also
 the `\` character is escaped to make the output unambiguous.
 
 [phrasecount]: https://github.com/fluo-io/phrasecount
-[FluoFactory]: /apidocs/fluo/1.0.0-beta-2/io/fluo/api/client/FluoFactory.html
-[FluoClient]: /apidocs/fluo/1.0.0-beta-2/io/fluo/api/client/FluoClient.html
-[FluoConfiguration]: /apidocs/fluo/1.0.0-beta-2/io/fluo/api/config/FluoConfiguration.html
-[AbstractObserver]: /apidocs/fluo/1.0.0-beta-2/io/fluo/api/observer/AbstractObserver.html
+[FluoFactory]: {{ site.old_api_static }}/fluo-api/1.0.0-beta-2/io/fluo/api/client/FluoFactory.html
+[FluoClient]: {{ site.old_api_static }}/fluo-api/1.0.0-beta-2/io/fluo/api/client/FluoClient.html
+[FluoConfiguration]: {{ site.old_api_static }}/fluo-api/1.0.0-beta-2/io/fluo/api/config/FluoConfiguration.html
+[AbstractObserver]: {{ site.old_api_static }}/fluo-api/1.0.0-beta-2/io/fluo/api/observer/AbstractObserver.html
 [fluo.properties]: https://github.com/fluo-io/fluo/blob/1.0.0-beta-2/modules/distribution/src/main/config/fluo.properties
-[API]: /apidocs/fluo/1.0.0-beta-2/
+[API]: {{ site.old_api_base }}/fluo-api/1.0.0-beta-2/
 [metrics]: /docs/fluo/1.0.0-beta-2/metrics/

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index 961d401..3c8e971 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -12,13 +12,13 @@ For a general overview of Fluo, take the [Fluo tour](/tour/).
 
 ### Apache Fluo documentation
 
-* [1.0.0-incubating][fluo-1.0] - September 27, 2016
+* [1.0.0-incubating][fluo-1.0] - October 14, 2016
 
 ### Apache Fluo Recipes documentation
 
 * The first release of Apache Fluo Recipes has not been made yet.
 
-Documentation for releases before joining Apache are available in the [Pre-ASF archive](archive).
+Documentation for releases before joining Apache have been [archived](archive).
 
 [Apache Fluo]: https://github.com/apache/fluo
 [Apache Fluo Recipes]: https://github.com/apache/fluo-recipes

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/pages/api-archive.md
----------------------------------------------------------------------
diff --git a/pages/api-archive.md b/pages/api-archive.md
new file mode 100644
index 0000000..90f3cdc
--- /dev/null
+++ b/pages/api-archive.md
@@ -0,0 +1,20 @@
+---
+layout: page
+title: Pre-ASF API Archive
+permalink: /api/archive/
+redirect_from:
+  - /apidocs/archive/
+---
+
+<div class="alert alert-danger" role="alert">Please note - This page links to Javadocs
for non-ASF releases of Fluo.  These releases were made before Apache Fluo became an ASF project
and are not endorsed by the ASF.</div>
+
+#### Fluo API documentation (before Apache)
+
+* <a href="{{ site.old_api_base }}/fluo-api/1.0.0-beta-2/" target="_blank">1.0.0-beta-2</a>
- January 12, 2016
+* <a href="{{ site.old_api_base }}/fluo-api/1.0.0-beta-1/" target="_blank">1.0.0-beta-1</a>
- June 9, 2015
+* <a href="{{ site.old_api_base }}/fluo-api/1.0.0-alpha-1/" target="_blank">1.0.0-alpha-1</a>
- October 2, 2014
+
+#### Fluo Recipes API documentation (before Apache)
+
+* **1.0.0-beta-2**: <a href="{{ site.old_api_base }}/fluo-recipes-core/1.0.0-beta-2/"
target="_blank">core</a>, <a href="{{ site.old_api_base }}/fluo-recipes-accumulo/1.0.0-beta-2/"
target="_blank">accumulo</a>, <a href="{{ site.old_api_base }}/fluo-recipes-kryo/1.0.0-beta-2/"
target="_blank">kryo</a>, <a href="{{ site.old_api_base }}/fluo-recipes-spark/1.0.0-beta-2/"
target="_blank">spark</a>, <a href="{{ site.old_api_base }}/fluo-recipes-test/1.0.0-beta-2/"
target="_blank">test</a> - March 19, 2016
+* **1.0.0-beta-1**: <a href="{{ site.old_api_base }}/fluo-recipes-core/1.0.0-beta-1/"
target="_blank">core</a>, <a href="{{ site.old_api_base }}/fluo-recipes-accumulo/1.0.0-beta-1/"
target="_blank">accumulo</a> - January 13, 2016

http://git-wip-us.apache.org/repos/asf/incubator-fluo-website/blob/22e3a3d4/pages/api.md
----------------------------------------------------------------------
diff --git a/pages/api.md b/pages/api.md
new file mode 100644
index 0000000..9b71392
--- /dev/null
+++ b/pages/api.md
@@ -0,0 +1,24 @@
+---
+layout: page
+title: API
+permalink: /api/
+redirect_from:
+  - /apidocs/
+  - /apidocs/fluo/
+  - /apidocs/fluo-recipes/
+---
+
+[Apache Fluo] and [Apache Fluo Recipes] have seperate API as they are different repositories
with their own release cycle.
+
+#### Apache Fluo API
+
+* <a href="{{ site.fluo_api_base }}/1.0.0-incubating/" target="_blank">1.0.0-incubating</a>
- October 14, 2016
+
+#### Apache Fluo Recipes API
+
+* The first release of Apache Fluo Recipes has not been made yet.
+
+API for releases before joining Apache have been [archived](/api/archive).
+
+[Apache Fluo]: https://github.com/apache/fluo
+[Apache Fluo Recipes]: https://github.com/apache/fluo-recipes



Mime
View raw message