Skip to content

Resolve syncing conflicts from FromPrivateLiveToMaster to master#3453

Merged
colin-home merged 2 commits into
masterfrom
FromPrivateLiveToMaster
Oct 13, 2021
Merged

Resolve syncing conflicts from FromPrivateLiveToMaster to master#3453
colin-home merged 2 commits into
masterfrom
FromPrivateLiveToMaster

Conversation

@openpublishbuild
Copy link
Copy Markdown
Contributor

Pull request opened by Docs to resolve syncing conflicts from FromPrivateLiveToMaster to master.

* add new classes: ambiguous_local_time & nonexistent_local_time

* acrolinx

* fix links

* finish descriptions

* fix more links

* smoothing out

* proofing

* add some better linking

* tune description

* update descriptions

* needed to update local-info-struct.md to reflect changes to descriptions for nonexistent and ambiguous

* add chrono functions

* rounding out duration links

* Add documentation for IntelliSense linter for C++ (#3821)

* Add first draft of linter check documentation

* WIP overview.

Signed-off-by: Kyle Reed <kylereed@microsoft.com>

* Update toc. First draft of the linter overview.

* Add screenshots, move files, code samples are stand-alone.

Signed-off-by: Kyle Reed <kylereed@microsoft.com>

* Style and Acrolinx grammar checker pass

* Add missing Options cues for checks

* Update to use latest option names

Co-authored-by: 3836425+corob-msft@users.noreply.github.com <corob@microsoft.com>

* connecting duration up to it's non-member pieces and doing some general updates

* fix links

* cleanup

* Split out VS2019 content for linter (#3824)

* Update working-with-project-properties.md

* cleanup

* cleanup

* cleanup

* cleanup

* cleanup

* cleanup

* cleanup

* fix function signature

* fix line ending

* remove duplicate

Co-authored-by: TylerMSFT <Tyler.Whitney@microsoft.com>
Co-authored-by: Colin Robertson <corob@microsoft.com>
Co-authored-by: Kyle Reed <kylereed@microsoft.com>
Co-authored-by: Chai Wei Jie <chai_weijie@hotmail.com>
Co-authored-by: opbld15 <opbld15@microsoft.com>
Co-authored-by: PRMerger19 <prmrgr19@microsoft.com>
Co-authored-by: Laura Brenner <90344170+laurabren@users.noreply.github.com>
Co-authored-by: Courtney Wales <62625502+Court72@users.noreply.github.com>
Co-authored-by: Andrea Courtright <74212614+v-andreaco@users.noreply.github.com>
Co-authored-by: PRMerger15 <prmrgr15@microsoft.com>
Co-authored-by: opbld16 <opbld16@microsoft.com>
Co-authored-by: PRMerger8 <prmrgr8@microsoft.com>
@PRMerger12
Copy link
Copy Markdown
Contributor

@Taojunshen : Thanks for your contribution! The author(s) have been notified to review your proposed change.

@PRMerger9
Copy link
Copy Markdown
Contributor

@corob-msft : Thanks for your contribution! The author(s) have been notified to review your proposed change.

@colin-home colin-home merged commit 9b5b88e into master Oct 13, 2021
@colin-home colin-home deleted the FromPrivateLiveToMaster branch October 13, 2021 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants