Resolve syncing conflicts from master-sync-work to master - #1

Merged

Gordon Hogenson (ghogen) merged 87 commits into

master-sync-work

Nov 16, 2016

Commits on Nov 12, 2016

various manual formatting fixes
Michael Blome
committed
2431dd4

Commits on Nov 13, 2016

manual formatting fixes on stl <header>-functions pages
Michael Blome
committed
da17f9a
Removed incorrect uses of Method in STL class docs
Michael Blome
committed
b0cbf81
code formatting in mfc macros
Michael Blome
committed
404b892
Merge pull request #40 from Microsoft/mblome
Gordon Hogenson (ghogen)
authored
e3d894f
fixed incorrect indent on mfc struct topic syntax blocks
Michael Blome
committed
2ecd4f0
misc syntax fixes STL plus added cpp to example blocks in 207 files
Michael Blome
committed
db414a1
Merge pull request #41 from Microsoft/mblome
Gordon Hogenson (ghogen)
authored
3f719c7
ATL Macro syntax fixes
Michael Blome
committed
68d214f
misc formatting and fixed-up TOC
Michael Blome
committed
9305d2a
Merge pull request #42 from Microsoft/mblome
Gordon Hogenson (ghogen)
authored
897e3bb
remove ms.prod
Gordon Hogenson (ghogen)
committed
3168772

Commits on Nov 14, 2016

Merge pull request #43 from Microsoft/ghogen-metadata
Gordon Hogenson (ghogen)
authored
bd61948
Start making index.md changes and some TOC fixes
Gordon Hogenson (ghogen)
committed
b89c6ab
index.md files added in some folders
Gordon Hogenson (ghogen)
committed
26e4b29
Merge branch 'master' of github.com:Microsoft/vcppdocs into ghogen-metadata
Gordon Hogenson (ghogen)
committed
7dc40c6
Revert "remove ms.prod"
Gordon Hogenson (ghogen)
committed
b68e38d
Try again ... remove ms.prod
Gordon Hogenson (ghogen)
committed
c6dbdc6
Merge pull request #44 from Microsoft/ghogen-metadata
Gordon Hogenson (ghogen)
authored
9793238
a few more STL code formatting fixes
Michael Blome
committed
6f33521
Add index.md as appropriate
Gordon Hogenson (ghogen)
committed
567ae1b
Merge pull request #45 from Microsoft/ghogen-index
Gordon Hogenson (ghogen)
authored
385650a
Updates to whats new
Michael Blome
committed
319267f
removed limits-functions because no content
Michael Blome
committed
01c4aa6
Make some additions to compiler options for RC
Colin Robertson
committed
4a39c6e
Add syntax block to permissive option
Colin Robertson
committed
b5bec10
Merge remote-tracking branch 'refs/remotes/origin/master' into colin-rc
Colin Robertson
committed
585cdf8
New content and links for top level mfc page
Michael Blome
committed
e21beb5
new content for what's new in vcpp
Michael Blome
committed
c2e4725
new content for conformance improvements page
Michael Blome
committed
6224c99
Add breadcrumb file toc.yml
Gordon Hogenson (ghogen)
committed
6ffb699
Add breadcrumb and docfx.json
Gordon Hogenson (ghogen)
committed
bafff0c
Update toc.yml to /cpp
Gordon Hogenson (ghogen)
committed
ff2a39c
Merge pull request #46 from Microsoft/ghogen-tocyml
Gordon Hogenson (ghogen)
authored
d74018f
Fix link and compiler option reference.
Colin Robertson
committed
c136f3b
Change all vs links to remove dash
Colin Robertson
committed
6cad522
Merge remote-tracking branch 'refs/remotes/origin/master' into colin-rc
Colin Robertson
committed
a6f9169

Commits on Nov 15, 2016

