Merge branch '5.2' into 5.3

javiereguiluz · javiereguiluz · commit f11b5e29f099 · 2021-07-22T13:22:06.000+02:00
* 5.2:
  #42227 update phpdoc to recommend createIndex over ensureIndex
diff --git a/components/lock.rst b/components/lock.rst
@@ -768,7 +768,7 @@ Such an index can be created manually:
 
 .. code-block:: javascript
 
-    db.lock.ensureIndex(
+    db.lock.createIndex(
         { "expires_at": 1 },
         { "expireAfterSeconds": 0 }
     )

Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ Such an index can be created manually:`
`768`	`768`
`769`	`769`	`.. code-block:: javascript`
`770`	`770`
`771`		`- db.lock.ensureIndex(`
	`771`	`+ db.lock.createIndex(`
`772`	`772`	`{ "expires_at": 1 },`
`773`	`773`	`{ "expireAfterSeconds": 0 }`
`774`	`774`	`)`