Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1

This commit is contained in:
Frank Celler 2012-11-21 18:05:55 +01:00
parent b428373e1d f3b87fbe1f
commit 25697a5e34
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Examples/graph-graph-get-edge Normal file
View File

@ -0,0 +1,2 @@
arango> e = g.getEdge("1");
Edge(1)

1
Documentation/Examples/option-database-directory Normal file
View File

@ -0,0 +1 @@
> ./arangod --server.endpoint tcp://127.0.0.1:8529 --database.directory /tmp/vocbase

4
arangod/Documentation/api-blueprints.dox
View File

@ -43,7 +43,6 @@
///
///
///
///
/// @anchor A_JSF_POST_blueprints_vertex
/// @copydetails JSF_POST_blueprints_vertex
///
@ -58,13 +57,11 @@
///
///
///
///
/// @anchor A_JSF_POST_blueprints_vertices
/// @copydetails JSF_POST_blueprints_vertices
///
///
///
///
/// @anchor A_JSF_POST_blueprints_edge
/// @copydetails JSF_POST_blueprints_edge
///
@ -79,7 +76,6 @@
///
///
///
///
/// @anchor A_JSF_POST_blueprints_edges
/// @copydetails JSF_POST_blueprints_edges
///

4
arangod/Documentation/implementor-manual.dox
View File

@ -105,12 +105,12 @@
/// <li>@ref A_JSF_GET_blueprints_vertex "GET /_api/blueprints/vertex"</li>
/// <li>@ref A_JSF_PUT_blueprints_vertex "PUT /_api/blueprints/vertex"</li>
/// <li>@ref A_JSF_DELETE_blueprints_vertex "DELETE /_api/blueprints/vertex"</li>
/// <li>@ref A_JSF_GET_blueprints_vertices "GET /_api/blueprints/vertices"</li>
/// <li>@ref A_JSF_POST_blueprints_vertices "POST /_api/blueprints/vertices"</li>
/// <li>@ref A_JSF_POST_blueprints_edge "POST /_api/blueprints/edge"</li>
/// <li>@ref A_JSF_GET_blueprints_edge "GET /_api/blueprints/edge"</li>
/// <li>@ref A_JSF_PUT_blueprints_edge "PUT /_api/blueprints/edge"</li>
/// <li>@ref A_JSF_DELETE_blueprints_edge "DELETE /_api/blueprints/edge"</li>
/// <li>@ref A_JSF_GET_blueprints_edges "GET /_api/blueprints/edges"</li>
/// <li>@ref A_JSF_POST_blueprints_edges "POST /_api/blueprints/edges"</li>
/// </ul>
/// </li>
/// </ul>

4
js/common/bootstrap/modules.js
View File

@ -222,11 +222,11 @@ module = ModuleCache["/"] = new Module("/");
///
/// @FN{require} checks if the file specified by @FA{path} has already been
/// loaded. If not, the content of the file is executed in a new
/// context. Within the context you can use the global variable @CODE{exports}
/// context. Within the context you can use the global variable @LIT{exports}
/// in order to export variables and functions. This variable is returned by
/// @FN{require}.
///
/// Assume that your module file is @CODE{test1.js} and contains
/// Assume that your module file is @LIT{test1.js} and contains
///
/// @verbinclude modules-require-1
///

2
js/common/modules/graph.js
View File

@ -440,7 +440,7 @@ Vertex.prototype.edges = function () {
/// @FUN{@FA{vertex}.getId()}
///
/// Returns the identifier of the @FA{vertex}. If the vertex was deleted, then
/// @CODE{undefined} is returned.
/// @LIT{undefined} is returned.
///
/// @EXAMPLES
///

2
js/common/modules/simple-query-basics.js
View File

@ -323,7 +323,7 @@ SimpleQuery.prototype.execute = function () {
/// @FUN{@FA{query}.limit(@FA{number})}
///
/// Limits a result to the first @FA{number} documents. Specifying a limit of
/// @CODE{0} returns no documents at all. If you do not need a limit, just do
/// @LIT{0} returns no documents at all. If you do not need a limit, just do
/// not add the limit operator. The limit must be non-negative.
///
/// In general the input to @FN{limit} should be sorted. Otherwise it will be