Change cs and vb link paths to include articles
Colin Robertson
committed
71863a6
fixes to very top default toc
Michael Blome
committed
9ddf668
fixes to cpp TOC and to c++ language and library nav pages to match TOC
Michael Blome
committed
976e100
fixed bad token
Michael Blome
committed
6e752b9
Attempt to fix toc.yml
Gordon Hogenson (ghogen)
committed
ab0bcd4
fixed up what's new content organization and links
Michael Blome
committed
21793b0
Merge pull request #47 from Microsoft/colin-rc
Gordon Hogenson (ghogen)
authored
9bc43ea
Merge pull request #48 from Microsoft/ghogen-fixyml
Gordon Hogenson (ghogen)
authored
03b5a68
little tweak to kick off new build that crashed
Michael Blome
committed
9340832
fixtoc
Gordon Hogenson (ghogen)
committed
2f369e8
Merge pull request #50 from Microsoft/fixtoc
Gordon Hogenson (ghogen)
authored
898bb69
Update links using scanbrokenlink
Colin Robertson
committed
84964b0
Merge pull request #51 from Microsoft/colin-links2
Gordon Hogenson (ghogen)
authored
0176347
Fixed typo in what's new
Michael Blome
committed
56d3456
typos in conformance doc
Michael Blome
committed
8a2d8ed
fixed messed up topic
Michael Blome
committed
31da59e
fixed messed up links in formerly mess-up topic
Michael Blome
committed
8362b6f
removed bad links in cpp files
Michael Blome
committed
922d498
fixed up merge comflicts
Michael Blome
committed
31a7a65
Merge pull request #49 from Microsoft/mblome
Gordon Hogenson (ghogen)
authored
f0fbe98
broken links in TOC and typo in hub page
Michael Blome
committed
7343e5d
Update .openpublishing.publish.config.json
Megan Bradley (meganbradley)
authored
083652c
Merge pull request #52 from meganbradley/master
Gordon Hogenson (ghogen)
authored
f1d2266
Fix misc topic and TOC issues
Gordon Hogenson (ghogen)
committed
03a061f
Merge pull request #54 from Microsoft/gordon-metafix
Gordon Hogenson (ghogen)
authored
597851a
fixed to hub page and whats new and some atl links
Michael Blome
committed
646ddeb
Big additions to /permissive- content
Colin Robertson
committed
82d889c
Merge remote-tracking branch 'refs/remotes/origin/master' into colin-rc2
Colin Robertson
committed
fc723e7
Merge pull request #53 from Microsoft/mblome
Gordon Hogenson (ghogen)
authored
2bfee9a
toc fix and a few links
Michael Blome
committed
98ee788
Set default technology tag to devlang-cpp
Gordon Hogenson (ghogen)
committed
f80df09
Merge pull request #56 from Microsoft/colin-rc2
Gordon Hogenson (ghogen)
authored
f60dfec
Remove misc folder
Gordon Hogenson (ghogen)
committed
e9d9394
Add contributing guide and readme.
Gordon Hogenson (ghogen)
committed
245e93c
Add style guide
Gordon Hogenson (ghogen)
committed
50e2282
Merge pull request #55 from Microsoft/mblome-links
Gordon Hogenson (ghogen)
authored
e8e025b
A little more specific about what's allowed.
Colin Robertson
committed
0cc95cb

Commits on Nov 16, 2016

Revert "Remove misc folder"
Gordon Hogenson (ghogen)
committed
87824e5
Remove just the .md files in misc folder, not tokens
Gordon Hogenson (ghogen)
committed
3fa9289
Also remove misc/codesnippet and misc/media
Gordon Hogenson (ghogen)
committed
04a8aa0
Spacing changes for formatting.
Colin Robertson
committed
f8110a8
Add license.md
Gordon Hogenson (ghogen)
committed
ff6c2df
Merge pull request #57 from Microsoft/ghogen-techtag
Gordon Hogenson (ghogen)
authored
dd2df42
Merge pull request #58 from Microsoft/ghogen-misc
Gordon Hogenson (ghogen)
authored
390bca3
Merge pull request #59 from Microsoft/colin-rc2
Gordon Hogenson (ghogen)
authored
a47606c
Merge pull request #60 from Microsoft/ghogen-license
Gordon Hogenson (ghogen)
authored
4b14862
Fix metadata issues with punctuation
Colin Robertson
committed
9652295
Merge remote-tracking branch 'refs/remotes/origin/master' into colin-rc2
Colin Robertson
committed
f2c2be4
Merge pull request #63 from Microsoft/colin-rc2
Gordon Hogenson (ghogen)
authored
bcca4b0
Merge pull request #61 from Microsoft/master
Gordon Hogenson (ghogen)
authored
87c04cc