diff --git a/db/dur.cpp b/db/dur.cpp index 46f8fb2a1dc..484837ea9d9 100644 --- a/db/dur.cpp +++ b/db/dur.cpp @@ -171,7 +171,7 @@ namespace mongo { } /** Declare that a file has been created - Normally writes are applied only after journalling, for safety. But here the file + Normally writes are applied only after journaling, for safety. But here the file is created first, and the journal will just replay the creation if the create didn't happen because of crashing. */ diff --git a/db/dur.h b/db/dur.h index 83dacd88933..ea8bf342b3f 100644 --- a/db/dur.h +++ b/db/dur.h @@ -29,7 +29,7 @@ namespace mongo { virtual ~DurableInterface() { log() << "ERROR warning ~DurableInterface not intended to be called" << endl; } /** Declare that a file has been created - Normally writes are applied only after journalling, for safety. But here the file + Normally writes are applied only after journaling, for safety. But here the file is created first, and the journal will just replay the creation if the create didn't happen because of crashing. */ diff --git a/db/dur_commitjob.h b/db/dur_commitjob.h index 143db7cd215..104d054748a 100644 --- a/db/dur_commitjob.h +++ b/db/dur_commitjob.h @@ -74,8 +74,8 @@ namespace mongo { unsigned len; // up to this len }; - /** try to remember things we have already marked for journalling. false negatives are ok if infrequent - - we will just log them twice. + /** try to remember things we have already marked for journaling. false negatives are ok if infrequent - + we will just log them twice. */ template class Already : boost::noncopyable { diff --git a/db/dur_stats.h b/db/dur_stats.h index f5a78972357..8565a53270b 100644 --- a/db/dur_stats.h +++ b/db/dur_stats.h @@ -3,7 +3,7 @@ namespace mongo { namespace dur { - /** journalling stats. the model here is that the commit thread is the only writer, and that reads are + /** journaling stats. the model here is that the commit thread is the only writer, and that reads are uncommon (from a serverStatus command and such). Thus, there should not be multicore chatter overhead. */ struct Stats { diff --git a/db/instance.cpp b/db/instance.cpp index 9f68efdcc36..9e5d6ab5da2 100644 --- a/db/instance.cpp +++ b/db/instance.cpp @@ -922,7 +922,7 @@ namespace mongo { if( !cmdLine.dur && dur::haveJournalFiles() ) { cout << "**************" << endl; cout << "Error: journal files are present in journal directory, yet starting without --dur enabled." << endl; - cout << "It is recommended that you start with journalling enabled so that recovery may occur." << endl; + cout << "It is recommended that you start with journaling enabled so that recovery may occur." << endl; cout << "Alternatively (not recommended), you can backup everything, then delete the journal files, and run --repair" << endl; cout << "**************" << endl; uasserted(13597, "can't start without --dur enabled when journal/ files are present"); @@ -946,7 +946,7 @@ namespace mongo { if( !cmdLine.dur && dur::haveJournalFiles() ) { cout << "**************" << endl; cout << "Error: journal files are present in journal directory, yet starting without --dur enabled." << endl; - cout << "It is recommended that you start with journalling enabled so that recovery may occur." << endl; + cout << "It is recommended that you start with journaling enabled so that recovery may occur." << endl; cout << "Alternatively (not recommended), you can backup everything, then delete the journal files, and run --repair" << endl; cout << "**************" << endl; uasserted(13618, "can't start without --dur enabled when journal/ files are present");