Merge branch '4.1' into 4.2

xabbuh · xabbuh · commit 181861e460c0 · 2018-12-08T13:55:36.000Z
* 4.1:
  Fixed typos
diff --git a/components/ldap.rst b/components/ldap.rst
@@ -155,10 +155,10 @@ method to update multiple attributes at once::
 
     $entryManager = $ldap->getEntryManager();
 
-    // Adding multiple email adresses at once
+    // Adding multiple email addresses at once
     $entryManager->applyOperations($entry->getDn(), array(
-        new UpdateOpteration(LDAP_MODIFY_BATCH_ADD, 'mail', 'new1@example.com'),
-        new UpdateOpteration(LDAP_MODIFY_BATCH_ADD, 'mail', 'new2@example.com'),
+        new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', 'new1@example.com'),
+        new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', 'new2@example.com'),
     ));
 
 Possible operation types are ``LDAP_MODIFY_BATCH_ADD``, ``LDAP_MODIFY_BATCH_REMOVE``,

-Original file line number
+Diff line change
     $entryManager = $ldap->getEntryManager();
 -    // Adding multiple email adresses at once
 +    // Adding multiple email addresses at once
     $entryManager->applyOperations($entry->getDn(), array(
 -        new UpdateOpteration(LDAP_MODIFY_BATCH_ADD, 'mail', '[email protected]'),
 -        new UpdateOpteration(LDAP_MODIFY_BATCH_ADD, 'mail', '[email protected]'),
 +        new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', '[email protected]'),
 +        new UpdateOperation(LDAP_MODIFY_BATCH_ADD, 'mail', '[email protected]'),
     ));
 Possible operation types are ``LDAP_MODIFY_BATCH_ADD``, ``LDAP_MODIFY_BATCH_REMOVE``,