helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [1/3] Change to reflow theme, update home, 0.6.1
Date Thu, 26 Dec 2013 05:44:27 GMT
Updated Branches:
  refs/heads/helix-website [created] 92edaabc1


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md
index a5b9a0e..ed1bd17 100644
--- a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md
@@ -17,46 +17,47 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-# Helix Tutorial: Spectator
+Helix Tutorial: Spectator
+-------------------------
 
-Next, we\'ll learn how to implement a SPECTATOR.  Typically, a spectator needs to react to changes within the distributed system.  Examples: a client that needs to know where to send a request, a topic consumer in a consumer group.  The spectator is automatically informed of changes in the _external state_ of the cluster, but it does not have to add any code to keep track of other components in the system.
+Next, we\'ll learn how to implement a __spectator__.  Typically, a spectator needs to react to changes within the distributed system.  Examples: a client that needs to know where to send a request, a topic consumer in a consumer group.  The spectator is automatically informed of changes in the _external state_ of the cluster, but it does not have to add any code to keep track of other components in the system.
 
-### Start the Helix agent
+### Start a Connection
 
-Same as for a PARTICIPANT, The Helix agent is the common component that connects each system component with the controller.
+Same as for a participant, The Helix manager is the common component that connects each system component with the cluster.
 
 It requires the following parameters:
 
 * clusterName: A logical name to represent the group of nodes
-* instanceName: A logical name of the process creating the manager instance. Generally this is host:port.
+* instanceName: A logical name of the process creating the manager instance. Generally this is host:port
 * instanceType: Type of the process. This can be one of the following types, in this case, use SPECTATOR:
-    * CONTROLLER: Process that controls the cluster, any number of controllers can be started but only one will be active at any given time.
-    * PARTICIPANT: Process that performs the actual task in the distributed system.
-    * SPECTATOR: Process that observes the changes in the cluster.
-    * ADMIN: To carry out system admin actions.
-* zkConnectString: Connection string to Zookeeper. This is of the form host1:port1,host2:port2,host3:port3.
+    * CONTROLLER: Process that controls the cluster, any number of controllers can be started but only one will be active at any given time
+    * PARTICIPANT: Process that performs the actual task in the distributed system
+    * SPECTATOR: Process that observes the changes in the cluster
+    * ADMIN: To carry out system admin actions
+* zkConnectString: Connection string to ZooKeeper. This is of the form host1:port1,host2:port2,host3:port3
 
-After the Helix manager instance is created, only thing that needs to be registered is the listener.  When the ExternalView changes, the listener is notified.
-
-### Spectator Code
+After the Helix manager instance is created, the only thing that needs to be registered is the listener.  When the ExternalView changes, the listener is notified.
 
 A spectator observes the cluster and is notified when the state of the system changes. Helix consolidates the state of entire cluster in one Znode called ExternalView.
 Helix provides a default implementation RoutingTableProvider that caches the cluster state and updates it when there is a change in the cluster.
 
 ```
 manager = HelixManagerFactory.getZKHelixManager(clusterName,
-                                                          instanceName,
-                                                          InstanceType.PARTICIPANT,
-                                                          zkConnectString);
+                                                instanceName,
+                                                InstanceType.PARTICIPANT,
+                                                zkConnectString);
 manager.connect();
 RoutingTableProvider routingTableProvider = new RoutingTableProvider();
 manager.addExternalViewChangeListener(routingTableProvider);
 ```
 
+### Spectator Code
+
 In the following code snippet, the application sends the request to a valid instance by interrogating the external view.  Suppose the desired resource for this request is in the partition myDB_1.
 
 ```
-## instances = routingTableProvider.getInstances(, "PARTITION_NAME", "PARTITION_STATE");
+// instances = routingTableProvider.getInstances(, "PARTITION_NAME", "PARTITION_STATE");
 instances = routingTableProvider.getInstances("myDB", "myDB_1", "ONLINE");
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -68,5 +69,5 @@ result = theInstance.sendRequest(yourApplicationRequest, responseObject);
 
 ```
 
-When the external view changes, the application needs to react by sending requests to a different instance.  
+When the external view changes, the application needs to react by sending requests to a different instance.
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md
index cb51be9..7a98c09 100644
--- a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md
@@ -17,44 +17,49 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-# Helix Tutorial: State Machine Configuration
+Helix Tutorial: State Machine Configuration
+-------------------------------------------
 
 In this chapter, we\'ll learn about the state models provided by Helix, and how to create your own custom state model.
 
-## State Models
+### State Models
 
-Helix comes with 3 default state models that are commonly used.  It is possible to have multiple state models in a cluster. 
-Every resource that is added should be configured to use a state model that govern its _ideal state_.
+Helix comes with 3 default state models that are commonly used.  It is possible to have multiple state models in a cluster.
+Every resource that is added should be configured to use a single state model that will govern its _ideal state_.
 
-### MASTER-SLAVE
+#### MASTER-SLAVE
 
 * Has 3 states: OFFLINE, SLAVE, MASTER
 * Maximum # of masters: 1
-* Slaves are based on the replication factor. Replication factor can be specified while adding the resource
+* Slaves are based on the replication factor. The replication factor can be specified while adding the resource
 
+#### ONLINE-OFFLINE
 
-### ONLINE-OFFLINE
-* Has 2 states: OFFLINE and ONLINE.  This simple state model is a good starting point for most applications.
+Has 2 states: OFFLINE and ONLINE.  This simple state model is a good starting point for most applications.
 
-### LEADER-STANDBY
-* 1 Leader and multiple stand-bys.  The idea is that exactly one leader accomplishes a designated task, the stand-bys are ready to take over if the leader fails.
+#### LEADER-STANDBY
 
-## Constraints
+1 Leader and multiple stand-bys.  The idea is that exactly one leader accomplishes a designated task, the stand-bys are ready to take over if the leader fails.
+
+### Constraints
 
 In addition to the state machine configuration, one can specify the constraints of states and transitions.
 
 For example, one can say:
+
 * MASTER:1
- Maximum number of replicas in MASTER state at any time is 1
 
-* OFFLINE-SLAVE:5 
-Maximum number of OFFLINE-SLAVE transitions that can happen concurrently in the system is 5 in this example.
+to indicate that the maximum number of replicas in MASTER state at any time is 1
+
+* OFFLINE-SLAVE:5
+
+to indicate that the maximum number of OFFLINE-SLAVE transitions that can happen concurrently in the system is 5 in this example.
 
-### State Priority
+#### State Priority
 
 Helix uses a greedy approach to satisfy the state constraints. For example, if the state machine configuration says it needs 1 MASTER and 2 SLAVES, but only 1 node is active, Helix must promote it to MASTER. This behavior is achieved by providing the state priority list as MASTER,SLAVE.
 
-### State Transition Priority
+#### State Transition Priority
 
 Helix tries to fire as many transitions as possible in parallel to reach the stable state without violating constraints. By default, Helix simply sorts the transitions alphabetically and fires as many as it can without violating the constraints. You can control this by overriding the priority order.
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md
index 5002156..0760d74 100644
--- a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md
@@ -17,13 +17,14 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-# Helix Tutorial: Throttling
+Helix Tutorial: Throttling
+--------------------------
 
