Merge branch 'master' into mb-props

Colin Robertson · web-flow · commit 01b4fe1b05d7 · 2017-10-23T17:56:07.000-07:00
diff --git a/docs/atl/reference/string-conversion-macros.md b/docs/atl/reference/string-conversion-macros.md
@@ -8,7 +8,7 @@ ms.technology:
   - "cpp-windows"
 ms.tgt_pltfrm: ""
 ms.topic: "reference"
-f1_keywords: ["atlconv/ATL::DEVMODEA2W",  "atlconv/ATL::TEXTMETRICA2W",
+f1_keywords: ["atlconv/ATL::DEVMODEA2W", "atlconv/ATL::TEXTMETRICA2W", "atlconv/ATL::DEVMODEOLE2T", "atlconv/ATL::TEXTMETRICOLE2T", "atlconv/ATL::DEVMODET2OLE", "atlconv/ATL::TEXTMETRICT2OLE", "atlconv/ATL::DEVMODEW2A", "atlconv/ATL::TEXTMETRICW2A"]
 dev_langs: 
   - "C++"
 ms.assetid: 2ff7c0b6-2bde-45fe-897f-6128e18e0c27
diff --git a/docs/cpp/punctuators-cpp.md b/docs/cpp/punctuators-cpp.md
@@ -7,7 +7,6 @@ ms.suite: ""
 ms.technology: ["devlang-cpp"]
 ms.tgt_pltfrm: ""
 ms.topic: "language-reference"
-f1_keywords: [";", ", "{", "}", "(", ")", "[", "]", "!", "%", "&#94;", "&#42;", "&#34;"]
 dev_langs: ["C++"]
 helpviewer_keywords: ["punctuators [C++]"]
 ms.assetid: 1521564c-a977-488a-9490-068079897592
