diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.js b/mozilla/editor/ui/dialogs/content/EdTableProps.js index bcb7cd614ce..2f00cd0f504 100644 --- a/mozilla/editor/ui/dialogs/content/EdTableProps.js +++ b/mozilla/editor/ui/dialogs/content/EdTableProps.js @@ -445,7 +445,7 @@ function SelectCellHAlign() { SetCheckbox("CellHAlignCheckbox"); // Once user changes the alignment, - // we loose their original "CharAt" alignment" + // we lose their original "CharAt" alignment" gAlignWasChar = false; } diff --git a/mozilla/parser/htmlparser/public/nsIParserFilter.h b/mozilla/parser/htmlparser/public/nsIParserFilter.h index 411939a8ab4..29103a9297f 100644 --- a/mozilla/parser/htmlparser/public/nsIParserFilter.h +++ b/mozilla/parser/htmlparser/public/nsIParserFilter.h @@ -66,7 +66,7 @@ class nsIParserFilter : public nsISupports { NS_IMETHOD WillAddToken(CToken & token) = 0; - NS_IMETHOD ProcessTokens( /* dont know what goes here yet */ void ) = 0; + NS_IMETHOD ProcessTokens( /* don't know what goes here yet */ void ) = 0; NS_IMETHOD Finish() = 0; diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index 70bb0092c5a..c9175822939 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -3067,7 +3067,7 @@ CNavDTD::CreateContextStackFor(eHTMLTags aChild) if (eHTMLTag_unknown == theTop) { result = BackwardPropagate(mScratch, eHTMLTag_html, aChild); } else if (theTop != aChild) { - // Dont even bother if we're already inside a similar element... + // Don't even bother if we're already inside a similar element... result = BackwardPropagate(mScratch, theTop, aChild); } } diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index 16566d598bd..70866ce4f3f 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -1625,7 +1625,7 @@ nsParser::Parse(const nsAString& aSourceBuffer, CParserContext* pc=0; if((!mParserContext) || (mParserContext->mKey!=aKey)) { - //only make a new context if we dont have one, OR if we do, but has a different context key... + //only make a new context if we don't have one, OR if we do, but has a different context key... nsScanner* theScanner = new nsScanner(mUnusedInput,mCharset,mCharsetSource); NS_ENSURE_TRUE(theScanner, NS_ERROR_OUT_OF_MEMORY); diff --git a/mozilla/parser/htmlparser/src/nsParserNode.cpp b/mozilla/parser/htmlparser/src/nsParserNode.cpp index cb7f02a9485..882302ec8ec 100644 --- a/mozilla/parser/htmlparser/src/nsParserNode.cpp +++ b/mozilla/parser/htmlparser/src/nsParserNode.cpp @@ -83,7 +83,7 @@ nsCParserNode::nsCParserNode(CToken* aToken, /** * destructor - * NOTE: We intentionally DONT recycle mToken here. + * NOTE: We intentionally DON'T recycle mToken here. * It may get cached for use elsewhere * @update gess 3/25/98 * @param diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp index 38d2dc421f6..f11728ee8a1 100644 --- a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp +++ b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp @@ -1272,7 +1272,7 @@ NPP_SetWindow(NPP instance, NPWindow* window) // NPP_NewStream: // Notifies an instance of a new data stream and returns an error value. // -// Create a stream peer and stream. If succesful, save +// Create a stream peer and stream. If successful, save // the stream peer in NPStream's pdata. //+++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp index 30ce760de5c..40983099bd6 100644 --- a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp +++ b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp @@ -2811,7 +2811,7 @@ nsChromeRegistry::GetProfileRoot(nsACString& aFileURL) const nsAFlatCString& empty = EmptyCString(); // copy along - // It aint an error if these files dont exist + // It ain't an error if these files don't exist defaultUserContentFile->CopyToNative(userChromeDir, empty); defaultUserChromeFile->CopyToNative(userChromeDir, empty); } diff --git a/mozilla/toolkit/components/filepicker/content/filepicker.js b/mozilla/toolkit/components/filepicker/content/filepicker.js index 076eb838b2f..0c85cf6eadf 100644 --- a/mozilla/toolkit/components/filepicker/content/filepicker.js +++ b/mozilla/toolkit/components/filepicker/content/filepicker.js @@ -762,7 +762,7 @@ function toggleShowHidden(event) { // from the current directory and whatever was entered // in the entry field, try to make a new path. This -// uses "/" as the directory seperator, "~" as a shortcut +// uses "/" as the directory separator, "~" as a shortcut // for the home directory (but only when seen at the start // of a path), and ".." to denote the parent directory. // returns an array of the files listed, diff --git a/mozilla/toolkit/mozapps/installer/unix/wizard/nsWelcomeDlg.cpp b/mozilla/toolkit/mozapps/installer/unix/wizard/nsWelcomeDlg.cpp index 222da3d9d3c..27b452a9d12 100644 --- a/mozilla/toolkit/mozapps/installer/unix/wizard/nsWelcomeDlg.cpp +++ b/mozilla/toolkit/mozapps/installer/unix/wizard/nsWelcomeDlg.cpp @@ -228,7 +228,7 @@ nsWelcomeDlg::Show(int aDirection) free(msgText); - // Now add 100px of padding, and then the last mesage. + // Now add 100px of padding, and then the last message. spacer = gtk_alignment_new(0.0, 0.0, 0.0, 0.0); gtk_widget_set_size_request(spacer, -1, 110); gtk_box_pack_start(GTK_BOX(vbox), spacer, FALSE, FALSE, 0); diff --git a/mozilla/toolkit/mozapps/installer/windows/wizard/uninstall/dialogs.c b/mozilla/toolkit/mozapps/installer/windows/wizard/uninstall/dialogs.c index e9587d6b464..91807d1fb04 100644 --- a/mozilla/toolkit/mozapps/installer/windows/wizard/uninstall/dialogs.c +++ b/mozilla/toolkit/mozapps/installer/windows/wizard/uninstall/dialogs.c @@ -74,7 +74,7 @@ void ParseDefaultsInfo() int iIndex; DWORD dwIconsVisible; - // If szAppPath is a null sting, i.e. we cannot find where the app has been installed: + // If szAppPath is a null string, i.e. we cannot find where the app has been installed: // - HIDEICONS will still remove the shortcuts but // - SHOWICONS will do nothing because we won't be able to find the shortcuts to display. ParsePath(ugUninstall.szAppPath, szStorageDir, MAX_BUF, PP_PATH_ONLY); diff --git a/mozilla/tools/codesighs/codesighs.c b/mozilla/tools/codesighs/codesighs.c index 3ecb4fbfd19..dcd22ee3cb0 100644 --- a/mozilla/tools/codesighs/codesighs.c +++ b/mozilla/tools/codesighs/codesighs.c @@ -251,7 +251,7 @@ int codesighs(Options* inOptions) /* ** Read the file line by line, regardless of number of fields. - ** We assume tab seperated value formatting, at least 7 lead values: + ** We assume tab separated value formatting, at least 7 lead values: ** size class scope module segment object symbol .... */ while(0 == retval && NULL != fgets(lineBuffer, sizeof(lineBuffer), inOptions->mInput)) diff --git a/mozilla/tools/codesighs/msmap2tsv.c b/mozilla/tools/codesighs/msmap2tsv.c index cf2a9ee0c4f..a2e57b4a363 100644 --- a/mozilla/tools/codesighs/msmap2tsv.c +++ b/mozilla/tools/codesighs/msmap2tsv.c @@ -403,7 +403,7 @@ int readSymDB(const char* inDBName, SymDB_Container** outDB) trimWhite(lineBuf); /* - ** Each line has four arguments. tab seperated values (tsv). + ** Each line has four arguments. tab separated values (tsv). ** Symbol ** Section ** Length @@ -1597,7 +1597,7 @@ static int qsortRVABase(const void* in1, const void* in2) static int tsvout(Options* inOptions, unsigned inSize, MSMap_SegmentClass inClass, MSMap_SymbolScope inScope, const char* inModule, const char* inSegment, const char* inObject, const char* inSymbol) /* -** Output a line of map information seperated by tabs. +** Output a line of map information separated by tabs. ** Some items (const char*), if not present, will receive a default value. */ { @@ -1715,7 +1715,7 @@ void cleanModule(MSMap_Module* inModule) int map2tsv(Options* inOptions) /* ** Read all input. -** Output tab seperated value data. +** Output tab separated value data. */ { int retval = 0; diff --git a/mozilla/tools/codesighs/nm2tsv.c b/mozilla/tools/codesighs/nm2tsv.c index 63bb33666b0..e0b4d745c58 100644 --- a/mozilla/tools/codesighs/nm2tsv.c +++ b/mozilla/tools/codesighs/nm2tsv.c @@ -141,7 +141,7 @@ void trimWhite(char* inString) int nm2tsv(Options* inOptions) /* ** Read all input. -** Output tab seperated value data. +** Output tab separated value data. ** ** We expect our data to be in a particular format. ** nm --format=bsd --size-sort --print-file-name --demangle diff --git a/mozilla/tools/dreftool/main.cpp b/mozilla/tools/dreftool/main.cpp index aa26b1dfdaf..6afb80930e9 100644 --- a/mozilla/tools/dreftool/main.cpp +++ b/mozilla/tools/dreftool/main.cpp @@ -829,7 +829,7 @@ void ConsumeArguments(int argc, char* argv[]) { break; case 's': case 'S': - gSloppy=true; // Dont look for member variables + gSloppy=true; // Don't look for member variables break; default: diff --git a/mozilla/tools/footprint/heapmap.pl b/mozilla/tools/footprint/heapmap.pl index 6559d2825ac..38438d8b9f8 100644 --- a/mozilla/tools/footprint/heapmap.pl +++ b/mozilla/tools/footprint/heapmap.pl @@ -97,7 +97,7 @@ while(<>) { $uncommFreeCount++; $uncommFreeBytes += $2; - # these wont have an overhead + # these won't have any overhead # we shouldn't view this as a free as we could shed this and # reduce our VmSize $prevFree = $2; diff --git a/mozilla/tools/jprof/leaky.cpp b/mozilla/tools/jprof/leaky.cpp index 420d253cb5c..bdda186df4f 100644 --- a/mozilla/tools/jprof/leaky.cpp +++ b/mozilla/tools/jprof/leaky.cpp @@ -371,9 +371,9 @@ void leaky::generateReportHTML(FILE *fp, int *countArray, int count) for(int cnt=usefulSymbols; --cnt>=0; rankingTable[cnt]=cnt); // Drat. I would use ::qsort() but I would need a global variable and my - // into-pascal professor threatened to flunk anyone who used globals. - // She dammaged me for life :-) (That was 1986. See how much influence - // she had. I dont remember her name but I always feel guilty about globals) + // intro-pascal professor threatened to flunk anyone who used globals. + // She damaged me for life :-) (That was 1986. See how much influence + // she had. I don't remember her name but I always feel guilty about globals) // Shell Sort. 581130733 is the max 31 bit value of h = 3h+1 int mx, i, h; @@ -389,8 +389,8 @@ void leaky::generateReportHTML(FILE *fp, int *countArray, int count) } } - // Ok, We are sorted now. Lets go through the table until we get to - // functions that were never called. Right now we dont do much inside + // Ok, We are sorted now. Let's go through the table until we get to + // functions that were never called. Right now we don't do much inside // this loop. Later we can get callers and callees into it like gprof // does fprintf(fp, diff --git a/mozilla/tools/jprof/stub/libmalloc.cpp b/mozilla/tools/jprof/stub/libmalloc.cpp index a36f7ddc800..c238ffe733c 100644 --- a/mozilla/tools/jprof/stub/libmalloc.cpp +++ b/mozilla/tools/jprof/stub/libmalloc.cpp @@ -123,7 +123,7 @@ static int rtcFD = -1; #if defined(linux) || defined(NTO) static void DumpAddressMap() { - // Turn off the timer so we dont get interrupts during shutdown + // Turn off the timer so we don't get interrupts during shutdown #if defined(linux) if (rtcHz) { enableRTCSignals(false); diff --git a/mozilla/tools/jprof/stub/libmalloc.h b/mozilla/tools/jprof/stub/libmalloc.h index cb105d81a66..74887b82673 100644 --- a/mozilla/tools/jprof/stub/libmalloc.h +++ b/mozilla/tools/jprof/stub/libmalloc.h @@ -24,7 +24,7 @@ extern "C" { typedef unsigned long u_long; -// Format of a malloc log entry. This is whats written out to the +// Format of a malloc log entry. This is what's written out to the // "malloc-log" file. struct malloc_log_entry { u_long delTime; diff --git a/mozilla/tools/leaky/leaky.html b/mozilla/tools/leaky/leaky.html index 3cb8ca6a546..ea03a22a8cc 100644 --- a/mozilla/tools/leaky/leaky.html +++ b/mozilla/tools/leaky/leaky.html @@ -34,7 +34,7 @@ my-program The debugging malloc library creates two files, malloc-log and malloc-map. The malloc-log file can be quite large for large programs (e.g. mozilla) -so be prepared to have alot of disk space. The malloc-map is tiny. +so be prepared to have a lot of disk space. The malloc-map is tiny.

Once your program has completed execution you can use leaky to look for memory leaks, or at least use it to dump the log. For memory leaks, you use leaky like this: @@ -81,7 +81,7 @@ its memory address...

  • On a typical *short* run of mozilla, I'll end up with a malloc-log file of around 5 to 10 megabytes and the resulting converted log file will be -10 to 20 times that so be prepared to have alot of disk space. It helps +10 to 20 times that so be prepared to have a lot of disk space. It helps a great deal to narrow down your problem space to reduce the log file size...
  • diff --git a/mozilla/tools/leaky/libmalloc.h b/mozilla/tools/leaky/libmalloc.h index 2a7401e78fa..7361243ac1c 100644 --- a/mozilla/tools/leaky/libmalloc.h +++ b/mozilla/tools/leaky/libmalloc.h @@ -49,7 +49,7 @@ extern "C" { typedef unsigned long u_long; -// Format of a malloc log entry. This is whats written out to the +// Format of a malloc log entry. This is what's written out to the // "malloc-log" file. struct malloc_log_entry { u_long type; diff --git a/mozilla/tools/module-deps/find-unused-exports.pl b/mozilla/tools/module-deps/find-unused-exports.pl index 528f7094016..7c45ae75d74 100644 --- a/mozilla/tools/module-deps/find-unused-exports.pl +++ b/mozilla/tools/module-deps/find-unused-exports.pl @@ -154,7 +154,7 @@ while ($func = pop @funcs_to_demangle) { # print STDERR "Got result $_\n"; if (/\s*(\S+)\s*==\s*(.*)$/) { - # print STDERR"succesfully demangled $1 to $2\n"; + # print STDERR"successfully demangled $1 to $2\n"; $demangle{$1} = $2; } else { $demangle{$1} = $1; diff --git a/mozilla/tools/module-deps/force_order.txt b/mozilla/tools/module-deps/force_order.txt index 28248ffeb99..573b18ab7e8 100644 --- a/mozilla/tools/module-deps/force_order.txt +++ b/mozilla/tools/module-deps/force_order.txt @@ -4,7 +4,7 @@ # # This file is hand crafted. # -# Each line contains two module names seperated by whitespace. +# Each line contains two module names separated by whitespace. # If both modules are in the needed modules as defined by module-graph.pl, # then the first module will always proceed the second module. # Module order is not changed otherwise. diff --git a/mozilla/tools/performance/layout/perf-doc.html b/mozilla/tools/performance/layout/perf-doc.html index d1abb945903..f4f66f79cb6 100644 --- a/mozilla/tools/performance/layout/perf-doc.html +++ b/mozilla/tools/performance/layout/perf-doc.html @@ -167,7 +167,7 @@ regenerate their corresponding table.
  • Uncombine.pl : a script that breaks up a single text file -containing all of the timing data for all of the sites into a seperate +containing all of the timing data for all of the sites into a separate file for each individual site.
  • diff --git a/mozilla/tools/performance/startup/printlog.pl b/mozilla/tools/performance/startup/printlog.pl index 42ca6a7029f..c4411166d1e 100644 --- a/mozilla/tools/performance/startup/printlog.pl +++ b/mozilla/tools/performance/startup/printlog.pl @@ -3,7 +3,7 @@ # big % differences my $percent = 1; # anything over 1% of total is of interest to us -my $ignoreDllLoads = 0; # by default dont ignore dll timings +my $ignoreDllLoads = 0; # by default don't ignore dll timings # Read in log to memory my @lines = <>; diff --git a/mozilla/tools/preloader/preloader.cpp b/mozilla/tools/preloader/preloader.cpp index c1a6c49ff24..e6a539189e1 100644 --- a/mozilla/tools/preloader/preloader.cpp +++ b/mozilla/tools/preloader/preloader.cpp @@ -1101,7 +1101,7 @@ void RemoveFromStartupFolder() { } } - if(theFilename) { //dont try if you can't get a reasonable guess to the path in the startup folder. + if(theFilename) { //don't try if you can't get a reasonable guess to the path in the startup folder. //----------------------------------------------------------------------------- //first, let's try to remove ourselves from the current users's startup folder... @@ -1385,7 +1385,7 @@ int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpszArgs,in } - if(!gUserPath[0]) { //dont override something they provide at the + if(!gUserPath[0]) { //don't override something they provide at the if(cp){ cp=strchr(cp,'['); //seek to the separator for the pathname (optional) if(cp && *cp) { diff --git a/mozilla/tools/trace-malloc/rules.txt b/mozilla/tools/trace-malloc/rules.txt index acdc46c623f..25619a900b3 100644 --- a/mozilla/tools/trace-malloc/rules.txt +++ b/mozilla/tools/trace-malloc/rules.txt @@ -14,7 +14,7 @@ # # Predefined Categories # "All" - All allocations [default] -# "uncategorized" - All allocations that dont match any category +# "uncategorized" - All allocations that don't match any category # # # Suresh Duddi @@ -445,4 +445,4 @@ js_ # Everything else # ---------------------------------------------------------------------- # -# This is a predefined category. Dont create it yourself. +# This is a predefined category. Don't create it yourself. diff --git a/mozilla/tools/trace-malloc/spacecategory.c b/mozilla/tools/trace-malloc/spacecategory.c index f544c4f54fd..1d31c203f0d 100644 --- a/mozilla/tools/trace-malloc/spacecategory.c +++ b/mozilla/tools/trace-malloc/spacecategory.c @@ -246,7 +246,7 @@ NewCategoryNode(const char *catName, STCategoryNode * parent, STGlobals * g) /* ** ProcessCategoryLeafRule ** -** Add this into the tree as a leaf node. It doesnt know who its parent is. For now we make +** Add this into the tree as a leaf node. It doesn't know who its parent is. For now we make ** root as its parent */ int @@ -337,7 +337,7 @@ initCategories(STGlobals * g) fp = fopen(g->mCommandLineOptions.mCategoryFile, "r"); if (!fp) { - /* It isnt an error to not have a categories file */ + /* It isn't an error to not have a categories file */ REPORT_INFO("No categories file."); return -1; } @@ -576,7 +576,7 @@ categorizeAllocation(STOptions * inOptions, STContext * inContext, aAllocation; /* - ** Make sure run's stats are calculated. We dont go update the parents of allocation + ** Make sure run's stats are calculated. We don't go update the parents of allocation ** at this time. That will happen when we focus on this category. This updating of ** stats will provide us fast categoryreports. */ diff --git a/mozilla/tools/trace-malloc/spacetrace.c b/mozilla/tools/trace-malloc/spacetrace.c index 534910bd035..fc939accaf2 100644 --- a/mozilla/tools/trace-malloc/spacetrace.c +++ b/mozilla/tools/trace-malloc/spacetrace.c @@ -586,7 +586,7 @@ pngSink(void *aContext, const char *aBuffer, int aLen) /* ** FormatNumber ** -** Formats a number with thousands separator. Dont free the result. Returns +** Formats a number with thousands separator. Don't free the result. Returns ** static data. */ char * @@ -5251,7 +5251,7 @@ contextLookup(STOptions * inOptions) unlock = PR_TRUE; /* - ** Just a category change. We dont need to harvest. Just find the + ** Just a category change. We don't need to harvest. Just find the ** right node and set the cache.mSortedRun. We need to recompute ** cost though. But that is cheap. */ @@ -5790,7 +5790,7 @@ handleClient(void *inArg) */ PR_fprintf(aFD, "HTTP/1.1 200 OK%s", crlf); PR_fprintf(aFD, "Server: %s%s", - "$Id: spacetrace.c,v 1.50 2004-04-25 21:07:16 gerv%gerv.net Exp $", + "$Id: spacetrace.c,v 1.51 2005-11-25 19:47:26 timeless%mozdev.org Exp $", crlf); PR_fprintf(aFD, "Content-type: "); if (NULL != strstr(start, ".png")) { @@ -5810,7 +5810,7 @@ handleClient(void *inArg) } PR_fprintf(aFD, crlf); /* - ** One more to seperate headers from content. + ** One more to separate headers from content. */ PR_fprintf(aFD, crlf); /* diff --git a/mozilla/tools/uuiddeps/uuidgrep.bash b/mozilla/tools/uuiddeps/uuidgrep.bash index dfd4ef9af0e..9f1fbb9d3ec 100755 --- a/mozilla/tools/uuiddeps/uuidgrep.bash +++ b/mozilla/tools/uuiddeps/uuidgrep.bash @@ -65,7 +65,7 @@ find . -type f -and \( -name \*.cpp -or -name \*.c -or -name \*.h \) > $ALLSOURC export IDMATCHFILE=$MYTMPDIR/idmatches.txt xargs -l grep -Hn $SEARCHING4 < $ALLSOURCEFILES > $IDMATCHFILE -# Seperate the variable names out of the matches. +# Separate the variable names out of the matches. # We have the possibility here of having duplicates with differing names # or of having different CIDs with the same names here, but this is as # good as it gets for now. diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp index 53e3ac4e02c..9179b9f459b 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -1393,7 +1393,7 @@ nsExternalAppHandler::~nsExternalAppHandler() NS_IMETHODIMP nsExternalAppHandler::SetWebProgressListener(nsIWebProgressListener2 * aWebProgressListener) { - // this call back means we've succesfully brought up the + // this call back means we've successfully brought up the // progress window so set the appropriate flag, even though // aWebProgressListener might be null diff --git a/mozilla/webshell/tests/viewer/samples/test8.html b/mozilla/webshell/tests/viewer/samples/test8.html index 5705f371258..5b715df4b14 100644 --- a/mozilla/webshell/tests/viewer/samples/test8.html +++ b/mozilla/webshell/tests/viewer/samples/test8.html @@ -631,8 +631,8 @@ Fish</option> -You should see a Combobox with optgroups, the second item's label should be "Label" (known bug because the label and contet shouldn't be appended) -You should see a Listbox with optgroups, the second item's label should be "Label" (known bug because the label and contet shouldn't be appended) +You should see a Combobox with optgroups, the second item's label should be "Label" (known bug because the label and content shouldn't be appended) +You should see a Listbox with optgroups, the second item's label should be "Label" (known bug because the label and content shouldn't be appended) diff --git a/mozilla/webtools/apidoc/parse_apidoc.pl b/mozilla/webtools/apidoc/parse_apidoc.pl index 4ef5e8732da..48d262b9027 100644 --- a/mozilla/webtools/apidoc/parse_apidoc.pl +++ b/mozilla/webtools/apidoc/parse_apidoc.pl @@ -30,7 +30,7 @@ # # Contributor(s): # Robert Ginda , Initial development. -# Pavel Hlavnicka , seperate tocs, param linking. +# Pavel Hlavnicka , separate tocs, param linking. # Petr Cimprich , nested frameset fix, encoded URLs. # Petr Cimprich , Mozilla sidebar generated from TOC # diff --git a/mozilla/webtools/apidoc/parse_devedge_doc.pl b/mozilla/webtools/apidoc/parse_devedge_doc.pl index 09d1ecfbef1..a51549206a8 100644 --- a/mozilla/webtools/apidoc/parse_devedge_doc.pl +++ b/mozilla/webtools/apidoc/parse_devedge_doc.pl @@ -65,7 +65,7 @@ my $NAMESPACE = ""; # "APIDOC"; my $TAB = " "; my $indent_pfx = ""; -die ("I said, dont use this script! Don't you read the comments?\n"); +die ("I said, don't use this script! Don't you read the comments?\n"); &parse_old_doc (); diff --git a/mozilla/webtools/bonsai/README b/mozilla/webtools/bonsai/README index 39ce2234798..75401c62bc7 100644 --- a/mozilla/webtools/bonsai/README +++ b/mozilla/webtools/bonsai/README @@ -307,7 +307,7 @@ doeditmessage.cgi Perl. Edits one of the email messages that bonsai sends Calls: nobody -doeditprofile.cgi Perl. Edit peoples contact info. Left-over code from +doeditprofile.cgi Perl. Edit people's contact info. Left-over code from before we started getting this info from LDAP. Called by: editprofile.cgi @@ -345,7 +345,7 @@ editmessage.cgi Perl. Edits one of the email messages that bonsai sends Calls: doeditmessage.cgi -editprofile.cgi Perl. Edit peoples contact info. Left-over code from +editprofile.cgi Perl. Edit people's contact info. Left-over code from before we started getting this info from LDAP. Called by: localprofile.cgi diff --git a/mozilla/webtools/bonsai/globals.pl b/mozilla/webtools/bonsai/globals.pl index 130d9a8253b..892826178c1 100644 --- a/mozilla/webtools/bonsai/globals.pl +++ b/mozilla/webtools/bonsai/globals.pl @@ -776,7 +776,7 @@ sub _to_array { return ($thing); } -# Get all of the headers for a mail message, returned as a comma seperated +# Get all of the headers for a mail message, returned as a comma separated # string, unless looking for a subject sub _GetMailHeaders { my ($mail_hdrs, $hdr) = @_; diff --git a/mozilla/webtools/bugzilla/Bugzilla/User.pm b/mozilla/webtools/bugzilla/Bugzilla/User.pm index 0cca45682f6..d35077a4bf2 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/User.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/User.pm @@ -1488,7 +1488,7 @@ the page footer, and C<0> otherwise. =item C -Retruns a string for the identity of the user. This will be of the form +Returns a string for the identity of the user. This will be of the form CemailE> if the user has specified a name, and C otherwise. diff --git a/mozilla/webtools/bugzilla/contrib/README.Mailif b/mozilla/webtools/bugzilla/contrib/README.Mailif index 8b66044388f..0c65cef83e5 100644 --- a/mozilla/webtools/bugzilla/contrib/README.Mailif +++ b/mozilla/webtools/bugzilla/contrib/README.Mailif @@ -54,7 +54,7 @@ Search the script after 'default' - you find some default-Settings for bug reports, which are used, if the sender did not send a field for it. The defaults should be checked and changed. -Thats hopefully all, we will come up with any configuration file or something. +That's hopefully all, we will come up with any configuration file or something. If your mail works, your script will insert mails from now on. diff --git a/mozilla/webtools/bugzilla/contrib/bug_email.pl b/mozilla/webtools/bugzilla/contrib/bug_email.pl index f30ad238467..b71cf20b34b 100755 --- a/mozilla/webtools/bugzilla/contrib/bug_email.pl +++ b/mozilla/webtools/bugzilla/contrib/bug_email.pl @@ -38,7 +38,7 @@ # # You need to work with bug_email.pl the MIME::Parser installed. # -# $Id: bug_email.pl,v 1.29 2005-08-26 23:11:32 bugreport%peshkin.net Exp $ +# $Id: bug_email.pl,v 1.30 2005-11-25 19:47:38 timeless%mozdev.org Exp $ ############################################################### # 02/12/2000 (SML) @@ -193,7 +193,7 @@ sub horLine( ) # Check if $Name is in $GroupName # This is no more CreateBugs group, so I'm using this routine to just determine if the user is -# in the database. Eventually, here should be a seperate routine or renamed, or something (SML) +# in the database. Eventually, here should be a separate routine or renamed, or something (SML) sub CheckPermissions { my ($GroupName, $Name) = @_; @@ -451,7 +451,7 @@ sub FetchAllSQLData( ) # 0 - Its an error, but bugzilla can process the bug. The user should # handle that as a warning. # -# 1 - Its a real bug. Bugzilla cant store the bug. The mail has to be +# 1 - It's a real bug. Bugzilla can't store the bug. The mail has to be # resent. # # 2 - Permission error: The user does not have the permission to send @@ -465,7 +465,7 @@ sub BugMailError($ $ ) { my ( $errflag, $text ) = @_; - # On permission error, dont sent all other Errors back -> just quit ! + # On permission error, don't sent all other Errors back -> just quit ! if( $errflag == 2 ) { # Permission-Error Reply( $SenderShort, $Message_ID, "Bugzilla Error", "Permission denied.\n\n" . "You do not have the permissions to create a new bug. Sorry.\n" ); @@ -677,7 +677,7 @@ sub extractControls( $ ) } } - # thats it. + # that's it. return( $backbody ); } diff --git a/mozilla/webtools/bugzilla/contrib/bugmail_help.html b/mozilla/webtools/bugzilla/contrib/bugmail_help.html index a2f89f26040..1b43cd2b564 100644 --- a/mozilla/webtools/bugzilla/contrib/bugmail_help.html +++ b/mozilla/webtools/bugzilla/contrib/bugmail_help.html @@ -39,7 +39,7 @@ You receive a reply mail with the new bug-ID if your request was ok. If not, you get a mail with some help on the bugmail system and a specific analysis of your request.

    -Please dont refuse to send one or two wrong mails, you will get all the information +Please don't refuse to send one or two wrong mails, you will get all the information you need in the replies, and only in the mail replies. The information on this page, concerning available products, versions and so on, is not dynamicly generated and may be old therefore. @@ -91,23 +91,23 @@ hopefully valid value. @rep_platform The desired platform - no.
    If you dont give a value, this field is set to All. + no.
    If you don't give a value, this field is set to All. @bug_severity The severity of the bug - no.
    If you dont give a value, this field is set to + no.
    If you don't give a value, this field is set to normal @priority The priority of the bug - no.
    If you dont give a value, this field is set to P3 + no.
    If you don't give a value, this field is set to P3 @op_sys The operating system - no.
    If you dont give a value, this field is set to Linux. + no.
    If you don't give a value, this field is set to Linux. @assigned_to @@ -150,7 +150,7 @@ Give string values for the most keys above. Some keywords require special value

    1. E-Mail adresses: If you want to set the qa-contact, specify a email-adress for @qa_contact. The email must be known by bugzilla of course.
    2. Listvalues: Most of the values have to be one of a list of valid values. Try by sending -a mail and read the reply. Skip fields if you dont get help for them unless you dont know +a mail and read the reply. Skip fields if you don't get help for them unless you don't know which values you may choose.
    3. free Text: The descriptions may be free text.
    4. Special: The field groupset may be specified in different in three different kinds: @@ -181,7 +181,7 @@ Some of the values must be choosen from a list:

      After you have specified the required keywords and maybe some other value, you may -describe your bug. You dont need a keyword for starting your bug description. All +describe your bug. You don't need a keyword for starting your bug description. All text which follows the keyword block is handled as long description of the bug.

      @@ -198,7 +198,7 @@ the attachment in bugzilla.

      Example Mail

      -See the example of the mail body (Dont forget to specify the short description +See the example of the mail body (Don't forget to specify the short description in the mail subject):
       
         @product      = Bugzilla
      diff --git a/mozilla/webtools/bugzilla/contrib/gnatsparse/gnatsparse.py b/mozilla/webtools/bugzilla/contrib/gnatsparse/gnatsparse.py
      index b317b240d18..5315ee8b0b1 100755
      --- a/mozilla/webtools/bugzilla/contrib/gnatsparse/gnatsparse.py
      +++ b/mozilla/webtools/bugzilla/contrib/gnatsparse/gnatsparse.py
      @@ -270,7 +270,7 @@ def load_responsible(fname):
           rfp.close()
       
       def split_csl(list):
      -    """ Split a comma seperated list """
      +    """ Split a comma separated list """
           newlist = re.split(r"""\s*,\s*""", list)
           return newlist
       
      diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
      index e56793fcd63..77496f2a389 100755
      --- a/mozilla/webtools/bugzilla/process_bug.cgi
      +++ b/mozilla/webtools/bugzilla/process_bug.cgi
      @@ -341,7 +341,7 @@ if (((defined $cgi->param('id') && $cgi->param('product') ne $oldproduct)
                   my %defaults;
                   # We set the defaults to these fields to the old value,
                   # if its a valid option, otherwise we use the default where
      -            # thats appropriate
      +            # that's appropriate
                   $vars->{'versions'} = $::versions{$prod};
                   if ($vok) {
                       $defaults{'version'} = $cgi->param('version');
      diff --git a/mozilla/webtools/newsbot/newsbot.pl b/mozilla/webtools/newsbot/newsbot.pl
      index 1e90ba2ec9f..41c0d2dc86a 100755
      --- a/mozilla/webtools/newsbot/newsbot.pl
      +++ b/mozilla/webtools/newsbot/newsbot.pl
      @@ -97,7 +97,7 @@ for my $msg (sort { $a <=> $b } $folder->message_list) {
               $summary = $summary . $_ while (defined($_ = $IO->getline));
               $IO->close;
               if ( $entity->parts(0)->head->mime_type =~ /text\/plain/ ) {
      -             # line beginning with -- is a signature seperator. Delete the sig
      +             # line beginning with -- is a signature separator. Delete the sig
                    $summary =~ s/^--.*//ms;
                    $summary =~ s/&/&/g;
                    $summary =~ s/ 'Project_A',
      @@ -136,7 +136,7 @@ sub print_tests {
       
       
           $out .= "Simulation of VC column call\n";
      -    $out .=  $seperator;
      +    $out .=  $separator;
           
           %args = (
       	     'tree' => 'Project_A',
      @@ -149,7 +149,7 @@ sub print_tests {
           $out .= print_test($url, %args);
        
           $out .= "Simulation of time column call\n";
      -    $out .=  $seperator;
      +    $out .=  $separator;
       
           %args = (
       	     'tree' => 'Project_A',
      diff --git a/mozilla/widget/src/Makefile.in b/mozilla/widget/src/Makefile.in
      index 729245b70e4..e395ad9d076 100644
      --- a/mozilla/widget/src/Makefile.in
      +++ b/mozilla/widget/src/Makefile.in
      @@ -64,7 +64,7 @@ DIRS		+= windows build
       endif
       
       #
      -# Dont build the DSO under the 'build' directory as windows does.
      +# Don't build the DSO under the 'build' directory as windows does.
       #
       # The DSOs get built in the toolkit dir itself.  Do this so that 
       # multiple implementations of widget can be built on the same
      diff --git a/mozilla/widget/src/gtk/nsWidget.cpp b/mozilla/widget/src/gtk/nsWidget.cpp
      index 2d14c34cc3b..d7469ac998e 100644
      --- a/mozilla/widget/src/gtk/nsWidget.cpp
      +++ b/mozilla/widget/src/gtk/nsWidget.cpp
      @@ -1151,7 +1151,7 @@ NS_IMETHODIMP nsWidget::InvalidateRegion(const nsIRegion *aRegion, PRBool aIsSyn
           }
         }
       
      -  // drop the const.. whats the right thing to do here?
      +  // drop the const.. what's the right thing to do here?
         ((nsIRegion*)aRegion)->FreeRects(regionRectSet);
       
         return NS_OK;
      diff --git a/mozilla/widget/src/gtk/nsWindow.cpp b/mozilla/widget/src/gtk/nsWindow.cpp
      index e06b29cd0a9..348f8ecf5ff 100644
      --- a/mozilla/widget/src/gtk/nsWindow.cpp
      +++ b/mozilla/widget/src/gtk/nsWindow.cpp
      @@ -1273,7 +1273,7 @@ GdkCursor *nsWindow::GtkCreateCursor(nsCursor aCursorType)
             break;
         }
       
      -  /* if by now we dont have a xcursor, this means we have to make a custom one */
      +  /* if by now we don't have a xcursor, this means we have to make a custom one */
         if (newType != 0xff) {
           gdk_color_parse("#000000", &fg);
           gdk_color_parse("#ffffff", &bg);
      diff --git a/mozilla/widget/src/gtk2/nsClipboard.cpp b/mozilla/widget/src/gtk2/nsClipboard.cpp
      index b7fcc5a590e..ebbd91876e8 100644
      --- a/mozilla/widget/src/gtk2/nsClipboard.cpp
      +++ b/mozilla/widget/src/gtk2/nsClipboard.cpp
      @@ -471,7 +471,7 @@ nsClipboard::SelectionGetEvent (GtkWidget        *aWidget,
           else if (aSelectionData->selection == GDK_SELECTION_CLIPBOARD)
               whichClipboard = kGlobalClipboard;
           else
      -        return; // THAT AINT NO CLIPBOARD I EVER HEARD OF
      +        return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
       
           nsCOMPtr trans = GetTransferable(whichClipboard);
           
      @@ -572,7 +572,7 @@ nsClipboard::SelectionClearEvent (GtkWidget         *aWidget,
           else if (aEvent->selection == GDK_SELECTION_CLIPBOARD)
               whichClipboard = kGlobalClipboard;
           else
      -        return; // THAT AINT NO CLIPBOARD I EVER HEARD OF
      +        return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
       
           EmptyClipboard(whichClipboard);
       }
      diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp
      index 9daadf0001b..cab55abe035 100644
      --- a/mozilla/widget/src/gtk2/nsWindow.cpp
      +++ b/mozilla/widget/src/gtk2/nsWindow.cpp
      @@ -3574,7 +3574,7 @@ get_gtk_cursor(nsCursor aCursor)
               break;
           }
       
      -    // if by now we dont have a xcursor, this means we have to make a
      +    // if by now we don't have a xcursor, this means we have to make a
           // custom one
           if (newType != 0xff) {
               gdk_color_parse("#000000", &fg);
      diff --git a/mozilla/widget/src/mac/nsFilePicker.cpp b/mozilla/widget/src/mac/nsFilePicker.cpp
      index c40f9ca9c41..05a71b0cbbb 100644
      --- a/mozilla/widget/src/mac/nsFilePicker.cpp
      +++ b/mozilla/widget/src/mac/nsFilePicker.cpp
      @@ -592,7 +592,7 @@ nsFilePicker::PutLocalFile(const nsString& inTitle, const nsString& inDefaultNam
         else
         {
           dialogCreateOptions.optionFlags &= ~kNavAllowStationery;  // remove Stationery option
      -    creatorToSave = kNavGenericSignature;   // This supresses the default format menu items
      +    creatorToSave = kNavGenericSignature;   // This suppresses the default format menu items
           SetupFormatMenuItems(&dialogCreateOptions);
         }
         
      diff --git a/mozilla/widget/src/photon/nsWindow.cpp b/mozilla/widget/src/photon/nsWindow.cpp
      index 0cb2dbe22b7..fde9a2bdff7 100644
      --- a/mozilla/widget/src/photon/nsWindow.cpp
      +++ b/mozilla/widget/src/photon/nsWindow.cpp
      @@ -687,7 +687,7 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
       		PtWidgetOffset(pWidget, &offset);
       		/* Build a List of Tiles that might be in front of me.... */
       		PhTile_t *new_damage, *clip_tiles, *intersect;
      -		/* Intersect the Damage tile list w/ the clipped out list and see whats left! */
      +		/* Intersect the Damage tile list w/ the clipped out list and see what's left! */
       		new_damage = PhRectsToTiles(&damage->rect, 1);
       		PhDeTranslateTiles(new_damage, &offset);
       		clip_tiles = GetWindowClipping( pWidget );
      diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
      index 7762316d3cf..ee29d26f092 100644
      --- a/mozilla/widget/src/windows/nsWindow.cpp
      +++ b/mozilla/widget/src/windows/nsWindow.cpp
      @@ -5829,7 +5829,7 @@ PRBool nsWindow::DispatchMouseEvent(PRUint32 aEventType, WPARAM wParam, nsPoint*
         PRBool insideMovementThreshold = (abs(gLastMousePoint.x - mp.x) < (short)::GetSystemMetrics(SM_CXDOUBLECLK)) &&
                                          (abs(gLastMousePoint.y - mp.y) < (short)::GetSystemMetrics(SM_CYDOUBLECLK));
       
      -  // Supress mouse moves caused by widget creation
      +  // Suppress mouse moves caused by widget creation
         if ((aEventType == NS_MOUSE_MOVE) &&
             (gLastMouseMovePoint.x == mp.x) &&
             (gLastMouseMovePoint.y == mp.y))
      diff --git a/mozilla/widget/src/xlib/nsAppShell.cpp b/mozilla/widget/src/xlib/nsAppShell.cpp
      index c91b60e27b8..245a78fe69a 100644
      --- a/mozilla/widget/src/xlib/nsAppShell.cpp
      +++ b/mozilla/widget/src/xlib/nsAppShell.cpp
      @@ -411,7 +411,7 @@ NS_IMETHODIMP nsAppShell::ListenToEventQueue(nsIEventQueue *aQueue,
                                       HandleQueueXtProc,
                                       (XtPointer)mEventQueue);
       
      -/* This hack would not be neccesary if we would have a hashtable function
      +/* This hack would not be necessary if we would have a hashtable function
        * which returns success/failure in a separate var ...
        */
       #define NEVER_BE_ZERO_MAGIC (54321) 
      @@ -869,7 +869,7 @@ nsAppShell::HandleKeyPressEvent(XEvent *event, nsWidget *aWidget)
             break;
         }
       
      -  // Dont dispatch events for modifier keys pressed ALONE
      +  // Don't dispatch events for modifier keys pressed ALONE
         if (nsKeyCode::KeyCodeIsModifier(event->xkey.keycode))
         {
           return;
      @@ -942,7 +942,7 @@ nsAppShell::HandleKeyReleaseEvent(XEvent *event, nsWidget *aWidget)
             break;
         }
       
      -  // Dont dispatch events for modifier keys pressed ALONE
      +  // Don't dispatch events for modifier keys pressed ALONE
         if (nsKeyCode::KeyCodeIsModifier(event->xkey.keycode))
         {
           return;
      @@ -1214,7 +1214,7 @@ void nsAppShell::HandleDragDropEvent(XEvent *event, nsWidget *aWidget) {
         nsresult rv;
         nsCOMPtr dragService( do_GetService(kCDragServiceCID, &rv) );
       
      -  // FIXME: Dont think the currentlyDragging check is required. KenF
      +  // FIXME: Don't think the currentlyDragging check is required. KenF
         if (NS_SUCCEEDED(rv)) {
           nsCOMPtr dragServiceXlib;
           dragServiceXlib = do_QueryInterface(dragService);
      diff --git a/mozilla/widget/src/xlib/nsWidget.cpp b/mozilla/widget/src/xlib/nsWidget.cpp
      index 3610d7206f5..8e1a3586a9b 100644
      --- a/mozilla/widget/src/xlib/nsWidget.cpp
      +++ b/mozilla/widget/src/xlib/nsWidget.cpp
      @@ -363,7 +363,7 @@ nsWidget::StandardWidgetCreate(nsIWidget *aParent,
       NS_IMETHODIMP nsWidget::Destroy()
       {
       
      -  // Dont reenter.
      +  // Don't reenter.
         if (mIsDestroying)
           return NS_OK;
       
      @@ -724,7 +724,7 @@ NS_IMETHODIMP nsWidget::SetCursor(nsCursor aCursor)
         if (!mBaseWindow)
           return NS_ERROR_FAILURE;
       
      -  /* don't bother setting if it it isnt mapped, duh */
      +  /* don't bother setting if it it isn't mapped, duh */
         if (!mMapped)
           return NS_OK;
         
      @@ -1464,7 +1464,7 @@ Cursor nsWidget::XlibCreateCursor(nsCursor aCursorType)
             break;
         }
       
      -  /* if by now we dont have a xcursor, this means we have to make a custom one */
      +  /* if by now we don't have a xcursor, this means we have to make a custom one */
         if (!xcursor) {
           NS_ASSERTION(newType != 0xff, "Unknown cursor type and no standard cursor");
           
      diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp
      index 1d2b1d89ec9..807100f5066 100644
      --- a/mozilla/xpcom/components/nsComponentManager.cpp
      +++ b/mozilla/xpcom/components/nsComponentManager.cpp
      @@ -312,7 +312,7 @@ PR_STATIC_CALLBACK(void)
       factory_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr)
       {
           nsFactoryTableEntry* entry = NS_STATIC_CAST(nsFactoryTableEntry*, aHdr);
      -    // nsFactoryEntry is arena allocated. So we dont delete it.
      +    // nsFactoryEntry is arena allocated. So we don't delete it.
           // We call the destructor by hand.
           entry->mFactoryEntry->~nsFactoryEntry();
           PL_DHashClearEntryStub(aTable, aHdr);
      @@ -336,7 +336,7 @@ contractID_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr)
           if (entry->mFactoryEntry->mTypeIndex == NS_COMPONENT_TYPE_SERVICE_ONLY &&
               entry->mFactoryEntry->mCid.Equals(kEmptyCID)) {
               // this object is owned by the hash.
      -        // nsFactoryEntry is arena allocated. So we dont delete it.
      +        // nsFactoryEntry is arena allocated. So we don't delete it.
               // We call the destructor by hand.
               entry->mFactoryEntry->~nsFactoryEntry();
           }
      @@ -396,7 +396,7 @@ nsFactoryEntry::~nsFactoryEntry(void)
           // Release any service reference
           mServiceObject = nsnull;
       
      -    // nsFactoryEntry is arena allocated. So we dont delete it.
      +    // nsFactoryEntry is arena allocated. So we don't delete it.
           // We call the destructor by hand.
           if (mParent)
               mParent->~nsFactoryEntry();
      @@ -1783,7 +1783,7 @@ nsComponentManagerImpl::ContractIDToClassID(const char *aContractID, nsCID *aCla
        * Translates a classID to a {ContractID, Class Name}. Does direct registry
        * access to do the translation.
        *
      - * NOTE: Since this isn't heavily used, we arent caching this.
      + * NOTE: Since this isn't heavily used, we aren't caching this.
        */
       nsresult
       nsComponentManagerImpl::CLSIDToContractID(const nsCID &aClass,
      @@ -1858,7 +1858,7 @@ nsComponentManagerImpl::CreateInstance(const nsCID &aClass,
           // shutdown -- whether it's available or not would depend on the order it
           // occurs in the list
           if (gXPCOMShuttingDown) {
      -        // When processing shutdown, dont process new GetService() requests
      +        // When processing shutdown, don't process new GetService() requests
       #ifdef SHOW_DENIED_ON_SHUTDOWN
               nsXPIDLCString cid, iid;
               cid.Adopt(aClass.ToString());
      @@ -1939,7 +1939,7 @@ nsComponentManagerImpl::CreateInstanceByContractID(const char *aContractID,
           // shutdown -- whether it's available or not would depend on the order it
           // occurs in the list
           if (gXPCOMShuttingDown) {
      -        // When processing shutdown, dont process new GetService() requests
      +        // When processing shutdown, don't process new GetService() requests
       #ifdef SHOW_DENIED_ON_SHUTDOWN
               nsXPIDLCString iid;
               iid.Adopt(aIID.ToString());
      @@ -2058,7 +2058,7 @@ nsComponentManagerImpl::GetService(const nsCID& aClass,
           // shutdown -- whether it's available or not would depend on the order it
           // occurs in the list
           if (gXPCOMShuttingDown) {
      -        // When processing shutdown, dont process new GetService() requests
      +        // When processing shutdown, don't process new GetService() requests
       #ifdef SHOW_DENIED_ON_SHUTDOWN
               nsXPIDLCString cid, iid;
               cid.Adopt(aClass.ToString());
      @@ -2242,14 +2242,14 @@ nsComponentManagerImpl::IsServiceInstantiated(const nsCID & aClass,
                                                     const nsIID& aIID,
                                                     PRBool *result)
       {
      -    // Now we want to get the service if we already got it. If not, we dont want
      +    // Now we want to get the service if we already got it. If not, we don't want
           // to create an instance of it. mmh!
       
           // test this first, since there's no point in returning a service during
           // shutdown -- whether it's available or not would depend on the order it
           // occurs in the list
           if (gXPCOMShuttingDown) {
      -        // When processing shutdown, dont process new GetService() requests
      +        // When processing shutdown, don't process new GetService() requests
       #ifdef SHOW_DENIED_ON_SHUTDOWN
               nsXPIDLCString cid, iid;
               cid.Adopt(aClass.ToString());
      @@ -2284,14 +2284,14 @@ NS_IMETHODIMP nsComponentManagerImpl::IsServiceInstantiatedByContractID(const ch
                                                                               const nsIID& aIID,
                                                                               PRBool *result)
       {
      -    // Now we want to get the service if we already got it. If not, we dont want
      +    // Now we want to get the service if we already got it. If not, we don't want
           // to create an instance of it. mmh!
       
           // test this first, since there's no point in returning a service during
           // shutdown -- whether it's available or not would depend on the order it
           // occurs in the list
           if (gXPCOMShuttingDown) {
      -        // When processing shutdown, dont process new GetService() requests
      +        // When processing shutdown, don't process new GetService() requests
       #ifdef SHOW_DENIED_ON_SHUTDOWN
               nsXPIDLCString iid;
               iid.Adopt(aIID.ToString());
      @@ -2358,7 +2358,7 @@ nsComponentManagerImpl::GetServiceByContractID(const char* aContractID,
           // shutdown -- whether it's available or not would depend on the order it
           // occurs in the list
           if (gXPCOMShuttingDown) {
      -        // When processing shutdown, dont process new GetService() requests
      +        // When processing shutdown, don't process new GetService() requests
       #ifdef SHOW_DENIED_ON_SHUTDOWN
               nsXPIDLCString iid;
               iid.Adopt(aIID.ToString());
      diff --git a/mozilla/xpcom/components/nsIModule.idl b/mozilla/xpcom/components/nsIModule.idl
      index a71b9b13d9a..bc5fd40038a 100644
      --- a/mozilla/xpcom/components/nsIModule.idl
      +++ b/mozilla/xpcom/components/nsIModule.idl
      @@ -107,7 +107,7 @@ interface nsIModule : nsISupports
           *		unloaded.  It is very important to ensure that no outstanding 
           *       references to the module's code/data exist before returning 
           *       PR_TRUE. 
      -    *		Returning PR_FALSE guaratees that the module wont be unloaded.
      +    *		Returning PR_FALSE guaratees that the module won't be unloaded.
           */
           boolean canUnload(in nsIComponentManager aCompMgr);
       };
      diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.cpp b/mozilla/xpcom/components/nsNativeComponentLoader.cpp
      index 19c94d5c7ce..b46bcba3a17 100644
      --- a/mozilla/xpcom/components/nsNativeComponentLoader.cpp
      +++ b/mozilla/xpcom/components/nsNativeComponentLoader.cpp
      @@ -166,7 +166,7 @@ nsNativeComponentLoader::GetFactory(const nsIID & aCID,
           // other CID for which factory creation can pass.
           // We will just let it be. The effect will be next time we try
           // creating the object, we will query the dll again. Since the
      -    // dll is loaded, this aint a big hit. So for optimized builds
      +    // dll is loaded, this ain't a big hit. So for optimized builds
           // this is ok to limp along.
           NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Factory creation failed");
           
      @@ -212,7 +212,7 @@ nsNativeComponentLoader::RegisterComponentsInDir(PRInt32 when,
       #if 0
           // Going to many of these checks is a performance hit on the mac.
           // Since these routines are called relatively infrequently and
      -    // we will fail anyway down the line if a directory aint there,
      +    // we will fail anyway down the line if a directory ain't there,
           // we are commenting this check out.
       
           // Make sure we are dealing with a directory
      @@ -328,7 +328,7 @@ nsFreeLibrary(nsDll *dll, nsIServiceManager *serviceMgr, PRInt32 when)
       
       #ifdef DEBUG_dougt
                   // XXX dlls aren't counting their outstanding instances correctly
      -            // XXX hence, dont unload until this gets enforced.
      +            // XXX hence, don't unload until this gets enforced.
                   rv = dll->Unload();
       #endif /* 0 */
               }
      @@ -880,7 +880,7 @@ nsNativeComponentLoader::AutoRegisterComponent(PRInt32 when,
           {
               // Create and add the dll to the mDllStore
               // It is ok to do this even if the creation of nsDll
      -        // didnt succeed. That way we wont do this again
      +        // didnt succeed. That way we won't do this again
               // when we encounter the same dll.
               dll = new nsDll(component, this);
               if (dll == NULL)
      diff --git a/mozilla/xpcom/components/xcDll.h b/mozilla/xpcom/components/xcDll.h
      index 5de5b0eb0cf..ec08eb5b5a8 100644
      --- a/mozilla/xpcom/components/xcDll.h
      +++ b/mozilla/xpcom/components/xcDll.h
      @@ -102,7 +102,7 @@ public:
           PRBool IsMarkedForUnload(void) { return m_markForUnload; }
       
           // Shutdown the dll. This will call any on unload hook for the dll.
      -    // This wont unload the dll. Unload() implicitly calls Shutdown().
      +    // This won't unload the dll. Unload() implicitly calls Shutdown().
           nsresult Shutdown(void);
       
       	void *FindSymbol(const char *symbol);
      diff --git a/mozilla/xpcom/ds/nsArrayEnumerator.cpp b/mozilla/xpcom/ds/nsArrayEnumerator.cpp
      index 59ec8f71f45..243ba8657f3 100644
      --- a/mozilla/xpcom/ds/nsArrayEnumerator.cpp
      +++ b/mozilla/xpcom/ds/nsArrayEnumerator.cpp
      @@ -185,7 +185,7 @@ nsCOMArrayEnumerator::operator new (size_t size, const nsCOMArray_base& aArray)
               NS_STATIC_CAST(nsCOMArrayEnumerator*, ::operator new(size));
       
           // now need to copy over the values, and addref each one
      -    // now this might seem like alot of work, but we're actually just
      +    // now this might seem like a lot of work, but we're actually just
           // doing all our AddRef's ahead of time since GetNext() doesn't
           // need to AddRef() on the way out
           PRUint32 i;
      diff --git a/mozilla/xpcom/ds/nsObserverList.cpp b/mozilla/xpcom/ds/nsObserverList.cpp
      index 51fb04b5310..38e50708b0a 100644
      --- a/mozilla/xpcom/ds/nsObserverList.cpp
      +++ b/mozilla/xpcom/ds/nsObserverList.cpp
      @@ -76,7 +76,7 @@ nsObserverList::AddObserver(nsIObserver* anObserver, PRBool ownsWeak)
           nsCOMPtr observerRef;
           if (ownsWeak) {
               nsCOMPtr weakRefFactory = do_QueryInterface(anObserver);
      -        NS_ASSERTION(weakRefFactory, "AddObserver: trying weak object that doesnt support nsIWeakReference");
      +        NS_ASSERTION(weakRefFactory, "AddObserver: trying weak object that doesn't support nsIWeakReference");
               if ( weakRefFactory )
                   observerRef = getter_AddRefs(NS_STATIC_CAST(nsISupports*, NS_GetWeakReference(weakRefFactory)));
           } else {
      diff --git a/mozilla/xpcom/ds/nsRecyclingAllocator.cpp b/mozilla/xpcom/ds/nsRecyclingAllocator.cpp
      index 719f51f9acd..1e93f8c0dd3 100644
      --- a/mozilla/xpcom/ds/nsRecyclingAllocator.cpp
      +++ b/mozilla/xpcom/ds/nsRecyclingAllocator.cpp
      @@ -179,7 +179,7 @@ nsRecyclingAllocator::Malloc(PRSize bytes, PRBool zeroit)
           // Add 4 bytes to what we allocate to hold the bucket index
           PRSize allocBytes = bytes + NS_ALLOCATOR_OVERHEAD_BYTES;
         
      -    // We dont have that memory already. Allocate.
      +    // We don't have that memory already. Allocate.
           Block *ptr = (Block *) (zeroit ? calloc(1, allocBytes) : malloc(allocBytes));
           
           // Deal with no memory situation
      @@ -188,7 +188,7 @@ nsRecyclingAllocator::Malloc(PRSize bytes, PRBool zeroit)
         
           // This is the first allocation we are holding.
           // Setup timer for releasing memory
      -    // If this fails, then we wont have a timer to release unused
      +    // If this fails, then we won't have a timer to release unused
           // memory. We can live with that. Also, the next allocation
           // will try again to set the timer.
           if (mRecycleAfter && !mRecycleTimer)
      @@ -285,7 +285,7 @@ nsRecyclingAllocator::FreeUnusedBuckets()
       nsRecyclingAllocator::Block*
       nsRecyclingAllocator::FindFreeBlock(PRSize bytes)
       {
      -    // We dont enter lock for this check. This is intentional.
      +    // We don't enter lock for this check. This is intentional.
           // Here is my logic: we are checking if (!mFreeList). Doing this check
           // without locking can lead to unpredictable results. YES. But the effect
           // of the unpredictedness are ok. here is why:
      @@ -298,7 +298,7 @@ nsRecyclingAllocator::FindFreeBlock(PRSize bytes)
           //    FindFreeBlock() will enter lock, while (null) and return null.
           //
           // The reason why I chose to not enter lock for this check was that when
      -    // the allocator is full, we dont want to impose any more overhead than
      +    // the allocator is full, we don't want to impose any more overhead than
           // we already are for failing over to malloc/free.
       
           if (!mFreeList)
      diff --git a/mozilla/xpcom/ds/nsRecyclingAllocator.h b/mozilla/xpcom/ds/nsRecyclingAllocator.h
      index 4266b1b8012..a51e7d2eb38 100644
      --- a/mozilla/xpcom/ds/nsRecyclingAllocator.h
      +++ b/mozilla/xpcom/ds/nsRecyclingAllocator.h
      @@ -55,7 +55,7 @@
        * This allocator is thread safe.
        *
        * CAVEATS: As the number of buckets increases, this allocators performance
      - *          will drop. As a general guideline, dont use this for more
      + *          will drop. As a general guideline, don't use this for more
        *          than NS_MAX_BLOCKS
        */
       
      diff --git a/mozilla/xpcom/io/nsPipe3.cpp b/mozilla/xpcom/io/nsPipe3.cpp
      index d6f8d070099..1ad5a05322b 100644
      --- a/mozilla/xpcom/io/nsPipe3.cpp
      +++ b/mozilla/xpcom/io/nsPipe3.cpp
      @@ -413,7 +413,7 @@ nsPipe::GetReadSegment(const char *&segment, PRUint32 &segmentLen)
       void
       nsPipe::AdvanceReadCursor(PRUint32 bytesRead)
       {
      -    NS_ASSERTION(bytesRead, "dont call if no bytes read");
      +    NS_ASSERTION(bytesRead, "don't call if no bytes read");
       
           nsPipeEvents events;
           {
      @@ -511,7 +511,7 @@ nsPipe::GetWriteSegment(char *&segment, PRUint32 &segmentLen)
       void
       nsPipe::AdvanceWriteCursor(PRUint32 bytesWritten)
       {
      -    NS_ASSERTION(bytesWritten, "dont call if no bytes written");
      +    NS_ASSERTION(bytesWritten, "don't call if no bytes written");
       
           nsPipeEvents events;
           {
      diff --git a/mozilla/xpcom/obsolete/component/nsIRegistry.idl b/mozilla/xpcom/obsolete/component/nsIRegistry.idl
      index bc9990e28ee..670dfddee70 100644
      --- a/mozilla/xpcom/obsolete/component/nsIRegistry.idl
      +++ b/mozilla/xpcom/obsolete/component/nsIRegistry.idl
      @@ -53,7 +53,7 @@ interface nsIRegistry : nsISupports
           const long ApplicationComponentRegistry = 1;
           const long ApplicationRegistry = 2;
       
      -    // Dont use this one. This for internal use only.
      +    // Don't use this one. This for internal use only.
           const long ApplicationCustomRegistry = -1;
       
           void open(in nsIFile regFile);
      @@ -159,7 +159,7 @@ interface nsIRegistryGetter : nsISupports
            *    terminating NULL and buf will be unchanged.
            *  NS_ERROR_FAILURE if an unknown error happened. state of buf and
            *    length undefined.
      -     *  various failure codes otherwise. buf and length wont be updated.
      +     *  various failure codes otherwise. buf and length won't be updated.
            */
           void getStringUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
                                        inout char buf, inout PRUint32 length);
      @@ -175,7 +175,7 @@ interface nsIRegistryGetter : nsISupports
            *    terminating NULL and buf will be unchanged.
            *  NS_ERROR_FAILURE if an unknown error happened. state of buf and
            *    length undefined.
      -     *  various other failure codes otherwise. buf and length wont be updated.
      +     *  various other failure codes otherwise. buf and length won't be updated.
            */
           void getBytesUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
                                       inout PRUint8 buf, inout PRUint32 length);
      diff --git a/mozilla/xpcom/obsolete/component/nsRegistry.cpp b/mozilla/xpcom/obsolete/component/nsRegistry.cpp
      index 41268514957..2838055f266 100644
      --- a/mozilla/xpcom/obsolete/component/nsRegistry.cpp
      +++ b/mozilla/xpcom/obsolete/component/nsRegistry.cpp
      @@ -464,7 +464,7 @@ EnsureDefaultRegistryDirectory() {
       
           /* The default registry on the unix system is $HOME/.mozilla/registry per
            * vr_findGlobalRegName(). vr_findRegFile() will create the registry file
      -     * if it doesn't exist. But it wont create directories.
      +     * if it doesn't exist. But it won't create directories.
            *
            * Hence we need to create the directory if it doesn't exist already.
            *
      @@ -472,7 +472,7 @@ EnsureDefaultRegistryDirectory() {
            * ------------------------------------------
            * The app cannot create the directory in main() as most of the registry
            * and initialization happens due to use of static variables.
      -     * And we dont want to be dependent on the order in which
      +     * And we don't want to be dependent on the order in which
            * these static stuff happen.
            *
            * Permission for the $HOME/.mozilla will be Read,Write,Execute
      diff --git a/mozilla/xpcom/obsolete/nsIRegistry.idl b/mozilla/xpcom/obsolete/nsIRegistry.idl
      index bc9990e28ee..670dfddee70 100644
      --- a/mozilla/xpcom/obsolete/nsIRegistry.idl
      +++ b/mozilla/xpcom/obsolete/nsIRegistry.idl
      @@ -53,7 +53,7 @@ interface nsIRegistry : nsISupports
           const long ApplicationComponentRegistry = 1;
           const long ApplicationRegistry = 2;
       
      -    // Dont use this one. This for internal use only.
      +    // Don't use this one. This for internal use only.
           const long ApplicationCustomRegistry = -1;
       
           void open(in nsIFile regFile);
      @@ -159,7 +159,7 @@ interface nsIRegistryGetter : nsISupports
            *    terminating NULL and buf will be unchanged.
            *  NS_ERROR_FAILURE if an unknown error happened. state of buf and
            *    length undefined.
      -     *  various failure codes otherwise. buf and length wont be updated.
      +     *  various failure codes otherwise. buf and length won't be updated.
            */
           void getStringUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
                                        inout char buf, inout PRUint32 length);
      @@ -175,7 +175,7 @@ interface nsIRegistryGetter : nsISupports
            *    terminating NULL and buf will be unchanged.
            *  NS_ERROR_FAILURE if an unknown error happened. state of buf and
            *    length undefined.
      -     *  various other failure codes otherwise. buf and length wont be updated.
      +     *  various other failure codes otherwise. buf and length won't be updated.
            */
           void getBytesUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
                                       inout PRUint8 buf, inout PRUint32 length);
      diff --git a/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp b/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp
      index 0460de2ac33..769a973fb7e 100644
      --- a/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp
      +++ b/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp
      @@ -78,7 +78,7 @@ nsProxyEventClass::GetNewOrUsedClass(REFNSIID aIID)
           nsProxyObjectManager *manager = nsProxyObjectManager::GetInstance();
           if (manager == nsnull) return nsnull;
       	
      -	// dont need to lock the map, because this is only called
      +	// don't need to lock the map, because this is only called
       	// by nsProxyEventClass::GetNewOrUsed which locks it for us.
       
       	nsHashtable *iidToClassMap =  manager->GetIIDToProxyClassMap();
      @@ -169,7 +169,7 @@ nsProxyEventClass::nsProxyEventClass(REFNSIID aIID, nsIInterfaceInfo* aInfo)
       
           nsProxyObjectManager *manager = nsProxyObjectManager::GetInstance();
           if (manager == nsnull) return;
      -	// dont need to lock the map, because this is only called
      +	// don't need to lock the map, because this is only called
       	// by GetNewOrUsed which locks it for us.
       
       	nsHashtable *iidToClassMap =  manager->GetIIDToProxyClassMap();
      diff --git a/mozilla/xpcom/sample/nsSampleModule.cpp b/mozilla/xpcom/sample/nsSampleModule.cpp
      index f02b9a5c1d4..2ec63359cc5 100644
      --- a/mozilla/xpcom/sample/nsSampleModule.cpp
      +++ b/mozilla/xpcom/sample/nsSampleModule.cpp
      @@ -80,10 +80,10 @@ static NS_METHOD nsSampleRegistrationProc(nsIComponentManager *aCompMgr,
       {
           // Do any registration specific activity like adding yourself to a
           // category. The Generic Module will take care of registering your
      -    // component with xpcom. You dont need to do that. Only any component
      +    // component with xpcom. You don't need to do that. Only any component
           // specific additional activity needs to be done here.
       
      -    // This functions is optional. If you dont need it, dont add it to the structure.
      +    // This functions is optional. If you don't need it, don't add it to the structure.
       
           return NS_OK;
       }
      @@ -95,10 +95,10 @@ static NS_METHOD nsSampleUnregistrationProc(nsIComponentManager *aCompMgr,
       {
           // Undo any component specific registration like adding yourself to a
           // category here. The Generic Module will take care of unregistering your
      -    // component from xpcom. You dont need to do that. Only any component
      +    // component from xpcom. You don't need to do that. Only any component
           // specific additional activity needs to be done here.
       
      -    // This functions is optional. If you dont need it, dont add it to the structure.
      +    // This functions is optional. If you don't need it, don't add it to the structure.
       
           // Return value is not used from this function.
           return NS_OK;
      @@ -110,8 +110,8 @@ NS_DECL_CLASSINFO(nsSampleImpl)
       static const nsModuleComponentInfo components[] =
       {
         { "Sample Component", NS_SAMPLE_CID, NS_SAMPLE_CONTRACTID, nsSampleImplConstructor,
      -    nsSampleRegistrationProc /* NULL if you dont need one */,
      -    nsSampleUnregistrationProc /* NULL if you dont need one */,
      +    nsSampleRegistrationProc /* NULL if you don't need one */,
      +    nsSampleUnregistrationProc /* NULL if you don't need one */,
           NULL /* no factory destructor */,
           NS_CI_INTERFACE_GETTER_NAME(nsSampleImpl),
           NULL /* no language helper */,
      diff --git a/mozilla/xpcom/tests/windows/nsStringTest.h b/mozilla/xpcom/tests/windows/nsStringTest.h
      index 034c57468b9..723f9a1cd33 100644
      --- a/mozilla/xpcom/tests/windows/nsStringTest.h
      +++ b/mozilla/xpcom/tests/windows/nsStringTest.h
      @@ -1074,7 +1074,7 @@ int CStringTester::TestDelete(){
       
           //let's try some whacky string deleting calls
         {
      -    const char* pbuf = "whats up doc?";
      +    const char* pbuf = "what's up doc?";
       
           nsCString s1(pbuf);
           s1.Cut(3,20); //try deleting more chars than actual length of pbuf
      @@ -1085,7 +1085,7 @@ int CStringTester::TestDelete(){
           NS_ASSERTION(s1==pbuf,"Cut error");
       
           s1=pbuf;
      -    s1.Cut(3,2);
      +    s1.Cut(3,3);
           NS_ASSERTION(s1=="wha up doc?","Cut error");
       
         }
      diff --git a/mozilla/xpfe/bootstrap/init.d/S80calendar_fix_permissions_bug_230617 b/mozilla/xpfe/bootstrap/init.d/S80calendar_fix_permissions_bug_230617
      index 8fdc6f91622..4cf2c75e3c2 100644
      --- a/mozilla/xpfe/bootstrap/init.d/S80calendar_fix_permissions_bug_230617
      +++ b/mozilla/xpfe/bootstrap/init.d/S80calendar_fix_permissions_bug_230617
      @@ -15,7 +15,7 @@ if [ ${MOZ_PIS_API} -lt 2 ] ; then
           exit 1
       fi
       
      -# We run in a seperate process so we are allows to use single-letter
      +# We run in a separate process so we are allows to use single-letter
       # shell vars (see mozilla/xpfe/bootstrap/init.d/README)
       for i in "${HOME}/${MOZ_PIS_USER_DIR}"/*/*.slt/Calendar ; do
           if [ -d "${i}" ] ; then
      diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp
      index 122c337425c..606809acc49 100644
      --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp
      +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp
      @@ -2334,7 +2334,7 @@ NS_IMETHODIMP
       nsNativeAppSupportOS2::StartServerMode() {
       
           if (mShouldShowUI) {
      -        // We dont have to anything anymore. The native UI
      +        // We don't have to anything anymore. The native UI
               // will create the window
               return NS_OK;
           } else {
      @@ -2349,7 +2349,7 @@ nsNativeAppSupportOS2::StartServerMode() {
               }
           }
       
      -    // Since native UI wont create any window, we create a hidden window
      +    // Since native UI won't create any window, we create a hidden window
           // so thing work alright.
       
           // Create some of the objects we'll need.
      diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
      index 884ce67dc03..85555e66e59 100644
      --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
      +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
      @@ -2549,7 +2549,7 @@ nsNativeAppSupportWin::StartServerMode() {
           SetupSysTrayIcon();
       
           if (mShouldShowUI) {
      -        // We dont have to anything anymore. The native UI
      +        // We don't have to anything anymore. The native UI
               // will create the window
               return NS_OK;
           } else {
      @@ -2564,7 +2564,7 @@ nsNativeAppSupportWin::StartServerMode() {
               }
           }
       
      -    // Since native UI wont create any window, we create a hidden window
      +    // Since native UI won't create any window, we create a hidden window
           // so thing work alright.
       
           // Create some of the objects we'll need.
      diff --git a/mozilla/xpfe/components/prefwindow/resources/content/mac/platformPrefOverlay.xul b/mozilla/xpfe/components/prefwindow/resources/content/mac/platformPrefOverlay.xul
      index b934ea82436..f74de170dbc 100644
      --- a/mozilla/xpfe/components/prefwindow/resources/content/mac/platformPrefOverlay.xul
      +++ b/mozilla/xpfe/components/prefwindow/resources/content/mac/platformPrefOverlay.xul
      @@ -41,7 +41,7 @@
       
         
      -  
                
      diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
      index 9c45d9ae830..db79fd48df9 100755
      --- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
      +++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
      @@ -960,7 +960,7 @@ InternetSearchDataSource::Init()
       
       	gEngineListBuilt = PR_FALSE;
       
      -	// Register as a profile change obsevrer
      +	// Register as a profile change observer
         nsCOMPtr observerService = 
                  do_GetService("@mozilla.org/observer-service;1", &rv);
         if (observerService) {
      diff --git a/mozilla/xpinstall/packager/build/win/mozilla/config.it b/mozilla/xpinstall/packager/build/win/mozilla/config.it
      index 2ec42a3c6cf..498c34754c7 100644
      --- a/mozilla/xpinstall/packager/build/win/mozilla/config.it
      +++ b/mozilla/xpinstall/packager/build/win/mozilla/config.it
      @@ -256,7 +256,7 @@ Title=$ProductName$ Setup - Windows Integration
       Message0=Check the options you would like Setup to perform.
       Message1=These settings allow you to set default Internet preferences for browsing and searching.  They affect browsers installed on your machine, including Mozilla, Netscape and Microsoft Internet Explorer.
       
      -; Only a maximum of 4 "Windows Integration-Item"s are allowded.  Each Item
      +; Only a maximum of 4 "Windows Integration-Item"s are allowed.  Each Item
       ; shows up as a checkbox in the Windows Integration dialog.
       [Windows Integration-Item0]
       CheckBoxState=FALSE
      diff --git a/mozilla/xpinstall/packager/windows/config.it b/mozilla/xpinstall/packager/windows/config.it
      index 9ae729935a1..593425e1fd8 100644
      --- a/mozilla/xpinstall/packager/windows/config.it
      +++ b/mozilla/xpinstall/packager/windows/config.it
      @@ -315,7 +315,7 @@ Title=$ProductName$ Setup - Windows Integration
       Message0=Check the options you would like Setup to perform.
       Message1=These settings allow you to set default Internet preferences for browsing and searching.  They affect browsers installed on your machine, including SeaMonkey, Mozilla, Netscape and Microsoft Internet Explorer.
       
      -; Only a maximum of 4 "Windows Integration-Item"s are allowded.  Each Item
      +; Only a maximum of 4 "Windows Integration-Item"s are allowed.  Each Item
       ; shows up as a checkbox in the Windows Integration dialog.
       [Windows Integration-Item0]
       CheckBoxState=FALSE
      diff --git a/mozilla/xpinstall/wizard/windows/uninstall/dialogs.c b/mozilla/xpinstall/wizard/windows/uninstall/dialogs.c
      index b441c6850bf..1439270b4b7 100644
      --- a/mozilla/xpinstall/wizard/windows/uninstall/dialogs.c
      +++ b/mozilla/xpinstall/wizard/windows/uninstall/dialogs.c
      @@ -74,7 +74,7 @@ void ParseDefaultsInfo()
         int  iIndex;
         DWORD dwIconsVisible;
       
      -  // If szAppPath is a null sting, i.e. we cannot find where the app has been installed:
      +  // If szAppPath is a null string, i.e. we cannot find where the app has been installed:
         //   - HIDEICONS will still remove the shortcuts but
         //   - SHOWICONS will do nothing because we won't be able to find the shortcuts to display.
         ParsePath(ugUninstall.szAppPath, szStorageDir, MAX_BUF, PP_PATH_ONLY);