-In this chapter, we\'ll learn how to control the parallel execution of cluster tasks.  Only a centralized cluster manager with global knowledge is capable of coordinating this decision.
+In this chapter, we\'ll learn how to control the parallel execution of cluster tasks.  Only a centralized cluster manager with global knowledge (i.e. Helix) is capable of coordinating this decision.
 
 ### Throttling
 
-Since all state changes in the system are triggered through transitions, Helix can control the number of transitions that can happen in parallel. Some of the transitions may be light weight, but some might involve moving data, which is quite expensive from a network and iops perspective.
+Since all state changes in the system are triggered through transitions, Helix can control the number of transitions that can happen in parallel. Some of the transitions may be lightweight, but some might involve moving data, which is quite expensive from a network and IOPS perspective.
 
 Helix allows applications to set a threshold on transitions. The threshold can be set at multiple scopes:
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/site-releases/0.6.1-incubating/src/site/site.xml
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/site.xml b/site-releases/0.6.1-incubating/src/site/site.xml
index 7326162..7d6bd69 100644
--- a/site-releases/0.6.1-incubating/src/site/site.xml
+++ b/site-releases/0.6.1-incubating/src/site/site.xml
@@ -17,21 +17,21 @@
 -->
 <project name="Apache Helix 0.6.1-incubating">
   <bannerLeft>
-    <src>images/helix-logo.jpg</src>
-    <href>http://helix.incubator.apache.org/site-releases/0.6.1-incubating-site</href>
+    <src>../../images/helix-logo.jpg</src>
+    <href>http://helix.incubator.apache.org/</href>
   </bannerLeft>
   <bannerRight>
-    <src>http://incubator.apache.org/images/egg-logo.png</src>
-    <href>http://incubator.apache.org/</href>
+    <src>../../images/feather_small.gif</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
   <version position="none"/>
 
   <publishDate position="right"/>
 
   <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
+    <groupId>lt.velykis.maven.skins</groupId>
+    <artifactId>reflow-maven-skin</artifactId>
+    <version>1.0.0</version>
   </skin>
 
   <body>
@@ -58,27 +58,28 @@
       <item name="Release 0.6.1-incubating" href="http://helix.incubator.apache.org/site-releases/0.6.1-incubating-site/"/>
     </breadcrumbs>
 
-    <menu name="Apache Helix">
-      <item name="Home" href="../../index.html"/>
+    <links>
+      <item name="Helix 0.6.1-incubating" href="./index.html"/>
+    </links>
+
+    <menu name="Get Helix">
+      <item name="Download" href="./download.html"/>
+      <item name="Building" href="./Building.html"/>
+      <item name="Release Notes" href="./releasenotes/release-0.6.1-incubating.html"/>
     </menu>
 
-    <menu name="Helix 0.6.1-incubating">
-      <item name="Introduction" href="./index.html"/>
-      <item name="Getting Helix" href="./Building.html"/>
-      <item name="Core concepts" href="./Concepts.html"/>
-      <item name="Architecture" href="./Architecture.html"/>
+    <menu name="Hands-On">
       <item name="Quick Start" href="./Quickstart.html"/>
       <item name="Tutorial" href="./Tutorial.html"/>
-      <item name="Release Notes" href="releasenotes/release-0.6.1-incubating.html"/>
-      <item name="Download" href="./download.html"/>
+      <item name="Javadocs" href="http://helix.incubator.apache.org/javadocs/0.6.1-incubating"/>
     </menu>
 
     <menu name="Recipes">
       <item name="Distributed lock manager" href="./recipes/lock_manager.html"/>
       <item name="Rabbit MQ consumer group" href="./recipes/rabbitmq_consumer_group.html"/>
       <item name="Rsync replicated file store" href="./recipes/rsync_replicated_file_store.html"/>
-      <item name="Service Discovery" href="./recipes/service_discovery.html"/>
-      <item name="Distributed task DAG Execution" href="./recipes/task_dag_execution.html"/>
+      <item name="Service discovery" href="./recipes/service_discovery.html"/>
+      <item name="Distributed task DAG execution" href="./recipes/task_dag_execution.html"/>
     </menu>
 <!--
     <menu ref="reports" inherit="bottom"/>
@@ -103,9 +104,29 @@
   </body>
 
   <custom>
-    <fluidoSkin>
+    <reflowSkin>
+      <theme>bootswatch-cerulean</theme>
+      <highlightJs>false</highlightJs>
+      <brand>
+        <name>Apache Helix</name>
+        <href>http://helix.incubator.apache.org</href>
+      </brand>
+      <slogan>A cluster management framework for partitioned and replicated distributed resources</slogan>
+      <bottomNav>
+        <column>Get Helix</column>
+        <column>Hands-On</column>
+        <column>Recipes</column>
+      </bottomNav>
+      <pages>
+        <index>
+          <sections>
+            <columns>3</columns>
+          </sections>
+        </index>
+      </pages>
+    </reflowSkin>
+    <!--fluidoSkin>
       <topBarEnabled>true</topBarEnabled>
-      <!-- twitter link work only with sidebar disabled -->
       <sideBarEnabled>true</sideBarEnabled>
       <googleSearch></googleSearch>
       <twitter>
@@ -113,7 +134,7 @@
         <showUser>true</showUser>
         <showFollowers>false</showFollowers>
       </twitter>
-    </fluidoSkin>
+    </fluidoSkin-->
   </custom>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm b/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm
index dabe9ec..2fc59c3 100644
--- a/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm
+++ b/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm
@@ -24,7 +24,7 @@ under the License.
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
   <properties>
-    <title>Apache Incubator Helix Downloads</title>
+    <title>Apache Helix Downloads</title>
     <author email="dev@helix.incubator.apache.org">Apache Helix Documentation Team</author>
   </properties>
 
@@ -34,11 +34,11 @@ under the License.
         <param name="class" value="toc"/>
       </macro>
     </div>
-    
-    <section name="Introduction">
+
+    <section name="Apache Helix Downloads">
       <p>Apache Helix artifacts are distributed in source and binary form under the terms of the
         <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        See the included <tt>LICENSE</tt> and <tt>NOTICE</tt> files included in each artifact for additional license 
+        See the included <tt>LICENSE</tt> and <tt>NOTICE</tt> files included in each artifact for additional license
         information.
       </p>
       <p>Use the links below to download a source distribution of Apache Helix.
@@ -48,54 +48,6 @@ under the License.
     <section name="Release">
       <p>Release date: ${releaseDate} </p>
       <p><a href="releasenotes/release-${releaseName}.html">${releaseName} Release notes</a></p>
