SERVER-18227 Fix minor typos

12 files changed, 23 insertions, 23 deletions

diff --git a/src/mongo/db/catalog/document_validation.h b/src/mongo/db/catalog/document_validation.h
index a0e6cb349e3..d03b1627a56 100644
--- a/src/mongo/db/catalog/document_validation.h
+++ b/src/mongo/db/catalog/document_validation.h
@@ -44,7 +44,7 @@ namespace mongo {
         return "bypassDocumentValidation";
     }
 
-    inline bool shouldBypassDocumentValidationforCommand(const BSONObj& cmdObj) {
+    inline bool shouldBypassDocumentValidationForCommand(const BSONObj& cmdObj) {
         return cmdObj[bypassDocumentValidationCommandOption()].trueValue();
     }
 
diff --git a/src/mongo/db/commands/apply_ops.cpp b/src/mongo/db/commands/apply_ops.cpp
index fc864c46498..7ca79ba57e4 100644
--- a/src/mongo/db/commands/apply_ops.cpp
+++ b/src/mongo/db/commands/apply_ops.cpp
@@ -83,7 +83,7 @@ namespace mongo {
                          string& errmsg,
                          BSONObjBuilder& result) {
             boost::optional<DisableDocumentValidation> maybeDisableValidation;
-            if (shouldBypassDocumentValidationforCommand(cmdObj))
+            if (shouldBypassDocumentValidationForCommand(cmdObj))
                 maybeDisableValidation.emplace(txn);
 
             if ( cmdObj.firstElement().type() != Array ) {
diff --git a/src/mongo/db/commands/clone.cpp b/src/mongo/db/commands/clone.cpp
index 76a801caa35..565d214ff44 100644
--- a/src/mongo/db/commands/clone.cpp
+++ b/src/mongo/db/commands/clone.cpp
@@ -81,7 +81,7 @@ namespace mongo {
             ActionSet actions;
             actions.addAction(ActionType::insert);
             actions.addAction(ActionType::createIndex);
-            if (shouldBypassDocumentValidationforCommand(cmdObj)) {
+            if (shouldBypassDocumentValidationForCommand(cmdObj)) {
                 actions.addAction(ActionType::bypassDocumentValidation);
             }
 
@@ -100,7 +100,7 @@ namespace mongo {
                          BSONObjBuilder& result) {
 
             boost::optional<DisableDocumentValidation> maybeDisableValidation;
-            if (shouldBypassDocumentValidationforCommand(cmdObj))
+            if (shouldBypassDocumentValidationForCommand(cmdObj))
                 maybeDisableValidation.emplace(txn);
 
             string from = cmdObj.getStringField("clone");
diff --git a/src/mongo/db/commands/clone_collection.cpp b/src/mongo/db/commands/clone_collection.cpp
index d0be61d3955..a532a1e402f 100644
--- a/src/mongo/db/commands/clone_collection.cpp
+++ b/src/mongo/db/commands/clone_collection.cpp
@@ -86,7 +86,7 @@ namespace mongo {
             ActionSet actions;
             actions.addAction(ActionType::insert);
             actions.addAction(ActionType::createIndex); // SERVER-11418
-            if (shouldBypassDocumentValidationforCommand(cmdObj)) {
+            if (shouldBypassDocumentValidationForCommand(cmdObj)) {
                 actions.addAction(ActionType::bypassDocumentValidation);
             }
 
@@ -112,7 +112,7 @@ namespace mongo {
                          BSONObjBuilder& result) {
 
             boost::optional<DisableDocumentValidation> maybeDisableValidation;
-            if (shouldBypassDocumentValidationforCommand(cmdObj))
+            if (shouldBypassDocumentValidationForCommand(cmdObj))
                 maybeDisableValidation.emplace(txn);
 
             string fromhost = cmdObj.getStringField("from");
diff --git a/src/mongo/db/commands/copydb.cpp b/src/mongo/db/commands/copydb.cpp
index 1d5a5b590b0..09e1fc28089 100644
--- a/src/mongo/db/commands/copydb.cpp
+++ b/src/mongo/db/commands/copydb.cpp
@@ -130,7 +130,7 @@ namespace mongo {
                          BSONObjBuilder& result) {
 
             boost::optional<DisableDocumentValidation> maybeDisableValidation;
-            if (shouldBypassDocumentValidationforCommand(cmdObj))
+            if (shouldBypassDocumentValidationForCommand(cmdObj))
                 maybeDisableValidation.emplace(txn);
 
             string fromhost = cmdObj.getStringField("fromhost");
diff --git a/src/mongo/db/commands/copydb_common.cpp b/src/mongo/db/commands/copydb_common.cpp
index 778fc39a93c..b72a91a9310 100644
--- a/src/mongo/db/commands/copydb_common.cpp
+++ b/src/mongo/db/commands/copydb_common.cpp
@@ -65,7 +65,7 @@ namespace copydb {
         ActionSet actions;
         actions.addAction(ActionType::insert);
         actions.addAction(ActionType::createIndex);
-        if (shouldBypassDocumentValidationforCommand(cmdObj)) {
+        if (shouldBypassDocumentValidationForCommand(cmdObj)) {
             actions.addAction(ActionType::bypassDocumentValidation);
         }
 
diff --git a/src/mongo/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp
index 099750539ab..c8726703b88 100644
--- a/src/mongo/db/commands/find_and_modify.cpp
+++ b/src/mongo/db/commands/find_and_modify.cpp
@@ -428,7 +428,7 @@ namespace {
             setupSynchronousCommit(txn);
 
             boost::optional<DisableDocumentValidation> maybeDisableValidation;
-            if (shouldBypassDocumentValidationforCommand(cmdObj))
+            if (shouldBypassDocumentValidationForCommand(cmdObj))
                 maybeDisableValidation.emplace(txn);
 
             // We may encounter a WriteConflictException when creating a collection during an
diff --git a/src/mongo/db/commands/find_and_modify_common.cpp b/src/mongo/db/commands/find_and_modify_common.cpp
index a5f0e91fb8d..abe8bdab8f2 100644
--- a/src/mongo/db/commands/find_and_modify_common.cpp
+++ b/src/mongo/db/commands/find_and_modify_common.cpp
@@ -51,7 +51,7 @@ namespace find_and_modify {
             bool update = cmdObj["update"].trueValue();
             bool upsert = cmdObj["upsert"].trueValue();
             bool remove = cmdObj["remove"].trueValue();
-            bool bypassDocumentValidation = shouldBypassDocumentValidationforCommand(cmdObj);
+            bool bypassDocumentValidation = shouldBypassDocumentValidationForCommand(cmdObj);
 
             ActionSet actions;
             actions.addAction(ActionType::find);
diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
index e723e533889..532d5423cf5 100644
--- a/src/mongo/db/commands/mr.cpp
+++ b/src/mongo/db/commands/mr.cpp
@@ -1289,7 +1289,7 @@ namespace mongo {
                 Timer t;
 
                 boost::optional<DisableDocumentValidation> maybeDisableValidation;
-                if (shouldBypassDocumentValidationforCommand(cmd))
+                if (shouldBypassDocumentValidationForCommand(cmd))
                     maybeDisableValidation.emplace(txn);
 
                 if (txn->getClient()->isInDirectClient()) {
@@ -1575,7 +1575,7 @@ namespace mongo {
                      string& errmsg,
                      BSONObjBuilder& result) {
                 boost::optional<DisableDocumentValidation> maybeDisableValidation;
-                if (shouldBypassDocumentValidationforCommand(cmdObj))
+                if (shouldBypassDocumentValidationForCommand(cmdObj))
                     maybeDisableValidation.emplace(txn);
 
                 ShardedConnectionInfo::addHook();
diff --git a/src/mongo/db/commands/mr_common.cpp b/src/mongo/db/commands/mr_common.cpp
index 02a5afe1ca5..64e65f3e501 100644
--- a/src/mongo/db/commands/mr_common.cpp
+++ b/src/mongo/db/commands/mr_common.cpp
@@ -127,7 +127,7 @@ namespace mongo {
                     outputActions.addAction(ActionType::update);
                 }
 
-                if (shouldBypassDocumentValidationforCommand(cmdObj)) {
+                if (shouldBypassDocumentValidationForCommand(cmdObj)) {
                     outputActions.addAction(ActionType::bypassDocumentValidation);
                 }
 
diff --git a/src/mongo/db/commands/write_commands/write_commands_common.cpp b/src/mongo/db/commands/write_commands/write_commands_common.cpp
index 92265e72507..69ca1014140 100644
--- a/src/mongo/db/commands/write_commands/write_commands_common.cpp
+++ b/src/mongo/db/commands/write_commands/write_commands_common.cpp
@@ -51,16 +51,16 @@ namespace auth {
                                      const BSONObj& cmdObj ) {
 
         vector<Privilege> privileges;
-        ActionSet actionsOnCommandNSSS;
+        ActionSet actionsOnCommandNSS;
 
-        if (shouldBypassDocumentValidationforCommand(cmdObj)) {
-            actionsOnCommandNSSS.addAction(ActionType::bypassDocumentValidation);
+        if (shouldBypassDocumentValidationForCommand(cmdObj)) {
+            actionsOnCommandNSS.addAction(ActionType::bypassDocumentValidation);
         }
 
         if ( cmdType == BatchedCommandRequest::BatchType_Insert ) {
 
             if ( !cmdNSS.isSystemDotIndexes() ) {
-                actionsOnCommandNSSS.addAction(ActionType::insert);
+                actionsOnCommandNSS.addAction(ActionType::insert);
             }
             else {
                 // Special-case indexes until we have a command
@@ -75,22 +75,22 @@ namespace auth {
             }
         }
         else if ( cmdType == BatchedCommandRequest::BatchType_Update ) {
-            actionsOnCommandNSSS.addAction(ActionType::update);
+            actionsOnCommandNSS.addAction(ActionType::update);
 
             // Upsert also requires insert privs
             if ( BatchedCommandRequest::containsUpserts( cmdObj ) ) {
-                actionsOnCommandNSSS.addAction(ActionType::insert);
+                actionsOnCommandNSS.addAction(ActionType::insert);
             }
         }
         else {
             fassert( 17251, cmdType == BatchedCommandRequest::BatchType_Delete );
-            actionsOnCommandNSSS.addAction(ActionType::remove);
+            actionsOnCommandNSS.addAction(ActionType::remove);
         }
 
 
-        if (!actionsOnCommandNSSS.empty()) {
+        if (!actionsOnCommandNSS.empty()) {
             privileges.emplace_back(ResourcePattern::forExactNamespace(cmdNSS),
-                                    actionsOnCommandNSSS);
+                                    actionsOnCommandNSS);
         }
 
         if ( authzSession->isAuthorizedForPrivileges( privileges ) )
diff --git a/src/mongo/db/pipeline/pipeline.cpp b/src/mongo/db/pipeline/pipeline.cpp
index 4804189982d..f5507cb6f9f 100644
--- a/src/mongo/db/pipeline/pipeline.cpp
+++ b/src/mongo/db/pipeline/pipeline.cpp
@@ -359,7 +359,7 @@ namespace mongo {
                 ActionSet actions;
                 actions.addAction(ActionType::remove);
                 actions.addAction(ActionType::insert);
-                if (shouldBypassDocumentValidationforCommand(cmdObj)) {
+                if (shouldBypassDocumentValidationForCommand(cmdObj)) {
                     actions.addAction(ActionType::bypassDocumentValidation);
                 }