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

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

This commit is contained in:
Jan Steemann 2014-12-05 14:59:00 +01:00
parent d9a945e33a e799dfa8f9
commit eb372dea63
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Books/Users/SimpleQueries/Pagination.mdpp
View File

@ -8,7 +8,7 @@ MySQL.
*skip* used together with *limit* can be used to implement pagination.
The *skip* operator skips over the first n documents. So, in order to create
result pages with 10 result documents per page, you can use *skip(n *
result pages with 10 result documents per page, you can use *skip(n \*
10).limit(10)* to access the 10 documents on the n.th page. This result should
be sorted, so that the pagination works in a predicable way.

10
js/common/modules/org/arangodb/arango-collection-common.js
View File

@ -504,7 +504,7 @@ ArangoCollection.prototype.closedRange = function (name, left, right) {
/// @startDocuBlock collectionGeo
/// `collection.geo(location-attribute)`
///
/// Looks up a geo index defined on attribute *location-attribute*.
/// Looks up a geo index defined on attribute *location_attribute*.
///
/// Returns a geo index object if an index was found. The *near* or
/// *within* operators can then be used to execute a geo-spatial query on
@ -512,17 +512,17 @@ ArangoCollection.prototype.closedRange = function (name, left, right) {
///
/// This is useful for collections with multiple defined geo indexes.
///
/// `collection.geo(location-attribute, true)`
/// `collection.geo(location_attribute, true)`
///
/// Looks up a geo index on a compound attribute *location-attribute*.
/// Looks up a geo index on a compound attribute *location_attribute*.
///
/// Returns a geo index object if an index was found. The *near* or
/// *within* operators can then be used to execute a geo-spatial query on
/// this particular index.
///
/// `collection.geo(latitude-attribute, longitude-attribute)`
/// `collection.geo(latitude_attribute, longitude_attribute)`
///
/// Looks up a geo index defined on the two attributes *latitude-attribute*
/// Looks up a geo index defined on the two attributes *latitude_attribute*
/// and *longitude-attribute*.
///
/// Returns a geo index object if an index was found. The *near* or