zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject [10/10] zookeeper git commit: ZOOKEEPER-3184: Use the same method to generate website as documentation
Date Fri, 07 Dec 2018 11:00:16 GMT
ZOOKEEPER-3184: Use the same method to generate website as documentation

With this change we use the same method to generate the website as we do for the documentation.
This way we would get rid of Jekyll and would not need to install anything besides maven on the build machine(s).

Also replaced the page structure to be able to use BootStrap for CSS, where
I've got "strong inspiration" from the Apache HBase website.

Change-Id: I94f79298f9ce8f97510ee71c65f857eaa41d59ed

Author: Tamas Penzes <tamaas@cloudera.com>

Reviewers: fangmin@apache.org, andor@apache.org

Closes #692 from tamaashu/ZOOKEEPER-3184 and squashes the following commits:

22f3ed92e [Tamas Penzes] ZOOKEEPER-3184: Simplify CSS with automatically adding Bootstrap CSS classes to tables
33301bcec [Tamas Penzes] ZOOKEEPER-3184: Move .htaccess file to resources, add it to generated directory
6d6194066 [Tamas Penzes] ZOOKEEPER-3184: Resized header and footer (it now has the same width as the content) Updated README.md with step-by-step guide of site update.
cb5df4ebc [Tamas Penzes] ZOOKEEPER-3184: Removed typo and one duplicated link
e404109c5 [Tamas Penzes] ZOOKEEPER-3184: Remove not needed line from md files
01b80c4ff [Tamas Penzes] ZOOKEEPER-3184: Use the same method to generate website as documentation
cb07edb0c [Tamas Penzes] ZOOKEEPER-3184: Use the same method to generate website as documentation
71c8994e2 [Tamas Penzes] ZOOKEEPER-3184: Use the same method to generate website as documentation


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/a0fb79f8
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/a0fb79f8
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/a0fb79f8