-      <a name="mirror"/>
-      <subsection name="Mirror">
-
-        <p>
-          [if-any logo]
-          <a href="[link]">
-            <img align="right" src="[logo]" border="0"
-                 alt="logo"/>
-          </a>
-          [end]
-          The currently selected mirror is
-          <b>[preferred]</b>.
-          If you encounter a problem with this mirror,
-          please select another mirror.
-          If all mirrors are failing, there are
-          <i>backup</i>
-          mirrors
-          (at the end of the mirrors list) that should be available.
-        </p>
-
-        <form action="[location]" method="get" id="SelectMirror" class="form-inline">
-          Other mirrors:
-          <select name="Preferred" class="input-xlarge">
-            [if-any http]
-            [for http]
-            <option value="[http]">[http]</option>
-            [end]
-            [end]
-            [if-any ftp]
-            [for ftp]
-            <option value="[ftp]">[ftp]</option>
-            [end]
-            [end]
-            [if-any backup]
-            [for backup]
-            <option value="[backup]">[backup] (backup)</option>
-            [end]
-            [end]
-          </select>
-          <input type="submit" value="Change" class="btn"/>
-        </form>
-
-        <p>
-          You may also consult the
-          <a href="http://www.apache.org/mirrors/">complete list of mirrors.</a>
-        </p>
-
-      </subsection>
       <subsection name="${releaseName} Sources">
         <table>
           <thead>
@@ -107,12 +59,12 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a href="[preferred]incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip">helix-${releaseName}-src.zip</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip">helix-${releaseName}-src.zip</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.asc">asc</a>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.md5">md5</a>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.asc">asc</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.md5">md5</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.sha1">sha1</a>
               </td>
             </tr>
           </tbody>
@@ -129,22 +81,22 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a href="[preferred]incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar">helix-core-${releaseName}-pkg.tar</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar">helix-core-${releaseName}-pkg.tar</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.asc">asc</a>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.md5">md5</a>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.asc">asc</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.md5">md5</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.sha1">sha1</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="[preferred]incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar">helix-admin-webapp-${releaseName}-pkg.tar</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar">helix-admin-webapp-${releaseName}-pkg.tar</a>
               </td>
               <td>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.asc">asc</a>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.md5">md5</a>
-                <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.sha1">sha1</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.asc">asc</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.md5">md5</a>
+                <a href="http://archive.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.sha1">sha1</a>
               </td>
             </tr>
           </tbody>
@@ -157,22 +109,22 @@ under the License.
 
     <section name="Verifying Releases">
       <p>We strongly recommend you verify the integrity of the downloaded files with both PGP and MD5.</p>
-      
-      <p>The PGP signatures can be verified using <a href="http://www.pgpi.org/">PGP</a> or 
-      <a href="http://www.gnupg.org/">GPG</a>. 
-      First download the <a href="http://www.apache.org/dist/incubator/helix/KEYS">KEYS</a> as well as the
-      <tt>*.asc</tt> signature file for the particular distribution. Make sure you get these files from the main 
+
+      <p>The PGP signatures can be verified using <a href="http://www.pgpi.org/">PGP</a> or
+      <a href="http://www.gnupg.org/">GPG</a>.
+      First download the <a href="http://archive.apache.org/dist/incubator/helix/KEYS">KEYS</a> as well as the
+      <tt>*.asc</tt> signature file for the particular distribution. Make sure you get these files from the main
       distribution directory, rather than from a mirror. Then verify the signatures using one of the following sets of
       commands:
 
         <source>$ pgp -ka KEYS
 $ pgp helix-*.zip.asc</source>
-      
+
         <source>$ gpg --import KEYS
 $ gpg --verify helix-*.zip.asc</source>
        </p>
-    <p>Alternatively, you can verify the MD5 signature on the files. A Unix/Linux program called  
-      <code>md5</code> or 
+    <p>Alternatively, you can verify the MD5 signature on the files. A Unix/Linux program called
+      <code>md5</code> or
       <code>md5sum</code> is included in most distributions.  It is also available as part of
       <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>.
       Windows users can get binary md5 programs from these (and likely other) places:

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/site-releases/0.6.2-incubating/src/site/site.xml
----------------------------------------------------------------------
diff --git a/site-releases/0.6.2-incubating/src/site/site.xml b/site-releases/0.6.2-incubating/src/site/site.xml
index 68cba65..b1bacd9 100644
--- a/site-releases/0.6.2-incubating/src/site/site.xml
+++ b/site-releases/0.6.2-incubating/src/site/site.xml
@@ -29,9 +29,9 @@
   <publishDate position="right"/>
 
   <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
+    <groupId>lt.velykis.maven.skins</groupId>
+    <artifactId>reflow-maven-skin</artifactId>
+    <version>1.0.0</version>
   </skin>
 
   <body>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/site-releases/0.7.0-incubating/src/site/site.xml
----------------------------------------------------------------------
diff --git a/site-releases/0.7.0-incubating/src/site/site.xml b/site-releases/0.7.0-incubating/src/site/site.xml
index babbe1c..4003197 100644
--- a/site-releases/0.7.0-incubating/src/site/site.xml
+++ b/site-releases/0.7.0-incubating/src/site/site.xml
@@ -29,9 +29,9 @@
   <publishDate position="right"/>
 
   <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
+    <groupId>lt.velykis.maven.skins</groupId>
+    <artifactId>reflow-maven-skin</artifactId>
+    <version>1.0.0</version>
   </skin>
 
   <body>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/site-releases/trunk/src/site/site.xml
----------------------------------------------------------------------
diff --git a/site-releases/trunk/src/site/site.xml b/site-releases/trunk/src/site/site.xml
index 52b9f8a..f2851a1 100644
--- a/site-releases/trunk/src/site/site.xml
+++ b/site-releases/trunk/src/site/site.xml
@@ -29,9 +29,9 @@
   <publishDate position="right"/>
 
   <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
+    <groupId>lt.velykis.maven.skins</groupId>
+    <artifactId>reflow-maven-skin</artifactId>
+    <version>1.0.0</version>
   </skin>
 
   <body>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/apt/releasing.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releasing.apt b/src/site/apt/releasing.apt
index 62f6bb9..3de33f5 100644
--- a/src/site/apt/releasing.apt
+++ b/src/site/apt/releasing.apt
@@ -25,7 +25,7 @@
 ~~ NOTE: For help with the syntax of this file, see:
 ~~ http://maven.apache.org/guides/mini/guide-apt-format.html
 
-Helix release process
+Helix Release Process
 
  [[1]] Post to dev@helix.incubator.apache.org a few days before you plan to do a Helix release
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/markdown/Architecture.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Architecture.md b/src/site/markdown/Architecture.md
index 933e917..1d724ad 100644
--- a/src/site/markdown/Architecture.md
+++ b/src/site/markdown/Architecture.md
@@ -21,83 +21,81 @@ under the License.
   <title>Architecture</title>
 </head>
 
-Architecture
-----------------------------
+## Architecture
+
 Helix aims to provide the following abilities to a distributed system:
 
-* Automatic management of a cluster hosting partitioned, replicated resources.
-* Soft and hard failure detection and handling.
-* Automatic load balancing via smart placement of resources on servers(nodes) based on server capacity and resource profile (size of partition, access patterns, etc).
-* Centralized config management and self discovery. Eliminates the need to modify config on each node.
-* Fault tolerance and optimized rebalancing during cluster expansion.
-* Manages entire operational lifecycle of a node. Addition, start, stop, enable/disable without downtime.
-* Monitor cluster health and provide alerts on SLA violation.
-* Service discovery mechanism to route requests.
+* Automatic management of a cluster hosting partitioned, replicated resources
+* Soft and hard failure detection and handling
+* Automatic load balancing via smart placement of resources on servers (nodes) based on server capacity and resource profile (size of partitions, access patterns, etc)
+* Centralized config management and self discovery, eliminating the need to modify config on each node
+* Fault tolerance and optimized rebalancing during cluster expansion
+* Management of the entire operational lifecycle of a node. Add, start, stop, enable, and disable without downtime
+* Monitoring of cluster health and alerting on SLA violations
+* A service discovery mechanism to route requests
 
