Skip to content

Commit e9032ae

Browse files
author
Michael Blome
committed
fixed merge conflicts in PR 62
2 parents 0b5981a + 88de1dd commit e9032ae

4,415 files changed

Lines changed: 1291 additions & 221783 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"locale": "en-us",
1111
"version": 0,
1212
"open_to_public_contributors": true,
13+
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
1314
"type_mapping": {
1415
"Conceptual": "Content",
1516
"ManagedReference": "Content",
@@ -30,4 +31,4 @@
3031
}
3132
],
3233
"need_generate_pdf_url_template": false
33-
}
34+
}

CONTRIBUTING.md

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# Contributing
2+
3+
Thank you for your interest in contributing to the Visual C++ documentation!
4+
5+
In this topic, you'll see the basic process for adding or updating content in the [Visual C++ documentation site](https://docs.microsoft.com/cpp-docs).
6+
7+
In this topic, we'll cover:
8+
9+
* [Process for contributing](#process-for-contributing)
10+
* [Guidance checklist](#guidance-checklist)
11+
* [Building the docs](#building-the-docs)
12+
* [Contributing to samples](#contributing-to-samples)
13+
* [Contributor License Agreement](#contributor-license-agreement)
14+
15+
## Process for contributing
16+
17+
**Step 1:** Open an issue describing the article you wish to write and how it relates to existing content.
18+
The content inside the **docs** folder is organized into sections that are organized by content area (e.g., debugger). Try to determine the correct folder for your new content. Get feedback on your proposal.
19+
20+
You can skip this first step for small changes.
21+
22+
**Step 2:** Fork the `Microsoft/cpp-docs` repo.
23+
24+
**Step 3:** Create a `branch` for your article.
25+
26+
**Step 4:** Write your article.
27+
28+
If it's a new topic, you can use this [template file](./styleguide/template.md) as your starting point. It contains the writing guidelines and also explains the metadata required for each article, such as author information.
29+
30+
Navigate to the folder that corresponds to the TOC location determined for your article in step 1.
31+
That folder contains the Markdown files for all articles in that section. If necessary, create a new folder to place the files for your content.
32+
33+
For images and other static resources, add them to the subfolder called **media**. If you are creating a new folder for content, add a media folder to the new folder.
34+
35+
Be sure to follow the proper Markdown syntax. See the [style guide](./styleguide/template.md) for more information.
36+
37+
### Example structure
38+
39+
docs
40+
/standard-library
41+
wstring-convert-class.md
42+
/media
43+
wstring-conversion.png
44+
45+
**Step 5:** Submit a Pull Request (PR) from your branch to `Microsoft/cpp-docs/master`.
46+
47+
If your PR is addressing an existing issue, add the `Fixes #Issue_Number` keyword to the commit message or PR description, so the issue can be automatically closed when the PR is merged. For more information, see [Closing issues via commit messages](https://help.github.com/articles/closing-issues-via-commit-messages/).
48+
49+
The Visual Studio team will review your PR and let you know if the change looks good or if there are any other updates/changes necessary in order to approve it.
50+
51+
**Step 6:** Make any necessary updates to your branch as discussed with the team.
52+
53+
The maintainers will merge your PR into the master branch once feedback has been applied and your change looks good.
54+
55+
On a certain cadence, we push all commits from master branch into the live branch and then you'll be able to see your contribution live at https://docs.microsoft.com/cpp-docs/.
56+
57+
## DOs and DON'Ts
58+
59+
Below is a short list of guiding rules that you should keep in mind when you are contributing to the .NET documentation.
60+
61+
- **DON'T** surprise us with big pull requests. Instead, file an issue and start a discussion so we can agree on a direction before you invest a large amount of time.
62+
- **DO** read the [style guide](./styleguide/template.md) and [voice and tone](./styleguide/voice-tone.md) guidelines.
63+
- **DO** use the [template](./styleguide/template.md) file as the starting point of your work.
64+
- **DO** create a separate branch on your fork before working on the articles.
65+
- **DO** follow the [GitHub Flow workflow](https://guides.github.com/introduction/flow/).
66+
- **DO** blog and tweet (or whatever) about your contributions, frequently!
67+
68+
> [!NOTE]
69+
> You might notice that some of the topics are not currently following all the guidelines specified here and on the [style guide](./styleguide/template.md) as well. We're working towards achieving consistency throughout the site. Check the list of [open issues](https://github.com/dotnet/docs/issues?q=is%3Aissue+is%3Aopen+label%3Aguidelines-adherence) we're currently tracking for that specific goal.
70+
71+
## Building the docs
72+
73+
The documentation is written in [GitHub Flavored Markdown](https://help.github.com/categories/writing-on-github/) and built using [DocFX](http://dotnet.github.io/docfx/) and other internal publishing/building tools. It is hosted at [docs.microsoft.com](https://docs.microsoft.com/dotnet).
74+
75+
If you want to build the docs locally, you need to install [DocFX](https://dotnet.github.io/docfx/); latest versions are the best.
76+
77+
There are several ways to use DocFX, and most of them are covered in the [DocFX getting started guide](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html).
78+
The following instructions use the [command-line based](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html#2-use-docfx-as-a-command-line-tool) version of the tool.
79+
If you are comfortable with other ways listed on the link above, feel free to use those.
80+
81+
**Note:** Currently DocFX requires the .NET Framework on Windows or Mono (for Linux or macOS). We hope to port it to .NET Core in the future.
82+
83+
You can build and preview the resulting site locally using a built-in web server. Navigate to the core-docs folder on your machine and type the following command:
84+
85+
```
86+
docfx -t default --serve
87+
```
88+
89+
This starts the local preview on [localhost:8080](http://localhost:8080). You can then view the changes by going to `http://localhost:8080/[path]`, such as http://localhost:8080/articles/welcome.html.
90+
91+
**Note:** the local preview currently doesn't contain any themes at the moment so the look and feel won't be the same as in the documentation site. We're working towards fixing that experience.
92+
93+
# Contributing to samples
94+
95+
For now, include required sample code as inline code blocks in your article. The repo has a codesnippets folder, but this is not ready for public contributions.

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Visual Studio 2017 RC documentation for Visual C++
2+
3+
Welcome! This repo contains source files for the work-in-progress Visual C++ RC technical documentation. The topics are published on the [Visual Studio documentation site](https://docs.microsoft.com/cpp-docs).
4+
5+
The documentation for Visual Basic and Visual C# are located in a separate repo at [http://github.com/dotnet/core-docs](http://github.com/dotnet/core-docs), and the Visual C++ documentation is located in the repo located at [http://github.com/Microsoft/cpp-docs](http://github.com/Microsoft/cpp-docs).
6+
7+
## Contributing to the documentation
8+
9+
To contribute to this documentation, please see the [Contributing guide](CONTRIBUTING.md).
10+
We welcome your contributions to help us improve the Visual Studio docs. All the articles in this repository use GitHub flavored markdown.
11+
12+
Several feature areas of Visual Studio have their own folders in this repo, such as **debugger** for topics on debugging, **ide** for topics on the Visual Studio interactive development environment (IDE), and so forth. The **/media** subfolder in each folder contains art files for the topics. The [Contributing guide](CONTRIBUTING.md) has more information.
13+
14+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

docs/_breadcrumb/toc.yml

Lines changed: 105 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -4,110 +4,117 @@
44
items:
55
- name: Visual C++
66
tocHref: /cpp/
7-
topicHref: /cpp/top/visual-cpp-in-visual-studio
7+
topicHref: /cpp
88
items:
9-
- name: C++ Language
10-
tocHref: /cpp/cpp/
11-
topicHref: /cpp/cpp/cpp-language-reference
12-
- name: C Language
13-
tocHref: /cpp/c-language/
14-
topicHref: /cpp/c-language/c-language-reference
15-
- name: C/C++ Preprocessor
16-
tocHref: /cpp/preprocessor/
17-
topicHref: /cpp/c-cpp-preprocessor-reference
18-
- name: C Runtime Library
19-
tocHref: /cpp/c-runtime-library/
20-
topicHref: /cpp/c-runtime-library/c-runtime-library-reference
9+
- name: Documentation
10+
tocHref: /cpp/
11+
topicHref: /cpp/top/visual-cpp-in-visual-studio
2112
items:
22-
- name: Reference
23-
tocHref: /cpp/c-runtime-library/reference/
24-
topicHref: /cpp/c-runtime-library/reference/alphabetical-function-reference
25-
- name: C++ Standard Library
26-
tocHref: /cpp/standard-library/
27-
topicHref: /cpp/standard-library/cpp-standard-library
28-
- name: Windows
29-
tocHref: /cpp/windows/
30-
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp
31-
items:
32-
- name: ATL
33-
tocHref: /cpp/atl/
34-
topicHref: /cpp/atl/atl-com-desktop-components
13+
- name: C++ Language
14+
tocHref: /cpp/cpp/
15+
topicHref: /cpp/cpp/cpp-language-reference
16+
- name: C Language
17+
tocHref: /cpp/c-language/
18+
topicHref: /cpp/c-language/c-language-reference
19+
- name: C/C++ Preprocessor
20+
tocHref: /cpp/preprocessor/
21+
topicHref: /cpp/c-cpp-preprocessor-reference
22+
- name: C Runtime Library
23+
tocHref: /cpp/c-runtime-library/
24+
topicHref: /cpp/c-runtime-library/c-runtime-library-reference
3525
items:
3626
- name: Reference
37-
tocHref: /cpp/atl/reference/
38-
topicHref: /cpp/atl/reference/atl-classes
39-
- name: MFC
40-
tocHref: /cpp/mfc/
41-
topicHref: /cpp/mfc/mfc-desktop-applications
27+
tocHref: /cpp/c-runtime-library/reference/
28+
topicHref: /cpp/c-runtime-library/reference/alphabetical-function-reference
29+
- name: C++ Standard Library
30+
tocHref: /cpp/standard-library/
31+
topicHref: /cpp/standard-library/cpp-standard-library
32+
- name: Windows
33+
tocHref: /cpp/windows/
34+
topicHref: /cpp/windows/overview-of-windows-programming-in-cpp
4235
items:
43-
- name: Reference
44-
tocHref: /cpp/mfc/reference/
45-
topicHref: /cpp/mfc/reference/mfc-classes
46-
- name: ATL/MFC Shared Classes
47-
tocHref: /cpp/atl-mfc-shared/
48-
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
36+
- name: ATL
37+
tocHref: /cpp/atl/
38+
topicHref: /cpp/atl/atl-com-desktop-components
39+
items:
40+
- name: Reference
41+
tocHref: /cpp/atl/reference/
42+
topicHref: /cpp/atl/reference/atl-classes
43+
- name: MFC
44+
tocHref: /cpp/mfc/
45+
topicHref: /cpp/mfc/mfc-desktop-applications
46+
items:
47+
- name: Reference
48+
tocHref: /cpp/mfc/reference/
49+
topicHref: /cpp/mfc/reference/mfc-classes
50+
- name: ATL/MFC Shared Classes
51+
tocHref: /cpp/atl-mfc-shared/
52+
topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
53+
items:
54+
- name: Reference
55+
tocHref: /cpp/atl-mfc-shared/reference/
56+
topicHref: /cpp/atl-mfc/shared/reference/classes-shared-by-atl-and-mfc
57+
- name: Linux
58+
tocHref: /cpp/linux/
59+
topicHref: /cpp/linux/download-install-and-setup-the-linux-development-workload
60+
- name: .NET
61+
tocHref: /cpp/dotnet/
62+
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli
63+
- name: Parallel Programming
64+
tocHref: /cpp/parallel/
65+
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
66+
- name: Data Access
67+
tocHref: /cpp/data/
68+
topicHref: /cpp/data/data-access
4969
items:
50-
- name: Reference
51-
tocHref: /cpp/atl-mfc-shared/reference/
52-
topicHref: /cpp/atl-mfc/shared/reference/classes-shared-by-atl-and-mfc
53-
- name: .NET
54-
tocHref: /cpp/dotnet/
55-
topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli
56-
- name: Parallel Programming
57-
tocHref: /cpp/parallel/
58-
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
59-
- name: Data Access
60-
tocHref: /cpp/data/
61-
topicHref: /cpp/data/data-access
62-
items:
63-
- name: OLEDB
64-
tocHref: /cpp/data/oledb/
65-
topicHref: /cpp/data/oledb/ole-db-programming
66-
- name: ODBC
67-
tocHref: /cpp/data/odbc/
68-
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
69-
- name: ADO and RDO
70-
tocHref: /cpp/data/ado-rdo/
71-
topicHref: /cpp/data/ado-rdo/data-bound-controls-ado-and-rdo
72-
- name: IDE and Tools
73-
tocHref: /cpp/ide/
74-
topicHref: /cpp/ide/ide-and-tools-for-visual-cpp-development
75-
items:
76-
- name: IDE
70+
- name: OLEDB
71+
tocHref: /cpp/data/oledb/
72+
topicHref: /cpp/data/oledb/ole-db-programming
73+
- name: ODBC
74+
tocHref: /cpp/data/odbc/
75+
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
76+
- name: ADO and RDO
77+
tocHref: /cpp/data/ado-rdo/
78+
topicHref: /cpp/data/ado-rdo/data-bound-controls-ado-and-rdo
79+
- name: IDE and Tools
7780
tocHref: /cpp/ide/
78-
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
79-
- name: Building
80-
tocHref: /cpp/build/
81-
tocHref: /cpp/build/building-c-cpp-programs
82-
- name: Compiler Intrinsics and Assembly Language
83-
tocHref: /cpp/intrinsics/
84-
topicHref: /cpp/intrinsics/c-cpp-intrinsics
81+
topicHref: /cpp/ide/ide-and-tools-for-visual-cpp-development
8582
items:
86-
- name: ARM
87-
tocHref: /cpp/assembler/arm/
88-
topicHref: /cpp/assembler/arm/arm-assembler-reference
89-
- name: Inline assembler
90-
tocHref: /cpp/assembler/inline/
91-
topicHref: /cpp/assembler/inline-assembler-reference
92-
- name: MASM
93-
tocHref: /cpp/assembler/masm/
94-
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
95-
- name: Build Reference
96-
tocHref: /cpp/build/reference/
97-
topicHref: /cpp/build/reference/c-cpp-building-reference
83+
- name: IDE
84+
tocHref: /cpp/ide/
85+
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
86+
- name: Building
87+
tocHref: /cpp/build/
88+
tocHref: /cpp/build/building-c-cpp-programs
89+
- name: Compiler Intrinsics and Assembly Language
90+
tocHref: /cpp/intrinsics/
91+
topicHref: /cpp/intrinsics/c-cpp-intrinsics
9892
items:
99-
- name: Compiler Errors
100-
tocHref: /cpp/error-messages/compiler-errors-1/
101-
topicHref: /cpp/compiler-errors-1/c-cpp-build-errors
102-
- name: Compiler Warnings
103-
tocHref: /cpp/compiler-warnings/
104-
topicHref: /cpp/compiler-warnings/compiler-warnings-c4000-through-C4199
105-
- name: Other Tools
106-
tocHref: /cpp/error-messages/tool-errors/
107-
topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
108-
- name: Porting and Upgrading
109-
tocHref: /cpp/porting/
110-
topicHref: /cpp/porting/porting-and-upgrading-guide
111-
- name: Text and Strings
112-
tocHref: /cpp/text/
113-
topicHref: /cpp/text/text-and-strings
93+
- name: ARM
94+
tocHref: /cpp/assembler/arm/
95+
topicHref: /cpp/assembler/arm/arm-assembler-reference
96+
- name: Inline assembler
97+
tocHref: /cpp/assembler/inline/
98+
topicHref: /cpp/assembler/inline-assembler-reference
99+
- name: MASM
100+
tocHref: /cpp/assembler/masm/
101+
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
102+
- name: Build Reference
103+
tocHref: /cpp/build/reference/
104+
topicHref: /cpp/build/reference/c-cpp-building-reference
105+
items:
106+
- name: Compiler Errors
107+
tocHref: /cpp/error-messages/compiler-errors-1/
108+
topicHref: /cpp/compiler-errors-1/c-cpp-build-errors
109+
- name: Compiler Warnings
110+
tocHref: /cpp/compiler-warnings/
111+
topicHref: /cpp/compiler-warnings/compiler-warnings-c4000-through-C4199
112+
- name: Other Tools
113+
tocHref: /cpp/error-messages/tool-errors/
114+
topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
115+
- name: Porting and Upgrading
116+
tocHref: /cpp/porting/
117+
topicHref: /cpp/porting/porting-and-upgrading-guide
118+
- name: Text and Strings
119+
tocHref: /cpp/text/
120+
topicHref: /cpp/text/text-and-strings

docs/assembler/masm/operator-double-quote.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ ms.technology:
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
12-
- "¨ ¨"
13-
- "operator ¨ ¨"
12+
- "" ""
13+
- "operator " ""
1414
dev_langs:
1515
- "C++"
1616
helpviewer_keywords:
17-
- "" " operator"
18-
- "operator " ""
17+
- "" " operator"
18+
- "operator " ""
1919
ms.assetid: e96fd419-06d4-4989-b65b-7d3754f00f81
2020
caps.latest.revision: 6
2121
author: "corob-msft"

0 commit comments

Comments
 (0)