helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [1/2] [HELIX-358] Update website to reflect graduation
Date Fri, 17 Jan 2014 17:57:25 GMT
Updated Branches:
  refs/heads/master 027eea291 -> ed3de1e51


http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/recipes/rabbitmq_consumer_group.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/recipes/rabbitmq_consumer_group.md b/website/trunk/src/site/markdown/recipes/rabbitmq_consumer_group.md
index 7a65542..6b9d80d 100644
--- a/website/trunk/src/site/markdown/recipes/rabbitmq_consumer_group.md
+++ b/website/trunk/src/site/markdown/recipes/rabbitmq_consumer_group.md
@@ -50,8 +50,8 @@ We showcase how such a dynamic application can be developed using Helix.
Even th
 ### Try It
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 mvn clean install package -DskipTests
 cd recipes/rabbitmq-consumer-group/bin
 chmod +x *
@@ -137,7 +137,7 @@ In any terminal press CTRL^C and notice that Helix detects the consumer
failure
 
 ### How does this work?
 
-Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=incubator-helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
+Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
 
 #### Cluster Setup
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/recipes/rsync_replicated_file_store.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/recipes/rsync_replicated_file_store.md b/website/trunk/src/site/markdown/recipes/rsync_replicated_file_store.md
index 24cca63..b8cb3fb 100644
--- a/website/trunk/src/site/markdown/recipes/rsync_replicated_file_store.md
+++ b/website/trunk/src/site/markdown/recipes/rsync_replicated_file_store.md
@@ -34,8 +34,8 @@ Near-Realtime Rsync Replicated File System
 
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 cd recipes/rsync-replicated-file-system/
 mvn clean install package -DskipTests
 cd target/rsync-replicated-file-system-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/recipes/service_discovery.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/recipes/service_discovery.md b/website/trunk/src/site/markdown/recipes/service_discovery.md
index 5338d82..c477e67 100644
--- a/website/trunk/src/site/markdown/recipes/service_discovery.md
+++ b/website/trunk/src/site/markdown/recipes/service_discovery.md
@@ -82,8 +82,8 @@ Helix provides these additional features compared to other implementations
avail
 ### Checkout and Build
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 mvn clean install package -DskipTests
 cd recipes/service-discovery/target/service-discovery-pkg/bin
 chmod +x *

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/recipes/task_dag_execution.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/recipes/task_dag_execution.md b/website/trunk/src/site/markdown/recipes/task_dag_execution.md
index 32faa1f..b58c023 100644
--- a/website/trunk/src/site/markdown/recipes/task_dag_execution.md
+++ b/website/trunk/src/site/markdown/recipes/task_dag_execution.md
@@ -79,8 +79,8 @@ See http://redis.io/topics/quickstart on how to install redis server
 Start redis e.g:
 ./redis-server --port 6379
 
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 cd recipes/task-execution
 mvn clean install package -DskipTests
 cd target/task-execution-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/recipes/user_def_rebalancer.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/recipes/user_def_rebalancer.md b/website/trunk/src/site/markdown/recipes/user_def_rebalancer.md
index 1202724..c26baa7 100644
--- a/website/trunk/src/site/markdown/recipes/user_def_rebalancer.md
+++ b/website/trunk/src/site/markdown/recipes/user_def_rebalancer.md
@@ -25,9 +25,9 @@ Helix is able to compute node preferences and state assignments automatically
us
 
 The YAML file below fully defines the cluster and the locks. A lock can be in one of two
states: locked and unlocked. Transitions can happen in either direction, and the locked is
preferred. A resource in this example is the entire collection of locks to distribute. A partition
is mapped to a lock; in this case that means there are 12 locks. These 12 locks will be distributed
across 3 nodes. The constraints indicate that only one replica of a lock can be in the locked
state at any given time. These locks can each only have a single holder, defined by a replica
count of 1.
 
