You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/08/25 16:05:33 UTC
[14/26] usergrid git commit: Remove references to incubator from docs, README files and POMs.

Remove references to incubator from docs, README files and POMs.


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

Branch: refs/heads/asf-site
Commit: 03ad8137234f294ca6be75aa70ddf09cc819ecaf
Parents: ae6d811
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 25 09:58:00 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 25 09:58:00 2015 -0400

----------------------------------------------------------------------
 DISCLAIMER                                      |   9 -
 NOTICE                                          |   2 +-
 README.md                                       |   8 +-
 content/community/index.html                    |  48 +++--
 content/index.html                              |  48 +++--
 content/releases/index.html                     |  38 ++--
 docs/installation/ug1-deploy-to-tomcat.md       |   6 +-
 docs/installation/ug1-launcher-quick-start.md   |   2 +-
 docs/installation/ug2-deploy-to-tomcat.md       |   4 +-
 docs/reference/contribute-code.md               |   2 +-
 docs/user-management/messagee-example.md        |   6 +-
 portal/README.md                                |   4 +-
 portal/index-template.html                      |  14 +-
 release/release-candidate.sh                    |  12 +-
 release/release.sh                              |  16 +-
 sdks/android/NOTICE                             |   2 +-
 sdks/android/pom.xml                            |   2 +-
 sdks/dotnet/NOTICE                              |   2 +-
 sdks/dotnet/README.md                           |   4 +-
 sdks/html5-javascript/README.md                 |  10 +-
 sdks/html5-javascript/index.html                |   2 +-
 sdks/java/pom.xml                               |   2 +-
 sdks/perl/README.md                             |   2 +-
 sdks/perl/lib/Usergrid/Client.pm                |   2 +-
 sdks/php/README.md                              |   6 +-
 sdks/ruby-on-rails/README.md                    |   2 +-
 stack/README.md                                 |   4 +-
 .../java/org/apache/usergrid/launcher/App.java  |   2 +-
 website/README.md                               |   2 +-
 website/content/community/index.html            |  12 +-
 website/content/index.html                      |  12 +-
 website/content/releases/index.html             |   2 +-
 website/layouts/footer.html                     |  32 ++-
 website/layouts/header.html                     |   4 +-
 website/tmp/checksums                           |   4 +-
 website/tmp/compiled_content                    | 204 +++++++++----------
 36 files changed, 255 insertions(+), 278 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index ffd2c60..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,9 +0,0 @@
-DISCLAIMER
-
-Apache Usergrid is an effort undergoing incubation at The Apache Software 
-Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of 
-all newly accepted projects until a further review indicates that the 
-infrastructure, communications, and decision making process have stabilized 
-in a manner consistent with other successful ASF projects. While incubation 
-status is not necessarily a reflection of the completeness or stability of the 
-code, it does indicate that the project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b080415..765a303 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Usergrid (incubating)
+Apache Usergrid 
 Copyright 2015 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a35594a..87cef17 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
 Apache Usergrid
 ===============
 
