Skip to content

Commit ee6e77a

Browse files
Merge pull request #12173 from dotnet/main
Merge main into live
2 parents b511a02 + 44b8832 commit ee6e77a

30 files changed

Lines changed: 1520 additions & 1520 deletions

File tree

xml/Microsoft.Aspnet.Snapin/IExtendPropertySheet2.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<remarks>
2626
<format type="text/markdown"><![CDATA[
2727
28-
## Remarks
28+
## Remarks
2929
For more information about programming with the IExtendPropertySheet2 interface and the Microsoft Management Console (MMC), see the [MMC Programmer's Guide](https://learn.microsoft.com/previous-versions/windows/desktop/mmc/mmc-programmer-s-guide-overview).
3030
3131
]]></format>
@@ -67,7 +67,7 @@ For more information about programming with the IExtendPropertySheet2 interface
6767
<remarks>
6868
<format type="text/markdown"><![CDATA[
6969
70-
## Remarks
70+
## Remarks
7171
For more information about programming with the <xref:Microsoft.Aspnet.Snapin.IExtendPropertySheet2> interface and the Microsoft Management Console (MMC), see the [MMC Programmer's Guide](https://learn.microsoft.com/previous-versions/windows/desktop/mmc/mmc-programmer-s-guide-overview).
7272
7373
]]></format>
@@ -103,14 +103,14 @@ For more information about programming with the <xref:Microsoft.Aspnet.Snapin.IE
103103
<param name="lphHeader">The handle to a bitmap that serves as the header for Wizard 97 pages.</param>
104104
<param name="lphPalette">The handle to a palette used for the bitmaps specified by lphWatermark and lphHeader.</param>
105105
<param name="bStretch">A GetWatermarks return value: true if the watermark and header bitmaps should be stretched rather than tiled; otherwise, false.</param>
106-
<summary>Retrieves the watermark and header bitmaps for wizard sheets that are implemented as Wizard 97-style wizards.</summary>
106+
<summary>Retrieves the watermark and header bitmaps for wizard sheets that are implemented as Wizard 97-style wizards.</summary>
107107
<returns>| Return Value | Description |
108108
| --- | --- |
109109
| etch | true if the watermark and header bitmaps should be stretched rather than tiled; otherwise, false. |</returns>
110110
<remarks>
111111
<format type="text/markdown"><![CDATA[
112112
113-
## Remarks
113+
## Remarks
114114
For more information about programming with the <xref:Microsoft.Aspnet.Snapin.IExtendPropertySheet2> interface and the Microsoft Management Console (MMC), see the [MMC Programmer's Guide](https://learn.microsoft.com/previous-versions/windows/desktop/mmc/mmc-programmer-s-guide-overview).
115115
116116
]]></format>
@@ -148,7 +148,7 @@ For more information about programming with the <xref:Microsoft.Aspnet.Snapin.IE
148148
<remarks>
149149
<format type="text/markdown"><![CDATA[
150150
151-
## Remarks
151+
## Remarks
152152
For more information about programming with the <xref:Microsoft.Aspnet.Snapin.IExtendPropertySheet2> interface and the Microsoft Management Console (MMC), see the [MMC Programmer's Guide](https://learn.microsoft.com/previous-versions/windows/desktop/mmc/mmc-programmer-s-guide-overview).
153153
154154
]]></format>

xml/Microsoft.IE/Manager.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<remarks>
3030
<format type="text/markdown"><![CDATA[
3131
32-
## Remarks
32+
## Remarks
3333
The Manager class initializes the properties that enable managed code to execute as an ActiveX control in a sandboxed application domain.
3434
3535
]]></format>
@@ -218,8 +218,8 @@ The Manager class initializes the properties that enable managed code to execute
218218
<Docs>
219219
<param name="assemblyName">The name of the assembly.</param>
220220
<param name="className">The name of the class.</param>
221-
<summary>Not implemented.
222-
221+
<summary>Not implemented.
222+
223223
This API is not CLS-compliant.</summary>
224224
<returns>Always null (Nothing in Visual Basic).</returns>
225225
<remarks>To be added.</remarks>
@@ -355,12 +355,12 @@ This API is not CLS-compliant.</summary>
355355
<param name="assemblyName">The name of the assembly.</param>
356356
<summary>Creates a class factory that provides security information about the assembly.
357357

358-
This API is not CLS-compliant. </summary>
358+
This API is not CLS-compliant. </summary>
359359
<returns>An object that represents the secure class factory.</returns>
360360
<remarks>
361361
<format type="text/markdown"><![CDATA[
362362
363-
## Remarks
363+
## Remarks
364364
Typically, most of the parameter values can be obtained from the Internet Security Manager.
365365
366366
]]></format>

xml/Microsoft.VisualBasic/Conversion.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2901,13 +2901,13 @@ Dim i3 As Integer = CInt(Fix(sng)) ' Result: 175
29012901
The following call returns the value 1615198.
29022902
29032903
```vb
2904-
Val(" 1615 198th Street N.E.") 
2904+
Val(" 1615 198th Street N.E.")
29052905
```
29062906
29072907
The following call returns the decimal value -1.
29082908
29092909
```vb
2910-
Val("&HFFFF") 
2910+
Val("&HFFFF")
29112911
```
29122912
29132913
> [!NOTE]
@@ -2995,13 +2995,13 @@ Dim n = 1.34&
29952995
The following call returns the value 1234123.
29962996
29972997
```vb
2998-
Val(" 1234 123th Street N.E.") 
2998+
Val(" 1234 123th Street N.E.")
29992999
```
30003000
30013001
The following call returns the decimal value -1.
30023002
30033003
```vb
3004-
Val("&HFFFF") 
3004+
Val("&HFFFF")
30053005
```
30063006
30073007
> [!NOTE]
@@ -3090,13 +3090,13 @@ Val("&HFFFF") 
30903090
The following call returns the value 1234123.
30913091
30923092
```vb
3093-
Val(" 1234 123th Street N.E.") 
3093+
Val(" 1234 123th Street N.E.")
30943094
```
30953095
30963096
The following call returns the decimal value -1.
30973097
30983098
```vb
3099-
Val("&HFFFF") 
3099+
Val("&HFFFF")
31003100
```
31013101
31023102
> [!NOTE]

xml/Microsoft.Vsa/BaseVsaSite.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<Parameter Name="error" Type="Microsoft.Vsa.IVsaError" />
235235
</Parameters>
236236
<Docs>
237-
<param name="error">The IVsaError object representing the offending error.</param>
237+
<param name="error">The IVsaError object representing the offending error.</param>
238238
<summary>Notifies the host about how to respond to compiler errors encountered by the script engine.</summary>
239239
<returns>
240240
<see langword="true" /> if the compiler is directed to continue reporting further errors to the IJSVsaSite object; <see langword="false" /> if the compiler is directed to stop reporting further errors to the IVsaSite object.</returns>

xml/Microsoft.Vsa/IVsaCodeItem.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<remarks>
3535
<format type="text/markdown"><![CDATA[
3636
37-
## Remarks
37+
## Remarks
3838
The specified code item can contain classes, modules, or other source text.
3939
4040
No permissions are required for calling any members of the IVsaCodeItem interface.
@@ -72,11 +72,11 @@ The script engine implements this interface in order to add code items.
7272
<remarks>
7373
<format type="text/markdown"><![CDATA[
7474
75-
## Remarks
75+
## Remarks
7676
The script engine uses information provided by the AddEventSource method to hook up events to the named event source. It obtains event sources by calling the IVsaSite.GetEventSourceInstance method, which is implemented by the host. The AddEventSource method creates a class that handles events raised by a host-provided object.
7777
7878
> [!NOTE]
79-
> The JScript .NET script engine does not support this method. In cases where the JScript .NET engine must hook up an event, you must do so using a global item. Rather than event sources, the JScript .NET engine uses AppGlobal item types. For more information, see VsaItemType.
79+
> The JScript .NET script engine does not support this method. In cases where the JScript .NET engine must hook up an event, you must do so using a global item. Rather than event sources, the JScript .NET engine uses AppGlobal item types. For more information, see VsaItemType.
8080
8181
8282
Within the code item, you can access the event source object by name, and, once accessed, you can write event handlers against the object. The event source type is passed as a string rather than as a Type object to facilitate implementing event sources by unmanaged hosts.
@@ -114,7 +114,7 @@ For more information about the mechanisms for hooking up events for the script e
114114
<remarks>
115115
<format type="text/markdown"><![CDATA[
116116
117-
## Remarks
117+
## Remarks
118118
Appended source text is not subjected to validation. For this reason, errors, if any, will surface on the next call to the IVsaEngine.Compile method.
119119
120120
The appended source text is provided as a single string. Should the string require any formatting, you must provide this yourself.
@@ -145,8 +145,8 @@ The appended source text is provided as a single string. Should the string requi
145145
<remarks>
146146
<format type="text/markdown"><![CDATA[
147147
148-
## Remarks
149-
The CodeDOM property is typically generated as part of the compilation step of the script engine, so it is not available until after a call to the IVsaEngine.Compile method. Some VSA implementations may be able to provide the CodeDOM dynamically, without the need for an explicit compilation step, but hosts cannot rely on this behavior. Some script engines, for example, the JScript .NET script engine, do not support this behavior.
148+
## Remarks
149+
The CodeDOM property is typically generated as part of the compilation step of the script engine, so it is not available until after a call to the IVsaEngine.Compile method. Some VSA implementations may be able to provide the CodeDOM dynamically, without the need for an explicit compilation step, but hosts cannot rely on this behavior. Some script engines, for example, the JScript .NET script engine, do not support this behavior.
150150
151151
]]></format>
152152
</remarks>
@@ -177,7 +177,7 @@ The CodeDOM property is typically generated as part of the compilation step of t
177177
<remarks>
178178
<format type="text/markdown"><![CDATA[
179179
180-
## Remarks
180+
## Remarks
181181
Removing an event source does not remove the underlying event handler from source text. Rather, events no longer raise notifications to the event handler. Therefore, you will get a compiler error if you delete an event source but leave the underlying function in the source code.
182182
183183
]]></format>
@@ -206,7 +206,7 @@ Removing an event source does not remove the underlying event handler from sourc
206206
<remarks>
207207
<format type="text/markdown"><![CDATA[
208208
209-
## Remarks
209+
## Remarks
210210
When you set this property, the text is not subjected to validation. For this reason, errors, if any, will surface on the next call to the IVsaEngine.Compile method.
211211
212212
The SourceText property returns the source text in one large string, including formatting characters such as carriage returns.

xml/Microsoft.Windows.Themes/BulletChrome.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,13 +578,13 @@
578578
## XAML Attribute Usage
579579
580580
```xaml
581-
<object IsChecked="bool"/>
581+
<object IsChecked="bool"/>
582582
```
583583
584584
-or-
585585
586586
```xaml
587-
<object IsChecked="x:Null"/>
587+
<object IsChecked="x:Null"/>
588588
```
589589
590590
]]></format>

xml/Microsoft.Windows.Themes/ClassicBorderDecorator.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
3535
```xaml
3636
<theme:ClassicBorderDecorator ...>
37-
  singleChild
37+
singleChild
3838
</theme:ClassicBorderDecorator>
3939
```
4040

xml/Microsoft.Windows.Themes/DataGridHeaderBorder.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
8484
```xaml
8585
<theme:DataGridHeaderBorder ...>
86-
  singleChild
86+
singleChild
8787
</theme:DataGridHeaderBorder>
8888
```
8989

xml/Microsoft.Windows.Themes/ListBoxChrome.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
4444
```xaml
4545
<theme:ListBoxChrome ...>
46-
  singleChild
46+
singleChild
4747
</theme:ListBoxChrome>
4848
```
4949

xml/Microsoft.Windows.Themes/SystemDropShadowChrome.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
8787
```xaml
8888
<theme:SystemDropShadowChrome ...>
89-
  singleChild
89+
singleChild
9090
</theme:SystemDropShadowChrome>
9191
```
9292

0 commit comments

Comments
 (0)