@@ -180,6 +180,16 @@
             "redirect_url": "/cpp/cloud/cloud-and-web-programming-in-visual-cpp",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/cpp/attributes2.md",
+            "redirect_url": "/cpp/cpp/attributes",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/cpp/character-sets2.md",
+            "redirect_url": "/cpp/cpp/character-sets",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/cpp/index.md",
             "redirect_url": "/cpp/cpp/cpp-language-reference",
 
@@ -36,7 +36,7 @@ Lets you specify the execution character set for your executable.
 ## Remarks  
  You can use the **/execution-charset** option to specify an execution character set. The execution character set is the encoding used for the text of your program that is input to the compilation phase after all preprocessing steps. This character set is used for the internal representation of any string or character literals in the compiled code. Set this option to specify the extended execution character set to use when your source files include characters that are not representable in the basic execution character set. You can use either the IANA or ISO character set name, or a dot (.) followed by a 3 to 5 digit decimal code page identifier to specify the character set to use. For a list of supported code page identifiers and character set names, see [Code Page Identifiers](http://msdn.microsoft.com/library/windows/desktop/dd317756).  
 
- By default, Visual Studio detects a byte-order mark to determine if the source file is in an encoded Unicode format, for example, UTF-16 or UTF-8. If no byte-order mark is found, it assumes the source file is encoded using the current user code page, unless you have specified a character set name or code page by using the **/source-charset** option or the **/utf-8** option. Visual Studio allows you to save your C++ source code by using any of several character encodings. For information about source and execution character sets, see [Character Sets](../../cpp/character-sets2.md) in the language documentation.  
+ By default, Visual Studio detects a byte-order mark to determine if the source file is in an encoded Unicode format, for example, UTF-16 or UTF-8. If no byte-order mark is found, it assumes the source file is encoded using the current user code page, unless you have specified a character set name or code page by using the **/source-charset** option or the **/utf-8** option. Visual Studio allows you to save your C++ source code by using any of several character encodings. For information about source and execution character sets, see [Character Sets](../../cpp/character-sets.md) in the language documentation.  
 
  If you want to set both the source character set and the execution character set to UTF-8, you can use the **/utf-8** compiler option as a shortcut. It is equivalent to specifying **/source-charset:utf-8 /execution-charset:utf-8** on the command line. Any of these options also enables the **/validate-charset** option by default.  
 
 
@@ -36,7 +36,7 @@ Lets you specify the source character set for your executable.
 ## Remarks  
  You can use the **/source-charset** option to specify an extended source character set to use when your source files include characters that are not represented in the basic source character set. The source character set is the encoding used to interpret the source text of your program into the internal representation used as input to the preprocessing phases before compilation. The internal representation is then converted to the execution character set to store string and character values in the executable. You can use either the IANA or ISO character set name, or a dot (.) followed by a 3 to 5 digit decimal code page identifier to specify the character set to use. For a list of supported code page identifiers and character set names, see [Code Page Identifiers](http://msdn.microsoft.com/library/windows/desktop/dd317756).  
 
- By default, Visual Studio detects a byte-order mark to determine if the source file is in an encoded Unicode format, for example, UTF-16 or UTF-8. If no byte-order mark is found, it assumes the source file is encoded using the current user code page, unless you specify a character set name or code page by using the **/source-charset** option. Visual Studio allows you to save your C++ source code by using any of several character encodings. For more information about source and execution character sets, see [Character Sets](../../cpp/character-sets2.md) in the language documentation.  
+ By default, Visual Studio detects a byte-order mark to determine if the source file is in an encoded Unicode format, for example, UTF-16 or UTF-8. If no byte-order mark is found, it assumes the source file is encoded using the current user code page, unless you specify a character set name or code page by using the **/source-charset** option. Visual Studio allows you to save your C++ source code by using any of several character encodings. For more information about source and execution character sets, see [Character Sets](../../cpp/character-sets.md) in the language documentation.  
 
  The source character set you supply must map the 7-bit ASCII characters to the same code points in your character set, or many compilation errors are likely to follow. Your source character set must also be mappable to the extended Unicode character set encodable by UTF-8. Characters that are not encodable in UTF-8 are represented by an implementation-specific substitute. The Microsoft compiler uses a question mark for these characters.  
 
 
@@ -29,7 +29,7 @@ Specifies both the source character set and the execution character set as UTF-8
 ## Remarks  
  You can use the **/utf-8** option to specify both the source and execution character sets as encoded by using UTF-8. It is equivalent to specifying **/source-charset:utf-8 /execution-charset:utf-8** on the command line. Any of these options also enables the **/validate-charset** option by default. For a list of supported code page identifiers and character set names, see [Code Page Identifiers](http://msdn.microsoft.com/library/windows/desktop/dd317756).  
 
- By default, Visual Studio detects a byte-order mark to determine if the source file is in an encoded Unicode format, for example, UTF-16 or UTF-8. If no byte-order mark is found, it assumes the source file is encoded using the current user code page, unless you have specified a code page by using **/utf-8** or the **/source-charset** option. Visual Studio allows you to save your C++ source code by using any of several character encodings. For information about source and execution character sets, see [Character Sets](../../cpp/character-sets2.md) in the language documentation.  
+ By default, Visual Studio detects a byte-order mark to determine if the source file is in an encoded Unicode format, for example, UTF-16 or UTF-8. If no byte-order mark is found, it assumes the source file is encoded using the current user code page, unless you have specified a code page by using **/utf-8** or the **/source-charset** option. Visual Studio allows you to save your C++ source code by using any of several character encodings. For information about source and execution character sets, see [Character Sets](../../cpp/character-sets.md) in the language documentation.  
 
 ### To set this compiler option in the Visual Studio development environment  
 
 
@@ -29,7 +29,7 @@ Validates that the source file text contains only characters representable as UT
 ## Remarks  
  You can use the **/validate-charset** option to validate that the source code contains only characters that can be represented in both the source character set and the execution character set. This check is enabled automatically when you specify **/source-charset**, **/execution-charset**, or **/utf-8** compiler options. You can explicitly disable this check by specifying the **/validate-charset-** option.  
 
- By default, Visual Studio detects a byte-order mark to determine if the source file is in an encoded Unicode format, for example, UTF-16 or UTF-8. If no byte-order mark is found, it assumes the source file is encoded using the current user code page, unless you have specified a code page by using **/utf-8** or the **/source-charset** option. Visual Studio allows you to save your C++ source code by using any of several character encodings. For information about source and execution character sets, see [Character Sets](../../cpp/character-sets2.md) in the language documentation. For a list of supported code page identifiers and character set names, see [Code Page Identifiers](http://msdn.microsoft.com/library/windows/desktop/dd317756).  
+ By default, Visual Studio detects a byte-order mark to determine if the source file is in an encoded Unicode format, for example, UTF-16 or UTF-8. If no byte-order mark is found, it assumes the source file is encoded using the current user code page, unless you have specified a code page by using **/utf-8** or the **/source-charset** option. Visual Studio allows you to save your C++ source code by using any of several character encodings. For information about source and execution character sets, see [Character Sets](../../cpp/character-sets.md) in the language documentation. For a list of supported code page identifiers and character set names, see [Code Page Identifiers](http://msdn.microsoft.com/library/windows/desktop/dd317756).  
 
  Visual Studio uses UTF-8 as the internal character encoding during conversion between the source character set and the execution character set. If a character in the source file cannot be represented in the execution character set, the UTF-8 conversion substitutes a question mark '?' character. The **/validate-charset** option causes the compilation to report a warning if this occurs.  
 
 
@@ -65,7 +65,7 @@ New attributes to silence warnings when an entity is not used, or to create a wa
 
 ### Using attribute namespaces without repetition
 
-New syntax to enable only a single namespace identifier in an attribute list. For more information, see [Attributes in C++](cpp/attributes2.md).
+New syntax to enable only a single namespace identifier in an attribute list. For more information, see [Attributes in C++](cpp/attributes.md).
 
 ### Structured bindings
 
 
@@ -21,7 +21,7 @@
 ### [Portability At ABI Boundaries (Modern C++)](portability-at-abi-boundaries-modern-cpp.md)
 ## [Lexical Conventions](lexical-conventions.md)
 ### [Overview of File Translation](overview-of-file-translation.md)
-### [Character Sets2](character-sets2.md)
+### [Character Sets](character-sets.md)
 ### [Tokens](tokens-cpp.md)
 ### [Comments](comments-cpp.md)
 ### [Identifiers](identifiers-cpp.md)
@@ -46,7 +46,7 @@
 #### [volatile](volatile-cpp.md)
 #### [auto](auto-cpp.md)
 #### [decltype](decltype-cpp.md)
-#### [Attributes](attributes2.md)
+#### [Attributes](attributes.md)
 ### [Scope (Visual C++)](scope-visual-cpp.md)
 ### [Program and Linkage](program-and-linkage-cpp.md)
 #### [Types of Linkage](types-of-linkage.md)
 
@@ -1,7 +1,7 @@
 ---
-title: "Character Sets2 | Microsoft Docs"
+title: "Character Sets | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "04/12/2018"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology: ["cpp-language"]
 
@@ -18,7 +18,7 @@ manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # deprecated (C++)
-This topic is about the Microsoft-specific deprecated declspec declaration. For information about the C++14 `[[deprecated]]` attribute, and guidance on when to use that attribute vs. the Microsoft-specific declspec or pragma, see [C++ Standard Attributes](attributes2.md).
+This topic is about the Microsoft-specific deprecated declspec declaration. For information about the C++14 `[[deprecated]]` attribute, and guidance on when to use that attribute vs. the Microsoft-specific declspec or pragma, see [C++ Standard Attributes](attributes.md).
 
  With the exceptions noted below, the **deprecated** declaration offers the same functionality as the [deprecated](../preprocessor/deprecated-c-cpp.md) pragma:  
 
@@ -28,7 +28,7 @@ This topic is about the Microsoft-specific deprecated declspec declaration. For
 
 -   Macros can only be marked as deprecated with the **deprecated** pragma.  
 
- If the compiler encounters the use of a deprecated identifier or the standard [`[[deprecated]]`](attributes2.md) attribute, a [C4996](../error-messages/compiler-warnings/compiler-warning-level-3-c4996.md) warning is thrown.  
+ If the compiler encounters the use of a deprecated identifier or the standard [`[[deprecated]]`](attributes.md) attribute, a [C4996](../error-messages/compiler-warnings/compiler-warning-level-3-c4996.md) warning is thrown.  
 
 ## Example  
  The following sample shows how to mark functions as deprecated, and how to specify a message that will be displayed at compile time, when the deprecated function is used.