diff --git a/xml/System.Runtime.ConstrainedExecution/Consistency.xml b/xml/System.Runtime.ConstrainedExecution/Consistency.xml
index a53243cdc92..8a93b8114a2 100644
--- a/xml/System.Runtime.ConstrainedExecution/Consistency.xml
+++ b/xml/System.Runtime.ConstrainedExecution/Consistency.xml
@@ -177,17 +177,7 @@
3
- In the face of exceptional conditions, the method is guaranteed not to corrupt state.
-
- [!NOTE]
-> This does not guarantee that the method will never fail; however, it does guarantee that such a failure will never corrupt state.
-
- ]]>
-
+ In the face of exceptional conditions, the method is guaranteed not to corrupt state. (This does not guarantee that the method will never fail; however, it does guarantee that such a failure will never corrupt state.)
diff --git a/xml/System.Runtime.InteropServices/ClassInterfaceType.xml b/xml/System.Runtime.InteropServices/ClassInterfaceType.xml
index b83b4f91849..23bd355be2c 100644
--- a/xml/System.Runtime.InteropServices/ClassInterfaceType.xml
+++ b/xml/System.Runtime.InteropServices/ClassInterfaceType.xml
@@ -106,15 +106,8 @@
1
- Indicates that the class only supports late binding for COM clients. A for the class is automatically exposed to COM clients on request. The type library produced by [Tlbexp.exe (Type Library Exporter)](~/docs/framework/tools/tlbexp-exe-type-library-exporter.md) does not contain type information for the in order to prevent clients from caching the DISPIDs of the interface. The does not exhibit the versioning problems described in because clients can only late-bind to the interface.
-
- .
-
- ]]>
-
+ Indicates that the class only supports late binding for COM clients. A for the class is automatically exposed to COM clients on request. The type library produced by Tlbexp.exe (Type Library Exporter) does not contain type information for the in order to prevent clients from caching the DISPIDs of the interface. The does not exhibit the versioning problems described in because clients can only late-bind to the interface.
+ This is the default setting for .
@@ -213,4 +206,4 @@
-
\ No newline at end of file
+
diff --git a/xml/System.Runtime.Remoting.Metadata/SoapOption.xml b/xml/System.Runtime.Remoting.Metadata/SoapOption.xml
index ad8092caa7e..29b797305f6 100644
--- a/xml/System.Runtime.Remoting.Metadata/SoapOption.xml
+++ b/xml/System.Runtime.Remoting.Metadata/SoapOption.xml
@@ -31,9 +31,44 @@
enumeration is used to specify instructions to the .NET Framework on how it will generate the SOAP.
+## Remarks
+
+The `SoapOption` enumeration is used to specify instructions to the .NET Framework on how it will generate the SOAP.
+
+For example, while a class by default (with the `SoapOptions.None` enumeration value) might be remoted in the SOAP format as:
+```xml
+10
+hello
+
+
+
+
+Hello World
+hello < world
+<
+< world
+
+```
+
+Remoting serialization with the `SoapOptions.XsdString` option produces the following XML:
+
+```xml
+10
+hello
+hello
+
+
+
+Hello World
+hello < world
+<
+< world
+hello < world
+```
+
+For more information about SOAP envelopes, see [www.w3.org/tr/soap/#_Toc478383494](https://www.w3.org/TR/soap/#_Toc478383494).
+
]]>
@@ -179,49 +214,9 @@
2
- Indicates that the output SOAP string type in a SOAP Envelope is using the prefix, and that the resulting XML does not have an ID attribute for the string.
-
- 10
-hello
-
-
-
-
-Hello World
-hello < world
-<
-< world
-
-```
-
- remoting serialization with the `XsdString` option would produce the following XML.
-
-```
-10
-hello
-hello
-
-
-
-Hello World
-hello < world
-<
-< world
-hello < world
-```
-
- For more information about SOAP envelopes, see www.w3.org/tr/soap/#_Toc478383494.
-
- ]]>
-
+ Indicates that the output SOAP string type in a SOAP Envelope uses the prefix, and that the resulting XML does not have an ID attribute for the string.
-
\ No newline at end of file
+
diff --git a/xml/System.Security.Cryptography.X509Certificates/StoreLocation.xml b/xml/System.Security.Cryptography.X509Certificates/StoreLocation.xml
index 1b5c83ca033..30150e0e809 100644
--- a/xml/System.Security.Cryptography.X509Certificates/StoreLocation.xml
+++ b/xml/System.Security.Cryptography.X509Certificates/StoreLocation.xml
@@ -31,17 +31,19 @@
constructor.
+## Remarks
+
+This enumeration is used with the constructor.
-## Examples
- The following code example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes you have three certificates to add to and remove from a local store.
-
- [!code-cpp[x509store2#1](~/samples/snippets/cpp/VS_Snippets_CLR/x509store2/CPP/x509store2.cpp#1)]
- [!code-csharp[x509store2#1](~/samples/snippets/csharp/VS_Snippets_CLR/x509store2/CS/x509store2.cs#1)]
- [!code-vb[x509store2#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb#1)]
+## Examples
+
+The following example opens an X.509 certificate store, adds and deletes certificates, and then closes the store. It assumes you have three certificates to add to and remove from a local store.
+
+[!code-cpp[x509store2#1](~/samples/snippets/cpp/VS_Snippets_CLR/x509store2/CPP/x509store2.cpp#1)]
+[!code-csharp[x509store2#1](~/samples/snippets/csharp/VS_Snippets_CLR/x509store2/CS/x509store2.cs#1)]
+[!code-vb[x509store2#1](~/samples/snippets/visualbasic/VS_Snippets_CLR/x509store2/vb/x509store2.vb#1)]
]]>
@@ -79,18 +81,6 @@
1
The X.509 certificate store used by the current user.
-
-
-
@@ -125,18 +115,6 @@
2
The X.509 certificate store assigned to the local machine.
-
-
-
diff --git a/xml/System.Security.Cryptography/ECDiffieHellmanKeyDerivationFunction.xml b/xml/System.Security.Cryptography/ECDiffieHellmanKeyDerivationFunction.xml
index e8943d899f8..aa8ce0c443a 100644
--- a/xml/System.Security.Cryptography/ECDiffieHellmanKeyDerivationFunction.xml
+++ b/xml/System.Security.Cryptography/ECDiffieHellmanKeyDerivationFunction.xml
@@ -24,9 +24,9 @@
enumeration defines the type of algorithm that will be used to transform a raw secret agreement into key material. The secret agreement is the value that is generated from a private key and the other party's public key, as part of the key exchange. It is the seed value for the key material that is generated by the method.
+ The `ECDiffieHellmanKeyDerivationFunction` enumeration defines the type of algorithm that will be used to transform a raw secret agreement into key material. The secret agreement is the value that is generated from a private key and the other party's public key, as part of the key exchange. It is the seed value for the key material that is generated by the method.
- The property uses this enumeration to get the key derivation function for the class.
+ The property uses this enumeration to get the key derivation function for the class.
]]>
@@ -55,17 +55,7 @@
0
- A hash algorithm is used to generate key material. The property specifies the name of the algorithm to use. If the algorithm name is not specified, is used as the default algorithm.
-
- and properties, but they are not required.
-
- The amount of key material that is generated is equivalent to the size of the hash value for the specified algorithm.
-
- ]]>
-
+ A hash algorithm is used to generate key material. The property specifies the name of the algorithm to use. If the algorithm name is not specified, is used as the default algorithm. You can also specify the and properties, but they are not required. The amount of key material that is generated is equivalent to the size of the hash value for the specified algorithm.
@@ -91,17 +81,7 @@
1
- A Hash-based Message Authentication Code (HMAC) algorithm is used to generate key material. The property specifies the key to use. Either this property must be set or the property must be set to ; otherwise, a is thrown when you use . If both properties are set, the secret agreement is used as the HMAC key.
-
- and properties, but they are not required.
-
- The amount of key material that is generated is equivalent to the size of the HMAC value.
-
- ]]>
-
+ A Hash-based Message Authentication Code (HMAC) algorithm is used to generate key material. The property specifies the key to use. Either this property must be set or the property must be set to ; otherwise, a is thrown when you use . If both properties are set, the secret agreement is used as the HMAC key. You can also specify the and properties, but they are not required. The amount of key material that is generated is equivalent to the size of the HMAC value.
@@ -127,16 +107,8 @@
2
- The Transport Layer Security (TLS) protocol is used to generate key material. The and properties must be set; otherwise, a is thrown when you use .
-
-
-
+ The Transport Layer Security (TLS) protocol is used to generate key material. The and properties must be set; otherwise, a is thrown when you use . This value generates 160 bits of key material.
-
\ No newline at end of file
+
diff --git a/xml/System.Security.Cryptography/KeyNumber.xml b/xml/System.Security.Cryptography/KeyNumber.xml
index 3ac2897b833..a664ff25f4f 100644
--- a/xml/System.Security.Cryptography/KeyNumber.xml
+++ b/xml/System.Security.Cryptography/KeyNumber.xml
@@ -39,9 +39,7 @@
enumeration with the property to inspect a key type or with the field to specify a key type.
-
-
+ Use the `KeyNumber` enumeration with the property to inspect a key type or with the field to specify a key type.
## Examples
The following code example demonstrates how to use the enumeration to specify a key type for an object.
@@ -84,15 +82,7 @@
1
- An exchange key pair used to encrypt session keys so that they can be safely stored and exchanged with other users.
-
-
-
+ An exchange key pair used to encrypt session keys so that they can be safely stored and exchanged with other users. This value corresponds to the AT_KEYEXCHANGE value used in the unmanaged Microsoft Cryptographic API (CAPI).
@@ -125,15 +115,7 @@
2
- A signature key pair used for authenticating digitally signed messages or files.
-
-
-
+ A signature key pair used for authenticating digitally signed messages or files. This value corresponds to the AT_SIGNATURE value used in the unmanaged Microsoft Cryptographic API (CAPI).
diff --git a/xml/System.Security.Cryptography/PaddingMode.xml b/xml/System.Security.Cryptography/PaddingMode.xml
index 87fa2dc4ab4..00e84461201 100644
--- a/xml/System.Security.Cryptography/PaddingMode.xml
+++ b/xml/System.Security.Cryptography/PaddingMode.xml
@@ -42,16 +42,15 @@
## Remarks
Most plain text messages do not consist of a number of bytes that completely fill blocks. Often, there are not enough bytes to fill the last block. When this happens, a padding string is added to the text. For example, if the block length is 64 bits and the last block contains only 40 bits, 24 bits of padding are added.
- Some encryption standards specify a particular padding scheme. The following example shows how these modes work. Given a blocklength of 8, a data length of 9, the number of padding octets equal to 7, and the data equal to FF FF FF FF FF FF FF FF FF:
-
- Data: FF FF FF FF FF FF FF FF FF
-
- X923 padding: FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 07
-
- PKCS7 padding: FF FF FF FF FF FF FF FF FF 07 07 07 07 07 07 07
-
- ISO10126 padding: FF FF FF FF FF FF FF FF FF 7D 2A 75 EF F8 EF 07
-
+ Some encryption standards specify a particular padding scheme. The following example shows how these modes work. Given a blocklength of 8, a data length of 9, the number of padding octets equal to 7, and the data equal to FF FF FF FF FF FF FF FF FF:
+
+ |||
+|-|-|
+|**Data:**|FF FF FF FF FF FF FF FF FF|
+|**X923 padding:**|FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 07|
+|**PKCS7 padding:**|FF FF FF FF FF FF FF FF FF 07 07 07 07 07 07 07|
+|**ISO10126 padding:**|FF FF FF FF FF FF FF FF FF 7D 2A 75 EF F8 EF 07|
+
]]>
Cryptographic Services
@@ -87,18 +86,6 @@
4
The ANSIX923 padding string consists of a sequence of bytes filled with zeros before the length.
-
-
-
@@ -131,18 +118,6 @@
5
The ISO10126 padding string consists of random data before the length.
-
-
-
@@ -211,18 +186,6 @@
2
The PKCS #7 padding string consists of a sequence of bytes, each of which is equal to the total number of padding bytes added.
-
-
-
@@ -260,4 +223,4 @@
-
\ No newline at end of file
+
diff --git a/xml/System.Security.Cryptography/RSAEncryptionPaddingMode.xml b/xml/System.Security.Cryptography/RSAEncryptionPaddingMode.xml
index 2e797bb57ba..4f7958f130f 100644
--- a/xml/System.Security.Cryptography/RSAEncryptionPaddingMode.xml
+++ b/xml/System.Security.Cryptography/RSAEncryptionPaddingMode.xml
@@ -28,7 +28,15 @@
Specifies the padding mode to use with RSA encryption or decryption operations.
- To be added.
+
+
+
@@ -62,15 +70,7 @@
1
- Optimal Asymmetric Encryption Padding.
-
-
-
+ Optimal Asymmetric Encryption Padding. It is recommended for new applications.
@@ -104,15 +104,7 @@
0
- PKCS #1 v1.5.
-
-
-
+ PKCS #1 v1.5. It is supported for compatibility with existing applications.
diff --git a/xml/System.Security.Cryptography/RSASignaturePaddingMode.xml b/xml/System.Security.Cryptography/RSASignaturePaddingMode.xml
index f8b314789b9..5c10d442e02 100644
--- a/xml/System.Security.Cryptography/RSASignaturePaddingMode.xml
+++ b/xml/System.Security.Cryptography/RSASignaturePaddingMode.xml
@@ -28,7 +28,17 @@
Specifies the padding mode to use with RSA signature creation or verification operations.
- To be added.
+
+
+
@@ -63,14 +73,6 @@
0
PKCS #1 v1.5
-
-
-
@@ -105,14 +107,6 @@
1
Probabilistic Signature Scheme
-
-
-
diff --git a/xml/System.Security.Permissions/FileIOPermissionAccess.xml b/xml/System.Security.Permissions/FileIOPermissionAccess.xml
index ad8cb1a7110..22848706cf1 100644
--- a/xml/System.Security.Permissions/FileIOPermissionAccess.xml
+++ b/xml/System.Security.Permissions/FileIOPermissionAccess.xml
@@ -37,17 +37,18 @@
class.
-
-> [!NOTE]
-> Although NoAccess and AllAccess are members of , they are not valid for use as the parameter for because they describe no file access types or all file access types, respectively, and expects a single file access type.
-
+## Remarks
+
+This enumeration is used with the class.
+
> [!NOTE]
-> Giving Write access to an assembly is similar to granting it Full Trust. If an application should not write to the file system it should not have Write access.
-
+> Giving `Write` access to an assembly is similar to granting it Full Trust. If an application should not write to the file system, it should not have Write access.
+
+Although `NoAccess` and `AllAccess` are members of `FileIOPermissionAccess`, they are not valid for use as the parameter for because they describe no file access types or all file access types, respectively. expects a single file access type.
+
]]>
+
@@ -108,17 +109,7 @@
4
- Access to append material to a file or directory. access includes the ability to create a new file or directory.
-
- [!NOTE]
-> To create files, code must also be granted both Append and either Write or Read access. For more detail see .
-
- ]]>
-
+ Access to append material to a file or directory. access includes the ability to create a new file or directory. To create files, code must also be granted both and either or access.
@@ -176,17 +167,8 @@
8
- Access to the information in the path itself. This helps protect sensitive information in the path, such as user names, as well as information about the directory structure revealed in the path. This value does not grant access to files or folders represented by the path.
-
- [!NOTE]
-> For performance reasons, `PathDiscovery` should only be granted to directories, not to files. For example, `PathDiscovery` permission should be granted to paths such as C:\test and C:\test\\, not C:\test\example.txt.
-
- ]]>
-
+ Access to the information in the path itself. This helps protect sensitive information in the path, such as user names, as well as information about the directory structure revealed in the path. This value does not grant access to files or folders represented by the path.
+ For performance reasons, should only be granted to directories, not to files. For example, permission should be granted to paths such as C:\test and C:\test\\, not C:\test\example.txt.
@@ -248,4 +230,4 @@
-
\ No newline at end of file
+
diff --git a/xml/System.Security.Permissions/KeyContainerPermissionFlags.xml b/xml/System.Security.Permissions/KeyContainerPermissionFlags.xml
index 1392f87aac1..cbb710eab57 100644
--- a/xml/System.Security.Permissions/KeyContainerPermissionFlags.xml
+++ b/xml/System.Security.Permissions/KeyContainerPermissionFlags.xml
@@ -40,18 +40,17 @@
This enumeration is used by members of the class.
> [!CAUTION]
-> Many of these flags can have powerful effects and should be granted only to highly trusted code.
-
- The most powerful of the flags are Create, Delete, Import, Export, Sign, Decrypt, and AllFlags. For specific threats that the use of these flags can present, see the member descriptions.
-
-
-
+> Many of these flags can have powerful effects and should be granted only to highly trusted code.
+>
+> The most powerful flags are `Create`, `Delete`, `Import`, `Export`, `Sign`, `Decrypt`, and `AllFlags`. For specific threats that the use of these flags can present, see the member descriptions.
+
## Examples
- The following code example shows the use of the enumeration.
-
- [!code-cpp[System.Security.Permissions.KeyContainerPermission#20](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Permissions.KeyContainerPermission/CPP/keycontainerpermission.cpp#20)]
- [!code-csharp[System.Security.Permissions.KeyContainerPermission#20](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Permissions.KeyContainerPermission/CS/keycontainerpermission.cs#20)]
- [!code-vb[System.Security.Permissions.KeyContainerPermission#20](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Permissions.KeyContainerPermission/VB/Form1.vb#20)]
+
+The following example shows the use of the `KeyContainerPermissionFlags` enumeration.
+
+[!code-cpp[System.Security.Permissions.KeyContainerPermission#20](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Permissions.KeyContainerPermission/CPP/keycontainerpermission.cpp#20)]
+[!code-csharp[System.Security.Permissions.KeyContainerPermission#20](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Permissions.KeyContainerPermission/CS/keycontainerpermission.cs#20)]
+[!code-vb[System.Security.Permissions.KeyContainerPermission#20](~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Security.Permissions.KeyContainerPermission/VB/Form1.vb#20)]
]]>
@@ -138,15 +137,7 @@
1
- Create a key container.
-
-
-
+ Create a key container.Creating a key container also creates a file on disk. It is very important that any key container that is created is removed when it is no longer in use.
@@ -174,15 +165,8 @@
512
- Decrypt a key container.
-
-
-
+ Decrypt a key container.
+ Decryption is a privileged operation because it uses the private key.
@@ -210,15 +194,7 @@
4
- Delete a key container.
-
-
-
+ Delete a key container.Deleting a key container can constitute a denial of service attack because it prevents the use of files encrypted or signed with the key. Therefore, deletion is a privileged operation.
@@ -246,15 +222,7 @@
32
- Export a key from a key container.
-
-
-
+ Export a key from a key container.The ability to export a key is potentially harmful because it removes the exclusivity of the key.
@@ -282,15 +250,7 @@
16
- Import a key into a key container.
-
-
-
+ Import a key into a key container.The ability to import a key can be as harmful as the ability to delete a container because importing a key into a named key container replaces the existing key.
@@ -346,15 +306,7 @@
2
- Open a key container and use the public key.
-
-
-
+ Open a key container and use the public key. does not give permission to sign or decrypt files using the private key, but it does allow a user to verify file signatures and to encrypt files. Only the owner of the key is able to decrypt these files using the private key.
@@ -382,15 +334,7 @@
256
- Sign a file using a key.
-
-
-
+ Sign a file using a key.The ability to sign a file is potentially harmful because it can allow a user to sign a file using another user's key.
diff --git a/xml/System.Security.Permissions/SecurityPermissionFlag.xml b/xml/System.Security.Permissions/SecurityPermissionFlag.xml
index 9e270917b14..4b416745401 100644
--- a/xml/System.Security.Permissions/SecurityPermissionFlag.xml
+++ b/xml/System.Security.Permissions/SecurityPermissionFlag.xml
@@ -48,7 +48,6 @@
attribute that allows a bitwise combination of its member values.
This enumeration is used by .
@@ -58,7 +57,8 @@
## Examples
- The following code example shows the use of the enumeration to deny and demand security permissions.
+
+The following example shows the use of the enumeration to deny and demand security permissions:
[!code-cpp[System.Security.Permissions.SecurityPermissionAttribute#1](~/samples/snippets/cpp/VS_Snippets_CLR_System/system.Security.Permissions.SecurityPermissionAttribute/CPP/securitypermissionattribute.cpp#1)]
[!code-csharp[System.Security.Permissions.SecurityPermissionAttribute#1](~/samples/snippets/csharp/VS_Snippets_CLR_System/system.Security.Permissions.SecurityPermissionAttribute/CS/securitypermissionattribute.cs#1)]
@@ -283,15 +283,7 @@
32
- Ability to provide evidence, including the ability to alter the evidence provided by the common language runtime.
-
-
-
+ Ability to provide evidence, including the ability to alter the evidence provided by the common language runtime.This is a powerful permission that should only be granted to highly trusted code.
@@ -327,15 +319,7 @@
64
- Ability to view and modify policy.
-
-
-
+ Ability to view and modify policy.This is a powerful permission that should only be granted to highly trusted code.
@@ -443,15 +427,7 @@
8
- Permission for the code to run. Without this permission, managed code will not be executed.
-
- , , and .
-
- ]]>
-
+ Permission for the code to run. Without this permission, managed code will not be executed.This flag has no effect when used dynamically with stack modifiers such as , , and .
@@ -631,17 +607,7 @@
4
- Ability to skip verification of code in this assembly. Code that is unverifiable can be run if this permission is granted.
-
- , , and .
-
- ]]>
-
+ Ability to skip verification of code in this assembly. Code that is unverifiable can be run if this permission is granted.This is a powerful permission that should be granted only to highly trusted code.This flag has no effect when used dynamically with stack modifiers such as , , and .
@@ -677,16 +643,8 @@
2
- Ability to call unmanaged code.
-
-
-
+ Ability to call unmanaged code. Since unmanaged code potentially allows other permissions to be bypassed, this is a dangerous permission that should only be granted to highly trusted code. It is used for such applications as calling native code using PInvoke or using COM interop.
-
\ No newline at end of file
+
diff --git a/xml/System.Security.Permissions/StorePermissionFlags.xml b/xml/System.Security.Permissions/StorePermissionFlags.xml
index d8ca9056ad1..c32c72cd943 100644
--- a/xml/System.Security.Permissions/StorePermissionFlags.xml
+++ b/xml/System.Security.Permissions/StorePermissionFlags.xml
@@ -32,10 +32,9 @@
enumeration.
@@ -72,15 +71,7 @@
32
- The ability to add a certificate to a store.
-
-
-
+ The ability to add a certificate to a store.For security reasons, this ability should be granted only to highly trusted code.
@@ -134,15 +125,7 @@
1
- The ability to create a new store.
-
- method.
-
- ]]>
-
+ The ability to create a new store.New stores are created by calling the method.
@@ -169,15 +152,7 @@
2
- The ability to delete a store.
-
- class.
-
- ]]>
-
+ The ability to delete a store.This functionality is not exposed by the class.
@@ -204,15 +179,7 @@
128
- The ability to enumerate the certificates in a store.
-
-
-
+ The ability to enumerate the certificates in a store.For privacy reasons, this ability should be granted only to fully trusted code.
@@ -239,15 +206,7 @@
4
- The ability to enumerate the stores on a computer.
-
- class.
-
- ]]>
-
+ The ability to enumerate the stores on a computer.This functionality is not exposed by the class.
@@ -301,15 +260,7 @@
16
- The ability to open a store.
-
-
-
+ The ability to open a store.The ability to open a store does not include the ability to enumerate certificates (which raises privacy concerns) or to add or remove certificates (which raises security concerns).
@@ -336,15 +287,7 @@
64
- The ability to remove a certificate from a store.
-
-
-
+ The ability to remove a certificate from a store.This ability should be granted only to highly trusted code because removing a certificate can result in a denial of service.
diff --git a/xml/System.Security.Permissions/UIPermissionWindow.xml b/xml/System.Security.Permissions/UIPermissionWindow.xml
index b90080a9e33..a34d380b8da 100644
--- a/xml/System.Security.Permissions/UIPermissionWindow.xml
+++ b/xml/System.Security.Permissions/UIPermissionWindow.xml
@@ -34,8 +34,45 @@
.
+## Remarks
+
+This enumeration is used by .
+
+When an application runs under the `SafeTopLevelWindows` permission, it:
+
+- Shows the DNS name or IP address of the Web site from which the application was loaded in its title bar.
+
+- Displays Balloon tooltip when it first displays, informing the user that it is running under a restricted trust level.
+
+- Must display its title bar at all times.
+
+- Must display window controls on its forms.
+
+- Cannot minimize its main window on startup.
+
+- Cannot move its windows off-screen.
+
+- Cannot use the property to make its windows less than 50% transparent.
+
+- Must use only rectangular windows, and must include the window frame. Windows Forms will not honor setting to .
+
+- Cannot make windows invisible. Any attempt by the application to set the property to `False` will be ignored.
+
+- Must have an entry in the Task Bar.
+
+- Has its controls prohibited from accessing the property. By implication, controls will also be barred from accessing siblings - that is, other controls at the same level of nesting.
+
+- Cannot control focus using the method.
+
+- Has restricted keyboard input access, so that a form or control can only access keyboard events for itself and its children.
+
+- Has restricted mouse coordinate access, so that a form or control can only read mouse coordinates if the mouse is over its visible area.
+
+- Cannot set the property.
+
+- Cannot control the z-order of controls on the form using the and methods.
+
+ These restrictions help prevent potentially harmful code from spoofing attacks, such as imitating trusted system dialogs.
]]>
@@ -157,50 +194,14 @@
2
- Users can only use and for drawing, and can only use user input events for the user interface within those top-level windows and subwindows.
+ Users can only use and for drawing, and can only use user input events for the user interface within those top-level windows and subwindows. See the Remarks section for more information.
property on to make its windows less than 50% transparent.
-
-- Must use only rectangular windows, and must include the window frame. Windows Forms will not honor setting to `None`.
-
-- Cannot make windows invisible. Any attempt by the application to set the property on its objects to `False` will be ignored.
-
-- Must have an entry in the Task Bar.
-
-- Will have its controls prohibited from accessing the property. By implication, controls will also be barred from accessing siblings - that is, other controls at the same level of nesting.
-
-- Cannot control focus using the method.
-
-- Will have restricted keyboard input access, so that a form or control can only access keyboard events for itself and its children.
-
-- Will have restricted mouse coordinate access, so that a form or control can only read mouse coordinates if the mouse is over its visible area.
-
-- Cannot set the property.
-
-- Cannot control the z-order of controls on the form using the and methods.
-
- These restrictions help prevent potentially harmful code from spoofing attacks, such as imitating trusted system dialogs.
-
]]>
-
\ No newline at end of file
+
diff --git a/xml/System.Web.UI/UpdatePanelUpdateMode.xml b/xml/System.Web.UI/UpdatePanelUpdateMode.xml
index e4005b189a6..6be81c90d5d 100644
--- a/xml/System.Web.UI/UpdatePanelUpdateMode.xml
+++ b/xml/System.Web.UI/UpdatePanelUpdateMode.xml
@@ -18,15 +18,22 @@
enumeration defines the possible update modes for the content of an control. The property must be set to one of the values of the enumeration. The control requires that the property of the control be `true` for partial-page rendering to occur.
+## Remarks
+
+The `UpdatePanelUpdateMode` enumeration is used by the property and defines the possible update modes for the content of an control. The control requires that the property be `true` for partial-page rendering to occur.
+
+The default value of the property is `Always`.
- The default value of the property is Always.
+If the control is inside another control and the parent panel is updated, the nested panel will also be updated regardless of the property value.
- If the control is inside another control and the parent panel is updated, the nested panel will also be updated regardless of the property value.
+The `Conditional` value updates the content of the control under the following conditions:
+
+- The method is called explicitly.
-
+- A control is defined as a trigger by using the property and causes a postback. In this scenario, the control is an explicit trigger for updating the panel content. The trigger control can be either inside or outside the control that defines the trigger.
+- The property is set to `true` and a child control of the control causes a postback. In this scenario, child controls of the control are implicit triggers for updating the panel. Child controls of nested controls do not cause the outer control to be updated unless they are explicitly defined as triggers.
+
## Examples
The following example declares two controls. The first panel sets the property of an control to Conditional. The second panel has set to Always by default. A button outside both panels is registered as an asynchronous postback control by using the method of the control. In the button's click event handler, the method of the first panel is called if more than five seconds have elapsed since its last update. In this scenario, the panel's content is updated only if the last panel update was more than five seconds ago. The second panel's content is always updated.
@@ -78,18 +85,13 @@
1
- The content of the control is updated under the following conditions:
+ Specifies a number of conditions under which the content of the control is updated; see the Remarks section for more information.
method of the control is called explicitly.
-
-- If a control is defined as a trigger by using the Triggers property of the control and causes a postback. In this scenario, the control is an explicit trigger for updating the panel content. The trigger control can be either inside or outside the control that defines the trigger.
-
-- If the property is set to `true` and a child control of the control causes a postback. In this scenario, child controls of the control are implicit triggers for updating the panel. Child controls of nested controls do not cause the outer control to be updated unless they are explicitly defined as triggers.
-
+
]]>