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 2014/03/23 23:09:03 UTC

svn commit: r1580633 - in /incubator/usergrid/site: content/docs/contribute-code.md content/docs/old-forks.md publish/docs/contribute-code/index.html publish/docs/old-forks/ publish/docs/old-forks/index.html

Author: snoopdave
Date: Sun Mar 23 22:09:03 2014
New Revision: 1580633

URL: http://svn.apache.org/r1580633
Log:
Adding some notes about old forks of "Apigee Usergrid"

Added:
    incubator/usergrid/site/content/docs/old-forks.md
    incubator/usergrid/site/publish/docs/old-forks/
    incubator/usergrid/site/publish/docs/old-forks/index.html
Modified:
    incubator/usergrid/site/content/docs/contribute-code.md
    incubator/usergrid/site/publish/docs/contribute-code/index.html

Modified: incubator/usergrid/site/content/docs/contribute-code.md
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/content/docs/contribute-code.md?rev=1580633&r1=1580632&r2=1580633&view=diff
==============================================================================
--- incubator/usergrid/site/content/docs/contribute-code.md (original)
+++ incubator/usergrid/site/content/docs/contribute-code.md Sun Mar 23 22:09:03 2014
@@ -10,7 +10,7 @@ We use Github as our code review and col
 We have two slightly different procedures for small fixes and for more significant changes.
 
 For small fixes
