Skip to content

Commit 6b6f7b3

Browse files
authored
Merge pull request #174 from mongodb/v2.0
DOCSP-44608: merge v2 into master
2 parents 633fb0a + f4033f5 commit 6b6f7b3

File tree

196 files changed

+188
-1375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+188
-1375
lines changed

snooty.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ toc_landing_pages = [
1717
"/reference/class/MongoDBInsertManyResult",
1818
"/reference/class/MongoDBUpdateResult",
1919
"/reference/class/MongoDBChangeStream",
20-
"/reference/class/MongoDBMapReduceResult",
2120
"/reference/class/MongoDBModelCollectionInfo",
2221
"/reference/class/MongoDBModelDatabaseInfo",
2322
"/reference/class/MongoDBModelIndexInfo",

source/data-formats/codecs.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Codecs
55
======
66

7-
.. default-domain:: mongodb
87

98
.. contents:: On this page
109
:local:

source/data-formats/custom-types.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Custom Data-Types
55
=================
66

7-
.. default-domain:: mongodb
87

98
.. note::
109

source/data-formats/decimal128.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Decimal128
55
==========
66

7-
.. default-domain:: mongodb
87

98
.. contents:: On this page
109
:local:

source/data-formats/modeling-bson-data.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Modeling BSON Data
55
==================
66

7-
.. default-domain:: mongodb
87

98
.. contents:: On this page
109
:local:

source/faq.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Frequently Asked Questions
55
==========================
66

7-
.. default-domain:: mongodb
87

98
.. contents:: On this page
109
:local:

source/includes/databases-collections/databases-collections.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
// Explicitly creates the "example_collection" collection
3232
// start-create-collection
33-
$result = $client->test_database->createCollection('example_collection');
33+
$client->test_database->createCollection('example_collection');
3434
// end-create-collection
3535

3636
// Lists the collections in the "test_database" database

source/includes/databases-collections/time-series.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
]
1717
];
1818

19-
$collection = $db->createCollection('sept2023', $options);
19+
$db->createCollection('sept2023', $options);
2020
// end-create-ts
2121

2222
// Lists the collections in the "precipitation" database

