diff --git a/mozilla/htmlparser/src/COtherDTD.cpp b/mozilla/htmlparser/src/COtherDTD.cpp
index eb3b2fb6893..9c8d33ff2c2 100644
--- a/mozilla/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/htmlparser/src/COtherDTD.cpp
@@ -151,10 +151,10 @@ COtherDTD::COtherDTD() : nsIDTD(), mSharedNodes(0) {
   mTokenRecycler=0;
   mParserCommand=eViewNormal;
 
-#if 0 //set this to 1 if you want strictDTD to be based on the environment setting.
-  char* theEnvString = PR_GetEnv("ENABLE_STRICT"); 
-  mEnableStrict=PRBool(theEnvString!=0);
-else
+#if 1 //set this to 1 if you want strictDTD to be based on the environment setting.
+  char* theEnvString = PR_GetEnv("MOZ_DISABLE_STRICT"); 
+  mEnableStrict=PRBool(0==theEnvString);
+#else
   mEnableStrict=PR_TRUE;
 #endif
 
diff --git a/mozilla/htmlparser/src/nsViewSourceHTML.cpp b/mozilla/htmlparser/src/nsViewSourceHTML.cpp
index 3295f9d9c2d..ab3a88b5a8f 100644
--- a/mozilla/htmlparser/src/nsViewSourceHTML.cpp
+++ b/mozilla/htmlparser/src/nsViewSourceHTML.cpp
@@ -28,7 +28,7 @@
  */
  
 
-#define ENABLE_ERROR_OUTPUT   //debug only for now...
+//#define ENABLE_ERROR_OUTPUT   //debug only for now...
 
 
 #ifdef RAPTOR_PERF_METRICS
diff --git a/mozilla/parser/htmlparser/src/COtherDTD.cpp b/mozilla/parser/htmlparser/src/COtherDTD.cpp
index eb3b2fb6893..9c8d33ff2c2 100644
--- a/mozilla/parser/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/parser/htmlparser/src/COtherDTD.cpp
@@ -151,10 +151,10 @@ COtherDTD::COtherDTD() : nsIDTD(), mSharedNodes(0) {
   mTokenRecycler=0;
   mParserCommand=eViewNormal;
 
-#if 0 //set this to 1 if you want strictDTD to be based on the environment setting.
-  char* theEnvString = PR_GetEnv("ENABLE_STRICT"); 
-  mEnableStrict=PRBool(theEnvString!=0);
-else
+#if 1 //set this to 1 if you want strictDTD to be based on the environment setting.
+  char* theEnvString = PR_GetEnv("MOZ_DISABLE_STRICT"); 
+  mEnableStrict=PRBool(0==theEnvString);
+#else
   mEnableStrict=PR_TRUE;
 #endif
 
diff --git a/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp b/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
index 3295f9d9c2d..ab3a88b5a8f 100644
--- a/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
+++ b/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
@@ -28,7 +28,7 @@
  */
  
 
-#define ENABLE_ERROR_OUTPUT   //debug only for now...
+//#define ENABLE_ERROR_OUTPUT   //debug only for now...
 
 
 #ifdef RAPTOR_PERF_METRICS