-Notice the rebalancer section of the definition. The mode is set to USER_DEFINED and the
class name refers to the plugged-in rebalancer implementation that inherits from [HelixRebalancer](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html).
This implementation is called whenever the state of the cluster changes, as is the case when
participants are added or removed from the system.
+Notice the rebalancer section of the definition. The mode is set to USER_DEFINED and the
class name refers to the plugged-in rebalancer implementation that inherits from [HelixRebalancer](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html).
This implementation is called whenever the state of the cluster changes, as is the case when
participants are added or removed from the system.
 
-Location: `incubator-helix/recipes/user-defined-rebalancer/src/main/resources/lock-manager-config.yaml`
+Location: `helix/recipes/user-defined-rebalancer/src/main/resources/lock-manager-config.yaml`
 
 ```
 clusterName: lock-manager-custom-rebalancer # unique name for the cluster
@@ -94,9 +94,9 @@ YAMLClusterSetup.YAMLClusterConfig config = setup.setupCluster(input);
 ```
 
 ### Write a Rebalancer
-Below is a full implementation of a rebalancer that extends [HelixRebalancer](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html).
In this case, it simply throws out the previous resource assignment, computes the target node
for as many partition replicas as can hold a lock in the LOCKED state (in this example, one),
and assigns them the LOCKED state (which is at the head of the state preference list). Clearly
a more robust implementation would likely examine the current ideal state to maintain current
assignments, and the full state list to handle models more complicated than this one. However,
for a simple lock holder implementation, this is sufficient.
+Below is a full implementation of a rebalancer that extends [HelixRebalancer](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html).
In this case, it simply throws out the previous resource assignment, computes the target node
for as many partition replicas as can hold a lock in the LOCKED state (in this example, one),
and assigns them the LOCKED state (which is at the head of the state preference list). Clearly
a more robust implementation would likely examine the current ideal state to maintain current
assignments, and the full state list to handle models more complicated than this one. However,
for a simple lock holder implementation, this is sufficient.
 