-To build such a system, we need a mechanism to co-ordinate between different nodes and other components in the system. This mechanism can be achieved with software that reacts to any change in the cluster and comes up with a set of tasks needed to bring the cluster to a stable state. The set of tasks will be assigned to one or more nodes in the cluster. Helix serves this purpose of managing the various components in the cluster.
+To build such a system, we need a mechanism to coordinate between different nodes and other components in the system. This mechanism can be achieved with software that reacts to any change in the cluster and comes up with a set of tasks needed to bring the cluster to a stable state. The set of tasks will be assigned to one or more nodes in the cluster. Helix serves this purpose of managing the various components in the cluster.
 
 ![Helix Design](images/system.png)
 
-Distributed System Components
+## Distributed System Components
 
 In general any distributed system cluster will have the following components and properties:
 
-* A set of nodes also referred to as instances.
-* A set of resources which can be databases, lucene indexes or tasks.
-* Each resource is also partitioned into one or more Partitions. 
-* Each partition may have one or more copies called replicas.
-* Each replica can have a state associated with it. For example Master, Slave, Leader, Standby, Online, Offline etc
+* A set of nodes also referred to as __instances__
+* A set of __resources__ which can be databases, lucene indexes or tasks
+* Subdivisions of each resource into one or more __partitions__
+* Copies of each resource called __replicas__
+* The __state__ of each replica, e.g. Master, Slave, Leader, Standby, Online, Offline, etc.
 
-Roles
------
+## Roles
 
 ![Helix Design](images/HELIX-components.png)
 
-Not all nodes in a distributed system will perform similar functionalities. For example, a few nodes might be serving requests and a few nodes might be sending requests, and some nodes might be controlling the nodes in the cluster. Thus, Helix categorizes nodes by their specific roles in the system.
+Not all nodes in a distributed system will perform similar functionalities. For example, a few nodes might be serving requests and a few nodes might be sending requests, and some other nodes might be controlling the nodes in the cluster. Thus, Helix categorizes nodes by their specific roles in the system.
 
-We have divided Helix nodes into 3 logical components based on their responsibilities:
+Helix divides nodes into 3 logical components based on their responsibilities:
 
-1. Participant: The nodes that actually host the distributed resources.
-2. Spectator: The nodes that simply observe the Participant state and route the request accordingly. Routers, for example, need to know the instance on which a partition is hosted and its state in order to route the request to the appropriate end point.
-3. Controller: The controller observes and controls the Participant nodes. It is responsible for coordinating all transitions in the cluster and ensuring that state constraints are satisfied and cluster stability is maintained. 
+1. __Participant__: The nodes that actually host the distributed resources
+2. __Spectator__: The nodes that simply observe the current state of each Participant and routes requests accordingly. Routers, for example, need to know the instance on which a partition is hosted and its state in order to route the request to the appropriate endpoint
+3. __Controller__: The node that observes and controls the Participant nodes. It is responsible for coordinating all transitions in the cluster and ensuring that state constraints are satisfied while maintaining cluster stability
 
-These are simply logical components and can be deployed as per the system requirements. For example:
+These are simply logical components and can be deployed according to system requirements. For example, the Controller:
 
-1. The controller can be deployed as a separate service
-2. The controller can be deployed along with a Participant but only one Controller will be active at any given time.
+1. can be deployed as a separate service
+2. can be deployed along with a Participant but only one Controller will be active at any given time.
 
 Both have pros and cons, which will be discussed later and one can chose the mode of deployment as per system needs.
 
+## Cluster State Metadata Store
 
