Skip to content

Commit 06cd98b

Browse files
mairawmairaw
authored
Merge pull request #3264 from dotnet/master
Update live with current master
2 parents 5f1f3b0 + b871b5f commit 06cd98b

File tree

7 files changed

+79
-82
lines changed

7 files changed

+79
-82
lines changed

‎xml/System.Collections.Generic/IEnumerable`1.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@
6363
]]></format>
6464
</remarks>
6565
<block subset="none" type="overrides">
66-
<para>
67-
<see cref="T:System.Collections.Generic.IEnumerable`1" /> is included for parity with non-generic collections; implementing <see cref="T:System.Collections.Generic.IEnumerable`1" /> allows a generic collection to be passed to a method that expects an <see cref="T:System.Collections.IEnumerable" /> object.</para>
66+
<para>To remain compatible with methods that iterate non-generic collections, <see cref="T:System.Collections.Generic.IEnumerable`1" /> implements <see cref="T:System.Collections.IEnumerable" />. This allows a generic collection to be passed to a method that expects an <see cref="T:System.Collections.IEnumerable" /> object.</para>
6867
</block>
6968
<altmember cref="T:System.Collections.Generic.IEnumerator`1" />
7069
<altmember cref="N:System.Collections" />

‎xml/System.ComponentModel.DataAnnotations/CreditCardAttribute.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<format type="text/markdown"><![CDATA[
3636
3737
## Remarks
38-
The value is validated using a regular expression. The class does not validate that the credit card number is valid for purchases, only that it is well formed.
38+
The value is validated using a string processing algorithm. The class does not validate that the credit card number is valid for purchases, only that it is well formed.
3939
4040
]]></format>
4141
</remarks>
@@ -101,7 +101,7 @@
101101
<format type="text/markdown"><![CDATA[
102102
103103
## Remarks
104-
The value is validated using a regular expression. The class does not validate that the credit card number is valid for purchases, only that it is well formed.
104+
The value is validated using a string processing algorithm. The class does not validate that the credit card number is valid for purchases, only that it is well formed.
105105
106106
]]></format>
107107
</remarks>

‎xml/System.IO/BinaryReader.xml

Lines changed: 37 additions & 38 deletions
Large diffs are not rendered by default.