Branch: refs/heads/website
Commit: a0fb79f811253eb0a6e4b603277ad7a67f4bd86a
Parents: ef9d41a
Author: Tamas Penzes <tamaas@cloudera.com>
Authored: Fri Dec 7 11:59:58 2018 +0100
Committer: Andor Molnar <andor@apache.org>
Committed: Fri Dec 7 11:59:58 2018 +0100

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 .htaccess                                       |    8 -
 LICENSE.md                                      |  200 +
 NOTICE.md                                       |   28 +
 README.md                                       |   60 +-
 _config.yml                                     |   11 -
 _includes/footer.html                           |    3 -
 _includes/header.html                           |    8 -
 _includes/search.html                           |    6 -
 _includes/sidenav.md                            |   25 -
 _layouts/page.html                              |   44 -
 bylaws.md                                       |  195 -
 credits.md                                      |   60 -
 css/site.css                                    |  269 -
 css/type-settings.css                           | 1221 ---
 documentation.md                                |   34 -
 git.md                                          |   12 -
 images/feather_small.gif                        |  Bin 7500 -> 0 bytes
 images/zookeeper_small.gif                      |  Bin 4847 -> 0 bytes
 index.md                                        |   28 -
 irc.md                                          |   11 -
 lists.md                                        |   43 -
 pom.xml                                         |   75 +
 privacy.md                                      |   21 -
 releases.md                                     |  210 -
 security.md                                     |  126 -
 src/main/resources/.htaccess                    |    8 +
 src/main/resources/markdown/bylaws.md           |  205 +
 src/main/resources/markdown/credits.md          |   73 +
 src/main/resources/markdown/css/bootstrap.css   | 9030 ++++++++++++++++++
 .../resources/markdown/css/bootstrap.min.css    |    7 +
 src/main/resources/markdown/css/print.css       |   23 +
 src/main/resources/markdown/css/site.css        |   86 +
 .../resources/markdown/css/type-settings.css    | 1221 +++
 src/main/resources/markdown/documentation.md    |   44 +
 src/main/resources/markdown/events.md           |   70 +
 src/main/resources/markdown/git.md              |   22 +
 src/main/resources/markdown/html/footer.html    |   17 +
 src/main/resources/markdown/html/header.html    |   81 +
 .../markdown/images/asf-logo-with-feather.png   |  Bin 0 -> 17673 bytes
 src/main/resources/markdown/images/favicon.ico  |  Bin 0 -> 1595 bytes
 .../resources/markdown/images/feather_small.gif |  Bin 0 -> 7500 bytes
 .../resources/markdown/images/maven-feather.png |  Bin 0 -> 3330 bytes
 .../markdown/images/powered-by-apache-logo.png  |  Bin 0 -> 20687 bytes
 .../markdown/images/zookeeper_small.gif         |  Bin 0 -> 4847 bytes
 src/main/resources/markdown/index.md            |   46 +
 src/main/resources/markdown/irc.md              |   22 +
 src/main/resources/markdown/js/bootstrap.js     | 3944 ++++++++
 src/main/resources/markdown/js/bootstrap.min.js |    7 +
 .../markdown/js/jquery-3.3.1.slim.min.js        |    2 +
 src/main/resources/markdown/js/popper.js        | 2528 +++++
 src/main/resources/markdown/js/popper.min.js    |    5 +
 src/main/resources/markdown/lists.md            |   53 +
 src/main/resources/markdown/privacy.md          |   38 +
 src/main/resources/markdown/releases.md         |  223 +
 src/main/resources/markdown/security.md         |  154 +
 56 files changed, 18244 insertions(+), 2364 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 45c1505..dec5af1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+target
 _site
 .sass-cache
 .jekyll-metadata

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/.htaccess
----------------------------------------------------------------------
diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index cd6152d..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-# .htaccess for ZooKeeper
-#
-# Old site had /docs while new site has /doc
-RedirectMatch Permanent ^/docs/(.+)$ /doc/$1
-# Old site had /mailing_lists.html while new site has /lists.html
-RedirectMatch Permanent ^/mailing_lists.html$ /lists.html
-# redirect bookkeeper site
-RedirectMatch Permanent ^/bookkeeper/(.+)$ http://bookkeeper.apache.org/$1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/LICENSE.md
----------------------------------------------------------------------
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..3955996
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,200 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+   
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/NOTICE.md
----------------------------------------------------------------------
diff --git a/NOTICE.md b/NOTICE.md
new file mode 100644
index 0000000..988c3d3
--- /dev/null
+++ b/NOTICE.md
@@ -0,0 +1,28 @@
+# Apache ZooKeeper
+Copyright 2009-2018 The Apache Software Foundation
+
+This product includes software developed at The Apache Software Foundation [http://www.apache.org/](http://www.apache.org/).
+
+---
+# Bootstrap
+This product includes portions of Bootstrap v4.1.3 [https://getbootstrap.com/](https://getbootstrap.com/)
+
+Copyright 2011-2018 The Bootstrap Authors [https://github.com/twbs/bootstrap/graphs/contributors](https://github.com/twbs/bootstrap/graphs/contributors)
+
+Licensed under MIT [https://github.com/twbs/bootstrap/blob/master/LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
+
+---
+# jQuery
+This product includes portions of jQuery v3.3.1 [https://jquery.org/](https://jquery.org/)
+
+(c) JS Foundation and other contributors [https://github.com/jquery/jquery/graphs/contributors](https://github.com/jquery/jquery/graphs/contributors)
+
+Licensed under MIT [https://jquery.org/license/](https://jquery.org/license/)
+
+---
+# Popper.js
+This product includes portions of Popper.js v1.14.3 [https://popper.js.org/](https://popper.js.org/)
+
+Copyright (c) 2016 Federico Zivolo and contributors [https://github.com/FezVrasta/popper.js/graphs/contributors](https://github.com/FezVrasta/popper.js/graphs/contributors)
+
+Licensed under MIT  [https://github.com/FezVrasta/popper.js/blob/master/LICENSE.md](https://github.com/FezVrasta/popper.js/blob/master/LICENSE.md)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8f0263f..90774d4 100644
--- a/README.md
+++ b/README.md
@@ -1,49 +1,51 @@
 ## Generating the static Apache ZooKeeper website
 
-In this directory you will find text files formatted using Markdown, with an `.md` suffix.
+In the `src/main/resources/markdown` directory you will find text files formatted using Markdown, with an `.md` suffix.
 
-Building the site requires [Jekyll](http://jekyllrb.com/docs) 3.6.2 or newer. 
-The easiest way to install jekyll is via a Ruby Gem. Jekyll will create a directory called `_site` 
-containing `index.html` as well as the rest of the compiled directories and files. _site should not
-be committed to git as this is the generated content.
-
-To install Jekyll and its required dependencies, execute `sudo gem install jekyll pygments.rb` 
-and `sudo pip install Pygments`. See the Jekyll installation page for more details.
+Building the site requires [Maven](http://maven.apache.org/) 3.5.0 or newer. 
+The easiest way to [install Maven](http://maven.apache.org/install.html) depends on your OS.
+The build process will create a directory called `target/html` containing `index.html` as well as the rest of the
+compiled directories and files. `target` should not be committed to git as it is generated content.
 
 You can generate the static ZooKeeper website by running:
 
-1. `jekyll build` in this directory.
-2. `cp -RP _released_docs _site/doc` - this will include the documentation (see "sub-dir" section below) in the generated site.
+1. `mvn clean install` in this directory.
+2. `cp -RP _released_docs target/html/doc` - this will include the documentation (see "sub-dir" section below) in the generated site.
 
-At this point the contents of _site are "staged" and can be reviewed prior to updating the ZooKeeper
+At this point the contents of `target` are "staged" and can be reviewed prior to updating the ZooKeeper
 production website.
 
-During development it may be useful to include the `--watch` flag when building to have jekyll recompile
-your files as you save changes. In addition to generating the site as HTML from the markdown files,
-jekyll can serve the site via a web server. To build the site and run a web server use the command
-`jekyll serve` which runs the web server on port 4000, then visit the site at http://localhost:4000.
-
-
 ## Docs sub-dir
 
-The product documentation is not generated as part of the website. They are built separately for each release 
+The product documentation creation is not part of the website generation process. They are built separately for each release 
 of ZooKeeper from the ZooKeeper source repository.
 
 Typically during a release the versioned documentation will be recreated and should be copied, and committed,
-under the "_released_docs" directory here.
+under the `_released_docs` directory here.
+
+## Steps to update the website
+1. `git clone -b website https://git-wip-us.apache.org/repos/asf/zookeeper.git`
+2. update the appropriate pages, typically a markdown file e.g. credits.md, etc...
+3.  `mvn clean install`
+4. `cp -RP _released_docs target/html/doc` These are the static release docs, not generated in this process.
 
+At this point verify that the generated files render properly (open target/html/index.html in a browser).
+If you are happy with the results move on to the next step, otherwise go to step 2 above.
 
-## Pygments
+5. `git status` should show modified files for the markdown that you changed
+6. `git add <the changed files>`
+7. `git commit -m "<appropriate commit message>"`
+8. `git push origin website`
 
-We also use [pygments](http://pygments.org) for syntax highlighting in documentation markdown pages.
+The source for the site is committed, now we need to push the generated files to the live site.
 
-To mark a block of code in your markdown to be syntax highlighted by `jekyll` during the 
-compile phase, use the following syntax:
+9. `git checkout asf-site`
+10. `rm -fr content`
+11. `mv target/html content`
+12. `git add content`
 
-    {% highlight java %}
-    // Your code goes here, you can replace java with many other
-    // supported languages too.
-    {% endhighlight %}
+Verify that content/index.html and other generated files are proper, e.g. open them in a browser
 
- You probably don't need to install that unless you want to regenerate the pygments CSS file. 
- It requires Python, and can be installed by running `sudo easy_install Pygments`.
+13. `git status` should show modified files for the markdown that you changed
+14. `git commit -m "<appropriate commit message>"`
+15. `git push origin asf-site`

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index cd71cf2..0000000
--- a/_config.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-title: Apache ZooKeeper
-url: "https://zookeeper.apache.org"
-
-highlighter: pygments
-markdown: kramdown
-kramdown:
-  entity_output: symbol
-permalink: none
-
-exclude:
-    - README.md

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/_includes/footer.html
----------------------------------------------------------------------
diff --git a/_includes/footer.html b/_includes/footer.html
deleted file mode 100644
index e140d3e..0000000
--- a/_includes/footer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="copyright_footer">
-<p>Copyright &copy; 2010-2017 The Apache Software Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache ZooKeeper, ZooKeeper, Apache, the Apache feather logo, and the Apache ZooKeeper project logo are trademarks of The Apache Software Foundation.</p>
-</div>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/_includes/header.html
----------------------------------------------------------------------
diff --git a/_includes/header.html b/_includes/header.html
deleted file mode 100644
index 00d8606..0000000
--- a/_includes/header.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<head>
-	<link href="css/site.css" rel="stylesheet" type="text/css">
-	<link href="css/type-settings.css" rel="stylesheet" type="text/css">
-
-	<title>Apache ZooKeeper - {{page.title}}</title>
-
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/_includes/search.html
----------------------------------------------------------------------
diff --git a/_includes/search.html b/_includes/search.html
deleted file mode 100644
index 369a520..0000000
--- a/_includes/search.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="searchbox"> 
-<form action="http://search-hadoop.com/zookeeper" method="get"> 
-<input onFocus="getBlank (this, 'Search with Apache Solr');" size="25" name="q" id="query" type="text" value="Search with Apache Solr">&nbsp;
-		  <input value="Search" type="submit"> 
-</form> 
-</div> 

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/_includes/sidenav.md
----------------------------------------------------------------------
diff --git a/_includes/sidenav.md b/_includes/sidenav.md
deleted file mode 100644
index 0cf18fd..0000000
--- a/_includes/sidenav.md
+++ /dev/null
@@ -1,25 +0,0 @@
-### Project
-
-* [News](releases.html#news)
-* [Releases](releases.html)
-* [Wiki](https://cwiki.apache.org/confluence/display/ZOOKEEPER/Index)
-* [Credits](credits.html)
-* [Bylaws](bylaws.html)
-* [License](https://www.apache.org/licenses/)
-* [Privacy Policy](privacy.html)
-* [Sponsorship](https://www.apache.org/foundation/sponsorship.html)
-* [Security](security.html)
-* [Thanks](https://www.apache.org/foundation/thanks.html)
-
-### Documentation
-
-* [Release 3.5.4-beta](doc/r3.5.4-beta)
-* [Release 3.4.13](doc/r3.4.13)
-* [Older Versions](documentation.html)
-
-### Developers
- 
-* [Mailing Lists](lists.html)
-* [IRC Channel](irc.html)
-* [Version Control](git.html)
-* [Issue Tracker](https://issues.apache.org/jira/browse/ZOOKEEPER)

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/_layouts/page.html
----------------------------------------------------------------------
diff --git a/_layouts/page.html b/_layouts/page.html
deleted file mode 100644
index 9aaf87f..0000000
--- a/_layouts/page.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  {% include header.html %}
-  <body>
-    <div class="white_box">
-      <div class="content">
-        <div class="content_l">
-          <div class="content_r">
-            <div>
-              <div id="header_background">
-	            <div id="zookeeper_logo">
-		          <a href="/"><img src="images/zookeeper_small.gif"/></a> <b><font size=+4 color=white>Apache ZooKeeper&trade;</font></b> <a href="https://apache.org"><img src="images/feather_small.gif"/></a>
-	            </div>
-              </div>
-              
-              <table border="0">
-                <tbody>
-                  <tr>
-                    <td style="overflow: hidden;" valign="top" width="100%">
-                      <div class="wiki-content">
-                        {{ content }}
-                      </div>
-                    </td>
-                    <td valign="top">
-                      <div class="navigation">
-                        <div class="navigation_top">
-                          {% include search.html %}
-                          <div class="navigation_bottom"> 
-                            {% capture my_include %}{% include sidenav.md %}{% endcapture %}
-                            {{ my_include | markdownify }}
-                          </div>
-                        </div>   
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-      </div>
-      {% include footer.html %}
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/bylaws.md
----------------------------------------------------------------------
diff --git a/bylaws.md b/bylaws.md
deleted file mode 100644
index 3487782..0000000
--- a/bylaws.md
+++ /dev/null
@@ -1,195 +0,0 @@
----
-layout: page
-title: Project Bylaws
----
-# Apache ZooKeeper Project Bylaws
-
-This is version 1 of the bylaws.
-
-# Introduction 
-
-This document defines the bylaws under which the Apache ZooKeeper 
-project operates. It defines the roles and responsibilities of the 
-project, who may vote, how voting works, how conflicts are resolved, etc. 
-
-ZooKeeper is a project of the [Apache Software Foundation](https://www.apache.org/foundation/) The foundation 
-holds the copyright on Apache code including the code in the ZooKeeper 
-codebase. The [foundation FAQ](https://www.apache.org/foundation/faq.html) explains the operation and background of 
-the foundation. 
-
-ZooKeeper is typical of Apache projects in that it operates under a set 
-of principles, known collectively as the Apache Way. If you are new to 
-Apache development, please refer to the [Incubator project](https://incubator.apache.org/) for more 
-information on how Apache projects operate. 
-
-# Roles and Responsibilities 
-
-Apache projects define a set of roles with associated rights and 
-responsibilities. These roles govern what tasks an individual may 
-perform within the project. The roles are defined in the following sections. 
-
-## Users 
-
-The most important participants in the project are people who use our 
-software. The majority of our contributors start out as users and guide 
-their development efforts from the user's perspective. 
-
-Users contribute to the Apache projects by providing feedback to 
-contributors in the form of bug reports and feature suggestions. As 
-well, users participate in the Apache community by helping other users 
-on mailing lists and user support forums. 
-
-## Contributors 
-
-All of the volunteers who are contributing time, code, documentation, or 
-resources to the ZooKeeper Project. A contributor that makes sustained, 
-welcome contributions to the project may be invited to become a 
-committer, though the exact timing of such invitations depends on many 
-factors. 
-
-## Committers 
-
-The project's committers are responsible for the project's technical 
-management. Committers have access to a specified set of subproject's 
-repositories. Committers on subprojects may cast binding 
-votes on any technical discussion regarding that subproject. 
-
-Committer access is by invitation only and must be approved by lazy 
-consensus of the active PMC members. A Committer is considered emeritus 
-by his or her own declaration or by not reviewing patches or commiting 
-patches to the project for over six months. An emeritus committer may 
-request reinstatement of commit access from the PMC which must be 
-approved by lazy consensus of the active PMC members. 
-
-Commit access can be revoked by a unanimous vote of all the active PMC 
-members (except the committer in question if he or she is also a PMC 
-member). 
-
-All Apache committers are required to have a signed [Contributor License Agreement (CLA)](https://www.apache.org/licenses/icla.txt)
- on file with the Apache Software Foundation. There is a 
-[Committer FAQ](https://www.apache.org/dev/committers.html) which provides more details on the requirements for 
-committers. 
-
-A committer who makes a sustained contribution to the project may be 
-invited to become a member of the PMC. The form of contribution is not 
-limited to code. It can also include code review, helping out users on 
-the mailing lists, documentation, etc. 
-
-## Project Management Committee 
-
-The PMC is responsible to the board and the ASF for the management and 
-oversight of the Apache ZooKeeper codebase. The responsibilities of the 
-PMC include: 
-
-* Deciding what is distributed as products of the Apache ZooKeeper 
-project. In particular all releases must be approved by the PMC. 
-* Maintaining the project's shared resources, including the codebase 
-repository, mailing lists, websites. 
-* Speaking on behalf of the project. 
-* Resolving license disputes regarding products of the project. 
-* Nominating new PMC members and committers. 
-* Maintaining these bylaws and other guidelines of the project. 
-* Membership of the PMC is by invitation only and must be approved by a 
-lazy consensus of active PMC members. A PMC member is considered 
-emeritus by his or her own declaration or by not contributing in any 
-form to the project for over six months. An emeritus member may request 
-reinstatement to the PMC, which must be approved by a lazy consensus of 
-active PMC members. 
-
-Membership of the PMC can be revoked by an unanimous vote of all the 
-active PMC members other than the member in question. 
-
-The chair of the PMC is appointed by the ASF board. The chair is an 
-office holder of the Apache Software Foundation (Vice President, Apache 
-ZooKeeper) and has primary responsibility to the board for the 
-management of the projects within the scope of the ZooKeeper PMC. The 
-chair reports to the board quarterly on developments within the 
-ZooKeeper project. 
-
-When the current chair of the PMC resigns, the PMC votes to recommend a 
-new chair using lazy consensus, but the decision must be ratified by the 
-Apache board. 
-
-# Decision Making 
-
-Within the ZooKeeper project, different types of decisions require 
-different forms of approval. For example, the previous section describes 
-several decisions which require 'lazy consensus' approval. This section 
-defines how voting is performed, the types of approvals, and which types 
-of decision require which type of approval. 
-
-## Voting 
-
-Decisions regarding the project are made by votes on the primary project 
-development mailing list dev@zookeeper.apache.org. Where necessary, PMC 
-voting may take place on the private ZooKeeper PMC mailing list 
-private@zookeeper.apache.org. Votes are clearly indicated by subject 
-line starting with [VOTE]. Votes may contain multiple items for approval 
-and these should be clearly separated. Voting is carried out by replying 
-to the vote mail. Voting may take four flavors. 
-
-|Vote|Meaning|
-|----|-------|
-| +1 |'Yes,' 'Agree,' or 'the action should be performed.' In general, this vote also indicates a willingness on the behalf of the voter in 'making it happen'.| 
-| +0 |This vote indicates a willingness for the action under consideration to go ahead. The voter, however will not be able to help.| 
-| -0 |This vote indicates that the voter does not, in general, agree with the proposed action but is not concerned enough to prevent the action going ahead.| 
-| -1 |This is a negative vote. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action.|
-
-All participants in the ZooKeeper project are encouraged to show their 
-agreement with or against a particular action by voting. For technical 
-decisions, only the votes of active committers are binding. Non binding 
-votes are still useful for those with binding votes to understand the 
-perception of an action in the wider ZooKeeper community. For PMC 
-decisions, only the votes of PMC members are binding. 
-
-Voting can also be applied to changes already made to the ZooKeeper 
-codebase. These typically take the form of a veto (-1) in reply to the 
-commit message sent when the commit is made. Note that this should be a 
-rare occurrence. All efforts should be made to discuss issues when they 
-are still patches before the code is committed. 
-
-## Approvals 
-
-There are the types of approvals that can be sought. Different actions 
-require different types of approvals. 
-
-|Approval Type|Definition|
-|-------------|----------|
-|Consensus |For this to pass, all voters with binding votes must vote and there can be no binding vetoes (-1). Consensus votes are rarely required due to the impracticality of getting all eligible voters to cast a vote.| 
-|Lazy Consensus |Lazy consensus requires 3 binding +1 votes and no binding vetoes.| 
-|Lazy Majority |A lazy majority vote requires 3 binding +1 votes and more binding +1 votes that -1 votes.| 
-|Lazy Approval |An action with lazy approval is implicitly allowed unless a -1 vote is received, at which time, depending on the type of action, either lazy majority or lazy consensus approval must be obtained.| 
-|2/3 Majority |Some actions require a 2/3 majority of active committers or PMC members to pass. Such actions typically affect the foundation of the project (e.g. adopting a new codebase to replace an existing product). The higher threshold is designed to ensure such changes are strongly supported. To pass this vote requires at least 2/3 of binding vote holders to vote +1.| 
-
-## Vetoes 
-
-A valid, binding veto cannot be overruled. If a veto is cast, it must
-be accompanied by a valid reason explaining the reasons for the
-veto. The validity of a veto, if challenged, can be confirmed by
-anyone who has a binding vote. This does not necessarily signify
-agreement with the veto - merely that the veto is valid.
-
-If you disagree with a valid veto, you must lobby the person casting the 
-veto to withdraw his or her veto. If a veto is not withdrawn, the action 
-that has been vetoed must be reversed in a timely manner. 
-
-## Actions 
-
-This section describes the various actions which are undertaken within 
-the project, the corresponding approval required for that action and 
-those who have binding votes over the action. It also specifies the 
-minimum length of time that a vote must remain open, measured in 
-business days. In general votes should not be called at times when it is 
-known that interested members of the project will be unavailable. 
-
-|Action|Description|Approval|Binding Votes|Minimum Length (days)|
-|------|-----------|--------|-------------|---------------------|
-|Code Change |A change made to a codebase of the project and committed by a committer. This includes source code, documentation, website content, etc. |Lazy approval (not counting the vote of the contributor), moving to lazy majority if a -1 is received |Active committers |1|
-|Release Plan |Defines the timetable and actions for a release. The plan also nominates a Release Manager. |Lazy majority |Active committers |3| 
-|Product Release |When a release of one of the project's products is ready, a vote is required to accept the release as an official release of the project. |Lazy Majority |Active PMC members |3| 
-|Adoption of New Codebase |When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects within the project. |2/3 majority |Active PMC members| 6| 
-|New Committer or reinstatement |When a new committer is proposed for the project. |Lazy consensus |Active PMC members |3| 
-|New PMC Member or reinstatement |When a committer is proposed for the PMC. |Lazy consensus |Active PMC members |3| 
-|Committer Removal |When removal of commit privileges is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. |Consensus |Active PMC members (excluding the committer in question if a member of the PMC). |6| 
-|PMC Member Removal |When removal of a PMC member is sought. Note: Such actions will also be referred to the ASF board by the PMC chair. |Consensus |Active PMC members (excluding the member in question). |6| 
-|Modifying Bylaws |Modifying this document. |2/3 majority |Active PMC members |6|

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/credits.md
----------------------------------------------------------------------
diff --git a/credits.md b/credits.md
deleted file mode 100644
index 7d8250e..0000000
--- a/credits.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-layout: page
-title: Credits
----
-# ZooKeeper Credits
-
-* [PMC Members](#pmc)
-* [Committers](#committers)
-* [Contributors](#contributors)
-
-## PMC Members
-
-ZooKeeper's active PMC members are
-
-|username|name|organization|timezone|
-|--------|----|------------|--------|
-|tdunning|Ted Dunning|MapR Technologies|-8|
-|camille|Camille Fournier|RentTheRunway|-5|
-|phunt|Patrick Hunt|Cloudera Inc.|-8|
-|fpj|Flavio Junqueira|Confluent|+0|
-|ivank|Ivan Kelly|Midokura|+2|
-|mahadev|Mahadev Konar|Hortonworks Inc.|-8|
-|michim|Michi Mutsuzaki|Nicira|-8|
-|cnauroth|Chris Nauroth|Hortonworks Inc.|-8| 
-|breed|Benjamin Reed|Facebook|-8|
-|henry|Henry Robinson|Cloudera Inc.|-8|
-|rgs|Raul Gutierrez Segales|Pinterest|-8|
-|rakeshr|Rakesh Radhakrishnan|Intel|+5:30|
-|hanm|Michael Han|Twitter|-8|
-
-## Committers
-
-ZooKeeper's active committers are
-
-|username|name|organization|timezone|
-|--------|----|------------|--------|
-|camille|Camille Fournier|RentTheRunway|-5|
-|phunt|Patrick Hunt|Cloudera Inc.|0|
-|fpj|Flavio Junqueira|Confluent|+1|
-|cnauroth|Chris Nauroth|Hortonworks Inc.|-8|
-|mahadev|Mahadev Konar|Hortonworks Inc.|-8|
-|gkesavan|Giridharan Kesavan|Hortonworks Inc.|-8|
-|akornev|Andrew Kornev|||
-|michim|Michi Mutsuzaki|Nicira|-8|
-|breed|Benjamin Reed|Facebook|-8|
-|henry|Henry Robinson|Cloudera Inc.|-8|
-|shralex|Alex Shraer|Apple|-8|
-|thawan|Thawan Kooburat|Facebook|-8|
-|rakeshr|Rakesh Radhakrishnan|Intel|+5:30|
-|hdeng|Hongchao Deng|CoreOS|-8|
-|rgs|Raul Gutierrez Segales|Pinterest|-8|
-|hanm|Michael Han|Twitter|-8|
-|arshad|Mohammad Arshad|Huawei|+5:30|
-|afine|Abraham Fine|IFTTT|-8|
-|andor|Andor Molnar|Cloudera Inc.|+2|
-|fangmin|Fangmin Lyu|Facebook|-8|
-
-## Contributors
-
-A list of ZooKeeper contributors and their contributions is available from [Jira](https://issues.apache.org/jira/browse/ZooKeeper)

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/css/site.css
----------------------------------------------------------------------
diff --git a/css/site.css b/css/site.css
deleted file mode 100644
index 2381388..0000000
--- a/css/site.css
+++ /dev/null
@@ -1,269 +0,0 @@
-body {
-    padding: 20px;
-}
-
-div.wiki-content thead
-{
-    background-color:#F0F0F0;
-}
-
-#div.wiki-content p { margin: inherit  ; }
-
-div.wiki-content table {
-    border-collapse: collapse;
-    border:1px solid #CCCCCC;
-}
-
-div.wiki-content th {
-    border:1px solid #CCCCCC;
-    padding: 0.5em ;
-}
-
-div.wiki-content td {
-    border:1px solid #CCCCCC;
-    padding: 0.5em ;
-}
-
-.wiki-content a {
-  font-weight:bold;
-}
-
-.wiki-content a:hover {
-  text-decoration:underline;
-}
-
-div.copyright_footer {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 10px;
-  text-align:center;
-  color: #a0a0a0;
-}
-
-/* ====================================================== */
-/*  Rounded Box Styles */
-/* ====================================================== */
-//div.white_box div.header   {background: transparent url("../images/white-header-top.png") repeat-x 0pt;}
-//div.white_box div.header_l {background: transparent url("../images/white-header-left.png") no-repeat 0pt;}
-//div.white_box div.header_r {background: transparent url("../images/white-header-right.png") no-repeat 100% 0pt;}
-div.white_box div.header_r {height: 18px;}
-
-div.white_box div.content   {background: #ffffff; } 
-//div.white_box div.content_l {background: transparent url("../images/content-left.png") repeat-y 0pt;}
-//div.white_box div.content_r {background: transparent url("../images/content-right.png") repeat-y 100% 0pt;}
-div.white_box div.content_r {padding-left: 6px; padding-right: 9px;}
-
-//div.white_box div.footer {background: transparent url("../images/white-footer-bottom.png") repeat-x 0pt;}
-//div.white_box div.footer_l {background: transparent url("../images/white-footer-left.png") no-repeat 0pt;}
-//div.white_box div.footer_r {background: transparent url("../images/white-footer-right.png") no-repeat 100% 0pt;}
-div.white_box div.footer_r {color: #ffffff; height:37px; padding:0px;}
-div.white_box div.footer_r {padding-left: 6px;padding-right: 9px;}
-
-//div.black_box div.footer {background: transparent url("../images/black-footer-bottom.png") repeat-x 0pt;}
-//div.black_box div.footer_l {background: transparent url("../images/black-footer-left.png") no-repeat 0pt;}
-//div.black_box div.footer_r {background: transparent url("../images/black-footer-right.png") no-repeat right bottom;}
-div.black_box div.footer_r {color: #ffffff; height:37; padding:0px;}
-div.black_box div.footer_r {padding-left: 6px;padding-right: 9px;}
-
-/* ====================================================== */
-/*  Logo Positioning */
-/* ====================================================== */
-div#header_background{background: #294563; }
-
-/* ====================================================== */
-/*  Top and Bottom Bar Styling */
-/* ====================================================== */
-div.top_red_bar {
-//  background: transparent url("../images/top-red-bar.png") repeat 0pt; 
-  background: transparent repeat 0pt; 
-  overflow: hidden;
-}
-div.bottom_red_bar {
-//  background: transparent url("../images/bottom-red-bar.png") repeat 0pt; height: 11px;
-  background: transparent repeat 0pt; height: 11px;
-  overflow: hidden;
-}
-
-
-div#searchbox {
-    right: 10px;
-    height: 42px;
-    font-size: 70%;
-    white-space: nowrap;
-    text-align: right;
-    color: white;
-    z-index:0;
-//    background-image: url(images/rc-t-l-5-1header-2searchbox-3searchbox.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-    bottom: -1px; /* compensate for IE rendering issue */
-}
-
-div#searchbox form {
-    padding: 5px 10px;
-    margin: 0;
-}
-div#searchbox p {
-    padding: 0 0 2px 0;
-    margin: 0;
-}
-div#searchbox input {
-    font-size: 100%;
-}
-
-div#site-breadcrumbs {
-  margin: 0px;
-  padding: 0px;
-  float:left;
-  padding: 2px;
-  padding-left: 20px;
-}
-div#site-quicklinks {
-  margin: 0px;
-  padding: 2px;
-  padding-right: 20px;
-}
-div#site-quicklinks p {
-  text-align: right;
-  padding: 0px; 
-  margin: 0px;
-}
-
-div#site-quicklinks, div#site-breadcrumbs, div#site-quicklinks p, div#site-breadcrumbs p,
-div#site-quicklinks a:link, div#site-quicklinks a:visited,
-div#site-breadcrumbs a:link, div#site-breadcrumbs a:visited {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 11px;
-  font-weight: bold;	
-  line-height: 16px;
-  color: #ffffff;
-  text-decoration: none;
-}
-div#site-quicklinks a:active, div#site-quicklinks a:hover,
-div#site-breadcrumbs a:active, div#site-breadcrumbs a:hover {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 11px;
-  font-weight: bold;	
-  line-height: 13px;
-  color: #c0c0c0;
-  text-decoration: underline;
-}
-div#site-quicklinks sup img {
-  height: 0px;
-  width: 0px;
-}
-
-/* ====================================================== */
-/*  Navigation Styling */
-/* ====================================================== */
-div.navigation {background: #ffffff repeat-y left 0pt; width:200px;}
-div.navigation_top {background: transparent no-repeat left top;} 
-div.navigation_bottom {background: transparent no-repeat left bottom;}
-div.navigation_bottom {padding-left: 5px;padding-right:11px; padding-top:17px; padding-bottom:17px;}
-
-/* div.navigation {float:right;} */
-div.navigation_bottom ol, 
-div.navigation_bottom ul, 
-div.navigation_bottom {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 11px;
-  font-weight: bold;	
-  line-height: 13px;
-  text-align: left;
-  padding-left: 11px;
-}
-
-div.navigation {
-  text-align: left;
-  clear: left;
-}
-
-div.navigation li {
-	list-style-type: square ;
-}
-
-div.navigation h3, 
-div.navigation h3 a:link, div.navigation h3 a:visited, div.navigation h3 a:active, div.navigation h3 a:hover { 
-  font-family: Verdana, arial, sans-serif;
-  font-size: 11px;
-  font-weight: bold;	
-  line-height: 120%;
-
-  border: none;
-  font-size: 15px; 
-  text-decoration: none;
-  color: #660033;
-  margin:5px;
-}
-
-Xdiv.navigation Xh3 {
-  background: no-repeat 0pt;
-  background-position:left center;
-  margin-left:15px;
-  padding-left: 20px;
-}
-
-div.navigation a:link, div.navigation a:visited, div.navigation a:active, div.navigation a:hover {
-  text-decoration: none;
-  color: #000000;
-}
-div.navigation a:active, div.navigation a:hover {
-  text-decoration: underline;
-  color: #880055;
-}
-
-div.navigation ul {
-  padding-left: 25px;
-  list-style: none; 
-  padding-bottom: 10px;
-  border-bottom:1px solid #CACACA;
-  margin: 0px;
-  margin-left: 10px;
-  margin-bottom: 10px;
-}
-
-div.navigation_bottom div { 
-  margin-left:10px;
-  padding-left:25px;
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-  border-bottom:1px solid #CACACA;
-}
-
-div.navigation img {
-  margin-left:15px;
-  padding-left: 20px;
-}
-
-div.navigation sup img { height: 0px; width: 0px; }
-
-/* ====================================================== */
-/*  Footer Styling */
-/* ====================================================== */
-div.black_box div.footer_r div {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 10px;
-  font-weight: normal;	
-  line-height: normal;
-  padding:5px;
-  padding-left:20px;
-}
-
-div.design_attribution, div.design_attribution a {
-  font-family: Verdana, arial, sans-serif;
-  font-size: 10px;
-  text-align:center;
-  color: #a0a0a0;
-}
-
-/* ====================================================== */
-/*  Rounded Box Styling  */
-/* ====================================================== */
-
-div.warning {
-  /*
-  font-family: Verdana, arial, sans-serif;
-  */
-  background: #FFCCCC; 
-  margin-right:20px;
-} 
-

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/css/type-settings.css
----------------------------------------------------------------------
diff --git a/css/type-settings.css b/css/type-settings.css
deleted file mode 100644
index f090ddb..0000000
--- a/css/type-settings.css
+++ /dev/null
@@ -1,1221 +0,0 @@
-/*********************************************************************
- CSS Elements that are part of the confluence rendered xhtml
- *********************************************************************/
-
-body, p, ul, ol, .bodytext, .stepfield  {
-	font-family: verdana,arial,helvetica,sans-serif;
-	font-size: 14px;
-	font-size-adjust: none;
-	font-style: normal;
-	font-font-variant: normal;
-	font-weight: normal;
-	line-height: 140% 
-	color: #000000;
-}
-
-ul, ol {
-	font-size: 12px;
-}
-td, table, tr {
-	font-family: verdana,arial,helvetica,sans-serif;
-	font-size: 10px;
-	font-size-adjust: none;
-	font-style: normal;
-	font-font-variant: normal;
-	font-weight: normal;
-	line-height: normal;
-	color: #000000;
-}
-
-table.sectionMacro td, table.sectionMacro td p {
-   font-size: 14px;
-   line-height: 150%;
-}
-
-.wiki-content {
-   padding: 10px;
-   padding-left: 45px;
-   line-height: 200%;
-}
-
-.monospaceInput {
-    font:12px monospace
-}
-
-.wiki-content pX, .commentblock p {
-    margin: 0px;
-    margin-top: 10px;
-    padding: 0px;
-}
-
-.wiki-content-preview {
-    padding: 5px;
-    border-left: 1px solid #3c78b5;
-    border-right: 1px solid #3c78b5;
-}
-
-a sup img {
-  width:0px;
-  height:0px;
-}
-
-A:link, A:visited, A:active, A:hover {
-   color: #880055;
-   text-decoration: none;
-}
-
-A:active, A:hover {
-   text-decoration: underline;
-   color: #202020;
-}
-
-ul, ol {
-    margin-left: 15px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    padding: 0px;
-}
-
-ul li {
-//list-style-image: url("../images/small-bullet-red.png");
-}
-ul li ul li{
-//list-style-image: url("../images/small-bullet-gray.png");
-}
-
-pre {
-    padding: 0px;
-    margin-top: 5px;
-    margin-left: 15px;
-    margin-bottom: 5px;
-    margin-right: 5px;
-    text-align: left;
-}
-
-.helpheading {
-    font-weight: bold;
-    background-color: #D0D9BD;
-        border-bottom: 1px solid #3c78b5;
-        padding: 4px 4px 4px 4px;
-        margin: 0px;
-        margin-top: 10px;
-}
-.helpcontent {
-        padding: 4px 4px 20px 4px;
-    background-color: #f5f7f1;
-}
-
-.code {
- 	border: 1px dashed #3c78b5;
-    font-size: 11px;
-	font-family: Courier;
-    margin: 10px;
-    margin-left: 0px;
-    line-height: 13px;
-}
-
-.focusedComment {
-    background: #ffffce;
-}
-
-.commentBox, .focusedComment {
-    padding: 10px;
-    margin: 5px 0 5px 0;
-    border: 1px #bbb solid;
-}
-
-.codeHeader {
-    background-color: #f0f0f0;
- 	border-bottom: 1px dashed #3c78b5;
-    padding: 3px;
-	text-align: center;
-}
-
-.codeContent {
-    text-align: left;
-    background-color: #f0f0f0;
-    padding: 3px;
-}
-
-.preformatted {
- 	border: 1px dashed #3c78b5;
-    font-size: 11px;
-	font-family: Courier;
-    margin: 10px;
-	line-height: 13px;
-}
-
-.preformattedHeader {
-    background-color: #f0f0f0;
- 	border-bottom: 1px dashed #3c78b5;
-    padding: 3px;
-	text-align: center;
-}
-
-.preformattedContent {
-    background-color: #f0f0f0;
-    padding: 3px;
-}
-
-.panel {
- 	border: 1px dashed #3c78b5;
-    margin: 10px;
-    margin-top: 0px;
-}
-
-.panelHeader {
-    background-color: #f0f0f0;
- 	border-bottom: 1px dashed #3c78b5;
-    padding: 3px;
-	text-align: center;
-}
-
-.panelContent {
-    background-color: #f0f0f0;
-    padding: 5px;
-}
-
-.anonymousAlert {
-    background-color: #f0f0f0;
- 	border: 1px dashed red;
-    font-size: 11px;
-    padding: 10px 5px 10px 5px;
-    margin: 4px;
-	line-height: 13px;
-}
-
-.lockAlert {
-    background-color: #f0f0f0;
-    width: 50%;
- 	border: 1px dashed red;
-    font-size: 11px;
-    padding: 10px 5px 10px 5px;
-    margin: 4px;
-	line-height: 13px;
-}
-
-
-.code-keyword {
-  color: #000091;
-  background-color: inherit;
-}
-
-.code-object {
-  color: #910091;
-  background-color: inherit;
-}
-
-.code-quote {
-  color: #009100;
-  background-color: inherit;
-}
-
-.code-comment {
-  color: #808080;
-  background-color: inherit;
-}
-
-
-.code-xml .code-keyword {
-  color: inherit;
-  font-weight: bold;
-}
-
-.code-tag {
-  color: #000091;
-  background-color: inherit;
-}
-
-.breadcrumbs {
-    background-color: #f0f0f0;
- 	border-color: #3c78b5;
-	border-width: 1px 0px 1px 0px;
-	border-style: solid;
-    font-size: 11px;
-    padding: 3px 0px 3px 0px;
-}
-
-.navmenu {
-    border: 1px solid #ccc;
-}
-
-.menuheading {
-    font-weight: bold;
-    background-color: #f0f0f0;
- 	border-bottom: 1px solid #3c78b5;
-	padding: 4px 4px 2px 4px;
-}
-
-.menuitems {
-	padding: 4px 4px 20px 4px;
-}
-
-.rightpanel {
-    border-left: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-}
-
-#helpheading {
-    text-align: left;
-    font-weight: bold;
-    background-color: #D0D9BD;
- 	border-bottom: 1px solid #3c78b5;
-	padding: 4px 4px 4px 4px;
-	margin: 0px;
-}
-#helpcontent {
-	padding: 4px 4px 4px 4px;
-    background-color: #f5f7f1;
-}
-.helptab-unselected {
-    font-weight: bold;
-	padding: 5px;
-    background-color: #f5f7f1;
-}
-.helptab-selected {
-    font-weight: bold;
-    background-color: #D0D9BD;
-	padding: 5px;
-}
-.helptabs {
-    margin: 0px;
-    background-color: #f5f7f1;
-	padding: 5px;
-}
-.infopanel-heading {
-    font-weight: bold;
-	padding: 4px 0px 2px 0px;
-}
-
-.pagebody {
-}
-
-.pageheader {
-	padding: 5px 5px 5px 0px;
- 	border-bottom: 1px solid #3c78b5;
-}
-
-.steptitle {
-	font-size: 18px;
-	font-weight: bold;
-	font-family: Arial, sans-serif;
-	color: #660033;
-	margin-bottom: 7px;
-}
-
-.substeptitle {
-    font-size: 12px;
-    font-weight: bold;
-    font-family: Arial, sans-serif;
-    color: #660033;
-    margin: 2px 4px 4px 4px;
-    padding: 2px 4px 1px 4px;
-}
-
-.stepdesc {
-    font-family: Verdana, arial, sans-serif;
-	font-size: 11px;
-	line-height: 16px;
-	font-weight: normal;
-    color: #666666;
-    margin-top: 7px;
-    margin-bottom: 7px;
-}
-
-.steplabel {
-    font-weight: bold;
-    margin-right: 4px;
-    color: black;
-    float: left;
-    width: 15%;
-    text-align: right;
-}
-
-.stepfield {
-    background: #f0f0f0;
-    padding: 5px;
-}
-
-.submitButtons{
-    margin-top:5px;
-    text-align:right;
-}
-
-.formtitle {
-	font-size: 12px;
-	font-weight: bold;
-	font-family: Arial, sans-serif;
-	color: #660033;
-}
-
-.sectionbottom {
-    border-bottom: 1px solid #3c78b5;
-}
-
-.topRow {
-    border-top: 2px solid #3c78b5;
-}
-
-.tabletitle {
-	font-size: 14px;
-	font-weight: bold;
-	font-family: Arial, sans-serif;
-    padding: 3px 0px 2px 0px;
-    margin: 8px 4px 2px 0px;
-	color: #660033;
-	border-bottom: 2px solid #3c78b5;
-}
-.pagesubheading {
-    color: #666666;
-    font-size: 10px;
-    padding: 0px 0px 5px 0px;
-}
-
-HR {
-	color: 3c78b5;
-	height: 1;
-}
-
-
-h1 A:link, h1 A:visited, h1 A:active {
-	text-decoration: none;
-}
-
-h1 A:hover {
-    border-bottom: 1px dotted #660033;
-}
-
-.wiki-content > :first-child, .commentblock > :first-child {
-    margin-top: 3px;
-}
-
-.logocell {
-    padding: 10px;
-}
-
-input {
-	font-family: verdana, geneva, arial, sans-serif;
-	font-size: 11px;
-	color: #000000;
-}
-
-textarea, textarea.editor {
-	font-family: verdana, geneva, arial, sans-serif;
-	font-size: 11px;
-	color: #333333;
-}
-
-.spacenametitle-printable {
-	font: 20px/25px Impact, Arial, Helvetica;
-    font-weight: 100;
-    color: #999999;
-	margin: 0px;
-}
-.spacenametitle-printable a {
-    text-decoration: none;
-    color: #999999;
-}
-.spacenametitle-printable a:visited {
-    text-decoration: none;
-    color: #999999;
-}
-
-.blogDate {
-	font-weight: bold;
-	text-decoration: none;
-	color: black;
-}
-
-div.blogpost {
-   margin-left: 0px;
-}
-
-div.blogpost div.wiki-content {
-   margin: 0px;
-   padding: 0px;
-}
-
-.blogSurtitle {
-   float: right;
-   background: transparent;
-   margin: 1px 10px 10px 1px;
-}
-
-.blogHeading {
-   background: #f0f0f0;
-   padding: 3px;
-   margin: 1px 1px 10px 1px;
-   border: 1px solid #ddd;
-   
-    font-size: 15px;
-    line-height: normal;
-    font-weight: bold;
-}
-
-.blogHeading a {
-   text-decoration: none;
-   color: black;
-}
-
-.endsection {
-	text-align: right;
-	color: #666666;
-	margin-top: 10px;
-	margin-bottom: 10px;
-	font-size: 10px;
-}
-.endsectionleftnav {
-	align: right;
-	color: #666666;
-	margin-top: 10px;
-}
-
-h1, h2, h3, h4, h5, h6  {
-  font-family: Georgia,'Times New Roman',serif;
-  line-height: normal;
-  font-weight: bold;
-}
-
-h1 {
-  border-bottom: 1px solid #808080;
-  padding: 2px;
-  margin: 36px 0px 4px -25px;
-  font-size: 20px;
-}
-
-h2 {
-  border-bottom: 1px solid #a0a0a0;
-  padding: 2px;
-  margin: 27px 0px 4px -20px;
-  font-size: 18px;
-}
-
-h3 {
-  border-bottom: 1px solid #c0c0c0;
-  padding: 2px;
-  margin: 21px 0px 4px -15px;
-  font-size: 16px;
-}
-
-h4 {
-  border-bottom: 1px solid #c0c0c0;
-  padding: 2px;
-  margin: 18px 0px 4px -10px;
-  font-size: 15px;
-}
-
-h4.search {
-  font-size: 12px;
-  line-height: normal;
-  font-weight: normal;
-  background-color: #f0f0f0;
-  padding: 4px;
-  margin: 18px 0px 4px 0px;
-}
-
-h5 {
-  padding: 2px;
-  margin: 14px 0px 4px -5px;
-  font-size: 14px;
-}
-
-h6 {
-  padding: 2px;
-  margin: 14px 0px 4px -5px;
-  font-size: 13px;
-}
-
-.smallfont {
-    font-size: 10px;
-}
-.descfont {
-    font-size: 10px;
-    color: #666666;
-}
-.smallerfont {
-    font-size: 9px;
-}
-.smalltext {
-    color: #666666;
-    font-size: 10px;
-}
-.smalltext a {
-    color: #666666;
-}
-.smalltext-blue {
-    color: #3c78b5;
-    font-size: 10px;
-}
-.surtitle {
-    margin-left: 1px;
-    margin-bottom: 5px;
-    font-size: 14px;
-    color: #666666;
-}
-
-
-div.padded { padding: 4px; }
-div.thickPadded { padding: 10px; }
-h3.macrolibrariestitle {
-    margin: 0px 0px 0px 0px;
-}
-
-div.centered { text-align: center; margin: 10px; }
-div.centered table {margin: 0px auto; text-align: left; }
-
-.tableview table {
-    margin: 0;
-}
-
-.tableview th {
-    text-align: left;
-    color: #660033;
-    font-size: 12px;
-    padding: 5px 0px 0px 5px;
-    border-bottom: 2px solid #3c78b5;
-}
-.tableview td {
-    text-align: left;
-    border-color: #ccc;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    margin: 0;
-    padding: 4px 10px 4px 5px;
-}
-
-.grid {
-    margin: 2px 0px 5px 0px;
-    border-collapse: collapse;
-}
-.grid th  {
-    border: 1px solid #ccc;
-    padding: 2px 4px 2px 4px;
-    background: #f0f0f0;
-    text-align: center;
-}
-.grid td  {
-    border: 1px solid #ccc;
-    padding: 3px 4px 3px 4px;
-}
-.gridHover {
-	background-color: #f9f9f9;
-}
-
-td.infocell {
-    background-color: #f0f0f0;
-}
-.label {
-	font-weight: bold;
-	color: #660033;
-}
-.error {
-	background-color: #fcc;
-}
-
-.errorBox {
-	background-color: #fcc;
-    border: 1px solid #c00;
-    padding: 5px;
-    margin: 5px;
-}
-
-.errorMessage {
-	color: #c00;
-}
-
-.success {
-	background-color: #dfd;
-}
-
-.successBox {
-	background-color: #dfd;
-    border: 1px solid #090;
-    padding: 5px;
-    margin-top:5px;
-    margin-bottom:5px;
-}
-
-blockquote {
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-left: 5px;
-	margin-right: 0px;
-	border-left: 1px solid #3c78b5;
-}
-
-table.confluenceTable
-{
-    margin: 5px;
-    border-collapse: collapse;
-}
-
-/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
-table.confluenceTable td.confluenceTd
-{
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ccc;
-    padding: 3px 4px 3px 4px;
-}
-
-/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
-table.confluenceTable th.confluenceTh
-{
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ccc;
-    padding: 3px 4px 3px 4px;
-    background-color: #f0f0f0;
-    text-align: center;
-}
-
-td.confluenceTd
-{
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ccc;
-    padding: 3px 4px 3px 4px;
-}
-
-th.confluenceTh
-{
-    border-width: 1px;
-    border-style: solid;
-    border-color: #ccc;
-    padding: 3px 4px 3px 4px;
-    background-color: #f0f0f0;
-    text-align: center;
-}
-
-DIV.small {
-	font-size: 9px;
-}
-
-H1.pagename {
-	margin-top: 0px;
-}
-
-IMG.inline  {}
-
-.loginform {
-    margin: 5px;
-    border: 1px solid #ccc;
-}
-
-/* The text how the "This is a preview" comment should be shown. */
-.previewnote { text-align: center;
-                font-size: 11px;
-                    color: red; }
-
-/* How the preview content should be shown */
-.previewcontent { background: #E0E0E0; }
-
-/* How the system messages should be shown (DisplayMessage.jsp) */
-.messagecontent { background: #E0E0E0; }
-
-/* How the "This page has been modified..." -comment should be shown. */
-.conflictnote { }
-
-.createlink {
-    color: maroon;
-}
-a.createlink {
-    color: maroon;
-}
-.templateparameter {
-    font-size: 9px;
-    color: darkblue;
-}
-
-.diffadded {
-    background: #ddffdd;
-    padding: 1px 1px 1px 4px;
-	border-left: 4px solid darkgreen;
-}
-.diffdeleted {
-    color: #999;
-    background: #ffdddd;
-    padding: 1px 1px 1px 4px;
-	border-left: 4px solid darkred;
-}
-.diffnochange {
-    padding: 1px 1px 1px 4px;
-	border-left: 4px solid lightgrey;
-}
-.differror {
-    background: brown;
-}
-.diff {
-    font-family: lucida console, courier new, fixed-width;
-	font-size: 12px;
-	line-height: 14px;
-}
-.diffaddedchars {
-    background-color:#99ff99;
-    font-weight:bolder;
-}
-.diffremovedchars {
-    background-color:#ff9999;
-    text-decoration: line-through;
-    font-weight:bolder;
-}
-
-.greybackground {
-    background: #f0f0f0
-}
-
-.greybox {
- 	border: 1px solid #ddd;
-	padding: 3px;
-	margin: 1px 1px 10px 1px;
-}
-
-.borderedGreyBox {
-    border: 1px solid #cccccc;
-    background-color: #f0f0f0;
-    padding: 10px;
-}
-
-.greyboxfilled {
- 	border: 1px solid #ddd;
-	padding: 5px;
-	margin: 10px 1px 10px 1px;
-	background: #f0f0f0;
-}
-
-.navBackgroundBox {
-    padding: 5px 5px 5px 5px;
-    font-size: 22px;
-	font-weight: bold;
-	font-family: Arial, sans-serif;
-	color: white;
-    background: #3c78b5;
-    text-decoration: none;
-}
-
-.previewBoxTop {
-	background-color: #f0f0f0;
-    border-width: 1px 1px 0px 1px;
-    border-style: solid;
-    border-color: #3c78b5;
-    padding: 5px;
-    margin: 5px 0px 0px 0px;
-    text-align: center;
-}
-.previewContent {
-    background-color: #fff;
- 	border-color: #3c78b5;
-	border-width: 0px 1px 0px 1px;
-	border-style: solid;
-	padding: 10px;
-	margin: 0px;
-}
-.previewBoxBottom {
-	background-color: #f0f0f0;
-    border-width: 0px 1px 1px 1px;
-    border-style: solid;
-    border-color: #3c78b5;
-    padding: 5px;
-    margin: 0px 0px 5px 0px;
-    text-align: center;
-}
-
-.functionbox {
-    background-color: #f0f0f0;
- 	border: 1px solid #3c78b5;
-	padding: 3px;
-	margin: 1px 1px 10px 1px;
-}
-
-.functionbox-greyborder {
-    background-color: #f0f0f0;
- 	border: 1px solid #ddd;
-	padding: 3px;
-	margin: 1px 1px 10px 1px;
-}
-
-.search-highlight {
-    background-color: #ffffcc;
-}
-
-/* normal (white) background */
-.rowNormal {
-    background-color: #ffffff;
- }
-
-/* alternate (pale yellow) background */
-.rowAlternate {
-    background-color: #f7f7f7;
-}
-
-/* used in the list attachments table */
-.rowAlternateNoBottomColor {
-    background-color: #f7f7f7;
-}
-
-.rowAlternateNoBottomNoColor {
-}
-
-.rowAlternateNoBottomColor td {
-    border-bottom: 0px;
-}
-
-.rowAlternateNoBottomNoColor td {
-    border-bottom: 0px;
-}
-
-/* row highlight (grey) background */
-.rowHighlight {
-    background-color: #f0f0f0;
-
-}
-
-TD.greenbar {FONT-SIZE: 2px; BACKGROUND: #00df00; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
-TD.redbar {FONT-SIZE: 2px; BACKGROUND: #df0000; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
-TD.darkredbar {FONT-SIZE: 2px; BACKGROUND: #af0000; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
-
-TR.testpassed {FONT-SIZE: 2px; BACKGROUND: #ddffdd; PADDING: 0px; }
-TR.testfailed {FONT-SIZE: 2px; BACKGROUND: #ffdddd; PADDING: 0px; }
-
-.toolbar  {
-    margin: 0px;
-    border-collapse: collapse;
-}
-
-.toolbar td  {
-    border: 1px solid #ccc;
-    padding: 2px 2px 2px 2px;
-    color: #ccc;
-}
-
-td.noformatting {
-    border-width: 0px;
-    border-style: none;
-    text-align: center;
-	padding: 0px;
-}
-
-.commentblock {
-    margin: 12px 0 12px 0;
-}
-
-/*
- * Divs displaying the license information, if necessary.
- */
-.license-eval, .license-none, .license-nonprofit {
-    border-top: 1px solid #bbbbbb;
-    text-align: center;
-    font-size: 10px;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.license-eval, .license-none {
-    background-color: #ffcccc;
-}
-
-.license-eval b, .license-none b {
-    color: #990000
-}
-
-.license-nonprofit {
-    background-color: #ffffff;
-}
-
-/*
- * The shadow at the bottom of the page between the main content and the
- * "powered by" section.
- */
-.bottomshadow {
-    height: 12px;
-    background-image: url("$req.contextPath/images/border/border_bottom.gif");
-    background-repeat: repeat-x;
-}
-
-/*
- * Styling of the operations box
- */
-.navmenu .operations li, .navmenu .operations ul {
-    list-style: none;
-    margin-left: 0;
-    padding-left: 0;
-}
-
-.navmenu .operations ul {
-    margin-bottom: 9px;
-}
-
-.navmenu .label {
-    font-weight: inherit;
-}
-
-/*
- * Styling of ops as a toolbar
- */
-.toolbar div {
-    display: none;
-}
-
-.toolbar .label {
-    display: none;
-}
-
-.toolbar .operations {
-    display: block;
-}
-
-.toolbar .operations ul {
-    display: inline;
-    list-style: none;
-    margin-left: 10px;
-    padding-left: 0;
-}
-
-.toolbar .operations li {
-    list-style: none;
-    display: inline;
-}
-
-.blogcalendar * {
-    font-family:verdana, arial, sans-serif;
-    font-size:x-small;
-    font-weight:normal;
-    line-height:140%;
-    padding:2px;
-}
-
-
-table.blogcalendar {
-    border: 1px solid #3c78b5;
-}
-
-.blogcalendar th.calendarhead, a.calendarhead {
-    font-size:x-small;
-    font-weight:bold;
-    padding:2px;
-    text-transform:uppercase;
-    background-color: #3c78b5;
-    color: #ffffff;
-    letter-spacing: .3em;
-    text-transform: uppercase;
-}
-
-.calendarhead:visited {color: white;}
-.calendarhead:active {color: white;}
-.calendarhead:hover {color: white;}
-
-/* warning panel */
-.warningPanel { background: #FFFFCE; border:#F0C000 1px solid; padding: 8px; margin: 10px; }
-/* alert panel */
-.alertPanel { background: #FFCCCC; border:#C00 1px solid; padding: 8px; margin: 10px; }
-
-/* side menu highlighting (e.g. space content screen) */
-.optionPadded { padding: 2px; }
-.optionSelected { background-color: #ffffcc; padding: 2px; border: 1px solid #ddd; margin: -1px; }
-.optionSelected a { font-weight: bold; text-decoration: none; color: black; }
-
-/* information macros */
-.noteMacro { border-style: solid; border-width: 1px; border-color: #F0C000; background-color: #FFFFCE; text-align:left; margin-top: 15px; margin-bottom: 5px}
-.warningMacro { text-align:left; }
-.infoMacro { border-style: solid; border-width: 1px; border-color: #3c78b5; background-color: #D8E4F1; text-align:left; margin-top: 15px; margin-bottom: 5px}
-.tipMacro { border-style: solid; border-width: 1px; border-color: #090; background-color: #dfd; text-align:left; margin-top: 15px; margin-bottom: 5px}
-.informationMacroPadding { padding: 5px 0 0 5px; }
-
-table.infoMacro td, table.warningMacro td, table.tipMacro td, table.noteMacro td, table.sectionMacro td {
-    border: none;
-}
-table.infoMacro p, table.warningMacro p, table.tipMacro p, table.noteMacro p, table.sectionMacro p {
-    font-size:x-small;
-}
-table.sectionMacroWithBorder td.columnMacro { border-style: dashed; border-width: 1px; border-color: #cccccc;}
-
-
-div.headerField {
-    float: left;
-    width: auto;
-    height: 100%;
-}
-
-.headerFloat {
-    margin-left: auto;
-    width: 50%;
-}
-
-.headerFloatLeft {
-    float: left;
-    margin-right: 20px;
-    margin-bottom: 10px;
-}
-
-#headerRow {
-    padding: 10px;
-}
-
-/* Style for label heatmap. */
-.top10 a {
-    font-weight: bold;
-    font-size: 2em;
-    color: #660033;
-}
-.top25 a {
-    font-weight: bold;
-    font-size: 1.6em;
-    color: #660033;
-}
-.top50 a {
-    font-size: 1.4em;
-    color: #660033;
-}
-.top100 a {
-    font-size: 1.2em;
-    color: #660033;
-}
-
-.heatmap {
-    list-style:none;
-    width: 95%;
-    margin: 0px auto;
-}
-
-.heatmap a {
-    text-decoration:none;
-}
-
-.heatmap a:hover {
-    text-decoration:underline;
-}
-
-.heatmap li {
-    display: inline;
-}
-
-.minitab {
-padding: 3px 0px 3px 8px;
-margin-left: 0;
-margin-top: 1px;
-margin-bottom: 0px;
-border-bottom: 1px solid #3c78b5;
-font: bold 9px Verdana, sans-serif;
-text-decoration: none;
-float:none;
-}
-.selectedminitab {
-padding: 3px 0.5em;
-margin-left: 3px;
-margin-top: 1px;
-border: 1px solid #3c78b5;
-background: white;
-border-bottom: 1px solid white;
-color: #000000;
-text-decoration: none;
-}
-.unselectedminitab {
-padding: 3px 0.5em;
-margin-left: 3px;
-margin-top: 1px;
-border: 1px solid #3c78b5;
-border-bottom: none;
-background: #3c78b5;
-color: #ffffff;
-text-decoration: none;
-}
-
-a.unselectedminitab:hover {
-color: #ffffff;
-background: #660033;
-border-color: #660033;
-}
-
-a.unselectedminitab:link { color: white; }
-a.unselectedminitab:visited { color: white; }
-
-a.selectedminitab:link { color: black; }
-a.selectedminitab:visited { color: black; }
-
-.linkerror { background-color: #fcc;}
-
-a.labelOperationLink:link {text-decoration: underline}
-a.labelOperationLink:active {text-decoration: underline}
-a.labelOperationLink:visited {text-decoration: underline}
-a.labelOperationLink:hover {text-decoration: underline}
-
-a.newLabel:link {background-color: #ddffdd}
-a.newLabel:active {background-color: #ddffdd}
-a.newLabel:visited {background-color: #ddffdd}
-a.newLabel:hover {background-color: #ddffdd}
-
-ul.square {list-style-type: square}
-
-.inline-control-link {
-    background: #ffc;
-    font-size: 9px;
-    color: #666;
-    padding: 2px;
-    text-transform: uppercase;
-    text-decoration: none;
-}
-
-
-.inline-control-link a:link {text-decoration: none}
-.inline-control-link a:active {text-decoration: none}
-.inline-control-link a:visited {text-decoration: none}
-.inline-control-link a:hover {text-decoration: none}
-
-.inline-control-link {
-    background: #ffc;
-    font-size: 9px;
-    color: #666;
-    padding: 2px;
-    text-transform: uppercase;
-    text-decoration: none;
-    cursor: pointer;
-}
-
-div.auto_complete {
-    width: 350px;
-    background: #fff;
-}
-div.auto_complete ul {
-    border: 1px solid #888;
-    margin: 0;
-    padding: 0;
-    width: 100%;
-    list-style-type: none;
-}
-div.auto_complete ul li {
-    margin: 0;
-    padding: 3px;
-}
-div.auto_complete ul li.selected {
-    background-color: #ffb;
-}
-div.auto_complete ul strong.highlight {
-    color: #800;
-    margin: 0;
-    padding: 0;
-}
-
-/******* Edit Page Styles *******/
-.toogleFormDiv{
-    border:1px solid #A7A6AA;
-    background-color:white;
-    padding:5px;
-    margin-top: 5px;
-}
-
-.toogleInfoDiv{
-    border:1px solid #A7A6AA;
-    background-color:white;
-    display:none;
-    padding:5px;
-    margin-top: 10px;
-}
-
-.inputSection{
-    margin-bottom:20px;
-}
-
-#editBox{
-   border:1px solid lightgray;
-   background-color:#F0F0F0;
-}
-

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/documentation.md
----------------------------------------------------------------------
diff --git a/documentation.md b/documentation.md
deleted file mode 100644
index 24d15bd..0000000
--- a/documentation.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: page
-title: Documentation
----
-# Documentation
-
-Setup instructions, programming guides, and other documentation are available for each stable version of ZooKeeper below:
-
-* [ZooKeeper 3.5.4-beta](doc/r3.5.4-beta/index.html)
-* [ZooKeeper 3.5.3-beta](doc/r3.5.3-beta/index.html)
-* [ZooKeeper 3.5.2-alpha](doc/r3.5.2-alpha/index.html)
-* [ZooKeeper 3.5.1-alpha](doc/r3.5.1-alpha/index.html)
-* [ZooKeeper 3.5.0-alpha](doc/r3.5.0-alpha/index.html)
-* [ZooKeeper 3.4.13](doc/r3.4.13/index.html)
-* [ZooKeeper 3.4.12](doc/r3.4.12/index.html)
-* [ZooKeeper 3.4.11](doc/r3.4.11/index.html)
-* [ZooKeeper 3.4.10](doc/r3.4.10/index.html)
-* [ZooKeeper 3.4.9](doc/r3.4.9/index.html)
-* [ZooKeeper 3.4.8](doc/r3.4.8/index.html)
-* [ZooKeeper 3.4.7](doc/r3.4.7/index.html)
-* [ZooKeeper 3.4.6](doc/r3.4.6/index.html)
-* [ZooKeeper 3.4.5](doc/r3.4.5/index.html)
-* [ZooKeeper 3.4.4](doc/r3.4.4/index.html)
-* [ZooKeeper 3.4.3](doc/r3.4.3/index.html)
-* [ZooKeeper 3.4.2](doc/r3.4.2/index.html)
-* [ZooKeeper 3.4.1](doc/r3.4.1/index.html)
-* [ZooKeeper 3.4.0](doc/r3.4.0/index.html)
-* [ZooKeeper 3.3.6](doc/r3.3.6/index.html)
-* [ZooKeeper 3.3.5](doc/r3.3.5/index.html)
-* [ZooKeeper 3.3.4](doc/r3.3.4/index.html)
-* [ZooKeeper 3.3.3](doc/r3.3.3/index.html)
-* [ZooKeeper 3.3.2](doc/r3.3.2/index.html)
-* [ZooKeeper 3.2.2](doc/r3.2.2/index.html)
-* [ZooKeeper 3.1.2](doc/r3.1.2/index.html)

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/git.md
----------------------------------------------------------------------
diff --git a/git.md b/git.md
deleted file mode 100644
index 8f95767..0000000
--- a/git.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: page
-title: Version Control
----
-# ZooKeeper Version Control System
-
-The ZooKeeper source code resides in the Apache Git repository:
-[https://git-wip-us.apache.org/repos/asf/zookeeper.git](https://git-wip-us.apache.org/repos/asf/zookeeper.git)
-All commits and releases are done on this repository.
-
-There is also a github mirror at:
-[https://github.com/apache/zookeeper](https://github.com/apache/zookeeper)

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/images/feather_small.gif
----------------------------------------------------------------------
diff --git a/images/feather_small.gif b/images/feather_small.gif
deleted file mode 100644
index 94f1892..0000000
Binary files a/images/feather_small.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/images/zookeeper_small.gif
----------------------------------------------------------------------
diff --git a/images/zookeeper_small.gif b/images/zookeeper_small.gif
deleted file mode 100644
index 4e8014f..0000000
Binary files a/images/zookeeper_small.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/index.md
----------------------------------------------------------------------
diff --git a/index.md b/index.md
deleted file mode 100644
index 2552a0d..0000000
--- a/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-layout: page
-title: Home
----
-# Welcome to Apache ZooKeeper&trade;
-
-Apache ZooKeeper is an effort to develop and maintain an open-source server which enables highly reliable distributed coordination.
-
-## What is ZooKeeper?
-
-ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed.
-
-Learn more about ZooKeeper on the [ZooKeeper Wiki](https://cwiki.apache.org/confluence/display/ZOOKEEPER/Index).
-
-## Getting Started
-
-Start by installing ZooKeeper on a single machine or a very small cluster.
-
-1. [Learn about](doc/current/index.html) ZooKeeper by reading the documentation.
-1. [Download](releases.html) ZooKeeper from the release page.
-
-## Getting Involved
-
-Apache ZooKeeper is an open source volunteer project under the Apache Software Foundation. We encourage you to learn about the project and contribute your expertise. Here are some starter links:
-
-1. See our [How to Contribute to ZooKeeper](https://cwiki.apache.org/confluence/display/ZOOKEEPER/HowToContribute) page.
-1. Give us [feedback](https://issues.apache.org/jira/browse/ZOOKEEPER): What can we do better?
-1. Join the [mailing list](lists.html): Meet the community.

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/irc.md
----------------------------------------------------------------------
diff --git a/irc.md b/irc.md
deleted file mode 100644
index 57e0d8e..0000000
--- a/irc.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: page
-title: IRC
----
-# ZooKeeper IRC Channel
-
-There is an IRC channel dedicated to zookeeper at irc.freenode.org. The name of the channel is #zookeeper.
-
-The IRC channel can be used for online discussion about zookeeper related stuff, but developers should be careful to transfer all the official decisions or useful discussions to the issue tracking system.
-
-

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/lists.md
----------------------------------------------------------------------
diff --git a/lists.md b/lists.md
deleted file mode 100644
index 872dbd6..0000000
--- a/lists.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-layout: page
-title: Mailing Lists
----
-# ZooKeeper Mailing Lists
-
-## Users
-
-If you use ZooKeeper, please subscribe to the ZooKeeper user mailing list.
-
-The ZooKeeper user mailing list is: [user@zookeeper.apache.org](mailto:user@zookeeper.apache.org)
-
-* [Subscribe to List](mailto:user-subscribe@zookeeper.apache.org)
-* [Unsubscribe from List](mailto:user-unsubscribe@zookeeper.apache.org)
-* [Archives](https://mail-archives.apache.org/mod_mbox/zookeeper-user/)
-* [Older Archives (Hadoop, pre-TLP)](https://mail-archives.apache.org/mod_mbox/hadoop-zookeeper-user/)
-
-Note
-In order to post to the list, it is necessary to first subscribe to it.
-
-
-## Developers
-
-If you'd like to contribute to ZooKeeper, please subscribe to the ZooKeeper developer mailing list.
-
-The ZooKeeper developer mailing list is : [dev@zookeeper.apache.org](mailto:dev@zookeeper.apache.org)
-
-* [Subscribe to List](mailto:dev-subscribe@zookeeper.apache.org)
-* [Unsubscribe from List](mailto:dev-unsubscribe@zookeeper.apache.org)
-* [Archives](https://mail-archives.apache.org/mod_mbox/zookeeper-dev/)
-* [Older Archives (Hadoop, pre-TLP)](https://mail-archives.apache.org/mod_mbox/hadoop-zookeeper-dev/)
-
-Note
-In order to post to the list, it is necessary to first subscribe to it.
-
-## Commits
-
-If you'd like to see changes made in ZooKeeper's version control system then subscribe to the ZooKeeper commit mailing list.
-
-* [Subscribe to List](mailto:commits-subscribe@zookeeper.apache.org)
-* [Unsubscribe from List](mailto:commits-unsubscribe@zookeeper.apache.org)
-* [Archives](https://mail-archives.apache.org/mod_mbox/zookeeper-commits/)
-* [Older Archives (Hadoop, pre-TLP)](https://mail-archives.apache.org/mod_mbox/hadoop-zookeeper-commits/)

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..f53bf12
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <!--
+    /**
+     * Licensed to the Apache Software Foundation (ASF) under one
+     * or more contributor license agreements.  See the NOTICE file
+     * distributed with this work for additional information
+     * regarding copyright ownership.  The ASF licenses this file
+     * to you under the Apache License, Version 2.0 (the
+     * "License"); you may not use this file except in compliance
+     * with the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+    -->
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.zookeeper</groupId>
+    <artifactId>zookeeper-web</artifactId>
+    <version>3.6.0-SNAPSHOT</version>
+    <name>Apache ZooKeeper - Website</name>
+    <description>Web content</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.ruleoftech</groupId>
+                <artifactId>markdown-page-generator-plugin</artifactId>
+                <version>2.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <headerHtmlFile>${project.basedir}/src/main/resources/markdown/html/header.html</headerHtmlFile>
+                    <footerHtmlFile>${project.basedir}/src/main/resources/markdown/html/footer.html</footerHtmlFile>
+                    <copyDirectories>images,css,js</copyDirectories>
+                    <attributes>
+                        <attribute>TableBlock|class=table table-striped table-bordered</attribute>
+                    </attributes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.coderplus.maven.plugins</groupId>
+                <artifactId>copy-rename-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-file</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <sourceFile>${project.basedir}/src/main/resources/.htaccess</sourceFile>
+                            <destinationFile>target/html/.htaccess</destinationFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a0fb79f8/privacy.md
----------------------------------------------------------------------
diff --git a/privacy.md b/privacy.md
deleted file mode 100644
index 5448a22..0000000
--- a/privacy.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: page
-title: Privacy Policy
----
-# Privacy Policy
-
-Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:
-
-1. The IP address from which you access the website;
-1. The type of browser and operating system you use to access our site;
-1. The date and time you access our site;
-1. The pages you visit; and
-1. The addresses of pages from where you followed a link to our site.
-
-Part of this information is gathered using a tracking cookie set by the [Google Analytics](https://www.google.com/analytics/) service and handled by Google as described in their [privacy policy](https://www.google.com/privacy.html). See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.
-
-We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.
-
-By using this website, you consent to the collection of this data in the manner and for the purpose described above.
-
-


Mime
View raw message