diff --git a/docs/cpp/cpp-debug.md b/docs/cpp/Debugging/cpp-debug.md similarity index 100% rename from docs/cpp/cpp-debug.md rename to docs/cpp/Debugging/cpp-debug.md diff --git a/docs/cpp/launch-json-reference.md b/docs/cpp/Debugging/launch-json-reference.md similarity index 100% rename from docs/cpp/launch-json-reference.md rename to docs/cpp/Debugging/launch-json-reference.md diff --git a/docs/cpp/build-with-cmake.md b/docs/cpp/cmake/build-with-cmake.md similarity index 100% rename from docs/cpp/build-with-cmake.md rename to docs/cpp/cmake/build-with-cmake.md diff --git a/docs/cpp/cmake-quickstart.md b/docs/cpp/cmake/cmake-quickstart.md similarity index 100% rename from docs/cpp/cmake-quickstart.md rename to docs/cpp/cmake/cmake-quickstart.md diff --git a/docs/cpp/configure-intellisense-crosscompilation.md b/docs/cpp/configure-intellisense-crosscompilation.md index c2ec907e04..b84783ca67 100644 --- a/docs/cpp/configure-intellisense-crosscompilation.md +++ b/docs/cpp/configure-intellisense-crosscompilation.md @@ -75,5 +75,5 @@ Given the settings above, your `c_cpp_configuration.json` file will look somethi - For more information about IntelliSense configuration, see [Customizing default settings](/docs/cpp/customize-default-settings-cpp.md). - If you have trouble configuring the settings, please start a discussion at [GitHub discussions](https://github.com/microsoft/vscode-cpptools/discussions), or if you find an issue that needs to be fixed, file an issue at [GitHub issues](https://github.com/microsoft/vscode-cpptools/issues). -- Explore the [c_cpp_properties schema](/docs/cpp/c-cpp-properties-schema-reference.md). +- Explore the [c_cpp_properties schema](/docs/cpp/customize-cpp-settings.md). - Review the [Overview of the C++ extension](/docs/languages/cpp.md). diff --git a/docs/cpp/configure-intellisense.md b/docs/cpp/configure-intellisense.md index 4d7bc410bb..b1f8c388ed 100644 --- a/docs/cpp/configure-intellisense.md +++ b/docs/cpp/configure-intellisense.md @@ -25,7 +25,7 @@ If you don't have IntelliSense configured, the C/C++ extension shows a yellow in To configure, select the status bar indicator, which brings up the [configuration Quick Pick](#option-1-select-a-configuration-option-through-the-configuration-quick-pick). The Quick Pick can help you select or install a C/C++ compiler. -If you do not see a status bar indicator, you can also check your project's `c_cpp_properties.json` file. This file stores all of your IntelliSense configuration settings. Navigate to this file by selecting **C/C++: Edit Configurations (UI)** from the Command Palette (`kb(workbench.action.showCommands)`). Check the `IntelliSense mode` to find your configuration. To learn more about the `c_cpp_properties.json` file, you can review the [schema reference](/docs/cpp/c-cpp-properties-schema-reference.md). +If you do not see a status bar indicator, you can also check your project's `c_cpp_properties.json` file. This file stores all of your IntelliSense configuration settings. Navigate to this file by selecting **C/C++: Edit Configurations (UI)** from the Command Palette (`kb(workbench.action.showCommands)`). Check the `IntelliSense mode` to find your configuration. To learn more about the `c_cpp_properties.json` file, you can review the [schema reference](/docs/cpp/customize-cpp-settings.md). ![Command Palette filtered on C/C++ Edit Configurations command](images/intellisense/edit-configurations-ui.png) @@ -59,7 +59,7 @@ You can edit the `c_cpp_properties.json` file directly to customize your configu Use the `compilerPath` variable to add a compiler. This variable is the full path of the compiler you're using to build your project. For example, when using the default install path for GCC on Linux, the compiler path is `/usr/bin/gcc`. -For more information about the `c_cpp_properties.json` file, review the [schema reference](/docs/cpp/c-cpp-properties-schema-reference.md). +For more information about the `c_cpp_properties.json` file, review the [schema reference](/docs/cpp/customize-cpp-settings.md). Select the sample below based on your operating system for a `c_cpp_configuration.json` file: @@ -203,5 +203,5 @@ You can select the pin icon on the right of any item in the language status bar * For more information about IntelliSense configuration, see [Customizing default settings](/docs/cpp/customize-default-settings-cpp.md). * If you have trouble configuring the settings, please start a discussion at [GitHub discussions](https://github.com/microsoft/vscode-cpptools/discussions), or if you find an issue that needs to be fixed, file an issue at [GitHub issues](https://github.com/microsoft/vscode-cpptools/issues). -* Explore the [c_cpp_properties schema](/docs/cpp/c-cpp-properties-schema-reference.md). +* Explore the [c_cpp_properties schema](/docs/cpp/customize-cpp-settings.md). * Review the [Overview of the C++ extension](/docs/languages/cpp.md). diff --git a/docs/cpp/customize-default-settings-cpp.md b/docs/cpp/customize-default-settings-cpp.md index 84594e7338..f447ca2dfa 100644 --- a/docs/cpp/customize-default-settings-cpp.md +++ b/docs/cpp/customize-default-settings-cpp.md @@ -87,7 +87,7 @@ Note that for the properties that accept string[], the syntax proposed above all If a property is missing from `c_cpp_properties.json`, the extension will use the value in the VS Code setting. If a developer assigns values to all of the settings that apply for a given folder, then `c_cpp_properties.json` could be removed from the .vscode folder as it will no longer be needed. -For in-depth information about the c_cpp_properties.json settings file, See [c_cpp_properties.json reference](/docs/cpp/c-cpp-properties-schema-reference.md). +For in-depth information about the c_cpp_properties.json settings file, See [c_cpp_properties.json reference](/docs/cpp/customize-cpp-settings.md). ### System includes diff --git a/docs/cpp/config-clang-mac.md b/docs/cpp/gettingstarted/config-clang-mac.md similarity index 100% rename from docs/cpp/config-clang-mac.md rename to docs/cpp/gettingstarted/config-clang-mac.md diff --git a/docs/cpp/config-linux.md b/docs/cpp/gettingstarted/config-linux.md similarity index 100% rename from docs/cpp/config-linux.md rename to docs/cpp/gettingstarted/config-linux.md diff --git a/docs/cpp/config-mingw.md b/docs/cpp/gettingstarted/config-mingw.md similarity index 100% rename from docs/cpp/config-mingw.md rename to docs/cpp/gettingstarted/config-mingw.md diff --git a/docs/cpp/config-msvc.md b/docs/cpp/gettingstarted/config-msvc.md similarity index 100% rename from docs/cpp/config-msvc.md rename to docs/cpp/gettingstarted/config-msvc.md diff --git a/docs/cpp/config-wsl.md b/docs/cpp/gettingstarted/config-wsl.md similarity index 100% rename from docs/cpp/config-wsl.md rename to docs/cpp/gettingstarted/config-wsl.md diff --git a/docs/toc.json b/docs/toc.json index fc74f1ae9e..0f32a15382 100644 --- a/docs/toc.json +++ b/docs/toc.json @@ -269,17 +269,35 @@ "area": "cpp", "topics": [ ["Intro Videos", "/docs/cpp/introvideos-cpp"], - ["GCC on Linux", "/docs/cpp/config-linux"], - ["GCC on Windows", "/docs/cpp/config-mingw"], - ["GCC on Windows Subsystem for Linux", "/docs/cpp/config-wsl"], - ["Clang on macOS", "/docs/cpp/config-clang-mac"], - ["Microsoft C++ on Windows", "/docs/cpp/config-msvc"], - ["Build with CMake", "/docs/cpp/build-with-cmake"], - ["CMake Tools on Linux", "/docs/cpp/cmake-linux"], - ["CMake Quick Start", "/docs/cpp/cmake-quickstart"], + ["", "", { + "name": "Getting Started", + "area": "cpp/gettingstarted", + "topics": [ + ["GCC on Linux", "/docs/cpp/gettingstarted/config-linux"], + ["GCC on Windows", "/docs/cpp/gettingstarted/config-mingw"], + ["GCC on Windows Subsystem for Linux", "/docs/cpp/gettingstarted/config-wsl"], + ["Clang on macOS", "/docs/cpp/gettingstarted/config-clang-mac"], + ["Microsoft C++ on Windows", "/docs/cpp/gettingstarted/config-msvc"] + ] + }], + ["", "", { + "name": "Build with CMake", + "area": "cpp/cmake", + "topics": [ + ["CMake Quick Start", "/docs/cpp/cmake/cmake-quickstart"], + ["Build with CMake", "/docs/cpp/cmake/build-with-cmake"], + ["CMake Tools on Linux", "/docs/cmake/cpp/cmake-linux"] + ] + }], ["Editing and Navigating", "/docs/cpp/cpp-ide"], - ["Debugging", "/docs/cpp/cpp-debug"], - ["Configure Debugging", "/docs/cpp/launch-json-reference"], + ["", "", { + "name": "Debugging", + "area": "cpp/debugging", + "topics": [ + ["Debugging", "/docs/cpp/debugging/cpp-debug"], + ["Configure Debugging", "/docs/cpp/debugging/launch-json-reference"], + ] + }], ["Refactoring", "/docs/cpp/cpp-refactoring"], ["Settings", "/docs/cpp/customize-default-settings-cpp"], ["Configure IntelliSense", "/docs/cpp/configure-intellisense"],