-## Cluster state metadata store
-
-We need a distributed store to maintain the state of the cluster and a notification system to notify if there is any change in the cluster state. Helix uses Zookeeper to achieve this functionality.
+We need a distributed store to maintain the state of the cluster and a notification system to notify if there is any change in the cluster state. Helix uses [Apache ZooKeeper](http://zookeeper.apache.org) to achieve this functionality.
 
 Zookeeper provides:
 
-* A way to represent PERSISTENT state which basically remains until its deleted.
-* A way to represent TRANSIENT/EPHEMERAL state which vanishes when the process that created the state dies.
-* Notification mechanism when there is a change in PERSISTENT and EPHEMERAL state
+* A way to represent PERSISTENT state which remains until its deleted
+* A way to represent TRANSIENT/EPHEMERAL state which vanishes when the process that created the state dies
+* A notification mechanism when there is a change in PERSISTENT and EPHEMERAL state
 
-The namespace provided by ZooKeeper is much like that of a standard file system. A name is a sequence of path elements separated by a slash (/). Every node[ZNode] in ZooKeeper\'s namespace is identified by a path.
+The namespace provided by ZooKeeper is much like that of a standard file system. A name is a sequence of path elements separated by a slash (/). Every node (ZNode) in ZooKeeper\'s namespace is identified by a path.
 
-More info on Zookeeper can be found at http://zookeeper.apache.org
+More info on Zookeeper can be found at [http://zookeeper.apache.org](http://zookeeper.apache.org)
 
-## State machine and constraints
+## State Machine and Constraints
 
 Even though the concepts of Resources, Partitions, and Replicas are common to most distributed systems, one thing that differentiates one distributed system from another is the way each partition is assigned a state and the constraints on each state.
 
 For example:
 
-1. If a system is serving read-only data then all partition\'s replicas are equal and they can either be ONLINE or OFFLINE.
-2. If a system takes _both_ reads and writes but ensure that writes go through only one partition, the states will be MASTER, SLAVE, and OFFLINE. Writes go through the MASTER and replicate to the SLAVEs. Optionally, reads can go through SLAVES.
+1. If a system is serving read-only data then all of a partition\'s replicas are equivalent and they can either be ONLINE or OFFLINE.
+2. If a system takes _both_ reads and writes but must ensure that writes go through only one partition, the states will be MASTER, SLAVE, and OFFLINE. Writes go through the MASTER and replicate to the SLAVEs. Optionally, reads can go through SLAVEs.
 
-Apart from defining state for each partition, the transition path to each state can be application specific. For example, in order to become MASTER it might be a requirement to first become a SLAVE. This ensures that if the SLAVE does not have the data as part of OFFLINE-SLAVE transition it can bootstrap data from other nodes in the system.
+Apart from defining the state for each partition, the transition path between states can be application specific. For example, in order to become MASTER it might be a requirement to first become a SLAVE. This ensures that if the SLAVE does not have the data as part of OFFLINE-SLAVE transition it can bootstrap data from other nodes in the system.
 
-Helix provides a way to configure an application specific state machine along with constraints on each state. Along with constraints on STATE, Helix also provides a way to specify constraints on transitions.  (More on this later.)
+Helix provides a way to configure an application-specific state machine along with constraints on each state. Along with constraints on STATE, Helix also provides a way to specify constraints on transitions.  (More on this later.)
 
 ```
-          OFFLINE  | SLAVE  |  MASTER  
+          OFFLINE  | SLAVE  |  MASTER
          _____________________________
         |          |        |         |
 OFFLINE |   N/A    | SLAVE  | SLAVE   |
@@ -115,40 +113,40 @@ MASTER  | SLAVE    | SLAVE  |   N/A   |
 
 ## Concepts
 
-The following terminologies are used in Helix to model a state machine.
+The following terminologies are used in Helix to model resources following a state machine.
 
-* IdealState: The state in which we need the cluster to be in if all nodes are up and running. In other words, all state constraints are satisfied.
-* CurrentState: Represents the actual current state of each node in the cluster 
-* ExternalView: Represents the combined view of CurrentState of all nodes.  
+* __IdealState__: The state in which we need the cluster to be in if all nodes are up and running. In other words, all state constraints are satisfied.
+* __CurrentState__: The actual current state of each node in the cluster
+* __ExternalView__: The combined view of the CurrentState of all nodes.
 
-The goal of Helix is always to make the CurrentState of the system same as the IdealState. Some scenarios where this may not be true are:
+The goal of Helix is always to make the CurrentState (and by extension, the ExternalView) of the system same as the IdealState. Some scenarios where this may not be true are:
 
-* When all nodes are down
-* When one or more nodes fail
+* Some or all nodes are down
+* One or more nodes fail
 * New nodes are added and the partitions need to be reassigned
 
 ### IdealState
 
-Helix lets the application define the IdealState on a resource basis which basically consists of:
+Helix lets the application define the IdealState for each resource. It consists of:
 
-* List of partitions. Example: 64
-* Number of replicas for each partition. Example: 3
-* Node and State for each replica.
+* A list of partitions, e.g. 64
+* Number of replicas for each partition, e.g. 3
+* The assigned node and state for each replica
 
 Example:
 
-* Partition-1, replica-1, Master, Node-1
-* Partition-1, replica-2, Slave, Node-2
-* Partition-1, replica-3, Slave, Node-3
+* Partition-1, replica-1: Master, Node-1
+* Partition-1, replica-2: Slave, Node-2
+* Partition-1, replica-3: Slave, Node-3
 * .....
 * .....
-* Partition-p, replica-3, Slave, Node-n
+* Partition-p, replica-r: Slave, Node-n
 
 Helix comes with various algorithms to automatically assign the partitions to nodes. The default algorithm minimizes the number of shuffles that happen when new nodes are added to the system.
 
 ### CurrentState
 
-Every instance in the cluster hosts one or more partitions of a resource. Each of the partitions has a state associated with it.
+Every participant in the cluster hosts one or more partitions of a resource. Each of the partitions has a state associated with it.
 
 Example Node-1
 
@@ -160,7 +158,7 @@ Example Node-1
 
 ### ExternalView
 
-External clients needs to know the state of each partition in the cluster and the Node hosting that partition. Helix provides one view of the system to Spectators as _ExternalView_. ExternalView is simply an aggregate of all node CurrentStates.
+External clients needs to know the state of each partition in the cluster and the Node hosting that partition. Helix provides one view of the system to Spectators as the ExternalView. The ExternalView is simply an aggregate of all node CurrentStates.
 
 * Partition-1, replica-1, Master, Node-1
 * Partition-1, replica-2, Slave, Node-2
@@ -176,49 +174,48 @@ Mode of operation in a cluster
 A node process can be one of the following:
 
 * Participant: The process registers itself in the cluster and acts on the messages received in its queue and updates the current state.  Example: a storage node in a distributed database
-* Spectator: The process is simply interested in the changes in the Externalview.
-* Controller: This process actively controls the cluster by reacting to changes in cluster state and sending messages to Participants.
-
+* Spectator: The process is simply interested in the changes in the ExternalView.
+* Controller: This process actively controls the cluster by reacting to changes in cluster state and sending state transition messages to Participants.
 
 ### Participant Node Process
 
-* When Node starts up, it registers itself under _LiveInstances_
-* After registering, it waits for new _Messages_ in the message queue
+* When the Participant starts up, it registers itself under __LiveInstances__
+* After registering, it waits for new __messages__ in the message queue
 * When it receives a message, it will perform the required task as indicated in the message
 * After the task is completed, depending on the task outcome it updates the CurrentState
 
 ### Controller Process
 
 * Watches IdealState
-* Notified when a node goes down/comes up or node is added/removed. Watches LiveInstances and CurrentState of each node in the cluster
-* Triggers appropriate state transitions by sending message to Participants
+* Notified when a Participant goes down, comes up, is added, or is removed. Watches the ephemeral LiveInstance ZNode and the CurrentState of each Participant in the cluster
+* Triggers appropriate state transitions by sending messages to Participants
 
 ### Spectator Process
 
 * When the process starts, it asks the Helix agent to be notified of changes in ExternalView
-* Whenever it receives a notification, it reads the Externalview and performs required duties.
+* Whenever it receives a notification, it reads the ExternalView and performs required duties
 
-#### Interaction between controller, participant and spectator
+### Interaction between the Controller, Participant and Spectator
 
-The following picture shows how controllers, participants and spectators interact with each other.
+The following picture shows how Controllers, Participants and Spectators interact with each other.
 
 ![Helix Architecture](images/helix-architecture.png)
 
-## Core algorithm
+## Core Controller Algorithm
 
-* Controller gets the IdealState and the CurrentState of active storage nodes from Zookeeper
-* Compute the delta between IdealState and CurrentState for each partition across all participant nodes
-* For each partition compute tasks based on the State Machine Table. It\'s possible to configure priority on the state Transition. For example, in case of Master-Slave:
-    * Attempt mastership transfer if possible without violating constraint.
-    * Partition Addition
-    * Drop Partition 
-* Add the tasks in parallel if possible to the respective queue for each storage node (if the tasks added are mutually independent)
-* If a task is dependent on another task being completed, do not add that task
-* After any task is completed by a Participant, Controllers gets notified of the change and the State Transition algorithm is re-run until the CurrentState is same as IdealState.
+* Get the IdealState and the CurrentState of active storage nodes from ZooKeeper
+* Compute the delta between IdealState and CurrentState for each partition replica across all Participant nodes
+* For each partition compute tasks based on the State Machine Table. It\'s possible to configure priority on the state Transition. For example, in case of MasterSlave:
+    * Attempt mastership transfer if possible without violating constraints
+    * Partition addition
+    * Partition drop
+* Add the transition tasks in parallel if possible to the respective queue for each storage node (if the tasks added are mutually independent)
+* If a transition task is dependent on another task being completed, do not add that task
+* After any task is completed by a Participant, Controllers gets notified of the change and the algorithm is re-run until the CurrentState matches the IdealState.
 
-## Helix ZNode layout
+## Helix ZNode Layout
 
-Helix organizes znodes under clusterName in multiple levels. 
+Helix organizes ZNodes under the cluster name in multiple levels.
 
 The top level (under the cluster name) ZNodes are all Helix-defined and in upper case:
 
@@ -247,6 +244,6 @@ Under CONFIGS, there are different scopes of configurations:
 * CLUSTER: contains cluster scope configurations
 * PARTICIPANT: contains participant scope configurations
 
-The following image shows an example of Helix znodes layout for a cluster named "test-cluster":
+The following image shows an example of the Helix ZNode layout for a cluster named "test-cluster":
 
 ![Helix znode layout](images/helix-znode-layout.png)

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/markdown/ClientLibraries.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/ClientLibraries.md b/src/site/markdown/ClientLibraries.md
index 6cdb56e..bcde42c 100644
--- a/src/site/markdown/ClientLibraries.md
+++ b/src/site/markdown/ClientLibraries.md
@@ -24,9 +24,13 @@ under the License.
 Client Libraries
 ----------------------------
 
-The following client libraries, in addition to the HelixAgent Java interface, are
+The following client libraries, in addition to the Helix Agent Java interface, are
 available for Helix:
 
-### Python 
+### Clojure
+
+* `clj-helix` - https://github.com/Factual/clj-helix
+
+### Python
 
 * `pyhelix` - https://github.com/kanakb/pyhelix

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/markdown/Concepts.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Concepts.md b/src/site/markdown/Concepts.md
index 5bf42ac..def0d1d 100644
--- a/src/site/markdown/Concepts.md
+++ b/src/site/markdown/Concepts.md
@@ -26,22 +26,22 @@ Concepts
 
 Helix is based on the idea that a given task has the following attributes associated with it:
 
-* _Location of the task_. For example it runs on Node N1
-* _State_. For example, it is running, stopped etc.
+* __Location__, e.g. it is available on Node N1
+* __State__, e.g. it is running, stopped etc.
 
-In Helix terminology, a task is referred to as a _resource_.
+In Helix terminology, a task is referred to as a __resource__.
 
-### IdealState
+### Ideal State
 
-IdealState simply allows one to map tasks to location and state. A standard way of expressing this in Helix:
+An __IdealState__ allows one to map tasks to location and state. A standard way of expressing this in Helix is as follows:
 
 ```
-  "TASK_NAME" : {
-    "LOCATION" : "STATE"
-  }
-
+"TASK_NAME" : {
+  "LOCATION" : "STATE"
+}
 ```
-Consider a simple case where you want to launch a task \'myTask\' on node \'N1\'. The IdealState for this can be expressed as follows:
+
+Consider a simple case where you want to launch a resource \"myTask\" on node \"N1\". The IdealState for this can be expressed as follows:
 
 ```
 {
@@ -53,11 +53,12 @@ Consider a simple case where you want to launch a task \'myTask\' on node \'N1\'
   }
 }
 ```
+
 ### Partition
 
-If this task get too big to fit on one box, you might want to divide it into subtasks. Each subtask is referred to as a _partition_ in Helix. Let\'s say you want to divide the task into 3 subtasks/partitions, the IdealState can be changed as shown below. 
+If this task get too big to fit on one box, you might want to divide it into subtasks. Each subtask is referred to as a __partition__ in Helix. Let\'s say you want to divide the task into 3 subtasks/partitions, the IdealState can be changed as shown below.
 
-\'myTask_0\', \'myTask_1\', \'myTask_2\' are logical names representing the partitions of myTask. Each tasks runs on N1, N2 and N3 respectively.
+\"myTask_0\", \"myTask_1\", \"myTask_2\" are logical names representing the partitions of myTask. Each tasks runs on N1, N2 and N3 respectively.
 
 ```
 {
@@ -81,9 +82,9 @@ If this task get too big to fit on one box, you might want to divide it into sub
 
 ### Replica
 
-Partitioning allows one to split the data/task into multiple subparts. But let\'s say the request rate for each partition increases. The common solution is to have multiple copies for each partition. Helix refers to the copy of a partition as a _replica_.  Adding a replica also increases the availability of the system during failures. One can see this methodology employed often in search systems. The index is divided into shards, and each shard has multiple copies.
+Partitioning allows one to split the data/task into multiple subparts. But let\'s say the request rate for each partition increases. The common solution is to have multiple copies for each partition. Helix refers to the copy of a partition as a __replica__.  Adding a replica also increases the availability of the system during failures. One can see this methodology employed often in search systems. The index is divided into shards, and each shard has multiple copies.
 
-Let\'s say you want to add one additional replica for each task. The IdealState can simply be changed as shown below. 
+Let\'s say you want to add one additional replica for each task. The IdealState can simply be changed as shown below.
 
 For increasing the availability of the system, it\'s better to place the replica of a given partition on different nodes.
 
@@ -111,11 +112,11 @@ For increasing the availability of the system, it\'s better to place the replica
 }
 ```
 
-### State 
+### State
 
 Now let\'s take a slightly more complicated scenario where a task represents a database.  Unlike an index which is in general read-only, a database supports both reads and writes. Keeping the data consistent among the replicas is crucial in distributed data stores. One commonly applied technique is to assign one replica as the MASTER and remaining replicas as SLAVEs. All writes go to the MASTER and are then replicated to the SLAVE replicas.
 
-Helix allows one to assign different states to each replica. Let\'s say you have two MySQL instances N1 and N2, where one will serve as MASTER and another as SLAVE. The IdealState can be changed to:
+Helix allows one to assign different __states__ to each replica. Let\'s say you have two MySQL instances N1 and N2, where one will serve as MASTER and another as SLAVE. The IdealState can be changed to:
 
 ```
 {
@@ -131,23 +132,22 @@ Helix allows one to assign different states to each replica. Let\'s say you have
     }
   }
 }
