Merge branch '5.4' into 6.0

javiereguiluz · javiereguiluz · commit 4c71e8359a2a · 2021-07-22T13:22:37.000+02:00
* 5.4:
  #42227 update phpdoc to recommend createIndex over ensureIndex
diff --git a/components/lock.rst b/components/lock.rst
@@ -750,7 +750,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
`@@ -750,7 +750,7 @@ Such an index can be created manually:`
`750`	`750`
`751`	`751`	`.. code-block:: javascript`
`752`	`752`
`753`		`- db.lock.ensureIndex(`
	`753`	`+ db.lock.createIndex(`
`754`	`754`	`{ "expires_at": 1 },`
`755`	`755`	`{ "expireAfterSeconds": 0 }`
`756`	`756`	`)`