Merge remote-tracking branch 'refs/remotes/origin/master' into 19H1

windows/deployment/docfx.json

@@ -42,7 +42,8 @@
 		"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
 		"_op_documentIdPathDepotMapping": {
 			"./": {
-			  "depot_name": "MSDN.win-development"
+			  "depot_name": "MSDN.win-development",
+                          "folder_relative_path_in_docset": "./"
 			}
 		}
 	},
@@ -51,4 +52,4 @@
     "dest": "win-development",
     "markdownEngineName": "dfm"
   }
-}
+}

windows/deployment/upgrade/log-files.md

@@ -55,7 +55,7 @@ Event logs: Generic rollbacks (0xC1900101) or unexpected reboots.</td>
 
 ## Log entry structure
 
-A setupact.log or setuperr.log (files are located at C:\Windows) entry includes the following elements:
+A setupact.log or setuperr.log entry (files are located at C:\Windows) includes the following elements:
 
 <ol>
 <LI><B>The date and time</B> - 2016-09-08 09:20:05.