Skip to content

Commit a6c4dae

Browse files
authored
Merge pull request #3425 from dotnet/master
Update live with current master
2 parents 145d54c + 78d2d11 commit a6c4dae

File tree

3 files changed

+30
-23
lines changed

3 files changed

+30
-23
lines changed

xml/Microsoft.VisualBasic.Devices/Keyboard.xml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -473,17 +473,16 @@
473473
|Web Control Library|No|
474474
|Windows Service|**Yes**|
475475
|Web Site|No|
476-
477-
478-
476+
479477
## Examples
480-
This example uses the `My.Computer.Keyboard.SendKeys` method to send keystrokes to an external application, the Calculator application, started by the `Shell` function.
478+
479+
This example uses the `My.Computer.Keyboard.SendKeys` method to send keystrokes to an external application, the Notepad application, started by the <xref:Microsoft.VisualBasic.Interaction.Shell%2A> method.
481480
482-
[!code-vb[VbVbalrMyComputer#25](~/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbVbalrMyComputer/VB/Class2.vb#25)]
481+
[!code-vb[VbVbalrMyComputer#25](~/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbVbalrMyComputer/VB/Class2.vb#25)]
482+
483+
An <xref:System.ArgumentException> exception is raised if an application with the requested process identifier cannot be found.
483484
484-
A <xref:System.ArgumentException> exception is raised if an application with the requested process identifier cannot be found.
485-
486-
The call to the `Shell` function requires full trust (<xref:System.Security.SecurityException> class).
485+
The call to the <xref:Microsoft.VisualBasic.Interaction.Shell%2A> method requires full trust (<xref:System.Security.SecurityException> class).
487486
488487
]]></format>
489488
</remarks>
@@ -579,17 +578,16 @@
579578
|Web Control Library|No|
580579
|Windows Service|**Yes**|
581580
|Web Site|No|
581+
582+
## Examples
583+
584+
This example uses the `My.Computer.Keyboard.SendKeys` method to send keystrokes to an external application, the Notepad application, started by the <xref:Microsoft.VisualBasic.Interaction.Shell%2A> method.
582585
583-
584-
585-
## Examples
586-
This example uses the `My.Computer.Keyboard.SendKeys` method to send keystrokes to an external application, the Calculator application, started by the `Shell` function.
587-
588-
[!code-vb[VbVbalrMyComputer#25](~/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbVbalrMyComputer/VB/Class2.vb#25)]
589-
590-
A <xref:System.ArgumentException> exception is raised if an application with the requested process identifier cannot be found.
586+
[!code-vb[VbVbalrMyComputer#25](~/samples/snippets/visualbasic/VS_Snippets_VBCSharp/VbVbalrMyComputer/VB/Class2.vb#25)]
587+
588+
An <xref:System.ArgumentException> exception is raised if an application with the requested process identifier cannot be found.
591589
592-
The call to the `Shell` function requires full trust (<xref:System.Security.SecurityException> class).
590+
The call to the <xref:Microsoft.VisualBasic.Interaction.Shell%2A> method requires full trust (<xref:System.Security.SecurityException> class).
593591
594592
]]></format>
595593
</remarks>

xml/System.Diagnostics/Process.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4824,9 +4824,12 @@ There is a similar issue when you read all text from both the standard output an
48244824
The <see cref="P:System.Diagnostics.ProcessStartInfo.UseShellExecute" /> property of the <paramref name="startInfo" /> parameter is <see langword="true" /> and the <see cref="P:System.Diagnostics.ProcessStartInfo.UserName" /> property is not <see langword="null" /> or empty or the <see cref="P:System.Diagnostics.ProcessStartInfo.Password" /> property is not <see langword="null" />.</exception>
48254825
<exception cref="T:System.ArgumentNullException">The <paramref name="startInfo" /> parameter is <see langword="null" />.</exception>
48264826
<exception cref="T:System.ObjectDisposedException">The process object has already been disposed.</exception>
4827-
<exception cref="T:System.IO.FileNotFoundException">The file specified in the <paramref name="startInfo" /> parameter's <see cref="P:System.Diagnostics.ProcessStartInfo.FileName" /> property could not be found.</exception>
48284827
<exception cref="T:System.ComponentModel.Win32Exception">An error occurred when opening the associated file.
4829-
4828+
4829+
-or-
4830+
4831+
The file specified in the <paramref name="startInfo" /> parameter's <see cref="P:System.Diagnostics.ProcessStartInfo.FileName" /> property could not be found.
4832+
48304833
-or-
48314834

48324835
The sum of the length of the arguments and the length of the full path to the process exceeds 2080. The error message associated with this exception can be one of the following: "The data area passed to a system call is too small." or "Access is denied."</exception>

xml/System.Net/HttpListener.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
<remarks>
3535
<format type="text/markdown"><![CDATA[
3636
37-
## Remarks
37+
## Remarks
38+
3839
Using the <xref:System.Net.HttpListener> class, you can create a simple HTTP protocol listener that responds to HTTP requests. The listener is active for the lifetime of the <xref:System.Net.HttpListener> object and runs within your application with its permissions.
3940
4041
To use <xref:System.Net.HttpListener>, create a new instance of the class using the <xref:System.Net.HttpListener> constructor and use the <xref:System.Net.HttpListener.Prefixes%2A> property to gain access to the collection that holds the strings that specify which Uniform Resource Identifier (URI) prefixes the <xref:System.Net.HttpListener> should process.
@@ -66,8 +67,12 @@
6667
6768
> [!NOTE]
6869
> If you specify multiple authentication schemes for the <xref:System.Net.HttpListener>, the listener will challenge clients in the following order: `Negotiate`, `NTLM`, `Digest`, and then `Basic`.
69-
70-
70+
71+
### HTTP.sys
72+
73+
The <xref:System.Net.HttpListener> class is built on top of `HTTP.sys`, which is the kernel mode listener that handles all HTTP traffic for Windows.
74+
`HTTP.sys` provides connection management, bandwidth throttling, and web server logging.
75+
Use the [HttpCfg.exe](/windows/win32/http/httpcfg-exe) tool to add SSL certificates.
7176
7277
## Examples
7378
The following code example demonstrates using a <xref:System.Net.HttpListener>.
@@ -77,7 +82,8 @@
7782
7883
]]></format>
7984
</remarks>
80-
<related type="Article" href="https://msdn.microsoft.com/library/8bf0b428-5a21-4299-8d6e-bf8251fd978a">Changes to NTLM authentication for HTTPWebRequest in Version 3.5 SP1</related>
85+
<related type="Article" href="~/docs/framework/network-programming/changes-to-ntlm-authentication-for-httpwebrequest-in-version-3-5-sp1.md">Changes to NTLM authentication for HTTPWebRequest in Version 3.5 SP1</related>
86+
<related type="Article" href="/windows/win32/http/httpcfg-exe">HttpCfg.exe</related>
8187
</Docs>
8288
<Members>
8389
<Member MemberName=".ctor">

0 commit comments

Comments
 (0)