----
+===
 We welcome small "drive-by" contributions from impatient developers! If you just have a small fix that you want to contribute then these are the steps you should follow to get your changes into Usergrid. 
 
 * __Get a Github account__ at [github.com](https://github.com/) if you do not already have one.
@@ -21,7 +21,7 @@ We welcome small "drive-by" contribution
 * __Done!__ your changes will now be committed to the official [Apache Git repo](https://git-wip-us.apache.org/repos/asf?p=incubator-usergrid.git;a=summary).
 
 For big changes
----
+===
 We love more significant contributions of code as well. Larger contributions do require more review and a couple of additional steps. If you have a larger contribution then these are the steps you should follow:
 
 First, sign up. This is a pain, to be sure, but it only has to happen once.
@@ -44,8 +44,7 @@ Once you're signed up:
 
 
 What about old forks?
-===
-
+---
 If you previously developed with Apigee Usergrid (i.e. before we moved to Apache), you know our code used to be structured into _separate_ repositories: usergrid-stack, usergrid-portal, etc. We are now using a _merged_ repository.
 
 ### How to update your code setup & pull changes from your old forks

Added: incubator/usergrid/site/content/docs/old-forks.md
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/content/docs/old-forks.md?rev=1580633&view=auto
==============================================================================
--- incubator/usergrid/site/content/docs/old-forks.md (added)
+++ incubator/usergrid/site/content/docs/old-forks.md Sun Mar 23 22:09:03 2014
@@ -0,0 +1,35 @@
+---
+title: What about old forks of Apigee Usergrid?
+category: docs
+layout: docs
+---
+If you previously developed with Apigee Usergrid (i.e. before we moved to Apache), you know our code used to be structured into _separate_ repositories: usergrid-stack, usergrid-portal, etc. We are now using a _merged_ repository.
+
+### How to update your code setup & pull changes from your old forks
+
+You just need to clone this repository, and use [git subtree (usually requires git 1.8+)](http://engineeredweb.com/blog/how-to-install-git-subtree/) to merge your changes under the new structure. Here’s an example for a portal fork. Adjust the prefix, repository address and branch you want to pull from as necessary.
+
+    git clone git@github.com:usergrid/usergrid.git
+    cd usergrid
+    git subtree pull --prefix=portal git@github.com:my-github-account/my-usergrid-portal-fork.git master
+
+This will pull (i.e. merge) the changes you made from the master branch of github.com/my-github-account/my-usergrid-portal-fork into the portal/ subfolder. It should ask you to provide a commit message for the merge. There’s lot of flexibility on how to fetch and merge, [please see the git subtree manual](https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt) for details. Then please do consider sending us a pull request with these changes ;)
+
+
+### How to pull commits made on this repo into your old forks
+
+You should really update your old repositories to the new structure with the instructions above, but the following may work for you, although we make no guarantee they will work in the future.
+
+You can produce a branch compatible with the old repos by using [git subtree (usually requires git 1.8+)](http://engineeredweb.com/blog/how-to-install-git-subtree/). Then from this repository you can
+
+    git clone git@github.com:usergrid/usergrid.git
+    cd usergrid
+    git checkout master
+    git subtree split --prefix=portal -b portal
+    git checkout portal
+
+This will create a “portal” branch that is compatible with the old usergrid-portal repository, from the code under the portal/ directory. You can pull from that branch (or push changes to it, although we will not accept pull requests sent thusly).
+
+The `git subtree split` above should function for portal, ugc, and any of the SDKs, but will not work for the stack, due to some anonymous comments left in the tree that prevent a split, and cannot be corrected lest we break the history and force a rebase on all forks.
+
+**Please update your code setup as soon as possible and [ask the dev list](https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/) if you have any questions!**

Modified: incubator/usergrid/site/publish/docs/contribute-code/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/contribute-code/index.html?rev=1580633&r1=1580632&r2=1580633&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/contribute-code/index.html (original)
+++ incubator/usergrid/site/publish/docs/contribute-code/index.html Sun Mar 23 22:09:03 2014
@@ -139,13 +139,22 @@
                 <div class="toc">
 	<ul>
 <li><a href="#for-small-fixes">For small fixes</a></li>
-<li><a href="#for-big-changes">For big changes</a></li>
+<li>
+<a href="#for-big-changes">For big changes</a><ul>
+<li>
+<a href="#what-about-old-forks">What about old forks?</a><ul>
+<li><a href="#how-to-update-your-code-setup-pull-changes-from-your-old-forks">How to update your code setup &amp; pull changes from your old forks</a></li>
+<li><a href="#how-to-pull-commits-made-on-this-repo-into-your-old-forks">How to pull commits made on this repo into your old forks</a></li>
+</ul>
+</li>
+</ul>
+</li>
 </ul>
 </div>
 <p>Usergrid is an open source project developed by folks like you. Anybody can contribute, but we do have some rules in place and we do like to review and discuss changes in public on our mailing lists and on our Github account.</p>
 <p>We use Github as our code review and collaboration system and we use the Apache Git repo as our official repository of record, that’s the code that we release when we make an official release.</p>
 <p>We have two slightly different procedures for small fixes and for more significant changes.</p>
-<h2 id="for-small-fixes">For small fixes</h2>
+<h1 id="for-small-fixes">For small fixes</h1>
 <p>We welcome small “drive-by” contributions from impatient developers! If you just have a small fix that you want to contribute then these are the steps you should follow to get your changes into Usergrid.</p>
 <ul>
 <li>
@@ -160,7 +169,7 @@
 <strong>Wait a bit</strong> for your Pull Request to be reviewed and merged. You may get some feedback as comments to the PR or on the dev mailing list and you may be asked to make some additional changes before your PR is accepted.</li>
 <li>
 <strong>Done!</strong> your changes will now be committed to the official <a href="https://git-wip-us.apache.org/repos/asf?p=incubator-usergrid.git;a=summary">Apache Git repo</a>.</li>
-</ul><h2 id="for-big-changes">For big changes</h2>
+</ul><h1 id="for-big-changes">For big changes</h1>
 <p>We love more significant contributions of code as well. Larger contributions do require more review and a couple of additional steps. If you have a larger contribution then these are the steps you should follow:</p>
 <p>First, sign up. This is a pain, to be sure, but it only has to happen once.</p>
 <ul>
@@ -196,7 +205,25 @@ document.write('<a h'+'ref'+'="ma'+'ilto
 <strong>Wait a bit</strong> for your Pull Request to be reviewed and merged. You may get some feedback as comments to the PR or on the dev mailing list and you may be asked to make some additional changes before your PR is accepted.</li>
 <li>
 <strong>Done!</strong> your changes will now be committed to the official <a href="https://git-wip-us.apache.org/repos/asf?p=incubator-usergrid.git;a=summary">Apache Git repo</a>.</li>
-</ul>
+</ul><h2 id="what-about-old-forks">What about old forks?</h2>
+<p>If you previously developed with Apigee Usergrid (i.e. before we moved to Apache), you know our code used to be structured into <em>separate</em> repositories: usergrid-stack, usergrid-portal, etc. We are now using a <em>merged</em> repository.</p>
+<h3 id="how-to-update-your-code-setup-pull-changes-from-your-old-forks">How to update your code setup &amp; pull changes from your old forks</h3>
+<p>You just need to clone this repository, and use <a href="http://engineeredweb.com/blog/how-to-install-git-subtree/">git subtree (usually requires git 1.8+)</a> to merge your changes under the new structure. Here’s an example for a portal fork. Adjust the prefix, repository address and branch you want to pull from as necessary.</p>
+<pre><code>git clone git@github.com:usergrid/usergrid.git
+cd usergrid
+git subtree pull --prefix=portal git@github.com:my-github-account/my-usergrid-portal-fork.git master</code></pre>
+<p>This will pull (i.e. merge) the changes you made from the master branch of github.com/my-github-account/my-usergrid-portal-fork into the portal/ subfolder. It should ask you to provide a commit message for the merge. There’s lot of flexibility on how to fetch and merge, <a href="https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt">please see the git subtree manual</a> for details. Then please do consider sending us a pull request with these changes ;)</p>
+<h3 id="how-to-pull-commits-made-on-this-repo-into-your-old-forks">How to pull commits made on this repo into your old forks</h3>
+<p>You should really update your old repositories to the new structure with the instructions above, but the following may work for you, although we make no guarantee they will work in the future.</p>
+<p>You can produce a branch compatible with the old repos by using <a href="http://engineeredweb.com/blog/how-to-install-git-subtree/">git subtree (usually requires git 1.8+)</a>. Then from this repository you can</p>
+<pre><code>git clone git@github.com:usergrid/usergrid.git
+cd usergrid
+git checkout master
+git subtree split --prefix=portal -b portal
+git checkout portal</code></pre>
+<p>This will create a “portal” branch that is compatible with the old usergrid-portal repository, from the code under the portal/ directory. You can pull from that branch (or push changes to it, although we will not accept pull requests sent thusly).</p>
+<p>The <code>git subtree split</code> above should function for portal, ugc, and any of the SDKs, but will not work for the stack, due to some anonymous comments left in the tree that prevent a split, and cannot be corrected lest we break the history and force a rebase on all forks.</p>
+<p><strong>Please update your code setup as soon as possible and <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/">ask the dev list</a> if you have any questions!</strong></p>
             </div>
         </div>
     </div>

Added: incubator/usergrid/site/publish/docs/old-forks/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/old-forks/index.html?rev=1580633&view=auto
==============================================================================
--- incubator/usergrid/site/publish/docs/old-forks/index.html (added)
+++ incubator/usergrid/site/publish/docs/old-forks/index.html Sun Mar 23 22:09:03 2014
@@ -0,0 +1,276 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Apache Usergrid (incubating) — What about old forks of Apigee 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">
+    <meta name="description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <meta property="og:title" content="Apache Usergrid" />
+    <meta property="og:description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <!-- Loading Typekit -->
+    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
+    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+    <!-- Loading Bootstrap -->
+    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
+    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
+    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
+    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
+
+    
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
+    <!--[if lt IE 9]>
+      <script src="js/html5shiv.js"></script>
+      <script src="js/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body>
+
+    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav secondary" role="banner">
+    <div class="container">
+        <div class="navbar-header">
+            <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bf-navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a href="/" class="navbar-brand">
+                <img id="home-logo" src="/img/apache_usergrid_logo_white_small.png" />
+            </a>
+        </div>
+        <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
+            <ul class="nav navbar-nav navbar-right">
+                <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
+                <li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
+                <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank"><span class="icns icon-stackexchange"></span></a></li>
+                <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4" target="_blank"><span class="icns icon-comments"></span></a></li>
+                <!--<li><a href="https://groups.google.com/forum/#!forum/usergrid" target="_blank"><span class="icns icon-envelope"></span></a></li>-->
+                <li><a href="https://twitter.com/usergrid" target="_blank"><span class="icns icon-twitter"></span></a></li>
+            </ul>
+        </nav>
+    </div>
+    </header>
+
+
+<div class="container bf-docs-container">    
+    <div class="row">
+        <div class="col-md-3">
+            <div class="bf-sidebar hidden-print" role="complementary">
+                <ul class="nav nav-list">
+                    <li><a href="/docs/getting-up-and-running-locally/">Getting Up &amp; Running Locally</a></li>
+                    <li><a href="/docs/deploy-local/">Deploying to local Tomcat &amp; Cassandra</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/ugc#usergrid-command-line-ugc"><code>ugc</code> — the Command-line Client</a></li>
+
+                    <li class="nav-header"><span>Concepts</span></li>
+                    <li>
+                        <a href="/docs/organizations-admins/">Organizations & Admins</a>
+                        <ul>
+                            <li>
+                                <a href="/docs/applications/">Applications</a>
+                                <ul>
+                                    <li><a href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
+                                    <!--<li><a href="#">Queues</a></li>-->
+                                    <li><a href="/docs/events-and-counters/">Events & Counters</a></li>
+                                    <li><a href="/docs/relationships/">Relationships (Joins)</a></li>
+                                    <li>
+                                        <a href="/docs/collections">Collections</a>
+                                        <ul>
+                                            <li><a href="/docs/query-language/">Query Language</a></li>
+                                            <li><a href="/docs/users-devices/">Users & Devices</a></li>
+                                            <li><a href="/docs/groups/">Groups</a></li>
+                                            <li><a href="/docs/activities/">Activities</a></li>
+                                            <li><a href="/docs/assets/">Assets</a></li>
+                                        </ul>
+                                    </li>
+                                </ul>
+                            </li>
+                        </ul>
+                    </li>
+
+
+                    <li class="nav-header"><span>Usage</span></li>
+                    <!-- <li>REST API — Coming Soon</li> -->
+                    <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+                    <li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
+                    <li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
+                    <li><a class="icns-windows" href="https://github.com/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
+
+                    <!--<li class="nav-header"><span>Internals</span></li>
+                    <li>Design & Goals — Coming Soon</li>
+                    <li>Java Architecture — Coming Soon</li>
+                    <li>Cassandra Schema — Coming Soon</li>-->
+
+                    <li class="nav-header"><span>Operations</span></li>
+                    <!--<li>Deploying — Coming Soon</li>-->
+                    <!-- <li>Monitoring — Coming Soon</li> -->
+                    <li><a href="/docs/upgrading/">Upgrading</a></li>
+                    <!-- <li>Security — Coming Soon</li> -->
+
+                    <li class="nav-header"><span>We need your help!</span></li>
+		    <li><a href="/docs/contribute-code/">How to contribute code</a></li>
+		    <!--
+		    <li><a href="/docs/contribute-docs">How to contribute docs</a></li>
+		    -->
+                </ul>
+            </div>
+        </div>
+
+        <div class="col-md-9 main-article" role="main">
+            <div class="page-article">
+                <div class="page-header">
+                    <h1>What about old forks of Apigee Usergrid?</h1>
+                    <!-- TODO: reenable this when we sync SVN to GitHub
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/old-forks.md">contribute to this article on github</a></small>
+                    -->
+                </div>
+                <div class="toc">
+	<ul>
+<li><a href="#how-to-update-your-code-setup-pull-changes-from-your-old-forks">How to update your code setup &amp; pull changes from your old forks</a></li>
+<li><a href="#how-to-pull-commits-made-on-this-repo-into-your-old-forks">How to pull commits made on this repo into your old forks</a></li>
+</ul>
+</div>
+<p>If you previously developed with Apigee Usergrid (i.e. before we moved to Apache), you know our code used to be structured into <em>separate</em> repositories: usergrid-stack, usergrid-portal, etc. We are now using a <em>merged</em> repository.</p>
+<h3 id="how-to-update-your-code-setup-pull-changes-from-your-old-forks">How to update your code setup &amp; pull changes from your old forks</h3>
+<p>You just need to clone this repository, and use <a href="http://engineeredweb.com/blog/how-to-install-git-subtree/">git subtree (usually requires git 1.8+)</a> to merge your changes under the new structure. Here’s an example for a portal fork. Adjust the prefix, repository address and branch you want to pull from as necessary.</p>
+<pre><code>git clone git@github.com:usergrid/usergrid.git
+cd usergrid
+git subtree pull --prefix=portal git@github.com:my-github-account/my-usergrid-portal-fork.git master</code></pre>
+<p>This will pull (i.e. merge) the changes you made from the master branch of github.com/my-github-account/my-usergrid-portal-fork into the portal/ subfolder. It should ask you to provide a commit message for the merge. There’s lot of flexibility on how to fetch and merge, <a href="https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt">please see the git subtree manual</a> for details. Then please do consider sending us a pull request with these changes ;)</p>
+<h3 id="how-to-pull-commits-made-on-this-repo-into-your-old-forks">How to pull commits made on this repo into your old forks</h3>
+<p>You should really update your old repositories to the new structure with the instructions above, but the following may work for you, although we make no guarantee they will work in the future.</p>
+<p>You can produce a branch compatible with the old repos by using <a href="http://engineeredweb.com/blog/how-to-install-git-subtree/">git subtree (usually requires git 1.8+)</a>. Then from this repository you can</p>
+<pre><code>git clone git@github.com:usergrid/usergrid.git
+cd usergrid
+git checkout master
+git subtree split --prefix=portal -b portal
+git checkout portal</code></pre>
+<p>This will create a “portal” branch that is compatible with the old usergrid-portal repository, from the code under the portal/ directory. You can pull from that branch (or push changes to it, although we will not accept pull requests sent thusly).</p>
+<p>The <code>git subtree split</code> above should function for portal, ugc, and any of the SDKs, but will not work for the stack, due to some anonymous comments left in the tree that prevent a split, and cannot be corrected lest we break the history and force a rebase on all forks.</p>
+<p><strong>Please update your code setup as soon as possible and <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/">ask the dev list</a> if you have any questions!</strong></p>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-3"></div>
+        <div class="col-md-9">
+            <div class="github-callout">
+                <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+                <!--
+                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/old-forks.md">this article on github</a>.</div> 
+                -->
+        </div>
+    </div>
+</div>
+
+
+<footer class="bf-footer" role="contentinfo">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="/">Home</a></li>
+                    <li class="nav-header"><a href="/community/">Community</a></li>
+                        <li><a href="/community/#events">Events</a></li>
+                        <li><a href="/community/#mailing-lists">Mailing Lists</a></li>
+                        <li><a href="/community/#deployments">Deployments</a></li>
+                        <li><a href="/community/#committers">Commiters</a></li>
+                    <!-- <li class="nav-header"><a href="#">Docs</a></li> -->
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="https://github.com/usergrid/usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/usergrid/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/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+                    <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+                    <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</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/usergrid/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>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Apache</li>
+                    <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+                    <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+                    <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+                    <li><a href="http://www.apache.org/security/">Security</a></li>
+                    <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
+                </ul>
+            </div>
+            <div class="col-md-4">
+                <a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976"  data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
+                <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+            </div> 
+        <!--
+            <div class="col-md-4">
+                <div class="input-group form-search">
+                    <input type="text" class="form-control search-query">
+                    <span class="input-group-btn">
+                        <button type="submit" class="btn btn-primary" data-type="last">Search</button>
+                    </span>
+                </div>
+            </div> -->
+        </div> 
+        <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>.</p>
+            </div>
+        </div>
+    </div>
+</footer>
+
+<script type="text/javascript" src="/js/head.js"></script>
+<script type="text/javascript">
+    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", "/js/usergrid-site.js");
+</script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-45815079-1', 'apache.org');
+  ga('send', 'pageview');
+
+</script>
+
+
+</body>
+</html>