diff --git a/includes/vsindigo-md.md b/includes/vsindigo-md.md deleted file mode 100644 index 98b719c6a72..00000000000 --- a/includes/vsindigo-md.md +++ /dev/null @@ -1 +0,0 @@ -Windows Communication Foundation (WCF) \ No newline at end of file diff --git a/xml/System.IdentityModel.Claims/Claim.xml b/xml/System.IdentityModel.Claims/Claim.xml index 21a5de599b4..5ce77c5e7b8 100644 --- a/xml/System.IdentityModel.Claims/Claim.xml +++ b/xml/System.IdentityModel.Claims/Claim.xml @@ -64,7 +64,7 @@ and classes. + Windows Communication Foundation ships a set of pre-defined claim types and rights that are represented as members of the and classes. ]]> diff --git a/xml/System.IdentityModel.Policy/AuthorizationContext.xml b/xml/System.IdentityModel.Policy/AuthorizationContext.xml index a3497d546d4..3b6cf61376f 100644 --- a/xml/System.IdentityModel.Policy/AuthorizationContext.xml +++ b/xml/System.IdentityModel.Policy/AuthorizationContext.xml @@ -213,7 +213,7 @@ to specify the of one or more identities that are related to the . The `Principal` property is used by an to specify the that is associated with an . + Windows Communication Foundation reserves two properties: `Identities` and `Principal`. The `Identities` property is used by an to specify the of one or more identities that are related to the . The `Principal` property is used by an to specify the that is associated with an . ]]> diff --git a/xml/System.IdentityModel.Selectors/CustomUserNameSecurityTokenAuthenticator.xml b/xml/System.IdentityModel.Selectors/CustomUserNameSecurityTokenAuthenticator.xml index da4ec21a121..5cdab34607e 100644 --- a/xml/System.IdentityModel.Selectors/CustomUserNameSecurityTokenAuthenticator.xml +++ b/xml/System.IdentityModel.Selectors/CustomUserNameSecurityTokenAuthenticator.xml @@ -88,7 +88,7 @@ When there are no authorization policies in effect for this application, return an empty of type . - When `null` is returned from the method, [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] throws the . + When the method returns `null`, Windows Communication Foundation throws a . ]]> diff --git a/xml/System.IdentityModel.Selectors/SecurityTokenAuthenticator.xml b/xml/System.IdentityModel.Selectors/SecurityTokenAuthenticator.xml index e8e3cf1ddb4..8c3879f508c 100644 --- a/xml/System.IdentityModel.Selectors/SecurityTokenAuthenticator.xml +++ b/xml/System.IdentityModel.Selectors/SecurityTokenAuthenticator.xml @@ -182,11 +182,11 @@ When the method is overridden, follow these guidelines: -- When the security token passed into the `token` parameter cannot be validated, throw the exception. +- When the security token passed into the `token` parameter cannot be validated, throw a exception. - When there are no authorization policies in effect for this application, return an empty of type . - When `null` is returned by this method, [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] throws the exception. + When this method returns `null`, Windows Communication Foundation throws a exception. The method is called by the method. diff --git a/xml/System.IdentityModel.Selectors/UserNameSecurityTokenAuthenticator.xml b/xml/System.IdentityModel.Selectors/UserNameSecurityTokenAuthenticator.xml index 5f80f546804..6cf7ff82222 100644 --- a/xml/System.IdentityModel.Selectors/UserNameSecurityTokenAuthenticator.xml +++ b/xml/System.IdentityModel.Selectors/UserNameSecurityTokenAuthenticator.xml @@ -20,7 +20,7 @@ ## Remarks Override the class to authenticate security tokens based on a user name and password. - The [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] ships with the following classes that provide support for authenticating security tokens. + Windows Communication Foundation ships with the following classes that provide support for authenticating security tokens. |Type|Description| |----------|-----------------| @@ -154,7 +154,7 @@ - When there are no authorization policies in effect for this application, return an empty of type . - When `null` is returned by this method, [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] throws the exception. + When this method returns `null`, Windows Communication Foundation throws a exception. diff --git a/xml/System.IdentityModel.Selectors/X509SecurityTokenAuthenticator.xml b/xml/System.IdentityModel.Selectors/X509SecurityTokenAuthenticator.xml index 93b6e1f0ddd..a111f5b2dcb 100644 --- a/xml/System.IdentityModel.Selectors/X509SecurityTokenAuthenticator.xml +++ b/xml/System.IdentityModel.Selectors/X509SecurityTokenAuthenticator.xml @@ -252,7 +252,7 @@ - When there are no authorization policies in effect for this application, return an empty of type . - When `null` is returned by this method, [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] throws the exception. + When this method returns `null`, Windows Communication Foundation throws a exception. The method calls the method of the validation method specified in the constructor to authenticate the `token` parameter. diff --git a/xml/System.IdentityModel.Services/ApplicationType.xml b/xml/System.IdentityModel.Services/ApplicationType.xml index c958c9922e0..28d22b3be46 100644 --- a/xml/System.IdentityModel.Services/ApplicationType.xml +++ b/xml/System.IdentityModel.Services/ApplicationType.xml @@ -51,7 +51,7 @@ 1 - A [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] application. + A Windows Communication Foundation application. diff --git a/xml/System.IdentityModel.Tokens/AsymmetricSecurityKey.xml b/xml/System.IdentityModel.Tokens/AsymmetricSecurityKey.xml index 77eae319fdc..fe7ab415d80 100644 --- a/xml/System.IdentityModel.Tokens/AsymmetricSecurityKey.xml +++ b/xml/System.IdentityModel.Tokens/AsymmetricSecurityKey.xml @@ -18,7 +18,7 @@ diff --git a/xml/System.IdentityModel.Tokens/KerberosTicketHashKeyIdentifierClause.xml b/xml/System.IdentityModel.Tokens/KerberosTicketHashKeyIdentifierClause.xml index 321d29f7405..e8d544a277e 100644 --- a/xml/System.IdentityModel.Tokens/KerberosTicketHashKeyIdentifierClause.xml +++ b/xml/System.IdentityModel.Tokens/KerberosTicketHashKeyIdentifierClause.xml @@ -83,7 +83,7 @@ diff --git a/xml/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.xml b/xml/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.xml index 63030967dbd..7de0b7307e6 100644 --- a/xml/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.xml +++ b/xml/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.xml @@ -112,7 +112,7 @@ diff --git a/xml/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.xml b/xml/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.xml index 685a3d385f7..76aaf3a0c4e 100644 --- a/xml/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.xml +++ b/xml/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.xml @@ -93,7 +93,7 @@ @@ -196,7 +196,7 @@ @@ -224,7 +224,7 @@ diff --git a/xml/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.xml b/xml/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.xml index 5dc408710d7..8194a8761d1 100644 --- a/xml/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.xml +++ b/xml/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.xml @@ -20,7 +20,7 @@ ## Remarks Typically, the is not used, other than when a custom security token service is created. When a security token service returns a security token, the issued security token contains references to attached and unattached security. Attached references refer to security tokens that are contained within the security header of a SOAP message and unattached references are security tokens that are not included within the security header of a SOAP message. These references typically affirm the authenticity of the issued security token. Use the class to reference a security token using the distinguished name of the certificate issuer and the X.509 certificate's serial number. The and properties represent the distinguished name of the certificate issuer and the X.509 certificate's serial number, respectively. - [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] supports the following types of security token references for security tokens. + Windows Communication Foundation supports the following types of security token references for security tokens. - diff --git a/xml/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.xml b/xml/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.xml index cd85eb3d2c4..7b4f1df259b 100644 --- a/xml/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.xml +++ b/xml/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.xml @@ -20,7 +20,7 @@ ## Remarks Typically, the does not need to be used, other than when a custom security token service is created. When a security token service returns a security token, the issued security token contains references to attached and unattached security tokens. Attached references refer to security tokens that are contained within the security header of a SOAP message and unattached references are security tokens that are not included within the security header of a SOAP message. These references typically affirm the authenticity of the issued security token. Use the class to reference a security token using the X.509 certificate's subject key identifier extension. The method returns the subject key identifier extension. - [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] supports the following types of security token references for security tokens. + Windows Communication Foundation supports the following types of security token references for security tokens. - diff --git a/xml/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.xml b/xml/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.xml index 427589ee3d8..45ac2eae687 100644 --- a/xml/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.xml +++ b/xml/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.xml @@ -20,7 +20,7 @@ ## Remarks Typically, the does not need to be used, other than when a custom security token service is created. When a security token service returns a security token, the issued security token contains references to attached and unattached security tokens. Attached references refer to security tokens that are contained within the security header of a SOAP message token and unattached references reference security tokens that are not included within the security header of a SOAP message. These references typically affirm the authenticity of the issued security token. Use the class to reference a security token using the X.509 certificate's thumbprint. The method returns the thumbprint. - [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] supports the following types of security token references for security tokens. + Windows Communication Foundation supports the following types of security token references for security tokens. - diff --git a/xml/System.Web.ApplicationServices/ApplicationServicesHostFactory.xml b/xml/System.Web.ApplicationServices/ApplicationServicesHostFactory.xml index 219f36fcb69..a583b2f56e4 100644 --- a/xml/System.Web.ApplicationServices/ApplicationServicesHostFactory.xml +++ b/xml/System.Web.ApplicationServices/ApplicationServicesHostFactory.xml @@ -92,7 +92,7 @@ diff --git a/xml/System.Web.ApplicationServices/AuthenticationService.xml b/xml/System.Web.ApplicationServices/AuthenticationService.xml index 1cecabccd41..2bfc632093d 100644 --- a/xml/System.Web.ApplicationServices/AuthenticationService.xml +++ b/xml/System.Web.ApplicationServices/AuthenticationService.xml @@ -29,7 +29,7 @@ object enables you to authenticate users through a [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] service. You use the WCF authentication service when you must authenticate users through ASP.NET membership from an application that is outside the Web application that stores the user credentials. The application must be able to send and consume message in the SOAP format. Through the class, you can log users in, log users out, validate credentials, check authentication status, customize authentication, and set the authentication cookie. + The object enables you to authenticate users through a Windows Communication Foundation (WCF) service. You use the WCF authentication service when you must authenticate users through ASP.NET membership from an application that is outside the Web application that stores the user credentials. The application must be able to send and consume message in the SOAP format. Through the class, you can log users in, log users out, validate credentials, check authentication status, customize authentication, and set the authentication cookie. The class contains four methods that you should access only through a WCF service: the , , , and methods. To call these methods, you enable the authentication service on a Web server and then connect a WCF-compatible client application to the Web service. For information about how to configure the authentication service, see [How to: Enable the WCF Authentication Service](http://msdn.microsoft.com/library/f7913259-762e-4a73-a771-ac9e42903f44). diff --git a/xml/System.Web.Script.Services/ProxyGenerator.xml b/xml/System.Web.Script.Services/ProxyGenerator.xml index 2fdaeb03cbb..ae89d30367a 100644 --- a/xml/System.Web.Script.Services/ProxyGenerator.xml +++ b/xml/System.Web.Script.Services/ProxyGenerator.xml @@ -18,7 +18,7 @@ method to retrieve the ECMAScript (JavaScript) code that is used to generate the proxy class for a Web service, for a [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] service, or for static page methods that have the attribute applied. + Use the method to retrieve the ECMAScript (JavaScript) code that is used to generate the proxy class for a Web service, for a Windows Communication Foundation service, or for static page methods that have the attribute applied. ]]> @@ -62,7 +62,7 @@ method returns the proxy-generation ECMAScript (JavaScript) for a Web service, for a [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] service, or for static page methods that have the attribute applied. The `type` parameter contains the type of the Web service class, WCF service class, or ASP.NET page class. When the type is a WCF service class or interface, the class or interface must have the attribute applied. If the `debug` parameter is `true`, the resulting code contains XML code comments that can be used for IntelliSense support in Visual Studio or other development environments. As a result, the size of the generated script is larger. + The method returns the proxy-generation ECMAScript (JavaScript) for a Web service, for a Windows Communication Foundation (WCF) service, or for static page methods that have the attribute applied. The `type` parameter contains the type of the Web service class, WCF service class, or ASP.NET page class. When the type is a WCF service class or interface, the class or interface must have the attribute applied. If the `debug` parameter is `true`, the resulting code contains XML code comments that can be used for IntelliSense support in Visual Studio or other development environments. As a result, the size of the generated script is larger. ]]> @@ -102,7 +102,7 @@ method returns the proxy-generation ECMAScript (JavaScript) for a Web service, for a [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)] service, or for static page methods that have the attribute applied. The `type` parameter contains the type of the Web service class, WCF service class, or ASP.NET page class. When the type is a WCF service class or interface, the class or interface must have the attribute applied. If the `debug` parameter is `true`, the resulting code contains XML code comments that can be used for IntelliSense support in Visual Studio or other development environments. As a result, the size of the generated script is larger. + The method returns the proxy-generation ECMAScript (JavaScript) for a Web service, for a Windows Communication Foundation (WCF) service, or for static page methods that have the attribute applied. The `type` parameter contains the type of the Web service class, WCF service class, or ASP.NET page class. When the type is a WCF service class or interface, the class or interface must have the attribute applied. If the `debug` parameter is `true`, the resulting code contains XML code comments that can be used for IntelliSense support in Visual Studio or other development environments. As a result, the size of the generated script is larger. ]]> diff --git a/xml/System.Windows.Markup/ContentPropertyAttribute.xml b/xml/System.Windows.Markup/ContentPropertyAttribute.xml index 1a2b3614810..d4939270ef7 100644 --- a/xml/System.Windows.Markup/ContentPropertyAttribute.xml +++ b/xml/System.Windows.Markup/ContentPropertyAttribute.xml @@ -32,10 +32,10 @@ Because of the `Inherited=true` declaration of the attribute, a value for a normally applies a content property designation to all derived classes as well. Applying an empty enables a derived class to remove a declaration of a content property attribute by a base class (and to note that the class has no content property). Applying a differently named replaces the inherited with the new one. - In previous versions of the .NET Framework, this class existed in the WPF-specific assembly WindowsBase, and also had a parallel implementation in [!INCLUDE[vsindigo](~/includes/vsindigo-md.md)]. In [!INCLUDE[net_v40_long](~/includes/net-v40-long-md.md)], is in the System.Xaml assembly. For more information, see [Types Migrated from WPF to System.Xaml](~/docs/framework/xaml-services/types-migrated-from-wpf-to-system-xaml.md). + In previous versions of the .NET Framework, this class existed in the WPF-specific assembly WindowsBase, and also had a parallel implementation in Windows Communication Foundation (WCF). Starting with the .NET Framework 4.0, is in the System.Xaml assembly. For more information, see [Types Migrated from WPF to System.Xaml](~/docs/framework/xaml-services/types-migrated-from-wpf-to-system-xaml.md). ## WPF Usage Notes - An example of a class in [!INCLUDE[TLA#tla_winclient](~/includes/tlasharptla-winclient-md.md)] that uses the is , which the class inherits from. The property on the is the content property set by the . If a is instantiate in XAML of the will be set to the element that is between the start and end button tags. + An example of a class in Windows Presentation Foundation (WPF) that uses the is , which the class inherits from. The property is the content property set by the . If a is instantiated in XAML, the of the will be set to the element that is between the start and end button tags. ## Examples The following example creates a class named `Film` that has a applied. The property named `Title` is indicated as the content property.