source/includes/read/cursor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// Creates a collection with a maximum size and inserts documents representing vegetables
3333
// start-capped-coll
3434
$db = $client->db;
35-
$create_coll = $db->createCollection(
35+
$db->createCollection(
3636
'vegetables',
3737
['capped' => true, 'size' => 1024 * 1024]
3838
);

source/indexes/index-mgmt.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ You can delete all indexes by calling the
127127
:end-before: end-remove-all-indexes
128128
:dedent:
129129

130-
The ``dropIndexes()`` method returns information about the number of
131-
indexes removed and a success message.
132-
133130
API Documentation
134131
~~~~~~~~~~~~~~~~~
135132

source/reference.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
API Documentation
33
=================
44

5-
.. default-domain:: mongodb
65

76
.. toctree::
87
:titlesonly:

source/reference/bson.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
BSON
33
====
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/class/MongoDBClient.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\Client Class
33
=====================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/class/MongoDBCollection.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\Collection Class
33
=========================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:
@@ -78,7 +77,6 @@ Methods
7877
insertOne() </reference/method/MongoDBCollection-insertOne>
7978
listIndexes() </reference/method/MongoDBCollection-listIndexes>
8079
listSearchIndexes() </reference/method/MongoDBCollection-listSearchIndexes>
81-
mapReduce() </reference/method/MongoDBCollection-mapReduce>
8280
rename() </reference/method/MongoDBCollection-rename>
8381
replaceOne() </reference/method/MongoDBCollection-replaceOne>
8482
updateMany() </reference/method/MongoDBCollection-updateMany>
@@ -122,7 +120,6 @@ Methods
122120
- :phpmethod:`MongoDB\Collection::insertOne()`
123121
- :phpmethod:`MongoDB\Collection::listIndexes()`
124122
- :phpmethod:`MongoDB\Collection::listSearchIndexes()`
125-
- :phpmethod:`MongoDB\Collection::mapReduce()`
126123
- :phpmethod:`MongoDB\Collection::rename()`
127124
- :phpmethod:`MongoDB\Collection::replaceOne()`
128125
- :phpmethod:`MongoDB\Collection::updateMany()`

source/reference/class/MongoDBDatabase.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\Database Class
33
=======================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/class/MongoDBGridFSBucket.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\GridFS\\Bucket Class
33
=============================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/class/MongoDBMapReduceResult.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.

source/reference/class/MongoDBModelCollectionInfo.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Definition
77

88
.. phpclass:: MongoDB\Model\CollectionInfo
99

10-
This class models information about a collection. Instances of this class are
11-
returned by traversing a :phpclass:`MongoDB\Model\CollectionInfoIterator`,
12-
which is returned by :phpmethod:`MongoDB\Database::listCollections()`.
10+
This class models information about a collection. Instances of this
11+
class are returned by traversing an :php:`Iterator
12+
<manual/en/class.iterator.php>`, which is returned by the
13+
:phpmethod:`MongoDB\Database::listCollections()` method.
1314

1415
.. versionchanged:: 1.4
1516

source/reference/class/MongoDBModelCollectionInfoIterator.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

source/reference/class/MongoDBModelDatabaseInfo.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Definition
77

88
.. phpclass:: MongoDB\Model\DatabaseInfo
99

10-
This class models information about a database. Instances of this class are
11-
returned by traversing a :phpclass:`MongoDB\Model\DatabaseInfoIterator`,
12-
which is returned by :phpmethod:`MongoDB\Client::listDatabases()`.
10+
This class models information about a database. Instances of this
11+
class are returned by traversing an :php:`Iterator
12+
<manual/en/class.iterator.php>`, which is returned by the
13+
:phpmethod:`MongoDB\Client::listDatabases()` method.
1314

1415
.. versionchanged:: 1.4
1516

source/reference/class/MongoDBModelDatabaseInfoIterator.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

source/reference/class/MongoDBModelIndexInfo.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Definition
77

88
.. phpclass:: MongoDB\Model\IndexInfo
99

10-
This class models information about an index. Instances of this class are
11-
returned by traversing a :phpclass:`MongoDB\Model\IndexInfoIterator`,
12-
which is returned by :phpmethod:`MongoDB\Collection::listIndexes()`.
10+
This class models information about an index. Instances of this
11+
class are returned by traversing an :php:`Iterator
12+
<manual/en/class.iterator.php>`, which is returned by the
13+
:phpmethod:`MongoDB\Collection::listIndexes()` method.
1314

1415
This class implements PHP's :php:`ArrayAccess <arrayaccess>` interface. This
1516
provides a mechanism for accessing index fields for which there exists no
@@ -33,7 +34,6 @@ Methods
3334
getNamespace() </reference/method/MongoDBModelIndexInfo-getNamespace>
3435
getVersion() </reference/method/MongoDBModelIndexInfo-getVersion>
3536
is2dSphere() </reference/method/MongoDBModelIndexInfo-is2dSphere>
36-
isGeoHaystack() </reference/method/MongoDBModelIndexInfo-isGeoHaystack>
3737
isSparse() </reference/method/MongoDBModelIndexInfo-isSparse>
3838
isText() </reference/method/MongoDBModelIndexInfo-isText>
3939
isTtl() </reference/method/MongoDBModelIndexInfo-isTtl>
@@ -44,7 +44,6 @@ Methods
4444
- :phpmethod:`MongoDB\Model\IndexInfo::getNamespace()`
4545
- :phpmethod:`MongoDB\Model\IndexInfo::getVersion()`
4646
- :phpmethod:`MongoDB\Model\IndexInfo::is2dSphere()`
47-
- :phpmethod:`MongoDB\Model\IndexInfo::isGeoHaystack()`
4847
- :phpmethod:`MongoDB\Model\IndexInfo::isSparse()`
4948
- :phpmethod:`MongoDB\Model\IndexInfo::isText()`
5049
- :phpmethod:`MongoDB\Model\IndexInfo::isTtl()`

source/reference/class/MongoDBModelIndexInfoIterator.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

source/reference/exception-classes.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
Exception Classes
33
=================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/function/add_logger.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ MongoDB\\add_logger()
44

55
.. versionadded:: 1.17
66

7-
.. default-domain:: mongodb
87

98
.. contents:: On this page
109
:local:

source/reference/function/remove_logger.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ MongoDB\\remove_logger()
44

55
.. versionadded:: 1.17
66

7-
.. default-domain:: mongodb
87

98
.. contents:: On this page
109
:local:

source/reference/function/with_transaction.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\with_transaction()
33
===========================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/functions.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
Functions
33
=========
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/method/MongoDBBulkWriteResult-getDeletedCount.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\BulkWriteResult::getDeletedCount()
33
===========================================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/method/MongoDBBulkWriteResult-getInsertedCount.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\BulkWriteResult::getInsertedCount()
33
============================================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/method/MongoDBBulkWriteResult-getInsertedIds.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\BulkWriteResult::getInsertedIds()
33
==========================================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/method/MongoDBBulkWriteResult-getMatchedCount.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\BulkWriteResult::getMatchedCount()
33
===========================================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/method/MongoDBBulkWriteResult-getModifiedCount.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\BulkWriteResult::getModifiedCount()
33
============================================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

source/reference/method/MongoDBBulkWriteResult-getUpsertedCount.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
MongoDB\\BulkWriteResult::getUpsertedCount()
33
============================================
44

5-
.. default-domain:: mongodb
65

76
.. contents:: On this page
87
:local:

0 commit comments

Comments
 (0)