Merge pull request #1985 from MicrosoftDocs/master

5/8 AM Publish

Author: Taojunshen

.openpublishing.redirection.json

@@ -885,6 +885,16 @@
             "redirect_url": "/visualstudio/ide/class-designer/designing-and-viewing-classes-and-types",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/ide/class-designer/viewing-types-and-relationships.md",
+            "redirect_url": "/visualstudio/ide/class-designer/designing-and-viewing-classes-and-types",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/ide/class-designer/working-with-class-diagrams.md",
+            "redirect_url": "/visualstudio/ide/class-designer/designing-and-viewing-classes-and-types",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/ide/connected-environment.md",
             "redirect_url": "/visualstudio/ide/signing-in-to-visual-studio",
@@ -2065,6 +2075,11 @@
             "redirect_url": "/visualstudio/vsto/office-and-sharepoint-development-in-visual-studio",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/vsto/you-must-explicitly-enable-access-to-the-microsoft-office-visual-basic-for-applications-project-system-before-you-can-create-or-open-a-----for-the-microsoft-office-system-project.md",
+            "redirect_url": "/visualstudio/vsto/enable-access-to-vba-to-create-or-open-a-visual-studio-tools-for-office-system-project",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/welcome-to-visual-studio.md",
             "redirect_url": "/visualstudio/ide/visual-studio-ide",

docs/TOC.md

@@ -180,7 +180,34 @@
 #### [Track Your Code by Customizing the Scrollbar](ide/how-to-track-your-code-by-customizing-the-scrollbar.md)
 #### [View the Structure of Code](ide/viewing-the-structure-of-code.md)
 ##### [Class View and Object Browser Icons](ide/class-view-and-object-browser-icons.md)
-##### [Design and View Classes and Types](ide/class-designer/TOC.md)
+##### [Design classes in Class Designer](ide/class-designer/designing-and-viewing-classes-and-types.md)
+###### [Add class diagrams to projects](ide/class-designer/how-to-add-class-diagrams-to-projects.md)
+###### [Customize class diagrams](ide/class-designer/how-to-customize-class-diagrams.md)
+###### [Copy class diagram elements to a Microsoft Office document](ide/class-designer/how-to-copy-class-diagram-elements-to-a-microsoft-office-document.md)
+###### [Export class diagrams as images](ide/class-designer/how-to-export-class-diagrams-as-images.md)
+###### [Print class diagrams](ide/class-designer/how-to-print-class-diagrams.md)
+###### [Add comments to class diagrams](ide/class-designer/how-to-add-comments-to-class-diagrams.md)
+###### Create classes and types
+####### [Create types](ide/class-designer/how-to-create-types.md)
+####### [Create inheritance between types](ide/class-designer/how-to-create-inheritance-between-types.md)
+####### [Create associations between types](ide/class-designer/how-to-create-associations-between-types.md)
+####### [Visualize a collection association](ide/class-designer/how-to-visualize-a-collection-association.md)
+####### [Create and configure type members](ide/class-designer/creating-and-configuring-type-members.md)
+###### View types and relationships
+####### [View existing types](ide/class-designer/how-to-view-existing-types.md)
+####### [View inheritance between types](ide/class-designer/how-to-view-inheritance-between-types.md)
+####### [Member notation and association notation](ide/class-designer/how-to-change-between-member-notation-and-association-notation.md)
+###### [Refactor classes and types](ide/class-designer/refactoring-classes-and-types.md)
+####### [Implement an interface](ide/class-designer/how-to-implement-an-interface.md)
+####### [Split a class into partial classes](ide/class-designer/how-to-split-a-class-into-partial-classes.md)
+####### [Create a nullable type](ide/class-designer/how-to-create-a-nullable-type.md)
+###### [Work with Visual C++ code](ide/class-designer/working-with-visual-cpp-code.md)
+####### [C++ classes](ide/class-designer/visual-cpp-classes.md)
+####### [C++ structures](ide/class-designer/visual-cpp-structures.md)
+####### [C++ enumerations](ide/class-designer/visual-cpp-enumerations.md)
+####### [C++ typedefs](ide/class-designer/visual-cpp-typedefs.md)
+###### [Keyboard and mouse shortcuts](ide/class-designer/keyboard-and-mouse-shortcuts-in-the-class-diagram-and-class-details-window.md)
+###### [Class Designer errors](ide/class-designer/additional-information-about-errors.md)
 #### [Set Bookmarks in Code](ide/setting-bookmarks-in-code.md)
 #### [Use the Task List](ide/using-the-task-list.md)
 #### [Find code changes and other history with CodeLens](ide/find-code-changes-and-other-history-with-codelens.md)

docs/ide/class-designer/TOC.md

@@ -21,8 +21,8 @@ helpviewer_keywords:
   - "errors, class diagrams"
   - "errors, Class Designer"
   - "error messages, Class Designer"
-  - "Class Designer [Visual Studio], errors"
   - "error messages, class diagrams"
+  - "Class Designer [Visual Studio], errors"
   - "class diagrams, errors"
 ms.assetid: 79d70e70-704c-4255-ab68-c10d6949470e
 author: gewarren
@@ -31,17 +31,17 @@ manager: douge
 ms.workload:
   - "multiple"
 ---
-# Additional information about Class Designer errors
+# Class Designer errors
 
-**Class Designer** does not track the location of your source files, so modifying your project structure or moving source files in the project can cause **Class Designer** to lose track of the type (especially the source type of a typedef, base classes, or association types). You might receive an error such as **Class Designer is unable to display this type**. If you do, drag the modified or relocated source code to the class diagram again to redisplay it.
+**Class Designer** does not track the location of your source files, so modifying your project structure or moving source files in the project can cause **Class Designer** to lose track of the type, For example, it's common to modify the source type of a typedef, base classes, and association types. You might receive an error such as **Class Designer is unable to display this type**. To resolve the error, drag the modified or relocated source code to the class diagram again to display it.
 
 ## Resources
 
 You can find assistance with other errors and warnings in the following resources:
 
-- [Working with Visual C++ Code](working-with-visual-cpp-code.md) includes troubleshooting information about displaying C++ in a class diagram.
-- [Visual Studio Class Designer forum](http://go.microsoft.com/fwlink/?LinkId=160754) provides a forum for questions about the **Class Designer**.
+- [Work with Visual C++ code](working-with-visual-cpp-code.md) includes troubleshooting information about displaying C++ in a class diagram.
+- [Visual Studio Class Designer forum](http://go.microsoft.com/fwlink/?LinkId=160754) provides a forum for questions about **Class Designer**.
 
 ## See also
 
-- [Designing and viewing classes and types](designing-and-viewing-classes-and-types.md)
+- [Design and view classes and types](designing-and-viewing-classes-and-types.md)