diff --git a/xml/System.Data.Services.Common/EntityPropertyMappingAttribute.xml b/xml/System.Data.Services.Common/EntityPropertyMappingAttribute.xml index b45fc9eee7e..644446ada76 100644 --- a/xml/System.Data.Services.Common/EntityPropertyMappingAttribute.xml +++ b/xml/System.Data.Services.Common/EntityPropertyMappingAttribute.xml @@ -151,7 +151,7 @@ is `true`, the feed is backward compatible with [!INCLUDE[ssAstoria](~/includes/ssastoria-md.md)] client applications that use protocol version 1.0. When the value of ``is `false`, the protocol version used by the data service must be 2.0 or later versions. For more information, see [Data Service Versioning](~/docs/framework/data/wcf/data-service-versioning-wcf-data-services.md). + When the value of is `true`, the feed is backward compatible with [!INCLUDE[ssAstoria](~/includes/ssastoria-md.md)] client applications that use protocol version 1.0. When the value of is `false`, the protocol version used by the data service must be 2.0 or later versions. For more information, see [Data Service Versioning](~/docs/framework/data/wcf/data-service-versioning-wcf-data-services.md). ]]> diff --git a/xml/System.Net.PeerToPeer/PeerNameRecordCollection.xml b/xml/System.Net.PeerToPeer/PeerNameRecordCollection.xml index a0ea64266e4..043f4d3ac06 100644 --- a/xml/System.Net.PeerToPeer/PeerNameRecordCollection.xml +++ b/xml/System.Net.PeerToPeer/PeerNameRecordCollection.xml @@ -28,14 +28,11 @@ element, which are used to specify information about a peer within a . - -- - - References to a peer name record collection are returned by the and methods. - - All members of the class are inherited from the Collection\ class. Only those methods which are overridden are described. + +This collection holds instances of the element, which are used to specify information about a peer within a . + +References to a peer name record collection are returned by the and methods. + ]]> @@ -142,4 +139,4 @@ - \ No newline at end of file + diff --git a/xml/System.Net.PeerToPeer/PnrpPermission.xml b/xml/System.Net.PeerToPeer/PnrpPermission.xml index 80536b2b2ff..3de0560da37 100644 --- a/xml/System.Net.PeerToPeer/PnrpPermission.xml +++ b/xml/System.Net.PeerToPeer/PnrpPermission.xml @@ -37,7 +37,7 @@ ## Remarks The default permissions allow all local and Intranet zone applications to access PNRP services. If the default permissions are not changed, all link-local and site-local applications have access to Peer-to-Peer services, but global (internet) applications have no access. - Instances of this type have two permission states: they either have no access to the resource(s) protected by the permission, or they have unrestricted full access to those resources. + Instances of this type have two permission states: they either have no access to the resources protected by the permission, or they have unrestricted full access to those resources. ]]> @@ -267,19 +267,18 @@ is a subset of the specified permission if the current permission specifies a set of operations that is wholly contained by the specified permission. For example, a permission that represents access to "*C:\example.txt*" is a subset of a permission that represents access to "*C:\\*". If this method returns `true`, the current permission represents no more access to the protected resource than does the specified permission. - - The following statements are required to be `true` for all implementations of the IsSubsetOf method. X, Y, and Z represent objects that are not a `null` reference (`Nothing` in Visual Basic). - -- X.IsSubsetOf(X) returns `true`. - -- X.IsSubsetOf(Y) returns the same value as Y.IsSubsetOf(X) if and only if X and Y represent the same set of permissions. - -- If X.IsSubsetOf(Y) and Y.IsSubsetOf(Z) both return `true`, X.IsSubsetOf(Z) returns `true`. + +The current is a subset of the specified permission if the current permission specifies a set of operations that is wholly contained by the specified permission. For example, a permission that represents access to "*C:\example.txt*" is a subset of a permission that represents access to "*C:\\*". If this method returns `true`, the current permission represents no more access to the protected resource than does the specified permission. -- +The following statements are required to be `true` for all implementations of the IsSubsetOf method. X, Y, and Z represent objects that are not a `null` reference (`Nothing` in Visual Basic). + +- `X.IsSubsetOf(X)` returns `true`. + +- `X.IsSubsetOf(Y)` returns the same value as `Y.IsSubsetOf(X)` if and only if X and Y represent the same set of permissions. + +- If `X.IsSubsetOf(Y)` and `Y.IsSubsetOf(Z)` both return `true`, `X.IsSubsetOf(Z)` returns `true`. - If X represents an empty IPermission object with a permission state of *None* and Y represents an IPermission object that is a `null` reference (`Nothing` in Visual Basic), X.IsSubsetOf(Y) returns `true`. If Z is also an empty permission, the compound set operation X.Union(Z).IsSubsetOf(Y) also returns `true` because the of two empty permissions is an empty permission. +If X represents an empty object with a permission state of *None*, and Y represents an object that is a `null` reference (`Nothing` in Visual Basic), `X.IsSubsetOf(Y)` returns `true`. If Z is also an empty permission, the compound set operation `X.Union(Z).IsSubsetOf(Y)` also returns `true` because the of two empty permissions is an empty permission. ]]> @@ -417,4 +416,4 @@ - \ No newline at end of file + diff --git a/xml/System.Security.Policy/Site.xml b/xml/System.Security.Policy/Site.xml index f676e548fe9..96234c5ab6b 100644 --- a/xml/System.Security.Policy/Site.xml +++ b/xml/System.Security.Policy/Site.xml @@ -41,9 +41,10 @@ evidence produces a in the grant set. If there is a for , the that corresponds to the evidence will be compared with the demanded permission. + +The presence of evidence produces a in the grant set. If there is a for , the that corresponds to the evidence will be compared with the demanded permission. - Site identity is defined for code from URLs with any protocol except FILE. A site is the string between the "//" after the protocol of a URL and the following "/", if present. For example, www.fourthcoffee.com is the site identity in the URL http://www.fourthcoffee.com/process/grind.htm. This excludes port numbers. If a given URL is http://www.fourthcoffee.com:8000/, the site is www.fourthcoffee.com, not www.fourthcoffee.com:8000. +Site identity is defined for code from URLs with any protocol except FILE. A site is the string between the "//" after the protocol of a URL and the following "/", if present. For example, `www.fourthcoffee.com` is the site identity in the URL `http://www.fourthcoffee.com/process/grind.htm`. This excludes port numbers. If a given URL is `http://www.fourthcoffee.com:8000/`, the site is `www.fourthcoffee.com`, not `www.fourthcoffee.com:8000`. ]]> diff --git a/xml/System.Security.Policy/SiteMembershipCondition.xml b/xml/System.Security.Policy/SiteMembershipCondition.xml index 4b7804b0e7f..9dcc45d84a0 100644 --- a/xml/System.Security.Policy/SiteMembershipCondition.xml +++ b/xml/System.Security.Policy/SiteMembershipCondition.xml @@ -46,9 +46,10 @@ . Site identity is defined for code from URLs with any protocol except FILE. A site is the string between the "//" after the protocol of a URL and the following "/", if present. For example, www.fourthcoffee.com is the site identity in the URL http://www.fourthcoffee.com/process/grind.htm. This excludes port numbers. If a given URL is http://www.fourthcoffee.com:8000/, the site is www.fourthcoffee.com, not www.fourthcoffee.com:8000. + +A code assembly satisfies a site membership condition if that code originates from the Web site specified by . Site identity is defined for code from URLs with any protocol except FILE. A site is the string between the "//" after the protocol of a URL and the following "/", if present. For example, `www.fourthcoffee.com` is the site identity in the URL `http://www.fourthcoffee.com/process/grind.htm`. This excludes port numbers. If a given URL is `http://www.fourthcoffee.com:8000/`, the site is `www.fourthcoffee.com`, not `www.fourthcoffee.com:8000`. - Sites can be matched exactly, or by a wildcard ("*") prefix at the dot delimiter. For example, the site name *.fourthcoffee.com matches fourthcoffee.com as well as www.fourthcoffee.com. Without a wildcard, the site name must be a precise match. The site name * will match any site, but will not match code that has no site evidence. +Sites can be matched exactly, or by a wildcard ("\*") prefix at the dot delimiter. For example, the site name `*.fourthcoffee.com` matches `fourthcoffee.com` as well as `www.fourthcoffee.com`. Without a wildcard, the site name must be a precise match. The site name \* will match any site, but will not match code that has no site evidence. ]]> diff --git a/xml/System.Web.UI.Design/TemplateEditingVerb.xml b/xml/System.Web.UI.Design/TemplateEditingVerb.xml index 58a309fd310..811c48b1469 100644 --- a/xml/System.Web.UI.Design/TemplateEditingVerb.xml +++ b/xml/System.Web.UI.Design/TemplateEditingVerb.xml @@ -211,20 +211,16 @@ When `disposing` is `true`, this method releases all resources held by any managed objects that this references. This method invokes the `Dispose` method of each referenced object. - ]]> - - - - - - The class is obsolete. Expose templates through the property of a control designer. The design host creates a for each defined for a control designer. +## Notes to inheritors + +The class is obsolete. Expose templates through the property of a control designer. The design host creates a for each defined for a control designer. - - - can be called multiple times by other objects. When overriding , be careful not to reference objects that have been previously disposed of in an earlier call to . For more information about how to implement , see [Implementing a Dispose Method](~/docs/standard/garbage-collection/implementing-dispose.md). +`Dispose` can be called multiple times by other objects. When overriding `Dispose(Boolean)`, be careful not to reference objects that have been previously disposed of in an earlier call to `Dispose`. For more information about how to implement `Dispose(Boolean)`, see [Implementing a Dispose Method](~/docs/standard/garbage-collection/implementing-dispose.md). - For more information about and , see [Cleaning Up Unmanaged Resources](~/docs/standard/garbage-collection/unmanaged.md) and [Overriding the Finalize Method](https://docs.microsoft.com/previous-versions/dotnet/netframework-4.0/ddae83kx(v=vs.100)). - +For more information about `Dispose` and , see [Cleaning Up Unmanaged Resources](~/docs/standard/garbage-collection/unmanaged.md) and [Overriding the Finalize Method](https://docs.microsoft.com/previous-versions/dotnet/netframework-4.0/ddae83kx(v=vs.100)). + + ]]> + diff --git a/xml/System.Web/HttpCookie.xml b/xml/System.Web/HttpCookie.xml index c6996e43075..33c40bc231d 100644 --- a/xml/System.Web/HttpCookie.xml +++ b/xml/System.Web/HttpCookie.xml @@ -373,9 +373,8 @@ property extends the property to completely describe the specific URL to which the cookie applies. For example, in the URL http:/www.microsoft.com/asp, the domain is www.microsoft.com and the path is /asp. - - + +The property extends the property to completely describe the specific URL to which the cookie applies. For example, in the URL `http:/www.microsoft.com/asp`, the domain is `www.microsoft.com` and the path is /asp. ## Examples The following code example sets the property of a new cookie. diff --git a/xml/System.Workflow.ComponentModel/ActivityExecutionStatusChangedEventArgs.xml b/xml/System.Workflow.ComponentModel/ActivityExecutionStatusChangedEventArgs.xml index 3e86ce21f05..938081579f5 100644 --- a/xml/System.Workflow.ComponentModel/ActivityExecutionStatusChangedEventArgs.xml +++ b/xml/System.Workflow.ComponentModel/ActivityExecutionStatusChangedEventArgs.xml @@ -134,8 +134,6 @@ - The as an enumeration converted to string, of the originating . -- - ]]> diff --git a/xml/System.Xml.Serialization/XmlTypeMapping.xml b/xml/System.Xml.Serialization/XmlTypeMapping.xml index 531394b6475..eee3ec6b779 100644 --- a/xml/System.Xml.Serialization/XmlTypeMapping.xml +++ b/xml/System.Xml.Serialization/XmlTypeMapping.xml @@ -35,7 +35,7 @@ class is used to serialize an object as encoded SOAP XML. The resulting XML conforms to section 5 of the World Wide Web Consortium (www.w3.org) document, "Simple Object Access Protocol (SOAP) 1.1". Create an by calling the method of the class. Use the to construct an instance of the class. To control the serialization, use one of the attributes listed in [Attributes That Control Encoded SOAP Serialization](~/docs/standard/serialization/attributes-that-control-encoded-soap-serialization.md). + The class is used to serialize an object as encoded SOAP XML. The resulting XML conforms to section 5 of the [World Wide Web Consortium](https://www.w3.org) document, "Simple Object Access Protocol (SOAP) 1.1". Create an by calling the method of the class. Use the to construct an instance of the class. To control the serialization, use one of the attributes listed in [Attributes That Control Encoded SOAP Serialization](~/docs/standard/serialization/attributes-that-control-encoded-soap-serialization.md). @@ -323,4 +323,4 @@ To set a namespace name of an object, apply a - \ No newline at end of file + diff --git a/xml/System/DateTime.xml b/xml/System/DateTime.xml index 9506bffecd9..aef9f2c8749 100644 --- a/xml/System/DateTime.xml +++ b/xml/System/DateTime.xml @@ -4953,7 +4953,7 @@ The `DateTime.Parse` overloads return a value whose