‎xml/System.Reflection.PortableExecutable/Machine.xml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<BaseTypeName>System.Enum</BaseTypeName>
1919
</Base>
2020
<Docs>
21-
<summary>To be added.</summary>
21+
<summary>Specifies the target machine's CPU architecture.</summary>
2222
<remarks>To be added.</remarks>
2323
</Docs>
2424
<Members>
@@ -44,7 +44,7 @@
4444
</ReturnValue>
4545
<MemberValue>388</MemberValue>
4646
<Docs>
47-
<summary>To be added.</summary>
47+
<summary>Alpha.</summary>
4848
</Docs>
4949
</Member>
5050
<Member MemberName="Alpha64">
@@ -69,7 +69,7 @@
6969
</ReturnValue>
7070
<MemberValue>644</MemberValue>
7171
<Docs>
72-
<summary>To be added.</summary>
72+
<summary>ALPHA64.</summary>
7373
</Docs>
7474
</Member>
7575
<Member MemberName="AM33">
@@ -94,7 +94,7 @@
9494
</ReturnValue>
9595
<MemberValue>467</MemberValue>
9696
<Docs>
97-
<summary>To be added.</summary>
97+
<summary>Matsushita AM33.</summary>
9898
</Docs>
9999
</Member>
100100
<Member MemberName="Amd64">
@@ -119,7 +119,7 @@
119119
</ReturnValue>
120120
<MemberValue>34404</MemberValue>
121121
<Docs>
122-
<summary>To be added.</summary>
122+
<summary>AMD64 (K8).</summary>
123123
</Docs>
124124
</Member>
125125
<Member MemberName="Arm">
@@ -144,7 +144,7 @@
144144
</ReturnValue>
145145
<MemberValue>448</MemberValue>
146146
<Docs>
147-
<summary>To be added.</summary>
147+
<summary>ARM little endian.</summary>
148148
</Docs>
149149
</Member>
150150
<Member MemberName="Arm64">
@@ -165,7 +165,7 @@
165165
</ReturnValue>
166166
<MemberValue>43620</MemberValue>
167167
<Docs>
168-
<summary>To be added.</summary>
168+
<summary>ARM64.</summary>
169169
</Docs>
170170
</Member>
171171
<Member MemberName="ArmThumb2">
@@ -190,7 +190,7 @@
190190
</ReturnValue>
191191
<MemberValue>452</MemberValue>
192192
<Docs>
193-
<summary>To be added.</summary>
193+
<summary>ARM Thumb-2 little endian.</summary>
194194
</Docs>
195195
</Member>
196196
<Member MemberName="Ebc">
@@ -215,7 +215,7 @@
215215
</ReturnValue>
216216
<MemberValue>3772</MemberValue>
217217
<Docs>
218-
<summary>To be added.</summary>
218+
<summary>EFI Byte Code.</summary>
219219
</Docs>
220220
</Member>
221221
<Member MemberName="I386">
@@ -240,7 +240,7 @@
240240
</ReturnValue>
241241
<MemberValue>332</MemberValue>
242242
<Docs>
243-
<summary>To be added.</summary>
243+
<summary>Intel 386.</summary>
244244
</Docs>
245245
</Member>
246246
<Member MemberName="IA64">
@@ -265,7 +265,7 @@
265265
</ReturnValue>
266266
<MemberValue>512</MemberValue>
267267
<Docs>
268-
<summary>To be added.</summary>
268+
<summary>Intel 64.</summary>
269269
</Docs>
270270
</Member>
271271
<Member MemberName="M32R">
@@ -290,7 +290,7 @@
290290
</ReturnValue>
291291
<MemberValue>36929</MemberValue>
292292
<Docs>
293-
<summary>To be added.</summary>
293+
<summary>M32R little-endian.</summary>
294294
</Docs>
295295
</Member>
296296
<Member MemberName="MIPS16">
@@ -315,7 +315,7 @@
315315
</ReturnValue>
316316
<MemberValue>614</MemberValue>
317317
<Docs>
318-
<summary>To be added.</summary>
318+
<summary>MIPS.</summary>
319319
</Docs>
320320
</Member>
321321
<Member MemberName="MipsFpu">
@@ -340,7 +340,7 @@
340340
</ReturnValue>
341341
<MemberValue>870</MemberValue>
342342
<Docs>
343-
<summary>To be added.</summary>
343+
<summary>MIPS with FPU.</summary>
344344
</Docs>
345345
</Member>
346346
<Member MemberName="MipsFpu16">
@@ -365,7 +365,7 @@
365365
</ReturnValue>
366366
<MemberValue>1126</MemberValue>
367367
<Docs>
368-
<summary>To be added.</summary>
368+
<summary>MIPS16 with FPU.</summary>
369369
</Docs>
370370
</Member>
371371
<Member MemberName="PowerPC">
@@ -390,7 +390,7 @@
390390
</ReturnValue>
391391
<MemberValue>496</MemberValue>
392392
<Docs>
393-
<summary>To be added.</summary>
393+
<summary>IBM PowerPC little endian.</summary>
394394
</Docs>
395395
</Member>
396396
<Member MemberName="PowerPCFP">
@@ -415,7 +415,7 @@
415415
</ReturnValue>
416416
<MemberValue>497</MemberValue>
417417
<Docs>
418-
<summary>To be added.</summary>
418+
<summary>PowerPCFP.</summary>
419419
</Docs>
420420
</Member>
421421
<Member MemberName="SH3">
@@ -440,7 +440,7 @@
440440
</ReturnValue>
441441
<MemberValue>418</MemberValue>
442442
<Docs>
443-
<summary>To be added.</summary>
443+
<summary>Hitachi SH3 little endian.</summary>
444444
</Docs>
445445
</Member>
446446
<Member MemberName="SH3Dsp">
@@ -465,7 +465,7 @@
465465
</ReturnValue>
466466
<MemberValue>419</MemberValue>
467467
<Docs>
468-
<summary>To be added.</summary>
468+
<summary>Hitachi SH3 DSP.</summary>
469469
</Docs>
470470
</Member>
471471
<Member MemberName="SH3E">
@@ -490,7 +490,7 @@
490490
</ReturnValue>
491491
<MemberValue>420</MemberValue>
492492
<Docs>
493-
<summary>To be added.</summary>
493+
<summary>Hitachi SH3 little endian.</summary>
494494
</Docs>
495495
</Member>
496496
<Member MemberName="SH4">
@@ -515,7 +515,7 @@
515515
</ReturnValue>
516516
<MemberValue>422</MemberValue>
517517
<Docs>
518-
<summary>To be added.</summary>
518+
<summary>Hitachi SH4 little endian.</summary>
519519
</Docs>
520520
</Member>
521521
<Member MemberName="SH5">
@@ -540,7 +540,7 @@
540540
</ReturnValue>
541541
<MemberValue>424</MemberValue>
542542
<Docs>
543-
<summary>To be added.</summary>
543+
<summary>Hitachi SH5.</summary>
544544
</Docs>
545545
</Member>
546546
<Member MemberName="Thumb">
@@ -565,7 +565,7 @@
565565
</ReturnValue>
566566
<MemberValue>450</MemberValue>
567567
<Docs>
568-
<summary>To be added.</summary>
568+
<summary>Thumb.</summary>
569569
</Docs>
570570
</Member>
571571
<Member MemberName="Tricore">
@@ -590,7 +590,7 @@
590590
</ReturnValue>
591591
<MemberValue>1312</MemberValue>
592592
<Docs>
593-
<summary>To be added.</summary>
593+
<summary>Infineon.</summary>
594594
</Docs>
595595
</Member>
596596
<Member MemberName="Unknown">
@@ -615,7 +615,7 @@
615615
</ReturnValue>
616616
<MemberValue>0</MemberValue>
617617
<Docs>
618-
<summary>To be added.</summary>
618+
<summary>The target CPU is unknown or not specified.</summary>
619619
</Docs>
620620
</Member>
621621
<Member MemberName="WceMipsV2">
@@ -640,7 +640,7 @@
640640
</ReturnValue>
641641
<MemberValue>361</MemberValue>
642642
<Docs>
643-
<summary>To be added.</summary>
643+
<summary>MIPS little-endian WCE v2.</summary>
644644
</Docs>
645645
</Member>
646646
</Members>