-**Apache Usergrid is a multi-tenant Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs. It is [currently incubating at the Apache Software Foundation](http://usergrid.incubator.apache.org/).**
+**Apache Usergrid is a multi-tenant Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs.**
 
 ##Contributing
-We accept all contributions via our GitHub, so you can fork our repo (apache/incubator-usergrid) and then submit a PR back to us for approval. For larger PRs you'll need to have an ICLA form on file with Apache. For more information see our [Contribution Workflow Policy](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow), and specifically our [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide).
+We accept all contributions via our GitHub, so you can fork our repo (apache/usergrid) and then submit a PR back to us for approval. For larger PRs you'll need to have an ICLA form on file with Apache. For more information see our [Contribution Workflow Policy](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow), and specifically our [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide).
 
 ##Build awesome apps with Usergrid!
 
 Apache Usergrid provides all code necessary to build and power modern mobile applications.  This includes the server stack, administrative portal website, SDKs in most popular languages, as well as command line tools. 
 
-Look for much more detailed README files in their corresponding subdirectories, or check out [our website](http://usergrid.incubator.apache.org/) for more info.
+Look for much more detailed README files in their corresponding subdirectories, or check out [our website](http://usergrid.apache.org/) for more info.
 
 * The server-side stack, a Java 7 + Cassandra codebase that powers all of the features, is located under [`/stack`](stack). You can install dependencies and compile it with maven. See [stack/README.md](stack#requirements) for instructions.
 
@@ -21,5 +21,5 @@ Look for much more detailed README files in their corresponding subdirectories,
 * a command-line client “ugc” allowing you to complete most maintenance tasks, as well as queries in a manner similar to the mysql or the mongo shell, located under [`/ugc`](ugc). You can install it on your machine with a simple `sudo gem install ugc`
 
 ##For more information
-See the [Apache Usergrid web site](http://usergrid.incubator.apache.org/).
+See the [Apache Usergrid web site](http://usergrid.apache.org/).
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/content/community/index.html
----------------------------------------------------------------------
diff --git a/content/community/index.html b/content/community/index.html
index 97f8b1d..f4eab5c 100644
--- a/content/community/index.html
+++ b/content/community/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — </title>
+    <title>Apache Usergrid — </title>
     <meta http-equiv="x-ua-compatible" content="ie=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
     <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
@@ -216,7 +216,7 @@
             <ul class="nav navbar-nav navbar-right">
                 <li class="active"><a href="/community/"><span class="icns icon-group"></span></a></li>
                 <li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+                <li><a href="http://github.com/apache/usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 
                        target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -306,20 +306,20 @@
 	    	<div class="col-md-4">
 	    		<h3>Users</h3>
 	    		<p><em>Perfect if you build apps against Apache Usergrid or deploy Apache Usergrid.</em></p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.incubator.apache.org">user-subscribe@usergrid.incubator.apache.org</a>.</p>
-	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-user/">read the archives</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.apache.org">user-subscribe@usergrid.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-user/">read the archives</a>.</p>
 			</div>
 	    	<div class="col-md-4">
 	    		<h3>Dev</h3>
 	    		<p><em>If you are building contributions & modifications to Apache Usergrid’s stack, portal, cli and SDKs, this is the list for you.</em><p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.incubator.apache.org">dev-subscribe@usergrid.incubator.apache.org</a>.</p>
-	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/">read the archives</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.apache.org">dev-subscribe@usergrid.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-dev/">read the archives</a>.</p>
 			</div>
 	    	<div class="col-md-4">
 	    		<h3>Commits</h3>
 	    		<p><em>This list receives an email whenever new code is contributed to Apache Usergrid.</em><p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.incubator.apache.org">commits-subscribe@usergrid.incubator.apache.org</a>.</p>
-	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-commits/">read the archives</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.apache.org">commits-subscribe@usergrid.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-commits/">read the archives</a>.</p>
 			</div>
 		</div>
 	</div>
@@ -493,32 +493,31 @@
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
-                    <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+                    <li class="nav-header"><a href="https://github.com/apache/usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
                 </ul>
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
                     <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="http://github.com/apache/usergrid" target="_blank">GitHub Code</a></li>
                     <li><a href="docs" target="_blank">Docs</a></li>
                     <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
                     <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
                     <li><a href="/community/#live">Live Chat</a></li>
                     <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
-                    <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
                 </ul>
             </div>
@@ -549,7 +548,6 @@
         <div class="row">
             <div id="copyright">
                 <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
                 <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
                 Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
                 <p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 7b6cc33..9416909 100644
--- a/content/index.html
+++ b/content/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — the BaaS not made for Hipsters</title>
+    <title>Apache Usergrid — the BaaS not made for Hipsters</title>
     <meta http-equiv="x-ua-compatible" content="ie=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
     <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
@@ -47,7 +47,7 @@
             <ul class="nav navbar-nav navbar-right">
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
                 <li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+                <li><a href="http://github.com/apache/usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 
                        target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -74,12 +74,12 @@
                 <h2 class="tagline">The BaaS Framework <em>you</em> run</h2>
                 <p class="description">Build Apps not Servers! Whether you need to support one App or a hundred, Usergrid is <em>your</em> backend. As easy as a LAMP stack, but built for mobile.
                   Get Apps to production in record time and stop wasting cycles writing server-side code.<br/><br/>
-                  Complete SDKs for iOS, Android, HTML5/JS, Node.js, Ruby, Java, .NET, and PHP. Open source since 2011.<br/><br/><em>Currently undergoing incubation at the Apache Software Foundation</em></p>
+                  Complete SDKs for iOS, Android, HTML5/JS, Node.js, Ruby, Java, .NET, and PHP. Open source since 2011.<br/><br/></p>
             </div>
 
             <div class="btn-wrapper">
-                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=incubator-usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
-                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=incubator-usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
                 <!--<p><span class="or">or</span> <a href="#">Download Usergrid</a></p>-->
             </div>
 
@@ -110,7 +110,7 @@
             <div class="col-md-4">
                 <div class="bf-icon-wrap" style="font-size:40px; vertical-align: 15px;"><i aria-hidden="true" class="icon-apple"></i> <i aria-hidden="true" class="icon-android"></i></div>
                 <h3>SDKs</h3>
-                <p>We have full SDKs for <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios">iOS</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android">Android</a>, and <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript">HTML5/JS</a> but also <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs">node.js</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails</a>, pure <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby">pure Ruby</a>, server-side <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java">Java</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet">.NET / Windows</a> and <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php">PHP</a>!</p>
+                <p>We have full SDKs for <a href="https://github.com/apache/usergrid/tree/master/sdks/ios">iOS</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/android">Android</a>, and <a href="https://github.com/apache/usergrid/tree/master/sdks/html5-javascript">HTML5/JS</a> but also <a href="https://github.com/apache/usergrid/tree/master/sdks/nodejs">node.js</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails</a>, pure <a href="https://github.com/apache/usergrid/tree/master/sdks/ruby">pure Ruby</a>, server-side <a href="https://github.com/apache/usergrid/tree/master/sdks/java">Java</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/dotnet">.NET / Windows</a> and <a href="https://github.com/apache/usergrid/tree/master/sdks/php">PHP</a>!</p>
             </div>
             <div class="col-md-4">
                 <div class="bf-icon-wrap"><span style="font-size:60px" aria-hidden="true" class="icon-road"></span></div>
@@ -131,7 +131,7 @@
 <section class="bf-questions">
     <div class="container">
             <div class="col-md-12 text-center cta">
-                Interested? You can <a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank" class="btn btn-inverse btn-lg">Try it on your Machine Now</a> <span class="avoidwrap">or&nbsp;<a href="/community/" class="btn btn-inverse btn-lg">Ask a Question on the Lists or at an Event Near You</a></span>
+                Interested? You can <a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank" class="btn btn-inverse btn-lg">Try it on your Machine Now</a> <span class="avoidwrap">or&nbsp;<a href="/community/" class="btn btn-inverse btn-lg">Ask a Question on the Lists or at an Event Near You</a></span>
             </div>
     </div>
 </section
@@ -142,7 +142,7 @@
         <div class="row">
             <div class="col-md-12 text-left">
                 <h2>About the Project</h2>
-                <p>Apache Usergrid is currently undergoing Incubation at the Apache Software Foundation. It’s an open-source Backend-as-a-Service (“BaaS” or “mBaaS”) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
+                <p>Usergrid is an open-source Backend-as-a-Service (“BaaS” or “mBaaS”) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
 
                 <p>It is a multi-tenant system designed for deployment to public cloud environments (such as Amazon Web Services, Rackspace, etc.) or to run on traditional server infrastructures so that anyone can run their own private BaaS deployment.</p>
 
@@ -178,32 +178,31 @@
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
-                    <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+                    <li class="nav-header"><a href="https://github.com/apache/usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
                 </ul>
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
                     <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="http://github.com/apache/usergrid" target="_blank">GitHub Code</a></li>
                     <li><a href="docs" target="_blank">Docs</a></li>
                     <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
                     <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
                     <li><a href="/community/#live">Live Chat</a></li>
                     <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
-                    <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
                 </ul>
             </div>
@@ -234,7 +233,6 @@
         <div class="row">
             <div id="copyright">
                 <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
                 <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
                 Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
                 <p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/content/releases/index.html
----------------------------------------------------------------------
diff --git a/content/releases/index.html b/content/releases/index.html
index 82925f5..d3ad9d1 100644
--- a/content/releases/index.html
+++ b/content/releases/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — </title>
+    <title>Apache Usergrid — </title>
     <meta http-equiv="x-ua-compatible" content="ie=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
     <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
@@ -47,7 +47,7 @@
             <ul class="nav navbar-nav navbar-right">
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
                 <li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+                <li><a href="http://github.com/apache/usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 
                        target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -95,7 +95,7 @@
 					Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2</a>
 				</p>
 				<p>
-					Project releases are approved by vote of the Apache Usergrid (incubating) Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.incubator.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
+					Project releases are approved by vote of the Apache Usergrid Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
 				</p>
 				<p>
 					Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS</a>
@@ -149,32 +149,31 @@
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
-                    <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+                    <li class="nav-header"><a href="https://github.com/apache/usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
                 </ul>
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
                     <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="http://github.com/apache/usergrid" target="_blank">GitHub Code</a></li>
                     <li><a href="docs" target="_blank">Docs</a></li>
                     <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
                     <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
                     <li><a href="/community/#live">Live Chat</a></li>
                     <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
-                    <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
                 </ul>
             </div>
@@ -205,7 +204,6 @@
         <div class="row">
             <div id="copyright">
                 <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
                 <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
                 Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
                 <p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/docs/installation/ug1-deploy-to-tomcat.md
----------------------------------------------------------------------
diff --git a/docs/installation/ug1-deploy-to-tomcat.md b/docs/installation/ug1-deploy-to-tomcat.md
index 5356a94..4c88387 100644
--- a/docs/installation/ug1-deploy-to-tomcat.md
+++ b/docs/installation/ug1-deploy-to-tomcat.md
@@ -16,9 +16,9 @@ For more information:
 
 ## Download
 
-Use GitHub to clone the [apache/incubator-usergrid](https://github.com/apache/incubator-usergrid) repo.
+Use GitHub to clone the [apache/usergrid](https://github.com/apache/usergrid) repo.
 
-Or you can start by [downloading our latest code](https://github.com/apache/incubator-usergrid/archive/master.zip) and extract it.
+Or you can start by [downloading our latest code](https://github.com/apache/usergrid/archive/master.zip) and extract it.
 
 ## Building
 
@@ -89,7 +89,7 @@ You should not be prompted for login because you already logged into for the Dat
 
 Build the Usergrid Console
 ---
-The Usergrid Console is an admin interface written in JavaScript that connects to your running Usergrid instance. For evaluation purposes, you can run it within Tomcat. Build it by following the steps [here](https://github.com/apache/incubator-usergrid/blob/master/portal/README.md). Once built, copy the directory _portal/build/usergrid-portal_ to _tomcat/webapps_.
+The Usergrid Console is an admin interface written in JavaScript that connects to your running Usergrid instance. For evaluation purposes, you can run it within Tomcat. Build it by following the steps [here](https://github.com/apache/usergrid/blob/master/portal/README.md). Once built, copy the directory _portal/build/usergrid-portal_ to _tomcat/webapps_.
 
 
 Login to the Usergrid Console & get started

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/docs/installation/ug1-launcher-quick-start.md
----------------------------------------------------------------------
diff --git a/docs/installation/ug1-launcher-quick-start.md b/docs/installation/ug1-launcher-quick-start.md
index 8399522..fe25e21 100644
--- a/docs/installation/ug1-launcher-quick-start.md
+++ b/docs/installation/ug1-launcher-quick-start.md
@@ -9,7 +9,7 @@
 
 ### Download2
 
-Start by [downloading our latest code](https://github.com/apache/incubator-usergrid/archive/master.zip) and extract it.
+Start by [downloading our latest code](https://github.com/apache/usergrid/archive/master.zip) and extract it.
 
 #### Building 3
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/docs/installation/ug2-deploy-to-tomcat.md
----------------------------------------------------------------------
diff --git a/docs/installation/ug2-deploy-to-tomcat.md b/docs/installation/ug2-deploy-to-tomcat.md
index 10ed013..a07f13a 100644
--- a/docs/installation/ug2-deploy-to-tomcat.md
+++ b/docs/installation/ug2-deploy-to-tomcat.md
@@ -9,7 +9,7 @@ __NOTE__: Beware that Usergrid 2 is UNRELEASED SOFTWARE
 * [Tomcat 7+](https://tomcat.apache.org/download-70.cgi)
 * [Cassandra 1.2.1*](http://cassandra.apache.org/download/)
 * [ElasticSearch 1.4+](https://www.elastic.co/downloads/elasticsearch) 
-* [Usergrid 2.0](https://github.com/apache/incubator-usergrid/tree/two-dot-o)
+* [Usergrid 2.0](https://github.com/apache/usergrid/tree/two-dot-o)
 
 ##Running
 
@@ -50,7 +50,7 @@ The stack is now ready to be queried against, but to get the most out of it you'
 [nodejs 0.10+](https://nodejs.org/download/) 
 
 1. Make sure you've installed node.js above. Any version above .10 or .10 should work fine.
-2. Navigate to ```incubator-usergrid/portal```.
+2. Navigate to ```usergrid/portal```.
 3. Open config.js and make sure the override URL is pointing to your local tomcat.
 4. Now in the portal folder run the following command ```./build.sh dev``` 
 5. The portal should automatically open ready for use!

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/docs/reference/contribute-code.md
----------------------------------------------------------------------
diff --git a/docs/reference/contribute-code.md b/docs/reference/contribute-code.md
index 5bfd0ce..cfd3073 100644
--- a/docs/reference/contribute-code.md
+++ b/docs/reference/contribute-code.md
@@ -7,7 +7,7 @@ by external contributors, and by those who are committers on the project.
 You can read this policy here [Usergrid Contribution Workflow](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow).
 
 Basically, we use GitHub as our code review system. So you should fork the 
-apache/incubator-usergrid repo and submit PRs back to the project. Here 
+apache/usergrid repo and submit PRs back to the project. Here 
 are are step-by-step guide for both both external contributors and committers:
 
 * [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide)

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/docs/user-management/messagee-example.md
----------------------------------------------------------------------
diff --git a/docs/user-management/messagee-example.md b/docs/user-management/messagee-example.md
index 1401d8c..e3f3a02 100644
--- a/docs/user-management/messagee-example.md
+++ b/docs/user-management/messagee-example.md
@@ -122,16 +122,16 @@ Because test-user-1 follows test-user-2, you should see the message sent by test
 
 ## iOS SDK
 
-If you want to write iOS applications that connect to Usergrid, [download the Usergrid iOS SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/ios).
+If you want to write iOS applications that connect to Usergrid, [download the Usergrid iOS SDK](https://github.com/apache/usergrid/tree/master/sdks/ios).
 
 __Note__: The Messagee iOS application uses RestKit, a popular REST framework for iOS, to communicate with Usergrid. Because Usergrid use a REST API, you can use any REST framework to talk with the service. However, the official Usergrid iOS SDK provides a more convenient communication mechanism that you should use unless you're already using RestKit or some other framework in your project.
 
 ## Android client and SDK
 Messagee is available as a sample Android app that acts as a Usergrid client. The source for the Android version is packaged with the Usergrid Android SDK in the /samples/messagee directory.
 
-[Download the Usergrid Android SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/android)
+[Download the Usergrid Android SDK](https://github.com/apache/usergrid/tree/master/sdks/android)
 
 ## Javascript/HTML5 client and SDK
 Messagee is also available as a sample HTML5 app that behaves in much the same way as the two previous examples. The source for the HTML5 version is packaged with the Usergrid Javascript/HTML5 SDK in the /samples/messagee directory.
 
-[Download the Usergrid Javascript/HTML5 SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript)
+[Download the Usergrid Javascript/HTML5 SDK](https://github.com/apache/usergrid/tree/master/sdks/html5-javascript)

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/portal/README.md
----------------------------------------------------------------------
diff --git a/portal/README.md b/portal/README.md
index d131551..1436d2f 100644
--- a/portal/README.md
+++ b/portal/README.md
@@ -5,7 +5,7 @@ The admin portal source code is fully open source and forkable. You can easily e
 
 The admin portal source is in the Usergrid repo here:
 
-<https://github.com/apache/incubator-usergrid/tree/master/portal>
+<https://github.com/apache/usergrid/tree/master/portal>
 
 ##About the Admin Portal
 Use the admin portal for administrative operations, including:
@@ -81,7 +81,7 @@ You can also use the Usergrid Command Line (ugc) for terminal access to the User
 ## Contributing
 We welcome your enhancements!
 
-The Admin Portal is part of the [Usergrid](http://usergrid.incubator.apache.org/), project. It is open source and licensed under the Apache License, Version 2.0.
+The Admin Portal is part of the [Usergrid](http://usergrid.apache.org/), project. It is open source and licensed under the Apache License, Version 2.0.
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/portal/index-template.html
----------------------------------------------------------------------
diff --git a/portal/index-template.html b/portal/index-template.html
index ca713dc..c9fcea9 100644
--- a/portal/index-template.html
+++ b/portal/index-template.html
@@ -110,13 +110,13 @@ under the License.
                       <li class="sdks span12">
                         <ul id="intro-9-sdks" class="pull-right">
                           <li class="title"><label>SDKs and Modules</label></li>
-                          <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-ios"></i></a></li>
-                          <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-android"></i></a></li>
-                          <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-js"></i></a></li>
-                          <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-node"></i></a></li>
-                          <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-ruby"></i></a></li>
-                          <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-net"></i></a></li>
-                          <li><a target="_blank" href="https://github.com/apache/incubator-usergrid/tree/master/sdks"><i class="sdk-icon-perl"></i></a></li>
+                          <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-ios"></i></a></li>
+                          <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-android"></i></a></li>
+                          <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-js"></i></a></li>
+                          <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-node"></i></a></li>
+                          <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-ruby"></i></a></li>
+                          <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-net"></i></a></li>
+                          <li><a target="_blank" href="https://github.com/apache/usergrid/tree/master/sdks"><i class="sdk-icon-perl"></i></a></li>
                         </ul>
                       </li>
                     </ul>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/release/release-candidate.sh
----------------------------------------------------------------------
diff --git a/release/release-candidate.sh b/release/release-candidate.sh
index 0e46f88..4ed7839 100755
--- a/release/release-candidate.sh
+++ b/release/release-candidate.sh
@@ -27,8 +27,8 @@ set -o errexit
 set -o nounset
 
 rc_tag_version=0
-usergrid_git_web_url='https://git-wip-us.apache.org/repos/asf?p=incubator-usergrid.git'
-usergrid_svn_dist_url='https://dist.apache.org/repos/dist/dev/incubator/usergrid'
+usergrid_git_web_url='https://git-wip-us.apache.org/repos/asf?p=usergrid.git'
+usergrid_svn_dist_url='https://dist.apache.org/repos/dist/dev/usergrid'
 
 function print_help_and_exit {
 cat <<EOF
@@ -177,7 +177,7 @@ git commit -m "Updating .usergridversion to ${current_version_tag}."
 
 echo "Building the source distribution"
 dist_dir=${base_dir}/dist
-dist_name="apache-usergrid-${current_version_tag}-incubating"
+dist_name="apache-usergrid-${current_version_tag}"
 
 mkdir -p ${dist_dir}
 git archive --prefix=${dist_name}/ -o ${dist_dir}/${dist_name}.tar.gz HEAD
@@ -213,7 +213,7 @@ cd ${base_dir}
 current_commit_id=`git rev-parse HEAD`
 
 echo "Done creating the release candidate. The following draft email has been created"
-echo "to send to the dev@usergrid.incubator.apache.org mailing list"
+echo "to send to the dev@usergrid.apache.org mailing list"
 echo
 
 # Create the email template for the release candidate to be sent to the mailing lists.
@@ -224,8 +224,8 @@ else
 fi
 
 MESSAGE=$(cat <<__EOF__
-To: dev@usergrid.incubator.apache.org
-Subject: [VOTE] Release Apache Usergrid ${current_version} (incubating) RC${rc_tag_version}
+To: dev@usergrid.apache.org
+Subject: [VOTE] Release Apache Usergrid ${current_version} RC${rc_tag_version}
 
 All,
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 411fb80..102e4d7 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -19,10 +19,10 @@
 set -e
 set -o nounset
 
-usergrid_git_url='https://git-wip-us.apache.org/repos/asf/incubator-usergrid.git'
-usergrid_git_web_url='https://git-wip-us.apache.org/repos/asf?p=incubator-usergrid.git'
-usergrid_svn_dist_url='https://dist.apache.org/repos/dist/release/incubator/usergrid'
-usergrid_svn_dev_dist_url='https://dist.apache.org/repos/dist/dev/incubator/usergrid'
+usergrid_git_url='https://git-wip-us.apache.org/repos/asf/usergrid.git'
+usergrid_git_web_url='https://git-wip-us.apache.org/repos/asf?p=usergrid.git'
+usergrid_svn_dist_url='https://dist.apache.org/repos/dist/release/usergrid'
+usergrid_svn_dev_dist_url='https://dist.apache.org/repos/dist/dev/usergrid'
 
 function print_help_and_exit {
 cat <<EOF
@@ -137,7 +137,7 @@ git tag -s "${current_version}" -m "usergrid-${current_version} release." $curre
   #git push origin --tags
 #fi
 
-dist_name="apache-usergrid-${current_version}-incubating"
+dist_name="apache-usergrid-${current_version}"
 
 dist_dir=${base_dir}/dist
 release_dir=${dist_dir}/${current_version}
@@ -185,13 +185,13 @@ current_commit_id=`git rev-parse HEAD`
 cd ${base_dir}
 
 echo "Done creating the release. The following draft email has been created"
-echo "to send to the dev@usergrid.incubator.apache.org mailing list."
+echo "to send to the dev@usergrid.apache.org mailing list."
 echo
 
 # Create the email template for the release to be sent to the mailing lists.
 MESSAGE=$(cat <<__EOF__
-To: dev@usergrid.incubator.apache.org
-Subject: [RESULT][VOTE] Release Apache Usergrid ${current_version} (incubating) RC#{rc_tag_version}
+To: dev@usergrid.apache.org
+Subject: [RESULT][VOTE] Release Apache Usergrid ${current_version} RC#{rc_tag_version}
 as the official Apache Usegrid ${current_version} release has passed.
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/android/NOTICE
----------------------------------------------------------------------
diff --git a/sdks/android/NOTICE b/sdks/android/NOTICE
index 5882fcd..b5db9bf 100644
--- a/sdks/android/NOTICE
+++ b/sdks/android/NOTICE
@@ -1,4 +1,4 @@
-Apache Usergrid (incubating)
+Apache Usergrid 
 Copyright 2014 The Apache Software Foundation.
 
 This product bundles SSToolkit Copyright (c) 2009-2011 Sam Soffes. All rights reserved.

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/android/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/android/pom.xml b/sdks/android/pom.xml
index 2ad8fc8..1ef5cfa 100644
--- a/sdks/android/pom.xml
+++ b/sdks/android/pom.xml
@@ -37,7 +37,7 @@
 	
 	<packaging>jar</packaging>
 	<description>A simple java client for usergrid</description>
-	<url>http://usergrid.incubator.apache.org</url>
+	<url>http://usergrid.apache.org</url>
 	
 	<licenses>
 		<license>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/dotnet/NOTICE
----------------------------------------------------------------------
diff --git a/sdks/dotnet/NOTICE b/sdks/dotnet/NOTICE
index 252fd9b..84a2bf0 100644
--- a/sdks/dotnet/NOTICE
+++ b/sdks/dotnet/NOTICE
@@ -1,4 +1,4 @@
-Apache Usergrid (incubating)
+Apache Usergrid 
 Copyright (c) The Apache Software Foundation.
 
 This product uses the following software:

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/dotnet/README.md
----------------------------------------------------------------------
diff --git a/sdks/dotnet/README.md b/sdks/dotnet/README.md
index 7d0d401..f002238 100644
--- a/sdks/dotnet/README.md
+++ b/sdks/dotnet/README.md
@@ -11,7 +11,7 @@ Solution is composed of following projects:
 ## Comments and Questions
 Please feel free to send your comments/suggestions/questions one of the
 several communication platforms. 
-<http://usergrid.incubator.apache.org/community/>
+<http://usergrid.apache.org/community/>
     
 ## Overview
 We welcome your contributions and suggestions. The repository is located [here][RepositoryLocation].
@@ -56,7 +56,7 @@ In order to run the integration tests, do the following:
 * Tests have been implemented using NUnit, so you can use any NUnit runner to run the tests.
 
 ## Authentication
-Usergrid Authentication is explained in [Usergrid Documentation](http://usergrid.incubator.apache.org/docs/).
+Usergrid Authentication is explained in [Usergrid Documentation](http://usergrid.apache.org/docs/).
 
 You can access your Usergrid data using following credentials:
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/html5-javascript/README.md
----------------------------------------------------------------------
diff --git a/sdks/html5-javascript/README.md b/sdks/html5-javascript/README.md
index bebc955..787cffc 100755
--- a/sdks/html5-javascript/README.md
+++ b/sdks/html5-javascript/README.md
@@ -84,11 +84,11 @@ The Javascript SDK is in the sdks/html5-javascript folder.
 
 To find out more about Usergrid, see:
 
-<http://usergrid.incubator.apache.org>
+<http://usergrid.apache.org>
 
 To view the Usergrid documentation, see:
 
-<http://usergrid.incubator.apache.org/docs/>
+<http://usergrid.apache.org/docs/>
 
 
 ##Node.js
@@ -405,7 +405,7 @@ You can also limit the results returned such that only the fields you specify ar
 
 You can find more information on custom queries here:
 
-<http://usergrid.incubator.apache.org/docs/query-language/>
+<http://usergrid.apache.org/docs/query-language/>
 ##Counters
 Counters can be used by an application to create custom statistics, such as how many times an a file has been downloaded or how many instances of an application are in use.
 
@@ -660,7 +660,7 @@ This creates a one-way connection between marty and einstein, where marty "likes
 
 Complete documentation on the entity relationships API can be found here:
 
-<http://usergrid.incubator.apache.org/docs/relationships/>
+<http://usergrid.apache.org/docs/relationships/>
 
 For example, say we have a new dog named einstein:
 
@@ -862,7 +862,7 @@ Like [Usergrid](https://github.com/apigee/usergrid-node-module), the Usergrid Ja
 usergrid.js and usergrid.min.js are built from modular components using Grunt. If you want to contribute updates to these files, please commit your changes to the modules in /lib/modules. Do not contribute directly to usergrid.js or your changes could get overwritten in a future build.
 
 ##More information
-For more information on Usergrid, visit <http://usergrid.incubator.apache.org/>.
+For more information on Usergrid, visit <http://usergrid.apache.org/>.
 For more information on Apigee App Services, visit <http://developers.apigee.com>.
 
 ## Copyright

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/html5-javascript/index.html
----------------------------------------------------------------------
diff --git a/sdks/html5-javascript/index.html b/sdks/html5-javascript/index.html
index 1f60c44..309d90b 100755
--- a/sdks/html5-javascript/index.html
+++ b/sdks/html5-javascript/index.html
@@ -40,7 +40,7 @@
          <br/>
          <h2>API documentation</h2>
          For more information on Usergrid, see the Apache docs:
-         <a href="http://usergrid.incubator.apache.org/">http://usergrid.incubator.apache.org/</a>
+         <a href="http://usergrid.apache.org/">http://usergrid.apache.org/</a>
          <br/>
          <br/>
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/java/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/pom.xml b/sdks/java/pom.xml
index 4265ff8..b1b98e7 100644
--- a/sdks/java/pom.xml
+++ b/sdks/java/pom.xml
@@ -20,7 +20,7 @@
     <version>1.0.0</version>
     <packaging>jar</packaging>
     <description>A Java client for usergrid</description>
-    <url>http://usergrid.incubator.apache.org</url>
+    <url>http://usergrid.apache.org</url>
 	
     <licenses>
         <license>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/perl/README.md
----------------------------------------------------------------------
diff --git a/sdks/perl/README.md b/sdks/perl/README.md
index 754a420..61069cc 100644
--- a/sdks/perl/README.md
+++ b/sdks/perl/README.md
@@ -64,7 +64,7 @@ front-end developers, it aims to simplify the development process by enabling
 them to rapidly build and operate mobile and web applications without requiring
 backend expertise.
 
-Source: [Usergrid Documentation](https://usergrid.incubator.apache.org/docs/)
+Source: [Usergrid Documentation](https://usergrid.apache.org/docs/)
 
 For more information, visit [http://www.usergrid.org](http://www.usergrid.org)
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/perl/lib/Usergrid/Client.pm
----------------------------------------------------------------------
diff --git a/sdks/perl/lib/Usergrid/Client.pm b/sdks/perl/lib/Usergrid/Client.pm
index cf3efd0..ccb276b 100644
--- a/sdks/perl/lib/Usergrid/Client.pm
+++ b/sdks/perl/lib/Usergrid/Client.pm
@@ -80,7 +80,7 @@ front-end developers, it aims to simplify the development process by enabling
 them to rapidly build and operate mobile and web applications without requiring
 backend expertise.
 
-Source: L<https://usergrid.incubator.apache.org/docs/>
+Source: L<https://usergrid.apache.org/docs/>
 
 For more information, visit L<http://www.usergrid.org>
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/php/README.md
----------------------------------------------------------------------
diff --git a/sdks/php/README.md b/sdks/php/README.md
index 545d519..ec04cc9 100644
--- a/sdks/php/README.md
+++ b/sdks/php/README.md
@@ -51,7 +51,7 @@ This SDK is open source, and we welcome any contributions!
 ##Comments / Questions
 Please feel free to send comments or questions to the various
 community communication channels
-<http://usergrid.incubator.apache.org/community/>
+<http://usergrid.apache.org/community/>
 
 ##Overview
 This open source SDK simplifies writing PHP applications that connect to App Services. The repo is located here:
@@ -62,7 +62,7 @@ You can download the release artfacts via the Apache Mirroring newtwork.
 
 A wealth of Usergrid documentation can be found on the site
 
-<http://usergrid.incubator.apache.org/docs/>
+<http://usergrid.apache.org/docs/>
 
 
 ##About the samples
@@ -367,7 +367,7 @@ We welcome your enhancements!
 5. Create new Pull Request (make sure you describe what you did and why your mod is needed)
 
 ##More information
-For more information on Usergrid, visit <http://usergrid.incubator.apache.org>.
+For more information on Usergrid, visit <http://usergrid.apache.org>.
 
 ## Copyright
 Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/sdks/ruby-on-rails/README.md
----------------------------------------------------------------------
diff --git a/sdks/ruby-on-rails/README.md b/sdks/ruby-on-rails/README.md
index 25efce2..dce855b 100644
--- a/sdks/ruby-on-rails/README.md
+++ b/sdks/ruby-on-rails/README.md
@@ -31,7 +31,7 @@ Or install it yourself as:
 
 #### It's great stuff! Check it out, here:
 
-  Docs: <https://usergrid.incubator.apache.org/docs/>  
+  Docs: <https://usergrid.apache.org/docs/>  
   Open source: <https://github.com/usergrid/usergrid/>
 
 ### Getting started with the Usergrid_ironhorse SDK is super simple!

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/stack/README.md
----------------------------------------------------------------------
diff --git a/stack/README.md b/stack/README.md
index 06bfb71..d2c8123 100644
--- a/stack/README.md
+++ b/stack/README.md
@@ -1,8 +1,8 @@
 # Usergrid
 A highly-scalable data platform for mobile applications.
 
-* **Documentation**: http://usergrid.incubator.apache.org/docs/
-* **Homepage**: http://http://usergrid.incubator.apache.org/
+* **Documentation**: http://usergrid.apache.org/docs/
+* **Homepage**: http://http://usergrid.apache.org/
 
 ## Requirements
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java b/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
index cee20d5..9ddee73 100644
--- a/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
+++ b/stack/launcher/src/main/java/org/apache/usergrid/launcher/App.java
@@ -44,7 +44,7 @@ public class App {
 
     // TODO: host portal on Apache infrastructure, or build portal into launcher
     private static final String GH_PORTAL_URL = 
-        "http://usergrid.incubator.apache.org/v101-portal-demo";
+        "http://usergrid.apache.org/v101-portal-demo";
 
     public static boolean MAC_OS_X = 
         ( System.getProperty( "os.name" ).toLowerCase().startsWith( "mac os x" ) );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/website/README.md
----------------------------------------------------------------------
diff --git a/website/README.md b/website/README.md
index bea925e..a25755a 100644
--- a/website/README.md
+++ b/website/README.md
@@ -7,7 +7,7 @@ Source files for the website are in ``${usergrid-project-dir}/website/content``
 Generated files for the website are in ``${usergrid-project-dir}/content``
 
 The website is updated by a "sync" tool that monitors the __asf-site__ branch of our Git repo, so after to make changes you must push your updated source and generated files to that branch. 
-The content will be published to the [Usegrid website](http://usergrid.incubator.apache.org), after a 5-20 minute delay. 
+The content will be published to the [Usegrid website](http://usergrid.apache.org), after a 5-20 minute delay. 
 
 ## Prerequsites
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/website/content/community/index.html
----------------------------------------------------------------------
diff --git a/website/content/community/index.html b/website/content/community/index.html
index 467c9a3..5be4329 100644
--- a/website/content/community/index.html
+++ b/website/content/community/index.html
@@ -70,20 +70,20 @@
 	    	<div class="col-md-4">
 	    		<h3>Users</h3>
 	    		<p><em>Perfect if you build apps against Apache Usergrid or deploy Apache Usergrid.</em></p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.incubator.apache.org">user-subscribe@usergrid.incubator.apache.org</a>.</p>
-	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-user/">read the archives</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.apache.org">user-subscribe@usergrid.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-user/">read the archives</a>.</p>
 			</div>
 	    	<div class="col-md-4">
 	    		<h3>Dev</h3>
 	    		<p><em>If you are building contributions & modifications to Apache Usergrid’s stack, portal, cli and SDKs, this is the list for you.</em><p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.incubator.apache.org">dev-subscribe@usergrid.incubator.apache.org</a>.</p>
-	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/">read the archives</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.apache.org">dev-subscribe@usergrid.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-dev/">read the archives</a>.</p>
 			</div>
 	    	<div class="col-md-4">
 	    		<h3>Commits</h3>
 	    		<p><em>This list receives an email whenever new code is contributed to Apache Usergrid.</em><p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.incubator.apache.org">commits-subscribe@usergrid.incubator.apache.org</a>.</p>
-	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-commits/">read the archives</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.apache.org">commits-subscribe@usergrid.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/usergrid-commits/">read the archives</a>.</p>
 			</div>
 		</div>
 	</div>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/website/content/index.html
----------------------------------------------------------------------
diff --git a/website/content/index.html b/website/content/index.html
index cc44555..7dbabff 100644
--- a/website/content/index.html
+++ b/website/content/index.html
@@ -10,12 +10,12 @@ title: the BaaS not made for Hipsters
                 <h2 class="tagline">The BaaS Framework <em>you</em> run</h2>
                 <p class="description">Build Apps not Servers! Whether you need to support one App or a hundred, Usergrid is <em>your</em> backend. As easy as a LAMP stack, but built for mobile.
                   Get Apps to production in record time and stop wasting cycles writing server-side code.<br/><br/>
-                  Complete SDKs for iOS, Android, HTML5/JS, Node.js, Ruby, Java, .NET, and PHP. Open source since 2011.<br/><br/><em>Currently undergoing incubation at the Apache Software Foundation</em></p>
+                  Complete SDKs for iOS, Android, HTML5/JS, Node.js, Ruby, Java, .NET, and PHP. Open source since 2011.<br/><br/></p>
             </div>
 
             <div class="btn-wrapper">
-                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=incubator-usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
-                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=incubator-usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
                 <!--<p><span class="or">or</span> <a href="#">Download Usergrid</a></p>-->
             </div>
 
@@ -46,7 +46,7 @@ title: the BaaS not made for Hipsters
             <div class="col-md-4">
                 <div class="bf-icon-wrap" style="font-size:40px; vertical-align: 15px;"><i aria-hidden="true" class="icon-apple"></i> <i aria-hidden="true" class="icon-android"></i></div>
                 <h3>SDKs</h3>
-                <p>We have full SDKs for <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios">iOS</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android">Android</a>, and <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript">HTML5/JS</a> but also <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs">node.js</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails</a>, pure <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby">pure Ruby</a>, server-side <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java">Java</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet">.NET / Windows</a> and <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php">PHP</a>!</p>
+                <p>We have full SDKs for <a href="https://github.com/apache/usergrid/tree/master/sdks/ios">iOS</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/android">Android</a>, and <a href="https://github.com/apache/usergrid/tree/master/sdks/html5-javascript">HTML5/JS</a> but also <a href="https://github.com/apache/usergrid/tree/master/sdks/nodejs">node.js</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails</a>, pure <a href="https://github.com/apache/usergrid/tree/master/sdks/ruby">pure Ruby</a>, server-side <a href="https://github.com/apache/usergrid/tree/master/sdks/java">Java</a>, <a href="https://github.com/apache/usergrid/tree/master/sdks/dotnet">.NET / Windows</a> and <a href="https://github.com/apache/usergrid/tree/master/sdks/php">PHP</a>!</p>
             </div>
             <div class="col-md-4">
                 <div class="bf-icon-wrap"><span style="font-size:60px" aria-hidden="true" class="icon-road"></span></div>
@@ -67,7 +67,7 @@ title: the BaaS not made for Hipsters
 <section class="bf-questions">
     <div class="container">
             <div class="col-md-12 text-center cta">
-                Interested? You can <a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank" class="btn btn-inverse btn-lg">Try it on your Machine Now</a> <span class="avoidwrap">or&nbsp;<a href="/community/" class="btn btn-inverse btn-lg">Ask a Question on the Lists or at an Event Near You</a></span>
+                Interested? You can <a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank" class="btn btn-inverse btn-lg">Try it on your Machine Now</a> <span class="avoidwrap">or&nbsp;<a href="/community/" class="btn btn-inverse btn-lg">Ask a Question on the Lists or at an Event Near You</a></span>
             </div>
     </div>
 </section
@@ -78,7 +78,7 @@ title: the BaaS not made for Hipsters
         <div class="row">
             <div class="col-md-12 text-left">
                 <h2>About the Project</h2>
-                <p>Apache Usergrid is currently undergoing Incubation at the Apache Software Foundation. It’s an open-source Backend-as-a-Service (“BaaS” or “mBaaS”) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
+                <p>Usergrid is an open-source Backend-as-a-Service (“BaaS” or “mBaaS”) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
 
                 <p>It is a multi-tenant system designed for deployment to public cloud environments (such as Amazon Web Services, Rackspace, etc.) or to run on traditional server infrastructures so that anyone can run their own private BaaS deployment.</p>
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/website/content/releases/index.html b/website/content/releases/index.html
index d897df9..10e6a2c 100644
--- a/website/content/releases/index.html
+++ b/website/content/releases/index.html
@@ -28,7 +28,7 @@
 					Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2</a>
 				</p>
 				<p>
-					Project releases are approved by vote of the Apache Usergrid (incubating) Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.incubator.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
+					Project releases are approved by vote of the Apache Usergrid Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
 				</p>
 				<p>
 					Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS</a>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/website/layouts/footer.html
----------------------------------------------------------------------
diff --git a/website/layouts/footer.html b/website/layouts/footer.html
index 143ba53..6101e04 100644
--- a/website/layouts/footer.html
+++ b/website/layouts/footer.html
@@ -13,32 +13,31 @@
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
-                    <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+                    <li class="nav-header"><a href="https://github.com/apache/usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
                 </ul>
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
                     <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="http://github.com/apache/usergrid" target="_blank">GitHub Code</a></li>
                     <li><a href="docs" target="_blank">Docs</a></li>
                     <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
                     <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
                     <li><a href="/community/#live">Live Chat</a></li>
                     <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
-                    <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
-                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                    <li><a href="https://github.com/apache/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
                 </ul>
             </div>
@@ -69,7 +68,6 @@
         <div class="row">
             <div id="copyright">
                 <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
                 <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
                 Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
                 <p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03ad8137/website/layouts/header.html
----------------------------------------------------------------------
diff --git a/website/layouts/header.html b/website/layouts/header.html
index fa1b189..e08dceb 100644
--- a/website/layouts/header.html
+++ b/website/layouts/header.html
@@ -1,6 +1,6 @@
 <head>
     <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — <%= @item[:title] %></title>
+    <title>Apache Usergrid — <%= @item[:title] %></title>
     <meta http-equiv="x-ua-compatible" content="ie=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
     <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
@@ -213,7 +213,7 @@
             <ul class="nav navbar-nav navbar-right">
                 <li class="<%= 'active' if @community %>"><a href="/community/"><span class="icns icon-group"></span></a></li>
                 <li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+                <li><a href="http://github.com/apache/usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 
                        target="_blank"><span class="icns icon-bug"></span></a></li>