-Location: `incubator-helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/LockManagerRebalancer.java`
+Location: `helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/LockManagerRebalancer.java`
 
 ```
 @Override
@@ -164,7 +164,7 @@ public ResourceAssignment computeResourceMapping(RebalancerConfig rebalancerConf
 ### Start up the Participants
 Here is a lock class based on the newly defined lock-unlock state model so that the participant
can receive callbacks on state transitions.
 
-Location: `incubator-helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/Lock.java`
+Location: `helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/Lock.java`
 
 ```
 public class Lock extends StateModel {
@@ -188,7 +188,7 @@ public class Lock extends StateModel {
 
 Here is the factory to make the Lock class accessible.
 
-Location: `incubator-helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/LockFactory.java`
+Location: `helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/LockFactory.java`
 
 ```
 public class LockFactory extends StateModelFactory<Lock> {
@@ -221,8 +221,8 @@ controllerManager =
 ### Try It Out
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 mvn clean install package -DskipTests
 cd recipes/user-defined-rebalancer/target/user-defined-rebalancer-pkg/bin
 chmod +x *

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/tutorial_accessors.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/tutorial_accessors.md b/website/trunk/src/site/markdown/tutorial_accessors.md
index 60b698f..fd8aa2f 100644
--- a/website/trunk/src/site/markdown/tutorial_accessors.md
+++ b/website/trunk/src/site/markdown/tutorial_accessors.md
@@ -25,7 +25,7 @@ under the License.
 
 Helix constructs follow a logical hierarchy. A cluster contains participants, and serve logical
resources. Each resource can be divided into partitions, which themselves can be replicated.
Helix now supports configuring and modifying clusters programmatically in a hierarchical way
using logical accessors.
 
-[Click here](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/api/accessor/package-summary.html)
for the Javadocs of the accessors.
+[Click here](http://helix.apache.org/apidocs/reference/org/apache/helix/api/accessor/package-summary.html)
for the Javadocs of the accessors.
 
 ### An Example
 
@@ -42,13 +42,13 @@ ParticipantConfig participantConfig = new ParticipantConfig.Builder(participantI
 #### Configure a Resource
 
 ##### RebalancerConfig
-A Resource is essentially a combination of a RebalancerConfig and a UserConfig. A [RebalancerConfig](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/RebalancerConfig.html)
consists of all the key properties required to rebalance a resource, including how it is partitioned
and replicated, and what state model it follows. Most Helix resources will make use of a [PartitionedRebalancerConfig](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/PartitionedRebalancerConfig.html),
which is a RebalancerConfig for resources that are partitioned.
+A Resource is essentially a combination of a RebalancerConfig and a UserConfig. A [RebalancerConfig](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/RebalancerConfig.html)
consists of all the key properties required to rebalance a resource, including how it is partitioned
and replicated, and what state model it follows. Most Helix resources will make use of a [PartitionedRebalancerConfig](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/PartitionedRebalancerConfig.html),
which is a RebalancerConfig for resources that are partitioned.
 
 Recall that there are four [rebalancing modes](./tutorial_rebalance.html) that Helix provides,
and so Helix also provides the following subclasses for PartitionedRebalancerConfig:
 
-* [FullAutoRebalancerConfig](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/FullAutoRebalancerConfig.html)
for FULL_AUTO mode.
-* [SemiAutoRebalancerConfig](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/SemiAutoRebalancerConfig.html)
for SEMI_AUTO mode. This class allows a user to specify "preference lists" to indicate where
each partition should ideally be served
-* [CustomRebalancerConfig](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/CustomRebalancerConfig.html)
for CUSTOMIZED mode. This class allows a user tp specify "preference maps" to indicate the
location and state for each partition replica.
+* [FullAutoRebalancerConfig](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/FullAutoRebalancerConfig.html)
for FULL_AUTO mode.
+* [SemiAutoRebalancerConfig](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/SemiAutoRebalancerConfig.html)
for SEMI_AUTO mode. This class allows a user to specify "preference lists" to indicate where
each partition should ideally be served
+* [CustomRebalancerConfig](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/CustomRebalancerConfig.html)
for CUSTOMIZED mode. This class allows a user tp specify "preference maps" to indicate the
location and state for each partition replica.
 
 Helix also supports arbitrary subclasses of PartitionedRebalancerConfig and even arbitrary
implementations of RebalancerConfig for applications that need a user-defined approach for
rebalancing. For more, see [User-Defined Rebalancing](./tutorial_user_def_rebalancer.html)
 
@@ -87,7 +87,7 @@ clusterAccessor.createCluster(clusterConfig);
 
 ### Create, Read, Update, and Delete
 
-Note that you don't have to specify the entire cluster beforehand! Helix provides a ClusterAccessor,
ParticipantAccessor, and ResourceAccessor to allow changing as much or as little of the cluster
as needed on the fly. You can add a resource or participant to a cluster, reconfigure a resource,
participant, or cluster, remove components from the cluster, and more. See the [Javadocs](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/api/accessor/package-summary.html)
to see all that the accessor classes can do.
+Note that you don't have to specify the entire cluster beforehand! Helix provides a ClusterAccessor,
ParticipantAccessor, and ResourceAccessor to allow changing as much or as little of the cluster
as needed on the fly. You can add a resource or participant to a cluster, reconfigure a resource,
participant, or cluster, remove components from the cluster, and more. See the [Javadocs](http://helix.apache.org/apidocs/reference/org/apache/helix/api/accessor/package-summary.html)
to see all that the accessor classes can do.
 
 #### Delta Classes
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/tutorial_admin.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/tutorial_admin.md b/website/trunk/src/site/markdown/tutorial_admin.md
index 98175f8..866c50b 100644
--- a/website/trunk/src/site/markdown/tutorial_admin.md
+++ b/website/trunk/src/site/markdown/tutorial_admin.md
@@ -30,7 +30,7 @@ Helix provides a set of admin APIs for cluster management operations. They
are s
 * REST Interface via helix-admin-webapp
 
 ### Java API
-See interface [_org.apache.helix.HelixAdmin_](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/HelixAdmin.html)
+See interface [_org.apache.helix.HelixAdmin_](http://helix.apache.org/apidocs/reference/org/apache/helix/HelixAdmin.html)
 
 ### Command Line Interface
 The command line tool comes with helix-core package:
@@ -38,8 +38,8 @@ The command line tool comes with helix-core package:
 Get the command line tool:
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 ./build
 cd helix-core/target/helix-core-pkg/bin
 chmod +x *.sh
@@ -107,8 +107,8 @@ All other commands have this form:
 The REST interface comes wit helix-admin-webapp package:
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 ./build
 cd helix-admin-webapp/target/helix-admin-webapp-pkg/bin
 chmod +x *.sh

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/tutorial_messaging.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/tutorial_messaging.md b/website/trunk/src/site/markdown/tutorial_messaging.md
index 9ed196d..21e1b99 100644
--- a/website/trunk/src/site/markdown/tutorial_messaging.md
+++ b/website/trunk/src/site/markdown/tutorial_messaging.md
@@ -67,4 +67,4 @@ int sentMessageCount = messagingService.sendAndWait(recipientCriteria,
     requestBackupUriRequest, responseHandler, timeout);
 ```
 
-See HelixManager.DefaultMessagingService in the [Javadocs](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/messaging/DefaultMessagingService.html)
for more information.
+See HelixManager.DefaultMessagingService in the [Javadocs](http://helix.apache.org/apidocs/reference/org/apache/helix/messaging/DefaultMessagingService.html)
for more information.

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/tutorial_propstore.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/tutorial_propstore.md b/website/trunk/src/site/markdown/tutorial_propstore.md
index 9fd1f9c..97308e7 100644
--- a/website/trunk/src/site/markdown/tutorial_propstore.md
+++ b/website/trunk/src/site/markdown/tutorial_propstore.md
@@ -31,4 +31,4 @@ It is common that an application needs support for distributed, shared data
stru
 
 While you could use ZooKeeper directly, Helix supports caching the data with a write-through
cache. This is far more efficient than reading from ZooKeeper for every access.
 
-See [HelixManager.getHelixPropertyStore](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/store/package-summary.html)
for details.
+See [HelixManager.getHelixPropertyStore](http://helix.apache.org/apidocs/reference/org/apache/helix/store/package-summary.html)
for details.

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/tutorial_user_def_rebalancer.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/tutorial_user_def_rebalancer.md b/website/trunk/src/site/markdown/tutorial_user_def_rebalancer.md
index 551f2ec..41d1111 100644
--- a/website/trunk/src/site/markdown/tutorial_user_def_rebalancer.md
+++ b/website/trunk/src/site/markdown/tutorial_user_def_rebalancer.md
@@ -27,7 +27,7 @@ Even though Helix can compute both the location and the state of replicas
intern
 
 Whenever the state of the cluster changes, as is the case when participants join or leave
the cluster, Helix automatically calls the rebalancer to compute a new mapping of all the
replicas in the resource. When using a pluggable rebalancer, the only required step is to
register it with Helix. Subsequently, no additional bootstrapping steps are necessary. Helix
uses reflection to look up and load the class dynamically at runtime. As a result, it is also
technically possible to change the rebalancing strategy used at any time.
 
-The [HelixRebalancer](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html)
interface is as follows:
+The [HelixRebalancer](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html)
interface is as follows:
 
 ```
 public void init(HelixManager helixManager, ControllerContextProvider contextProvider);
@@ -43,7 +43,7 @@ A ResourceAssignment is a full representation of the location and the state
of e
 
 ### Rebalancer Config
 
-Helix provides an interface called [RebalancerConfig](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/RebalancerConfig.html).
For each of the four main [rebalancing modes](./tutorial_rebalance.html), there is a base
class called [PartitionedRebalancerConfig](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/PartitionedRebalancerConfig.html),
which contains all of the basic properties required for a partitioned resource. Helix provides
three derived classes for PartitionedRebalancerConfig: FullAutoRebalancerConfig, SemiAutoRebalancerConfig,
and CustomizedRebalancerConfig. If none of these work for your application, you can create
your own class that derives PartiitonedRebalancerConfig (or even only implements RebalancerConfig).
+Helix provides an interface called [RebalancerConfig](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/RebalancerConfig.html).
For each of the four main [rebalancing modes](./tutorial_rebalance.html), there is a base
class called [PartitionedRebalancerConfig](http://helix.apache.org/apidocs/reference/org/apache/helix/controller/rebalancer/config/PartitionedRebalancerConfig.html),
which contains all of the basic properties required for a partitioned resource. Helix provides
three derived classes for PartitionedRebalancerConfig: FullAutoRebalancerConfig, SemiAutoRebalancerConfig,
and CustomizedRebalancerConfig. If none of these work for your application, you can create
your own class that derives PartiitonedRebalancerConfig (or even only implements RebalancerConfig).
 
 ### Specifying a Rebalancer
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/tutorial_yaml.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/tutorial_yaml.md b/website/trunk/src/site/markdown/tutorial_yaml.md
index 4660afa..1e4772e 100644
--- a/website/trunk/src/site/markdown/tutorial_yaml.md
+++ b/website/trunk/src/site/markdown/tutorial_yaml.md
@@ -82,7 +82,7 @@ participants: # list of nodes that can serve replicas (optional if dynamic
joini
 Using a file like the one above, the cluster can be set up either with the command line:
 
 ```
-incubator-helix/helix-core/target/helix-core/pkg/bin/YAMLClusterSetup.sh localhost:2199 lock-manager-config.yaml
+helix/helix-core/target/helix-core/pkg/bin/YAMLClusterSetup.sh localhost:2199 lock-manager-config.yaml
 ```
 
 or with code:

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/site.xml
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/site.xml b/website/trunk/src/site/site.xml
index c6e1743..8024831 100644
--- a/website/trunk/src/site/site.xml
+++ b/website/trunk/src/site/site.xml
@@ -18,7 +18,7 @@
 <project name="Apache Helix">
   <bannerLeft>
     <src>../images/helix-logo.jpg</src>
-    <href>http://helix.incubator.apache.org/</href>
+    <href>http://helix.apache.org/</href>
   </bannerLeft>
   <bannerRight>
     <src>../images/feather_small.gif</src>
@@ -54,8 +54,8 @@
     </head>
 
     <breadcrumbs position="left">
-      <item name="Apache Helix" href="http://helix.incubator.apache.org/"/>
-      <item name="trunk" href="http://helix.incubator.apache.org/trunk-docs/"/>
+      <item name="Apache Helix" href="http://helix.apache.org/"/>
+      <item name="trunk" href="http://helix.apache.org/trunk-docs/"/>
     </breadcrumbs>
 
     <links>
@@ -69,7 +69,7 @@
     <menu name="Hands-On">
       <item name="Quick Start" href="./Quickstart.html"/>
       <item name="Tutorial" href="./Tutorial.html"/>
-      <item name="Javadocs" href="http://helix.incubator.apache.org/apidocs"/>
+      <item name="Javadocs" href="http://helix.apache.org/apidocs"/>
     </menu>
 
     <menu name="Recipes">
@@ -108,7 +108,7 @@
       <highlightJs>false</highlightJs>
       <brand>
         <name>Apache Helix</name>
-        <href>http://helix.incubator.apache.org</href>
+        <href>http://helix.apache.org</href>
       </brand>
       <slogan>A cluster management framework for partitioned and replicated distributed
resources</slogan>
       <bottomNav>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/xdoc/download.xml.vm b/website/trunk/src/site/xdoc/download.xml.vm
index 2a4d76e..9c02bfe 100644
--- a/website/trunk/src/site/xdoc/download.xml.vm
+++ b/website/trunk/src/site/xdoc/download.xml.vm
@@ -25,7 +25,7 @@ under the License.
 
   <properties>
     <title>Apache Helix Downloads</title>
-    <author email="dev@helix.incubator.apache.org">Apache Helix Documentation Team</author>
+    <author email="dev@helix.apache.org">Apache Helix Documentation Team</author>
   </properties>
 
   <body>


Mime
View raw message