-
 ```
 
 
 ### State Machine and Transitions
 
-IdealState allows one to exactly specify the desired state of the cluster. Given an IdealState, Helix takes up the responsibility of ensuring that the cluster reaches the IdealState.  The Helix _controller_ reads the IdealState and then commands each Participant to take appropriate actions to move from one state to another until it matches the IdealState.  These actions are referred to as _transitions_ in Helix.
+The IdealState allows one to exactly specify the desired state of the cluster. Given an IdealState, Helix takes up the responsibility of ensuring that the cluster reaches the IdealState.  The Helix __controller__ reads the IdealState and then commands each Participant to take appropriate actions to move from one state to another until it matches the IdealState.  These actions are referred to as __transitions__ in Helix.
 
-The next logical question is:  how does the _controller_ compute the transitions required to get to IdealState?  This is where the finite state machine concept comes in. Helix allows applications to plug in a finite state machine.  A state machine consists of the following:
+The next logical question is: how does the controller compute the transitions required to get to IdealState?  This is where the __finite state machine__ concept comes in. Helix allows applications to plug in a finite state machine.  A state machine consists of the following:
 
-* State: Describes the role of a replica
-* Transition: An action that allows a replica to move from one state to another, thus changing its role.
+* __State__: Describes the role of a replica
+* __Transition__: An action that allows a replica to move from one state to another, thus changing its role.
 
 Here is an example of MasterSlave state machine:
 
 ```
-          OFFLINE  | SLAVE  |  MASTER  
+          OFFLINE  | SLAVE  |  MASTER
          _____________________________
         |          |        |         |
 OFFLINE |   N/A    | SLAVE  | SLAVE   |
@@ -183,7 +183,7 @@ Helix allows each resource to be associated with one state machine. This means y
 
 ### Current State
 
