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/09/11 21:25:42 UTC
svn commit: r1624368 [4/4] - in /incubator/usergrid/site: content/releases/
publish/docs/access-token/ publish/docs/activity/
publish/docs/admin-portal/ publish/docs/admin-user/
publish/docs/app-security/ publish/docs/application/ publish/docs/applicat...
Modified: incubator/usergrid/site/publish/docs/retrieving-data-entities/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/retrieving-data-entities/index.html?rev=1624368&r1=1624367&r2=1624368&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/retrieving-data-entities/index.html (original)
+++ incubator/usergrid/site/publish/docs/retrieving-data-entities/index.html Thu Sep 11 19:25:40 2014
@@ -207,8 +207,7 @@
<li><a href="#javascript_get_entity">JavaScript (HTML5)</a></li>
<li><a href="#ruby_get_entity">Ruby</a></li>
<li><a href="#nodejs_get_entity">Node.js</a></li>
-</ul>
-<h3 id="example-requestresponse">Example Request/Response</h3>
+</ul><h3 id="example-requestresponse">Example Request/Response</h3>
<h4 id="request">Request:</h4>
<p>Retrieve by UUID:</p>
<pre><code>curl -X GET "https://api.usergrid.com/your-org/your-app/items/da4a50dc-38dc-11e2-b2e4-02e81adcf3d0"</code></pre>
@@ -242,12 +241,10 @@
<pre><code>curl -X GET https://api.usergrid.com/<org>/<app>/<collection>/<entity></code></pre>
<h3 id="parameters">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">org</td>
@@ -266,8 +263,7 @@
<td align="left">Entity UUID or entity name</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
<h3 id="example-requestresponse-1">Example Request/Response</h3>
<h4 id="request-1">Request:</h4>
<pre><code>-(NSString*)getEntity {
@@ -325,12 +321,10 @@
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>endpoint</p></td>
@@ -345,8 +339,7 @@
<td align="left"><p>An optional query string. Requests for a specific entity should set the value to <code>nil</code></p></td>
</tr>
</tbody>
-</table>
-<p><br> This example uses the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
+</table><p><br> This example uses the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
<h3 id="example-requestresponse-2">Example Request/Response</h3>
<h4 id="request-2">Request:</h4>
<pre><code>//Create client entity
@@ -481,12 +474,10 @@ public void onResponse(ApiResponse respo
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>type</p></td>
@@ -505,8 +496,7 @@ public void onResponse(ApiResponse respo
<td align="left"><p>Callback function (Asynchronous calls only)</p></td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) SDK</a>.</p>
<h3 id="example-requestresponse-3">Example Request/Response</h3>
<h4 id="request-3">Request:</h4>
<pre><code>var properties = {
@@ -554,12 +544,10 @@ client.getEntity(properties, function (e
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>properties</p></td>
@@ -578,8 +566,7 @@ client.getEntity(properties, function (e
<td align="left"><p>Callback function</p></td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#ruby">Apache Usergrid RubyGem</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#ruby">Apache Usergrid RubyGem</a>.</p>
<h3 id="example-requestresponse-4">Example Request/Response</h3>
<h4 id="request-4">Request:</h4>
<pre><code>#Create a client object
@@ -684,8 +671,7 @@ client.getEntity(properties, function (e
<li>type: the entity type to be retrieved</li>
<li>name: the name of the entity to be retrieved</li>
<li>uuid: the uuid of the entity to be retrieved</li>
-</ul>
-<p>You only need to specify name or uuid, not both.</p>
+</ul><p>You only need to specify name or uuid, not both.</p>
<p>callback</p>
<p>Callback function</p>
<h2 id="retrieving-multiple-entities">Retrieving multiple entities</h2>
@@ -696,8 +682,7 @@ client.getEntity(properties, function (e
<li><a href="#javascript_get_multentity">JavaScript (HTML5)</a></li>
<li><a href="#ruby_get_multentity">Ruby</a></li>
<li><a href="#nodejs_get_multentity">Node.js</a></li>
-</ul>
-<p>This example describes how to retrieve multiple entities by UUID. You can also retrieve a set of entities by using a query string. For more information on querying your data, see <a href="/basic-query-syntax">Basic query syntax</a>.</p>
+</ul><p>This example describes how to retrieve multiple entities by UUID. You can also retrieve a set of entities by using a query string. For more information on querying your data, see <a href="/basic-query-syntax">Basic query syntax</a>.</p>
<h3 id="example-requestresponse-6">Example Request/Response</h3>
<h4 id="request-6">Request:</h4>
<pre><code>//note the url-encoded query string
@@ -748,12 +733,10 @@ curl -X GET "https://api.usergrid.com/yo
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>org_id</p></td>
@@ -779,8 +762,7 @@ curl -X GET "https://api.usergrid.com/yo
</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
<h3 id="example-requestresponse-7">Example Request/Response</h3>
<h4 id="request-7">Request:</h4>
<pre><code>-(NSString*)getEntity {
@@ -853,12 +835,10 @@ NSString *query = @"uuid = b3aad0a4-f322
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>type</p></td>
@@ -869,8 +849,7 @@ NSString *query = @"uuid = b3aad0a4-f322
<td align="left"><p>A query string of entity properties to be matched for the entities to be retrieved in the following format: <property>=<value> OR <property> =<value> OR â¦</value></property></value></property></p></td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
<h3 id="example-requestresponse-8">Example Request/Response</h3>
<h4 id="request-8">Request:</h4>
<pre><code>//Create client entity
@@ -951,12 +930,10 @@ public void onResponse(ApiResponse respo
<pre><code>ApiResponse getEntities(String type, String queryString)</code></pre>
<h3 id="properties-3">Properties</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">type</td>
@@ -971,8 +948,7 @@ public void onResponse(ApiResponse respo
<td align="left">Callback function (Asynchronous calls only)</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) module</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) module</a>.</p>
<h3 id="example-requestresponse-9">Example Request/Response</h3>
<h4 id="request-9">Request:</h4>
<pre><code>var dataClient = new Usergrid.Client({
@@ -1035,12 +1011,10 @@ if (err) {
<pre><code>request(properties,callback)</code></pre>
<h3 id="parameters-5">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">properties</td>
@@ -1051,8 +1025,7 @@ if (err) {
<td align="left">Callback function</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#ruby">Apache Usergrid RubyGem</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#ruby">Apache Usergrid RubyGem</a>.</p>
<h3 id="example-requestresponse-10">Example Request/Response</h3>
<h4 id="request-10">Request:</h4>
<p>This example uses the <a href="/app-services-sdks#ruby">Apache Usergrid RubyGem</a>.</p>
@@ -1116,12 +1089,10 @@ end
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>collection</p></td>
@@ -1135,8 +1106,7 @@ end
</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#nodejs">Apache Usergrid Node.js module</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#nodejs">Apache Usergrid Node.js module</a>.</p>
<h3 id="example-requestresponse-11">Example Request/Response</h3>
<h4 id="request-11">Request:</h4>
<pre><code>var dataClient = new Usergrid.client({
@@ -1191,12 +1161,10 @@ dataClient.request(options, function (er
<pre><code>request(properties,callback)</code></pre>
<h3 id="parameters-7">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">properties</td>
@@ -1207,8 +1175,7 @@ dataClient.request(options, function (er
<td align="left">Callback function</td>
</tr>
</tbody>
-</table>
-<h2 id="add-new-comment">Add new comment</h2>
+</table><h2 id="add-new-comment">Add new comment</h2>
<p>Your name</p>
<p>Email</p>
<p>Provide your email address if you wish to be contacted offline about your comment.<br>We will not display your email address as part of your comment.</p>
Modified: incubator/usergrid/site/publish/docs/role/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/role/index.html?rev=1624368&r1=1624367&r2=1624368&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/role/index.html (original)
+++ incubator/usergrid/site/publish/docs/role/index.html Thu Sep 11 19:25:40 2014
@@ -243,12 +243,10 @@
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>arg uuid|string org_id</p></td>
@@ -267,17 +265,13 @@
</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request">Example - Request</h3>
+</table><h3 id="example---request">Example - Request</h3>
<ul>
<li><a href="#curl_create_role">cURL</a></li>
<li><a href="#javascript_create_role">JavaScript (HTML5)</a></li>
<li><a href="#ruby_create_role">Ruby</a></li>
<li><a href="#nodejs_create_role">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/roles/ -d '{"name":"manager","title":"Manager"}'</code></pre>
+</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/roles/ -d '{"name":"manager","title":"Manager"}'</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -336,12 +330,10 @@ client.request(options, function (err, d
<p>GET /{org_id}/{app_id}/roles</p>
<h3 id="parameters-1">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -352,17 +344,13 @@ client.request(options, function (err, d
<td align="left">Application UUID or application name</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-1">Example - Request</h3>
+</table><h3 id="example---request-1">Example - Request</h3>
<ul>
<li><a href="#curl_get_roles">cURL</a></li>
<li><a href="#javascript_get_roles">JavaScript (HTML5)</a></li>
<li><a href="#ruby_get_roles">Ruby</a></li>
<li><a href="#nodejs_get_roles">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/roles"</code></pre>
+</ul><!-- --><pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/roles"</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -461,12 +449,10 @@ client.request(options, function (err, d
<p>DELETE /{org_id}/{app_id}/roles/{rolename}</p>
<h3 id="parameters-2">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -481,17 +467,13 @@ client.request(options, function (err, d
<td align="left">Role name</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-2">Example - Request</h3>
+</table><h3 id="example---request-2">Example - Request</h3>
<ul>
<li><a href="#curl_delete_role">cURL</a></li>
<li><a href="#javascript_delete_role">JavaScript (HTML5)</a></li>
<li><a href="#ruby_delete_role">Ruby</a></li>
<li><a href="#nodejs_delete_role">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/roles/manager"</code></pre>
+</ul><!-- --><pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/roles/manager"</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -551,12 +533,10 @@ client.request(options, function (err, d
<p>GET /{org_id}/{app_id}/roles/{rolename|role_id}/permissions</p>
<h3 id="parameters-3">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -571,17 +551,13 @@ client.request(options, function (err, d
<td align="left">Role UUID or role name</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-3">Example - Request</h3>
+</table><h3 id="example---request-3">Example - Request</h3>
<ul>
<li><a href="#curl_get_role_permissions">cURL</a></li>
<li><a href="#javascript_get_role_permissions">JavaScript (HTML5)</a></li>
<li><a href="#ruby_get_role_permissions">Ruby</a></li>
<li><a href="#nodejs_get_role_permissions">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/roles/manager/permissions"</code></pre>
+</ul><!-- --><pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/roles/manager/permissions"</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -620,12 +596,10 @@ client.request(options, function (err, d
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>arg uuid|string org_id</p></td>
@@ -648,17 +622,13 @@ client.request(options, function (err, d
</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-4">Example - Request</h3>
+</table><h3 id="example---request-4">Example - Request</h3>
<ul>
<li><a href="#curl_add_role_permissions">cURL</a></li>
<li><a href="#javascript_add_role_permissions">JavaScript (HTML5)</a></li>
<li><a href="#ruby_add_role_permissions">Ruby</a></li>
<li><a href="#nodejs_add_role_permissions">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/roles/manager/permissions" -d '{"permission":"get,put,post,delete:/users/me/groups" }'</code></pre>
+</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/roles/manager/permissions" -d '{"permission":"get,put,post,delete:/users/me/groups" }'</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -696,12 +666,10 @@ client.request(options, function (err, d
<p>DELETE /{org_id}/{app_id}/roles/{rolename|role_id}/permissions?permission={permissions_spec}</p>
<h3 id="parameters-5">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">uuid|string org_id</td>
@@ -720,17 +688,13 @@ client.request(options, function (err, d
<td align="left">The pattern on which the permissions were granted.</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-5">Example - Request</h3>
+</table><h3 id="example---request-5">Example - Request</h3>
<ul>
<li><a href="#curl_delete_role_permissions">cURL</a></li>
<li><a href="#javascript_delete_role_permissions">JavaScript (HTML5)</a></li>
<li><a href="#ruby_delete_role_permissions">Ruby</a></li>
<li><a href="#nodejs_delete_role_permissions">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X DELETE -H "authorization: Bearer INSERT_BEARER_TOKEN_HERE" "https://api.usergrid.com/my-org/my-app/roles/default/permissions?permission=get,post,delete:/notes"</code></pre>
+</ul><!-- --><pre><code>curl -X DELETE -H "authorization: Bearer INSERT_BEARER_TOKEN_HERE" "https://api.usergrid.com/my-org/my-app/roles/default/permissions?permission=get,post,delete:/notes"</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -795,12 +759,10 @@ client.request(options, function (err, d
<pre><code>POST /{org_id}/{app_id}/users/{uuid|username}/roles/{role_id}</code></pre>
<h3 id="parameters-6">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -819,17 +781,13 @@ client.request(options, function (err, d
<td align="left">User UUID or username</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-6">Example - Request</h3>
+</table><h3 id="example---request-6">Example - Request</h3>
<ul>
<li><a href="#curl_add_role_user">cURL</a></li>
<li><a href="#javascript_add_role_user">JavaScript (HTML5)</a></li>
<li><a href="#ruby_add_role_user">Ruby</a></li>
<li><a href="#nodejs_add_role_user">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/roles/manager/users/john.doe"</code></pre>
+</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/roles/manager/users/john.doe"</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -897,12 +855,10 @@ client.request(options, function (err, d
<pre><code>GET /{org_id}/{app_id}/roles/{role_id}/users</code></pre>
<h3 id="parameters-7">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -917,17 +873,13 @@ client.request(options, function (err, d
<td align="left">Role UUID or role name</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-7">Example - Request</h3>
+</table><h3 id="example---request-7">Example - Request</h3>
<ul>
<li><a href="#curl_get_role_users">cURL</a></li>
<li><a href="#javascript_get_role_users">JavaScript (HTML5)</a></li>
<li><a href="#ruby_get_role_users">Ruby</a></li>
<li><a href="#nodejs_get_role_users">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/roles/manager/users"</code></pre>
+</ul><!-- --><pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/roles/manager/users"</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -998,12 +950,10 @@ client.request(options, function (err, d
<pre><code>DELETE /{org_id}/{app_id}/roles/{role_id}/users/{uuid|username}</code></pre>
<h3 id="parameters-8">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -1022,17 +972,13 @@ client.request(options, function (err, d
<td align="left">User UUID or username</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-8">Example - Request</h3>
+</table><h3 id="example---request-8">Example - Request</h3>
<ul>
<li><a href="#curl_delete_role_user">cURL</a></li>
<li><a href="#javascript_delete_role_user">JavaScript (HTML5)</a></li>
<li><a href="#ruby_delete_role_user">Ruby</a></li>
<li><a href="#nodejs_delete_role_user">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/roles/manager/users/john.doe"</code></pre>
+</ul><!-- --><pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/roles/manager/users/john.doe"</code></pre>
<p>It is recommended that you use the <a href="http://apigee.com/usergrid">Admin Portal</a> for administrative activities instead of using JavaScript to do them programmatically in your app.</p>
<p><strong>Note:</strong>You can see the response below in the Admin Portal by using the <a href="/docs/usergrid/content/displaying-app-services-api-calls-curl-commands">JavaScript Console</a>.</p>
<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
@@ -1106,13 +1052,11 @@ curl -X DELETE "https://api.usergrid.com
<h3 id="general-properties">General properties</h3>
<p>Roles have the following general properties.</p>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Property</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">uuid</td>
@@ -1152,35 +1096,27 @@ curl -X DELETE "https://api.usergrid.com
<td align="left">Role title</td>
</tr>
</tbody>
-</table>
-<h3 id="set-properties">Set properties</h3>
+</table><h3 id="set-properties">Set properties</h3>
<p>Roles have the following set property.</p>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Set</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
+</tr></thead>
+<tbody><tr class="odd">
<td align="left">permissions</td>
<td align="left">string</td>
<td align="left">Set of user permissions</td>
-</tr>
-</tbody>
-</table>
-<h3 id="collection-properties">Collection properties</h3>
+</tr></tbody>
+</table><h3 id="collection-properties">Collection properties</h3>
<p>Roles have the following collections.</p>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Collection</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">users</td>
@@ -1193,8 +1129,7 @@ curl -X DELETE "https://api.usergrid.com
<td align="left">Collection of groups assigned to a role</td>
</tr>
</tbody>
-</table>
-<p>Â </p>
+</table><p>Â </p>
</div>
</div>
</div>
Modified: incubator/usergrid/site/publish/docs/updating-collections/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/updating-collections/index.html?rev=1624368&r1=1624367&r2=1624368&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/updating-collections/index.html (original)
+++ incubator/usergrid/site/publish/docs/updating-collections/index.html Thu Sep 11 19:25:40 2014
@@ -180,8 +180,7 @@
<li><a href="#javascript_update_collection">JavaScript (HTML5)</a></li>
<li><a href="#ruby_update_collection">Ruby</a></li>
<li><a href="#nodejs_update_collection">Node.js</a></li>
-</ul>
-<h3 id="example-requestresponse">Example Request/Response</h3>
+</ul><h3 id="example-requestresponse">Example Request/Response</h3>
<h4 id="request">Request:</h4>
<pre><code>curl -X PUT https://api.usergrid.com/your-org/your-app/items/?ql= -d '{"availability":"in-stock"}'</code></pre>
<p>Note the empty <code>?ql=</code> query string.</p>
@@ -225,12 +224,10 @@
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>org</p></td>
@@ -253,8 +250,7 @@
</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
<h3 id="example-requestresponse-1">Example Request/Response</h3>
<h4 id="request-1">Request:</h4>
<pre><code>-(NSString*)updateCollection {
@@ -319,12 +315,10 @@
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>url</p></td>
@@ -342,8 +336,7 @@
<td align="left"><p>A JSON-formatted string that contains the entity properties to be updated</p></td>
</tr>
</tbody>
-</table>
-<p>Updating all entities in a collection is not currently supported by the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
+</table><p>Updating all entities in a collection is not currently supported by the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
<p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) SDK</a>.</p>
<h3 id="example-requestresponse-2">Example Request/Response</h3>
<h4 id="request-2">Request:</h4>
@@ -410,12 +403,10 @@ __proto__: Object
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>options</p></td>
@@ -434,8 +425,7 @@ __proto__: Object
<td align="left"><p>Callback function to handle the API response</p></td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#ruby">Apache Usergrid RubyGem</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#ruby">Apache Usergrid RubyGem</a>.</p>
<h3 id="example-requestresponse-3">Example Request/Response</h3>
<h4 id="request-3">Request:</h4>
<pre><code>#Create a client object
@@ -489,12 +479,10 @@ end
<pre><code>collection.update_query(properties, query_string)</code></pre>
<h3 id="properties-1">Properties</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">properties</td>
@@ -505,8 +493,7 @@ end
<td align="left">A query string that specifies the entities to be updated. Use an empty string (<code>""</code>) to update all entities.</td>
</tr>
</tbody>
-</table>
-<p>The example assumes use of the <a href="/app-services-sdks#nodejs">Apache Usergrid Node.js module</a>.</p>
+</table><p>The example assumes use of the <a href="/app-services-sdks#nodejs">Apache Usergrid Node.js module</a>.</p>
<h3 id="example-requestresponse-4">Example Request/Response</h3>
<h4 id="request-4">Request:</h4>
<pre><code>//Create the Apache Usergrid client object
@@ -562,12 +549,10 @@ dataClient.request(options,function (err
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>options</p></td>
@@ -585,8 +570,7 @@ dataClient.request(options,function (err
<td align="left"><p>Callback function to handle the API response</p></td>
</tr>
</tbody>
-</table>
-<p>Â </p>
+</table><p>Â </p>
</div>
</div>
</div>
Modified: incubator/usergrid/site/publish/docs/updating-data-entities/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/updating-data-entities/index.html?rev=1624368&r1=1624367&r2=1624368&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/updating-data-entities/index.html (original)
+++ incubator/usergrid/site/publish/docs/updating-data-entities/index.html Thu Sep 11 19:25:40 2014
@@ -201,8 +201,7 @@
<li><a href="#javascript_update_entity">JavaScript (HTML5)</a></li>
<li><a href="#ruby_update_entity">Ruby</a></li>
<li><a href="#nodejs_update_entity">Node.js</a></li>
-</ul>
-<h3 id="example-requestresponse">Example Request/Response</h3>
+</ul><h3 id="example-requestresponse">Example Request/Response</h3>
<h4 id="request">Request:</h4>
<pre><code>curl -X PUT https://api.usergrid.com/your-org/your-app/items/milk -d '{"price":"4.00", "availability":"in-stock"}'</code></pre>
<h4 id="response">Response:</h4>
@@ -236,12 +235,10 @@
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>org</p></td>
@@ -268,8 +265,7 @@
</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
<h3 id="example-requestresponse-1">Example Request/Response</h3>
<h4 id="request-1">Request:</h4>
<pre><code>-(NSString*)updateEntity {
@@ -333,12 +329,10 @@
<pre><code>(ApigeeClientResponse *)updateEntity: (NSString *)entityID entity:(NSDictionary *)updatedEntity</code></pre>
<h3 id="parameters-1">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">entityID</td>
@@ -349,8 +343,7 @@
<td align="left">NSMutableDictionary containing the properties to be updated</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
<h3 id="example-requestresponse-2">Example Request/Response</h3>
<h4 id="request-2">Request:</h4>
<pre><code>//Create client entity
@@ -425,12 +418,10 @@ dataClient.updateEntityAsync(entityID, u
<pre><code>updateEntity(String entityID, Map<String, Object> updatedProperties)</code></pre>
<h3 id="parameters-2">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">entityID</td>
@@ -445,8 +436,7 @@ dataClient.updateEntityAsync(entityID, u
<td align="left">Callback function (Asynchronous calls only)</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) SDK</a>.</p>
<h3 id="example-requestresponse-3">Example Request/Response</h3>
<h4 id="request-3">Request:</h4>
<pre><code>//Create the Apache Usergrid client object
@@ -670,8 +660,7 @@ entity.save(function (error,response) {
<li><a href="#javascript_update_subproperty">JavaScript (HTML5)</a></li>
<li><a href="#ruby_update_subproperty">Ruby</a></li>
<li><a href="#nodejs_update_subproperty">Node.js</a></li>
-</ul>
-<h3 id="example-requestresponse-6">Example Request/Response</h3>
+</ul><h3 id="example-requestresponse-6">Example Request/Response</h3>
<h4 id="request-6">Request:</h4>
<pre><code>curl -X PUT https://api.usergrid.com/your-org/your-app/items/milk -d '{"varieties":[{"name":"1%","price":"3.25"},{"name":"whole","price":"4.00"}]}'</code></pre>
<h4 id="response-5">Response:</h4>
@@ -712,12 +701,10 @@ entity.save(function (error,response) {
<table>
<col width="16%">
<col width="81%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">org_id</td>
@@ -745,8 +732,7 @@ entity.save(function (error,response) {
</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#ios">Apache Usergrid iOS SDK</a>.</p>
<h3 id="example-requestresponse-7">Example Request/Response</h3>
<h4 id="request-7">Request:</h4>
<pre><code>-(NSString*)updateEntity {
@@ -827,12 +813,10 @@ entity.save(function (error,response) {
<pre><code>(ApigeeClientResponse *)updateEntity: (NSString *)entityID entity:(NSDictionary *)updatedEntity</code></pre>
<h3 id="parameters-4">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">entityID</td>
@@ -843,8 +827,7 @@ entity.save(function (error,response) {
<td align="left">Entity object containing the properties to be updated</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#android">Apache Usergrid Android SDK</a>.</p>
<h3 id="example-requestresponse-8">Example Request/Response</h3>
<h4 id="request-8">Request:</h4>
<pre><code>//Create client entity
@@ -942,12 +925,10 @@ dataClient.updateEntityAsync(entityID, u
<pre><code>updateEntity(String entityID, Map<String, Object> updatedProperties)</code></pre>
<h3 id="parameters-5">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">entityID</td>
@@ -962,8 +943,7 @@ dataClient.updateEntityAsync(entityID, u
<td align="left">Callback function (Asynchronous calls only)</td>
</tr>
</tbody>
-</table>
-<p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) SDK</a>.</p>
+</table><p>This example uses the <a href="/app-services-sdks#javascript">Apache Usergrid JavaScript (HTML5) SDK</a>.</p>
<h3 id="example-requestresponse-9">Example Request/Response</h3>
<h4 id="request-9">Request:</h4>
<pre><code>//Create the Apache Usergrid client object
Modified: incubator/usergrid/site/publish/docs/user/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/user/index.html?rev=1624368&r1=1624367&r2=1624368&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/user/index.html (original)
+++ incubator/usergrid/site/publish/docs/user/index.html Thu Sep 11 19:25:40 2014
@@ -265,12 +265,10 @@
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>arg uuid|string org_id</p></td>
@@ -291,8 +289,7 @@
</td>
</tr>
</tbody>
-</table>
-<p>Although the password parameter is not mandatory, if you donât specify it, the user will not be able to log in using username and password credentials. If a password is not specified for the user, and youâre an Admin, you can set a password for the user (see <a href="#set_password">Setting a password</a>).</p>
+</table><p>Although the password parameter is not mandatory, if you donât specify it, the user will not be able to log in using username and password credentials. If a password is not specified for the user, and youâre an Admin, you can set a password for the user (see <a href="#set_password">Setting a password</a>).</p>
<p><strong>Note:</strong> The username can contain any combination of characters, including those that represent letters, numbers, and symbols.</p>
<h3 id="example---request">Example - Request</h3>
<ul>
@@ -300,10 +297,7 @@
<li><a href="#javascript_create_user">JavaScript (HTML5)</a></li>
<li><a href="#ruby_create_user">Ruby</a></li>
<li><a href="#nodejs_create_user">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/users" -d '{"username":"john.doe","email":"john.doe@gmail.com","name":"John Doe"}'</code></pre>
+</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/users" -d '{"username":"john.doe","email":"john.doe@gmail.com","name":"John Doe"}'</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'POST',
@@ -398,10 +392,7 @@ client.request(options, function (err, d
<li><a href="#javascript_set_password">JavaScript (HTML5)</a></li>
<li><a href="#ruby_set_password">Ruby</a></li>
<li><a href="#nodejs_set_password">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X PUT "https://api.usergrid.com/my-org/my-app/users/john.doe/password" -d '{"newpassword":"foo9876a","oldpassword":"bar1234b"}'</code></pre>
+</ul><!-- --><pre><code>curl -X PUT "https://api.usergrid.com/my-org/my-app/users/john.doe/password" -d '{"newpassword":"foo9876a","oldpassword":"bar1234b"}'</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'PUT',
@@ -445,12 +436,10 @@ client.request(options, function (err, d
<p>GETÂ /{org_id}/{app_id}/users/{uuid|username|email_address}</p>
<h3 id="parameters-2">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -465,17 +454,13 @@ client.request(options, function (err, d
<td align="left">User UUID, username, or email address. The alias /users/me can be used in place of the current userâs uuid, username, or email address. <strong>Note:</strong> The /users/me endpoint is accessible only if you provide an access token with the request (see <a href="/authenticating-users-and-application-clients">Authenticating users and application clients</a>). If you make an anonymous (âguestâ) call, the system will not be able to determine which user to return as /users/me.</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-2">Example - Request</h3>
+</table><h3 id="example---request-2">Example - Request</h3>
<ul>
<li><a href="#curl_get_user">cURL</a></li>
<li><a href="#javascript_get_user">JavaScript (HTML5)</a></li>
<li><a href="#ruby_get_user">Ruby</a></li>
<li><a href="#nodejs_get_user">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users/jane.doe"</code></pre>
+</ul><!-- --><pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users/jane.doe"</code></pre>
<p>OR</p>
<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users/a407b1e7-58e8-11e1-ac46-22000a1c5a67e"</code></pre>
<p>OR</p>
@@ -556,10 +541,7 @@ client.request(options, function (err, d
<li><a href="#javascript_get_multuser">JavaScript (HTML5)</a></li>
<li><a href="#ruby_get_multuser">Ruby</a></li>
<li><a href="#nodejs_get_multuser">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users;7d1aa429-e978-11e0-8264-005056c00008;a407b1e7-58e8-11e1-ac46-22000a1c5a67e"</code></pre>
+</ul><!-- --><pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users;7d1aa429-e978-11e0-8264-005056c00008;a407b1e7-58e8-11e1-ac46-22000a1c5a67e"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'GET',
@@ -657,12 +639,10 @@ client.request(options, function (err, d
<table>
<col width="50%">
<col width="50%">
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left"><p>arg uuid|string org_id</p></td>
@@ -687,17 +667,13 @@ client.request(options, function (err, d
</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-3">Example - Request</h3>
+</table><h3 id="example---request-3">Example - Request</h3>
<ul>
<li><a href="#curl_update_user">cURL</a></li>
<li><a href="#javascript_update_user">JavaScript (HTML5)</a></li>
<li><a href="#ruby_update_user">Ruby</a></li>
<li><a href="#nodejs_update_user">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X PUT "https://api.usergrid.com/my-org/my-app/users/john.doe" -d '{"email":"john.doe@mail.com", "city":"san francisco"}'</code></pre>
+</ul><!-- --><pre><code>curl -X PUT "https://api.usergrid.com/my-org/my-app/users/john.doe" -d '{"email":"john.doe@mail.com", "city":"san francisco"}'</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'PUT',
@@ -778,12 +754,10 @@ client.request(options, function (err, d
<p>DELETEÂ /{org_id}/{app_id}/users/{uuid|username}</p>
<h3 id="parameters-4">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -802,17 +776,13 @@ client.request(options, function (err, d
<td align="left">One or more sets of user properties</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-4">Example - Request</h3>
+</table><h3 id="example---request-4">Example - Request</h3>
<ul>
<li><a href="#curl_delete_user">cURL</a></li>
<li><a href="#javascript_delete_user">JavaScript (HTML5)</a></li>
<li><a href="#ruby_delete_user">Ruby</a></li>
<li><a href="#nodejs_delete_user">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/users/john.doe"</code></pre>
+</ul><!-- --><pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/users/john.doe"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'DELETE',
@@ -894,12 +864,10 @@ client.request(options, function (err, d
<p>GETÂ /{org_id}/{app_id}/users?{query}</p>
<h3 id="parameters-5">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -914,17 +882,13 @@ client.request(options, function (err, d
<td align="left">Query in the query language. See <a href="/queries-and-parameters">Queries and parameters</a>.</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-5">Example - Request</h3>
+</table><h3 id="example---request-5">Example - Request</h3>
<ul>
<li><a href="#curl_query_users">cURL</a></li>
<li><a href="#javascript_query_users">JavaScript (HTML5)</a></li>
<li><a href="#ruby_query_users">Ruby</a></li>
<li><a href="#nodejs_query_users">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users?ql=select%20*%20where%20city%3D'Chicago'"</code></pre>
+</ul><!-- --><pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users?ql=select%20*%20where%20city%3D'Chicago'"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'GET',
@@ -1016,12 +980,10 @@ client.request(options, function (err, d
<p>POST /{org_id}/{app_id}/groups/{uuid|groupname}/users/{uuid|username}</p>
<h3 id="parameters-6">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -1040,17 +1002,13 @@ client.request(options, function (err, d
<td align="left">UUID or username of user</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-6">Example - Request</h3>
+</table><h3 id="example---request-6">Example - Request</h3>
<ul>
<li><a href="#curl_add_user">cURL</a></li>
<li><a href="#javascript_add_user">JavaScript (HTML5)</a></li>
<li><a href="#ruby_add_user">Ruby</a></li>
<li><a href="#nodejs_add_user">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/groups/mynewgroup/users/john.doe"</code></pre>
+</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/groups/mynewgroup/users/john.doe"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'POST',
@@ -1130,12 +1088,10 @@ client.request(options, function (err, d
<p>POSTÂ /{org_id}/{app_id}/{collection}/{first_entity_id}/{relationship}/{second_entity_id}</p>
<h3 id="parameters---use-case-1">Parameters - Use Case 1</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -1162,18 +1118,14 @@ client.request(options, function (err, d
<td align="left">Second entity UUID</td>
</tr>
</tbody>
-</table>
-<p>If the relationship is a collection (such as a users collection for the group employees), this request adds the second entity to the first entityâs collection of the specified name. (Note that employees is an entity name within the groups collection.) In the case of a group, this is how you add users as group members.</p>
+</table><p>If the relationship is a collection (such as a users collection for the group employees), this request adds the second entity to the first entityâs collection of the specified name. (Note that employees is an entity name within the groups collection.) In the case of a group, this is how you add users as group members.</p>
<h3 id="example---request---use-case-1-add-a-user-to-a-collection">Example - Request - Use Case 1 (Add a user to a collection)</h3>
<ul>
<li><a href="#curl_add_user_collection">cURL</a></li>
<li><a href="#javascript_add_user_collection">JavaScript (HTML5)</a></li>
<li><a href="#ruby_add_user_collection">Ruby</a></li>
<li><a href="#nodejs_add_user_collection">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/groups/employees/users/jane.doe"</code></pre>
+</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/groups/employees/users/jane.doe"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'POST',
@@ -1248,10 +1200,7 @@ client.request(options, function (err, d
<li><a href="#javascript_create_connection1">JavaScript (HTML5)</a></li>
<li><a href="#ruby_create_connection1">Ruby</a></li>
<li><a href="#nodejs_create_connection1">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/users/jane.doe/likes/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0"</code></pre>
+</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/users/jane.doe/likes/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'POST',
@@ -1325,12 +1274,10 @@ organization": "my-org",
<p>POSTÂ /{org_id}/{app_id}/{collection}/{first_entity_id}/{relationship}/{second_entity_type}/{second_entity_id}</p>
<h3 id="parameters---use-case-2">Parameters - Use Case 2</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -1361,18 +1308,14 @@ organization": "my-org",
<td align="left">Second entity UUID or entity name</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request---use-case-2">Example - Request - Use Case 2</h3>
+</table><h3 id="example---request---use-case-2">Example - Request - Use Case 2</h3>
<p>When creating a connection, if you specify the entity type for the second entity, then you can create the connection using the entityâs name rather than its UUID.</p>
<ul>
<li><a href="#curl_create_connection2">cURL</a></li>
<li><a href="#javascript_create_connection2">JavaScript (HTML5)</a></li>
<li><a href="#ruby_create_connection2">Ruby</a></li>
<li><a href="#nodejs_create_connection2">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/users/john.doe/likes/food/pizza"</code></pre>
+</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/users/john.doe/likes/food/pizza"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'POST',
@@ -1432,12 +1375,10 @@ client.request(options, function (err, d
<p>DELETEÂ /{org_id}/{app_id}/{collection}/{first_entity_id}/{relationship}/{second_entity_id}</p>
<h3 id="parameters---use-case-1-1">Parameters - Use Case 1</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -1464,18 +1405,14 @@ client.request(options, function (err, d
<td align="left">Second entity UUID</td>
</tr>
</tbody>
-</table>
-<p>If the relationship is a collection (such as a users collection for the group employees), this request removes the second entity from the first entityâs collection of the specified name. In the case of a group, this is how you delete users as group members.</p>
+</table><p>If the relationship is a collection (such as a users collection for the group employees), this request removes the second entity from the first entityâs collection of the specified name. In the case of a group, this is how you delete users as group members.</p>
<h3 id="example---request---use-case-1-remove-a-user-from-a-collection">Example - Request - Use Case 1 (Remove a user from a collection)</h3>
<ul>
<li><a href="#curl_delete_user_collection">cURL</a></li>
<li><a href="#javascript_delete_user_collection">JavaScript (HTML5)</a></li>
<li><a href="#ruby_delete_user_collection">Ruby</a></li>
<li><a href="#nodejs_delete_user_collection">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/groups/employees/users/jane.doe"</code></pre>
+</ul><!-- --><pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/groups/employees/users/jane.doe"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'DELETE',
@@ -1548,10 +1485,7 @@ client.request(options, function (err, d
<li><a href="#javascript_delete_connection">JavaScript (HTML5)</a></li>
<li><a href="#ruby_delete_connection">Ruby</a></li>
<li><a href="#nodejs_delete_connection">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/users/jane.doe/likes/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0"</code></pre>
+</ul><!-- --><pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/users/jane.doe/likes/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'DELETE',
@@ -1629,12 +1563,10 @@ client.request(options, function (err, d
<p>DELETEÂ /{org_id}/{app_id}/{collection}/{first_entity_id}/{relationship}/{second_entity_type}/{second_entity_id}</p>
<h3 id="parameters---use-case-2-1">Parameters - Use Case 2</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -1665,18 +1597,14 @@ client.request(options, function (err, d
<td align="left">Second entity UUID or entity name</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request---use-case-2-1">Example - Request - Use Case 2</h3>
+</table><h3 id="example---request---use-case-2-1">Example - Request - Use Case 2</h3>
<p>When removing a connection, if you specify the entity type for the second entity, then you can delete the connection using the entityâs name rather than its UUID.</p>
<ul>
<li><a href="#curl_delete_connection1">cURL</a></li>
<li><a href="#javascript_delete_connection1">JavaScript (HTML5)</a></li>
<li><a href="#ruby_delete_connection1">Ruby</a></li>
<li><a href="#nodejs_delete_connection1">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/users/test-user-1/follows/test-user-2"</code></pre>
+</ul><!-- --><pre><code>curl -X DELETE "https://api.usergrid.com/my-org/my-app/users/test-user-1/follows/test-user-2"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'DELETE',
@@ -1724,12 +1652,10 @@ client.request(options, function (err, d
<p>GETÂ /{org_id}/{app_id}/users/{uuid|username}/{relationship}?{query}</p>
<h3 id="parameters-7">Parameters</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Parameter</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">arg uuid|string org_id</td>
@@ -1752,17 +1678,13 @@ client.request(options, function (err, d
<td align="left">Query in the query language. See <a href="/queries-and-parameters">Queries and parameters</a>.</td>
</tr>
</tbody>
-</table>
-<h3 id="example---request-7">Example - Request</h3>
+</table><h3 id="example---request-7">Example - Request</h3>
<ul>
<li><a href="#curl_query_user_collections">cURL</a></li>
<li><a href="#javascript_query_user_collections">JavaScript (HTML5)</a></li>
<li><a href="#ruby_query_user_collections">Ruby</a></li>
<li><a href="#nodejs_query_user_collections">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users/jane.doe/likes?ql=select%20*%20where%20city%3D'milwaukee'"</code></pre>
+</ul><!-- --><pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users/jane.doe/likes?ql=select%20*%20where%20city%3D'milwaukee'"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'GET',
@@ -1836,10 +1758,7 @@ client.request(options, function (err, d
<li><a href="#javascript_get_user_feed">JavaScript (HTML5)</a></li>
<li><a href="#ruby_get_user_feed">Ruby</a></li>
<li><a href="#nodejs_get_user_feed">Node.js</a></li>
-</ul>
-<!-- -->
-
-<pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users/john.doe/feed"</code></pre>
+</ul><!-- --><pre><code>curl -X GET "https://api.usergrid.com/my-org/my-app/users/john.doe/feed"</code></pre>
<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
<pre><code>var options = {
method:'GET',
@@ -1931,13 +1850,11 @@ client.request(options, function (err, d
<h2 id="user-properties">User properties</h2>
<p>The following are the system-defined properties for user entities. You can create application-specific properties for a user entity in addition to the system-defined properties. The system-defined properties are reserved. You cannot use these names to create other properties for a user entity. In addition the users name is reserved for the users collection â you canât use it to name another collection.</p>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Property</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">uuid</td>
@@ -2012,16 +1929,13 @@ client.request(options, function (err, d
<td align="left">User picture</td>
</tr>
</tbody>
-</table>
-<p>The following property sets are assigned to user entities.</p>
+</table><p>The following property sets are assigned to user entities.</p>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Set</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">connections</td>
@@ -2044,16 +1958,13 @@ client.request(options, function (err, d
<td align="left">Set of user credentials</td>
</tr>
</tbody>
-</table>
-<p>Users have the following associated collections.</p>
+</table><p>Users have the following associated collections.</p>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Collection</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">groups</td>
@@ -2081,8 +1992,7 @@ client.request(options, function (err, d
<td align="left">Set of roles assigned to a user</td>
</tr>
</tbody>
-</table>
-<p>Â </p>
+</table><p>Â </p>
</div>
</div>
</div>
Modified: incubator/usergrid/site/publish/docs/users-devices/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/users-devices/index.html?rev=1624368&r1=1624367&r2=1624368&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/users-devices/index.html (original)
+++ incubator/usergrid/site/publish/docs/users-devices/index.html Thu Sep 11 19:25:40 2014
@@ -164,13 +164,11 @@
<h2 id="users">Users</h2>
<h3 id="properties">Properties</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Property</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">uuid</td>
@@ -245,16 +243,13 @@
<td align="left">User picture</td>
</tr>
</tbody>
-</table>
-<h3 id="sets">Sets</h3>
+</table><h3 id="sets">Sets</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Set</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">connections</td>
@@ -277,16 +272,13 @@
<td align="left">Set of user credentials</td>
</tr>
</tbody>
-</table>
-<h3 id="relationshops">Relationshops</h3>
+</table><h3 id="relationshops">Relationshops</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Collection</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">groups</td>
@@ -314,8 +306,7 @@
<td align="left">Set of roles assigned to a user</td>
</tr>
</tbody>
-</table>
-<h3 id="facebook-sign-in">Facebook Sign-in</h3>
+</table><h3 id="facebook-sign-in">Facebook Sign-in</h3>
<p>You can authenticate your Apache Usergrid requests by logging into Facebook. To access Apache Usergrid resources, you need to provide an access token with each request (unless you use the sandbox app). You can get an access token by connecting to an appropriate web service endpoint and providing the correct client credentials â this is further described in <a href="/authenticating-users-and-application-clients">Authenticating users and application clients</a>. However, you can also obtain an access token by logging into Facebook.</p>
<p>To enable authentication to Apache Usergrid through Facebook, do the following in your app:</p>
<ol style="list-style-type: decimal">
@@ -324,8 +315,7 @@
<p>Send the Facebook access token to Apache Usergrid. If the Facebook access token is valid and the user does not already exist in App Services, Apache Usergrid provisions a new Apache Usergrid user. It also returns an Apache Usergrid access token, which you can use for subsequent Apache Usergrid API calls. Behind the scenes, Apache Usergrid uses the Facebook access token to retrieve the userâs profile information from Facebook.</p>
<p>If the Facebook access token is invalid, Facebook returns an OAuth authentication error, and the login does not succeed.</p>
</li>
-</ol>
-<p>The request to authenticate to Apache Usergrid using a Facebook access token is:</p>
+</ol><p>The request to authenticate to Apache Usergrid using a Facebook access token is:</p>
<pre><code>GET https://api.usergrid.com/{my_org}/{my_app}/auth/facebook?fb_access_token={fb_access_token}</code></pre>
<p>where:</p>
<ul>
@@ -334,17 +324,14 @@
<li>{my_app} is the application UUID or application name.<br>
</li>
<li>{fb_access_token} is the Facebook access token.</li>
-</ul>
-<h2 id="devices">Devices</h2>
+</ul><h2 id="devices">Devices</h2>
<h3 id="properties-1">Properties</h3>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Property</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
+</tr></thead>
<tbody>
<tr class="odd">
<td align="left">uuid</td>
@@ -374,24 +361,19 @@
<td align="left">Device name (mandatory)</td>
</tr>
</tbody>
-</table>
-<h3 id="relationships">Relationships</h3>
+</table><h3 id="relationships">Relationships</h3>
<p>Devices have the following associated collection.</p>
<table>
-<thead>
-<tr class="header">
+<thead><tr class="header">
<th align="left">Collection</th>
<th align="left">Type</th>
<th align="left">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
+</tr></thead>
+<tbody><tr class="odd">
<td align="left">users</td>
<td align="left">user</td>
<td align="left">Collection of users to which a device belongs</td>
-</tr>
-</tbody>
+</tr></tbody>
</table>
</div>
</div>
Modified: incubator/usergrid/site/publish/docs/videos/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/videos/index.html?rev=1624368&r1=1624367&r2=1624368&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/videos/index.html (original)
+++ incubator/usergrid/site/publish/docs/videos/index.html Thu Sep 11 19:25:40 2014
@@ -152,14 +152,12 @@
<ul>
<li>David Johnson, <a href="http://apacheconnorthamerica2014.sched.org/event/29971aabd3c86398be2ae93403c7d1d2">ApacheCon NA 2014</a>
</li>
-</ul>
-<iframe width="640" height="360" src="//www.youtube.com/embed/cfwGmvUhFzY?rel=0" frameborder="0" allowfullscreen></iframe>
+</ul><iframe width="640" height="360" src="//www.youtube.com/embed/cfwGmvUhFzY?rel=0" frameborder="0" allowfullscreen></iframe>
<h2 id="c-2012-cassandra-at-apigee-usergrid-powering-mobile">C* 2012: Cassandra at Apigee: Usergrid Powering Mobile</h2>
<ul>
<li>Ed Anuff</li>
-</ul>
-<iframe width="640" height="360" src="//www.youtube.com/embed/RuJwIBu3jvs?rel=0" frameborder="0" allowfullscreen></iframe>
+</ul><iframe width="640" height="360" src="//www.youtube.com/embed/RuJwIBu3jvs?rel=0" frameborder="0" allowfullscreen></iframe>
</div>
</div>
</div>
Added: incubator/usergrid/site/publish/releases/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/releases/index.html?rev=1624368&view=auto
==============================================================================
--- incubator/usergrid/site/publish/releases/index.html (added)
+++ incubator/usergrid/site/publish/releases/index.html Thu Sep 11 19:25:40 2014
@@ -0,0 +1,234 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <meta charset="utf-8">
+ <title>Apache Usergrid (incubating) â </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 " 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>
+ </div>
+ <a href="/" class="navbar-brand">
+ <img id="home-logo" src="/img/apache_usergrid_logo_white_small.png" />
+ </a>
+ <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=""><a href="/docs/"><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="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>
+ <li><a href="https://cwiki.apache.org/confluence/display/usergrid/" target="_blank"><span class="icns icon-wiki"></span></a></li>
+ <li><a href="/releases/"><span class="icns icon-releases"></span></a></li>
+ </ul>
+ </nav>
+ </div>
+ </header>
+
+
+
+<section class="bf-tagline">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Usergrid Releases</h2>
+ </div>
+ </div>
+ </div>
+</section>
+
+<section class="bf-releases">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-12" id="events">
+ <h2 class="icns-download"><span>Releases</span></h2>
+ </div>
+ </div>
+ </br>
+ <div class="row">
+ <div class="col-md-9 done">
+ <p>
+ Releases of Usergrid are made available to the general public at no charge, under the <a href="http://apache.org/licenses/">Apache License</a>, in both binary and source distributions.
+ </p>
+ <p>
+ General Availability (GA) Releases - First Release! Usergrid 1.0.0
+ </p>
+ <p> fdsa</p>
+ <p>
+ Download the release from a <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.0/">mirror: https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.0/</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.
+ </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.0/">https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.0/</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>
+ </p>
+ <p>
+ The PGP signatures can be verified using PGP or GPG. First download the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.0/">asc signature</a> file for the particular distribution. Then verify the signatures using:
+ </p>
+ <p>
+ % pgpk -a KEYS
+ </br></br>
+ % pgpv ${filename}.tar.gz.asc
+ </br></br>
+ or
+ </br></br>
+ % pgp -ka KEYS
+ </br></br>
+ % pgp ${filename}.tar.gz.asc
+ </br></br>
+ or
+ </br></br>
+ % gpg --import KEYS
+ </br></br>
+ % gpg --verify ${filename}.tar.gz.asc
+ </br></br>
+ </p>
+ <p>
+ Alternatively, you can verify the MD5 signature on the files. A Unix program called md5 or md5sum is included in many Unix distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/md5sums/">here</a>, or <a href="http://www.slavasoft.com/fsum/">here</a>.
+ <p>
+ If you want to build directly from the sources, please check the <a href="/docs/getting-up-and-running-locally/">Project Docs</a>.
+ </p>
+ </div>
+ </div>
+ </div>
+</section>
+
+
+
+
+<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/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>
+ </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="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/apache/incubator-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>