Fix more iterator SCL macro language (MicrosoftDocs#119)

* Fix more iterator SCL macro language

* Missed a change.

Author: Colin Robertson

docs/porting/visual-cpp-change-history-2003-2015.md

@@ -2733,7 +2733,7 @@ When you upgrade to a new version of the Visual C++ compiler, you might encounte
   
 -   Support for Windows 95, Windows 98, Windows Millennium Edition, and Windows NT 4.0 has been removed.  
   
--   When compiling in debug mode with _HAS_ITERATOR_DEBUGGING defined, an application will now assert when an iterator attempts to increment or decrement past the bounds of the underlying container.  
+-   When compiling in debug mode with _HAS_ITERATOR_DEBUGGING defined (superseded by [_ITERATOR_DEBUG_LEVEL](../standard-library/iterator-debug-level.md) after Visual Studio 2010), an application will now assert when an iterator attempts to increment or decrement past the bounds of the underlying container.  
   
 -   The member variable c of the stack Class is now declared protected. Previously, this member variable was declared public.  
   
@@ -2819,7 +2819,7 @@ When you upgrade to a new version of the Visual C++ compiler, you might encounte
   
 -   When calling valarray::resize(), the contents of the valarray will be lost and will be replaced by default values. The resize() method is intended to reinitialize the valarray rather than grow it dynamically like a vector.  
   
--   Debug Iterators: Applications built with a debug version of the C-Runtime Library and which use iterators incorrectly might begin to see asserts at runtime. To disable these asserts, you must define _HAS_ITERATOR_DEBUGGING to 0. For more information, see [Debug Iterator Support](../standard-library/debug-iterator-support.md)  
+-   Debug Iterators: Applications built with a debug version of the C-Runtime Library and which use iterators incorrectly might begin to see asserts at runtime. To disable these asserts, you must define _HAS_ITERATOR_DEBUGGING (superseded by [_ITERATOR_DEBUG_LEVEL](../standard-library/iterator-debug-level.md) after Visual Studio 2010) to 0. For more information, see [Debug Iterator Support](../standard-library/debug-iterator-support.md)  
   
 ## Visual C++ .NET 2003 Breaking Changes  
   

docs/standard-library/debug-iterator-support.md

@@ -8,8 +8,6 @@ ms.technology:
   - "devlang-cpp"
 ms.tgt_pltfrm: ""
 ms.topic: "article"
-f1_keywords: 
-  - "_HAS_ITERATOR_DEBUGGING symbol"
 dev_langs: 
   - "C++"
 helpviewer_keywords: 
@@ -42,19 +40,20 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # Debug Iterator Support
-The Visual C++ run-time library detects incorrect iterator use, and asserts and displays a dialog box at run time. To enable debug iterator support, you must use a debug version of a C run-time library to compile your program. For more information, see [CRT Library Features](../c-runtime-library/crt-library-features.md). For information about how to use iterators, see [Checked Iterators](../standard-library/checked-iterators.md).  
+The Visual C++ run-time library detects incorrect iterator use, and asserts and displays a dialog box at run time. To enable debug iterator support, you must use debug versions of the C++ Standard Library and C Runtime Library to compile your program. For more information, see [CRT Library Features](../c-runtime-library/crt-library-features.md). For information about how to use checked iterators, see [Checked Iterators](../standard-library/checked-iterators.md).  
 
  The C++ standard describes how member functions might cause iterators to a container to become invalid. Two examples are:  
 
 -   Erasing an element from a container causes iterators to the element to become invalid.  
 
--   Increasing the size of a [vector](../standard-library/vector.md) (push or insert) causes iterators into the `vector` to become invalid.  
+-   Increasing the size of a [vector](../standard-library/vector.md) by using push or insert causes iterators into the `vector` to become invalid.  
 
 ## Example  
- If you compile the following program in debug mode, at run time it will assert and terminate.  
+If you compile this sample program in debug mode, at run time it asserts and terminates.  
 
 ```cpp  
-/* compile with /EHsc /MDd */  
+// iterator_debugging_0.cpp  
+// compile by using /EHsc /MDd  
 #include <vector>  
 #include <iostream>  
 
@@ -71,24 +70,21 @@ int main() {
    std::vector<int>::iterator j = v.end();  
    --j;  
 
-   std::cout<<*j<<'\n';  
+   std::cout << *j << '\n';  
 
    v.insert(i,25);   
 
-   std::cout<<*j<<'\n'; // Using an old iterator after an insert  
+   std::cout << *j << '\n'; // Using an old iterator after an insert  
 }  
 ```  
 
 ## Example  
- You can use the symbol [_HAS_ITERATOR_DEBUGGING](../standard-library/has-iterator-debugging.md) to turn off the iterator debugging feature in a debug build. The following program does not assert, but still triggers undefined behavior.  
-  
-> [!IMPORTANT]
->  Use `_ITERATOR_DEBUG_LEVEL` to control `_HAS_ITERATOR_DEBUGGING`. For more information, see [_ITERATOR_DEBUG_LEVEL](../standard-library/iterator-debug-level.md).  
+You can use the preprocessor macro [_ITERATOR_DEBUG_LEVEL](../standard-library/iterator-debug-level.md) to turn off the iterator debugging feature in a debug build. This program does not assert, but still triggers undefined behavior.  
 
 ```cpp  
-// iterator_debugging.cpp  
-// compile with: /EHsc /MDd  
-#define _HAS_ITERATOR_DEBUGGING 0  
+// iterator_debugging_1.cpp  
+// compile by using: /EHsc /MDd  
+#define _ITERATOR_DEBUG_LEVEL 0  
 #include <vector>  
 #include <iostream>  
 
@@ -105,11 +101,11 @@ int main() {
    std::vector<int>::iterator j = v.end();  
    --j;  
 
-   std::cout<<*j<<'\n';  
+   std::cout << *j << '\n';  
 
    v.insert(i,25);   
 
-   std::cout<<*j<<'\n'; // Using an old iterator after an insert  
+   std::cout << *j << '\n'; // Using an old iterator after an insert  
 }  
 ```  
 
@@ -119,12 +115,14 @@ int main() {
 ```  
 
 ## Example  
- An assert also occurs if you attempt to use an iterator before it is initialized, as shown here:  
+An assert also occurs if you attempt to use an iterator before it is initialized, as shown here:  
 
 ```cpp  
-/* compile with /EHsc /MDd */  
+// iterator_debugging_2.cpp  
+// compile by using: /EHsc /MDd  
 #include <string>  
 using namespace std;  
+  
 int main() {  
    string::iterator i1, i2;  
    if (i1 == i2)  
@@ -133,10 +131,11 @@ int main() {
 ```  
 
 ## Example  
- The following code example causes an assertion because the two iterators to the [for_each](../standard-library/algorithm-functions.md#for_each) algorithm are incompatible. Algorithms check to determine whether the iterators that are supplied to them are referencing the same container.  
+The following code example causes an assertion because the two iterators to the [for_each](../standard-library/algorithm-functions.md#for_each) algorithm are incompatible. Algorithms check to determine whether the iterators that are supplied to them reference the same container.  
 
 ```cpp  
-/* compile with /EHsc /MDd */  
+// iterator_debugging_3.cpp  
+// compile by using /EHsc /MDd  
 #include <algorithm>  
 #include <vector>  
 using namespace std;  
@@ -152,20 +151,20 @@ int main()
     v2.push_back(10);  
     v2.push_back(20);  
 
-    // The next line will assert because v1 and v2 are  
+    // The next line asserts because v1 and v2 are  
     // incompatible.  
     for_each(v1.begin(), v2.end(), [] (int& elem) { elem *= 2; } );  
 }  
 ```  
 
- Notice that this example uses the lambda expression `[] (int& elem) { elem *= 2; }` instead of a functor. Although this choice has no bearing on the assert failure—a similar functor would cause the same failure—lambdas are a very useful way to accomplish compact function object tasks. For more information about lambda expressions, see [Lambda Expressions](../cpp/lambda-expressions-in-cpp.md).  
+Notice that this example uses the lambda expression `[] (int& elem) { elem *= 2; }` instead of a functor. Although this choice has no bearing on the assert failure—a similar functor would cause the same failure—lambdas are a very useful way to accomplish compact function object tasks. For more information about lambda expressions, see [Lambda Expressions](../cpp/lambda-expressions-in-cpp.md).  
 
 ## Example  
- Debug iterator checking also causes an iterator variable that's declared in a `for` loop to be out of scope when the `for` loop scope ends.  
+Debug iterator checks also cause an iterator variable that's declared in a `for` loop to be out of scope when the `for` loop scope ends.  
 
 ```cpp  
-// debug_iterator.cpp  
-// compile with: /EHsc /MDd  
+// iterator_debugging_4.cpp  
+// compile by using: /EHsc /MDd  
 #include <vector>  
 #include <iostream>  
 int main() {  
@@ -175,20 +174,21 @@ int main() {
    v.push_back(15);  
    v.push_back(20);  
 
-   for (std::vector<int>::iterator i = v.begin() ; i != v.end(); ++i)  
-   ;  
+   for (std::vector<int>::iterator i = v.begin(); i != v.end(); ++i)  
+      ;   // do nothing  
    --i;   // C2065  
 }  
 ```  
 
 ## Example  
- Debug iterators have non-trivial destructors. If a destructor does not run, for whatever reason, access violations and data corruption might occur. Consider this example:  
+Debug iterators have non-trivial destructors. If a destructor does not run, for whatever reason, access violations and data corruption might occur. Consider this example:  
 
 ```cpp  
-/* compile with: /EHsc /MDd */  
+// iterator_debugging_5.cpp  
+// compile by using: /EHsc /MDd  
 #include <vector>  
 struct base {  
-   // FIX: uncomment the next line  
+   // TO FIX: uncomment the next line  
    // virtual ~base() {}  
 };  
 
@@ -207,7 +207,7 @@ int main() {
 ```  
   
 ## See Also  
- [C++ Standard Library Overview](../standard-library/cpp-standard-library-overview.md)
+[C++ Standard Library Overview](../standard-library/cpp-standard-library-overview.md)
 
 
 

docs/standard-library/has-iterator-debugging.md

@@ -34,22 +34,23 @@ translation.priority.ht:
   - "zh-cn"
   - "zh-tw"
 ---
-# _HAS_ITERATOR_DEBUGGING
-Defines whether the iterator debugging feature is enabled in a debug build. By default, iterator debugging is enabled in Debug builds and disabled in Retail builds. For more information, see [Debug Iterator Support](../standard-library/debug-iterator-support.md).  
+# _HAS_ITERATOR_DEBUGGING  
+  
+Superseded by [_ITERATOR_DEBUG_LEVEL](../standard-library/iterator-debug-level.md), this macro defines whether the iterator debugging feature is enabled in a debug build. By default, iterator debugging is enabled in Debug builds and disabled in Retail builds. For more information, see [Debug Iterator Support](../standard-library/debug-iterator-support.md).  
 
 > [!IMPORTANT]
 > Direct use of the `_HAS_ITERATOR_DEBUGGING` macro is deprecated. Instead, use `_ITERATOR_DEBUG_LEVEL` to control iterator debug settings. For more information, see [_ITERATOR_DEBUG_LEVEL](../standard-library/iterator-debug-level.md).  
   
 ## Remarks  
-To enable iterator debugging in debug builds, set `_ITERATOR_DEBUG_LEVEL` to 2. This implies a `_HAS_ITERATOR_DEBUGGING` setting of 1, or enabled:  
+To enable iterator debugging in debug builds, set `_ITERATOR_DEBUG_LEVEL` to 2. This is equivalent to a `_HAS_ITERATOR_DEBUGGING` setting of 1, or enabled:  
 
 ```  
 #define _ITERATOR_DEBUG_LEVEL 2  
 ```  
 
-`_ITERATOR_DEBUG_LEVEL` cannot be set to 2 and `_HAS_ITERATOR_DEBUGGING` cannot be set to 1 in retail builds.  
+`_ITERATOR_DEBUG_LEVEL` cannot be set to 2 (and `_HAS_ITERATOR_DEBUGGING` cannot be set to 1) in retail builds.  
 
-To disable debug iterators in debug builds, set `_ITERATOR_DEBUG_LEVEL` to 0 or 1. This implies a `_HAS_ITERATOR_DEBUGGING` setting of 0, or disabled:  
+To disable debug iterators in debug builds, set `_ITERATOR_DEBUG_LEVEL` to 0 or 1. This is equivalent to a `_HAS_ITERATOR_DEBUGGING` setting of 0, or disabled:  
 
 ```  
 #define _ITERATOR_DEBUG_LEVEL 0  

docs/standard-library/secure-scl.md

@@ -36,20 +36,20 @@ translation.priority.ht:
 ---
 # _SECURE_SCL
 
-Defines whether [Checked Iterators](../standard-library/checked-iterators.md) are enabled. By default, checked iterators are enabled in Debug builds, and disabled in Retail builds.  
+Superseded by [_ITERATOR_DEBUG_LEVEL](../standard-library/iterator-debug-level.md), this macro defines whether [Checked Iterators](../standard-library/checked-iterators.md) are enabled. By default, checked iterators are enabled in Debug builds, and disabled in Retail builds.  
 
 > [!IMPORTANT]
 > Direct use of the `_SECURE_SCL` macro is deprecated. Instead, use `_ITERATOR_DEBUG_LEVEL` to control checked iterator settings. For more information, see [_ITERATOR_DEBUG_LEVEL](../standard-library/iterator-debug-level.md).  
   
 ## Remarks  
 
-When checked iterators are enabled, unsafe iterator use causes a runtime error and the program is terminated. To enable checked iterators, set `_ITERATOR_DEBUG_LEVEL` to 1 or 2. This implies a `_SECURE_SCL` setting of 1, or enabled:  
+When checked iterators are enabled, unsafe iterator use causes a runtime error and the program is terminated. To enable checked iterators, set `_ITERATOR_DEBUG_LEVEL` to 1 or 2. This is equivalent to a `_SECURE_SCL` setting of 1, or enabled:  
 
 ```  
 #define _ITERATOR_DEBUG_LEVEL 1  
 ```  
 
-To disable checked iterators, set `_ITERATOR_DEBUG_LEVEL` to 0. This implies a `_SECURE_SCL` setting of 0, or disabled:  
+To disable checked iterators, set `_ITERATOR_DEBUG_LEVEL` to 0. This is equivalent to a `_SECURE_SCL` setting of 0, or disabled:  
 
 ```  
 #define _ITERATOR_DEBUG_LEVEL 0