‎xml/System.Reflection/ManifestResourceAttributes.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</ReturnValue>
5050
<MemberValue>2</MemberValue>
5151
<Docs>
52-
<summary>To be added.</summary>
52+
<summary>The resource is not exported from the assembly.</summary>
5353
</Docs>
5454
</Member>
5555
<Member MemberName="Public">
@@ -74,7 +74,7 @@
7474
</ReturnValue>
7575
<MemberValue>1</MemberValue>
7676
<Docs>
77-
<summary>To be added.</summary>
77+
<summary>The resource is exported from the assembly.</summary>
7878
</Docs>
7979
</Member>
8080
<Member MemberName="VisibilityMask">
@@ -99,7 +99,7 @@
9999
</ReturnValue>
100100
<MemberValue>7</MemberValue>
101101
<Docs>
102-
<summary>To be added.</summary>
102+
<summary>Masks just the visibility-related attributes.</summary>
103103
</Docs>
104104
</Member>
105105
</Members>

‎xml/System.Reflection/MethodSemanticsAttributes.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</ReturnValue>
4848
<MemberValue>8</MemberValue>
4949
<Docs>
50-
<summary>To be added.</summary>
50+
<summary><para>Used to add a handler for an event. Corresponds to the <see langword="AddOn" /> flag in the Ecma 335 CLI specification.</para><para>CLS-compliant adders are named the with <see langword="add_" /> prefix.</para></summary>
5151
</Docs>
5252
</Member>
5353
<Member MemberName="Getter">
@@ -71,7 +71,7 @@
7171
</ReturnValue>
7272
<MemberValue>2</MemberValue>
7373
<Docs>
74-
<summary>To be added.</summary>
74+
<summary><para>Reads the value of the property.</para><para>CLS-compliant getters are named with `get_` prefix.</para></summary>
7575
</Docs>
7676
</Member>
7777
<Member MemberName="Other">
@@ -95,7 +95,7 @@
9595
</ReturnValue>
9696
<MemberValue>4</MemberValue>
9797
<Docs>
98-
<summary>To be added.</summary>
98+
<summary>Other method for a property (not a getter or setter) or an event (not an adder, remover, or raiser).</summary>
9999
</Docs>
100100
</Member>
101101
<Member MemberName="Raiser">
@@ -119,7 +119,7 @@
119119
</ReturnValue>
120120
<MemberValue>32</MemberValue>
121121
<Docs>
122-
<summary>To be added.</summary>
122+
<summary><para>Used to indicate that an event has occurred. Corresponds to the <see langword="Fire" /> flag in the Ecma 335 CLI specification.</para><para> CLS-compliant raisers are named with the <see langword="raise_" /> prefix.</para></summary>
123123
</Docs>
124124
</Member>
125125
<Member MemberName="Remover">
@@ -143,7 +143,7 @@
143143
</ReturnValue>
144144
<MemberValue>16</MemberValue>
145145
<Docs>
146-
<summary>To be added.</summary>
146+
<summary><para>Used to remove a handler for an event. Corresponds to the <see langword="RemoveOn" /> flag in the Ecma 335 CLI specification.</para><para>CLS-compliant removers are named with the <see langword="remove_" /> prefix.</para></summary>
147147
</Docs>
148148
</Member>
149149
<Member MemberName="Setter">
@@ -167,7 +167,7 @@
167167
</ReturnValue>
168168
<MemberValue>1</MemberValue>
169169
<Docs>
170-
<summary>To be added.</summary>
170+
<summary><para>Used to modify the value of the property.</para><para>CLS-compliant setters are named with the <see langword="set_" /> prefix.</para></summary>
171171
</Docs>
172172
</Member>
173173
</Members>