-CurrentState of a resource simply represents its actual state at a Participant. In the below example:
+The __CurrentState__ of a resource simply represents its actual state at a participating node, a __participant__. In the below example:
 
 * INSTANCE_NAME: Unique name representing the process
 * SESSION_ID: ID that is automatically assigned every time a process joins the cluster
@@ -209,11 +209,12 @@ CurrentState of a resource simply represents its actual state at a Participant.
   }
 }
 ```
+
 Each node in the cluster has its own CurrentState.
 
 ### External View
 
-In order to communicate with the Participants, external clients need to know the current state of each of the Participants. The external clients are referred to as Spectators. In order to make the life of Spectator simple, Helix provides an ExternalView that is an aggregated view of the current state across all nodes. The ExternalView has a similar format as IdealState.
+In order to communicate with the participants, external clients need to know the current state of each of the participants. The external clients are referred to as __spectators__. In order to make the life of spectator simple, Helix provides an ExternalView that is an aggregated view of the current state across all nodes. The ExternalView has a similar format as IdealState.
 
 ```
 {
@@ -242,7 +243,8 @@ In order to communicate with the Participants, external clients need to know the
 
 The core component of Helix is the Controller which runs the Rebalancer algorithm on every cluster event. Cluster events can be one of the following:
 
-* Nodes start/stop and soft/hard failures
+* Nodes start and/or stop
+* Nodes experience soft and/or hard failures
 * New nodes are added/removed
 * Ideal state changes
 
@@ -250,9 +252,9 @@ There are few more examples such as configuration changes, etc.  The key takeawa
 
 When a rebalancer is run it simply does the following:
 
-* Compares the IdealState and current state
-* Computes the transitions required to reach the IdealState
-* Issues the transitions to each Participant
+* Compares the ideal state and current state
+* Computes the transitions required to reach the ideal state
+* Issues the transitions to each participant
 
 The above steps happen for every change in the system. Once the current state matches the IdealState, the system is considered stable which implies \'IdealState = CurrentState = ExternalView\'
 
@@ -260,7 +262,13 @@ The above steps happen for every change in the system. Once the current state ma
 
 One of the things that makes Helix powerful is that IdealState can be changed dynamically. This means one can listen to cluster events like node failures and dynamically change the ideal state. Helix will then take care of triggering the respective transitions in the system.
 
-Helix comes with a few algorithms to automatically compute the IdealState based on the constraints. For example, if you have a resource of 3 partitions and 2 replicas, Helix can automatically compute the IdealState based on the nodes that are currently active. See the [tutorial](./site-releases/0.7.0-incubating-site/tutorial_rebalance.html) to find out more about various execution modes of Helix like FULL_AUTO, SEMI_AUTO and CUSTOMIZED. 
+Helix allows various granularities of control for adjusting the ideal state. Whenever a cluster event occurs, Helix can operate in one of three modes:
+
+* __FULL\_AUTO__: Helix will automatically determine the location and state of each replica based on constraints
+* __SEMI\_AUTO__: Helix will take in a \"preference list\" representing the location each replica can live at, and automatically determine the state based on constraints
+* __CUSTOMIZED__: Helix will take in a map of location to state and fire transitions to get the external view to match
+
+Helix comes with a few algorithms to automatically compute the IdealState based on the constraints. For example, if you have a resource of 3 partitions and 2 replicas, Helix can automatically compute the IdealState based on the nodes that are currently active. See the [tutorial](./site-releases/0.6.2-incubating-site/tutorial_rebalance.html) to find out more about various execution modes of Helix like FULL_AUTO, SEMI_AUTO and CUSTOMIZED.
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 49cc12f..6d5154e 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -21,79 +21,69 @@ under the License.
   <title>Home</title>
 </head>
 
-News
-----
 
-Apache Helix has two new releases:
-
-* [0.6.2-incubating](./site-releases/0.6.2-incubating-site/index.html) - A release that fixes numerous bugs and improves platform stability. [\[Release Notes\]](./releasenotes/release-0.6.2-incubating.html)
+## Apache Helix
 
-* [0.7.0-incubating](./site-releases/0.7.0-incubating-site/index.html) - A release that includes high-level APIs to logically interact with Participants, Controllers, Resources, and other Helix constructs. __This release is an alpha and APIs are in the process of being finalized__. Feel free to play with it and provide any feedback you have! [\[Release Notes\]](./releasenotes/release-0.7.0-incubating.html)
+Apache Helix is a generic _cluster management_ framework used for the automatic management of partitioned, replicated and distributed resources hosted on a cluster of nodes. __Helix automates reassignment of resources in the face of node failure and recovery, cluster expansion, and reconfiguration.__
 
 
-What Is Helix?
---------------
-Helix is a generic _cluster management_ framework used for the automatic management of partitioned, replicated and distributed resources hosted on a cluster of nodes.
+## What Is Cluster Management?
 
-
-What Is Cluster Management?
----------------------------
-To understand Helix, first you need to understand _cluster management_.  A distributed system typically runs on multiple nodes for the following reasons:
+To understand Helix, you first need to understand __cluster management__. A distributed system typically runs on multiple nodes for the following reasons:
 
 * scalability
 * fault tolerance
 * load balancing
 
-Each node performs one or more of the primary function of the cluster, such as storing and serving data, producing and consuming data streams, and so on.  Once configured for your system, Helix acts as the global brain for the system.  It is designed to make decisions that cannot be made in isolation.  Examples of such decisions that require global knowledge and coordination:
+Each node performs one or more of the primary functions of the cluster, such as storing and serving data, producing and consuming data streams, and so on. __Once configured for your system, Helix acts as the global brain for the system__. It is designed to make decisions that cannot be made in isolation.  Examples of such decisions that require global knowledge and coordination:
 
 * scheduling of maintainence tasks, such as backups, garbage collection, file consolidation, index rebuilds
 * repartitioning of data or resources across the cluster
 * informing dependent systems of changes so they can react appropriately to cluster changes
 * throttling system tasks and changes
 
-While it is possible to integrate these functions into the distributed system, it complicates the code.  Helix has abstracted common cluster management tasks, enabling the system builder to model the desired behavior with a declarative state model, and let Helix manage the coordination.  The result is less new code to write, and a robust, highly operable system.
+While it is possible to integrate these functions into the distributed system, it complicates the code. Helix has abstracted common cluster management tasks, enabling the system builder to model the desired behavior with a declarative state model, and let Helix manage the coordination. __The result is less new code to write, and a robust, highly operable system__.
+
+## What does Helix provide?
 
+* Automatic assignment of resources and partitions to nodes
+* Node failure detection and recovery
+* Dynamic addition of resources
+* Dynamic addition of nodes to the cluster
+* Pluggable distributed state machine to manage the state of a resource via state transitions
+* Automatic load balancing and throttling of transitions
+* Optional pluggable rebalancing for user-defined assignment of resources and partitions
 
-What does Helix provide?
-------------------------
-1. Automatic assignment of resources and partitions to nodes
-2. Node failure detection and recovery
-3. Dynamic addition of resources
-4. Dynamic addition of nodes to the cluster
-5. Pluggable distributed state machine to manage the state of a resource via state transitions
-6. Automatic load balancing and throttling of transitions
-7. Optional pluggable rebalancing for user-defined assignment of resources and partitions
 
+## Why Helix?
 
-Why Helix?
-----------
 Modeling a distributed system as a state machine with constraints on states and transitions has the following benefits:
 
 * Separates cluster management from the core functionality of the system.
 * Allows a quick transformation from a single node system to an operable, distributed system.
 * Increases simplicity: system components do not have to manage a global cluster.  This division of labor makes it easier to build, debug, and maintain your system.
 
+---
 
-Download
---------
+### News
 
-[0.6.2-incubating](./site-releases/0.6.2-incubating-site/download.html)
+Apache Helix has two new releases:
 
-[0.7.0-incubating](./site-releases/0.7.0-incubating-site/download.html) (alpha)
+* [0.6.2-incubating](./site-releases/0.6.2-incubating-site/index.html) - A release that fixes numerous bugs and improves platform stability.
 
-Build Instructions
-------------------
+    [\[Quick Start\]](./site-releases/0.6.2-incubating-site/Quickstart.html) [\[Release Notes\]](./releasenotes/release-0.6.2-incubating.html)
 
-Requirements: JDK 1.6+, Maven 2.0.8+
+* [0.7.0-incubating](./site-releases/0.7.0-incubating-site/index.html) - A release that includes high-level APIs to logically interact with Participants, Controllers, Resources, and other Helix constructs. __This release is an alpha and APIs are in the process of being finalized__. Feel free to play with it and provide any feedback you have!
 
-```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
-git checkout tags/helix-0.6.2-incubating
-mvn install package -DskipTests
-```
+    [\[Quick Start\]](./site-releases/0.7.0-incubating-site/Quickstart.html) [\[Release Notes\]](./releasenotes/release-0.7.0-incubating.html)
+
+### Download
+
+<a href="./site-releases/0.6.2-incubating-site/download.html" class="btn btn-primary btn-small">0.6.2-incubating</a>
 
-Maven dependency
+<a href="./site-releases/0.7.0-incubating-site/download.html" class="btn btn-primary btn-small">0.7.0-incubating (alpha)</a>
+
+### Maven Dependency
 
 ```
 <dependency>
@@ -103,3 +93,19 @@ Maven dependency
 </dependency>
 ```
 
+### Building
+
+Requirements: JDK 1.6+, Maven 2.0.8+
+
+```
+git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+cd incubator-helix
+git checkout helix-0.6.2-incubating
+mvn install package -DskipTests
+```
+
+### Get Help
+
+[#apachehelix](./IRC.html)
+
+`user@helix.incubator.apache.org`

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/resources/images/feather_small.gif
----------------------------------------------------------------------
diff --git a/src/site/resources/images/feather_small.gif b/src/site/resources/images/feather_small.gif
new file mode 100644
index 0000000..94f1892
Binary files /dev/null and b/src/site/resources/images/feather_small.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/resources/images/helix-logo.jpg
----------------------------------------------------------------------
diff --git a/src/site/resources/images/helix-logo.jpg b/src/site/resources/images/helix-logo.jpg
index d6428f6..6299014 100644
Binary files a/src/site/resources/images/helix-logo.jpg and b/src/site/resources/images/helix-logo.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index af9225c..3d98c9d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -21,17 +21,17 @@
     <href>http://helix.incubator.apache.org/</href>
   </bannerLeft>
   <bannerRight>
-    <src>http://incubator.apache.org/images/egg-logo.png</src>
-    <href>http://incubator.apache.org/</href>
+    <src>images/feather_small.gif</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
 
   <publishDate position="none"/>
   <version position="none"/>
 
   <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
+    <groupId>lt.velykis.maven.skins</groupId>
+    <artifactId>reflow-maven-skin</artifactId>
+    <version>1.0.0</version>
   </skin>
 
   <body>
@@ -57,15 +57,14 @@
       <item name="Apache Helix" href="http://helix.incubator.apache.org/"/>
     </breadcrumbs>
 
-    <menu name="Apache Helix">
-      <item name="Introduction" href="./index.html"/>
+    <menu name="Learn">
       <item name="Core concepts" href="./Concepts.html"/>
       <item name="Architecture" href="./Architecture.html"/>
       <item name="Publications" href="./Publications.html"/>
       <item name="Client Libraries" href="./ClientLibraries.html"/>
     </menu>
 
-    <menu name="Releases">
+    <menu name="Documentation">
       <item name="0.6.2-incubating (stable)" href="./site-releases/0.6.2-incubating-site/index.html"/>
       <item name="0.7.0-incubating (alpha)" href="./site-releases/0.7.0-incubating-site/index.html"/>
       <item name="0.6.1-incubating" href="./site-releases/0.6.1-incubating-site/index.html"/>
@@ -73,6 +72,7 @@
     </menu>
 
     <menu name="Helix 0.6.2-incubating">
+      <item name="Documentation" href="./site-releases/0.6.2-incubating-site/index.html"/>
       <item name="Quick Start" href="./site-releases/0.6.2-incubating-site/Quickstart.html"/>
       <item name="Tutorial" href="./site-releases/0.6.2-incubating-site/Tutorial.html"/>
       <item name="Download" href="./site-releases/0.6.2-incubating-site/download.html"/>
@@ -110,7 +110,7 @@
   </body>
 
   <custom>
-    <fluidoSkin>
+    <!--fluidoSkin>
       <topBarEnabled>true</topBarEnabled>
       <googleSearch></googleSearch>
       <twitter>
@@ -118,9 +118,31 @@
         <showUser>true</showUser>
         <showFollowers>false</showFollowers>
       </twitter>
-      <!-- twitter link work only with sidebar disabled -->
       <sideBarEnabled>true</sideBarEnabled>
-    </fluidoSkin>
+    </fluidoSkin-->
+    <reflowSkin>
+      <theme>bootswatch-cerulean</theme>
+      <highlightJs>false</highlightJs>
+      <brand>
+        <name>Apache Helix</name>
+        <href>http://helix.incubator.apache.org</href>
+      </brand>
+      <slogan>A cluster management framework for partitioned and replicated distributed resources</slogan>
+      <bottomNav>
+        <column>Learn</column>
+        <column>Documentation|Helix 0.6.2-incubating</column>
+        <column>Get Involved</column>
+        <column>ASF</column>
+      </bottomNav>
+      <pages>
+        <index>
+          <sections>
+            <body />
+            <sidebar />
+          </sections>
+        </index>
+      </pages>
+    </reflowSkin>
   </custom>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/92edaabc/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index f075bab..ce4769a 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -22,7 +22,7 @@ under the License.
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
   <properties>
-    <title>Apache Incubator Helix Downloads</title>
+    <title>Apache Helix Downloads</title>
     <author email="dev@helix.incubator.apache.org">Apache Helix Documentation Team</author>
   </properties>
 
@@ -33,7 +33,7 @@ under the License.
       </macro>
     </div>
 
-    <section name="Introduction">
+    <section name="Apache Helix Downloads">
       <p>Apache Helix artifacts are distributed in source and binary form under the terms of the
         <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
         See the included <tt>LICENSE</tt> and <tt>NOTICE</tt> files included in each artifact for additional license


Mime
View raw message