‎xml/System.Xml.Linq/XElement.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,7 @@ Console.WriteLine(el)
420420
421421
The following example creates an element in a namespace with no content. For more information, see [Working with XML Namespaces](https://msdn.microsoft.com/library/e3003209-3234-45be-a832-47feb7927430).
422422
423-
```
424-
423+
```csharp
425424
XNamespace aw = "http://www.adventure-works.com";
426425
XElement root = new XElement(aw + "Root");
427426
Console.WriteLine(root);
@@ -769,7 +768,7 @@ Console.WriteLine(root)
769768
770769
This example produces the following output:
771770
772-
```
771+
```xml
773772
<Root>Some text</Root>
774773
<Root>
775774
<NewChild>n</NewChild>
@@ -1091,7 +1090,7 @@ Console.WriteLine(root)
10911090
10921091
This example produces the following output:
10931092
1094-
```
1093+
```xml
10951094
<Root>Some text</Root>
10961095
<Root>
10971096
<NewChild>n</NewChild>
@@ -6580,7 +6579,7 @@ Console.WriteLine(root)
65806579
65816580
This example produces the following output:
65826581
6583-
```
6582+
```xml
65846583
<Root>
65856584
<NewChild>n</NewChild>
65866585
</Root>

0 commit comments

Comments
 (0)