Skip to content

Commit 353d192

Browse files
authored
define acronym (dotnet#48133)
1 parent 90f3615 commit 353d192

File tree

7 files changed

+193
-195
lines changed

7 files changed

+193
-195
lines changed

docs/framework/configure-apps/file-schema/wcf/add-of-issuerchannelbehaviors.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.assetid: 50710506-e28f-45dd-ab7e-bff6f44173db
77

88
# \<add> of \<issuerChannelBehaviors>
99

10-
Adds an endpoint behavior to be used when communicating with an STS.
10+
Adds an endpoint behavior to be used when communicating with a security token service (STS).
1111

1212
> [!NOTE]
1313
> If any endpoint behavior contains a [\<clientCredentials>](clientcredentials.md) element, an exception will be thrown.
@@ -20,7 +20,7 @@ Adds an endpoint behavior to be used when communicating with an STS.
2020
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<clientCredentials>**](clientcredentials.md)\
2121
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<issuedToken>**](issuedtoken.md)\
2222
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<issuerChannelBehaviors>**](issuerchannelbehaviors-element.md)\
23-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**\<add>**
23+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**\<add>**
2424

2525
## Syntax
2626

docs/framework/configure-apps/file-schema/wcf/clientcredentials.md

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ ms.assetid: 1e6eef0d-a34e-4d74-b0f7-f65d2181858d
66
---
77
# \<clientCredentials>
88

9-
Specifies the credentials used to authenticate the client to a service.
10-
9+
Specifies the credentials used to authenticate the client to a service.
10+
1111
[**\<configuration>**](../configuration-element.md)\
1212
&nbsp;&nbsp;[**\<system.serviceModel>**](system-servicemodel.md)\
1313
&nbsp;&nbsp;&nbsp;&nbsp;[**\<behaviors>**](behaviors.md)\
1414
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<endpointBehaviors>**](endpointbehaviors.md)\
1515
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<behavior>**](behavior-of-endpointbehaviors.md)\
16-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**\<clientCredentials>**
17-
18-
## Syntax
19-
20-
```xml
16+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**\<clientCredentials>**
17+
18+
## Syntax
19+
20+
```xml
2121
<clientCredentials type="String"
2222
supportInteractive="Boolean" >
2323
<clientCertificate>
@@ -33,40 +33,40 @@ Specifies the credentials used to authenticate the client to a service.
3333
<windowsAuthentication>
3434
</windowsAuthentication>
3535
</clientCredentials>
36-
```
37-
38-
## Attributes and Elements
39-
40-
The following sections describe attributes, child elements, and parent elements.
41-
42-
### Attributes
43-
44-
|Attribute|Description|
45-
|---------------|-----------------|
46-
|`supportInteractive`|A Boolean value that specifies whether an interactive user can be involved in selecting a client credential at run time. The default value is `true`.|
47-
|`type`|A string that specifies the type of this configuration element.|
48-
49-
### Child Elements
50-
51-
|Element|Description|
52-
|-------------|-----------------|
53-
|[\<clientCertificate>](clientcertificate-of-clientcredentials-element.md)|Specifies the certificate used to authenticate the client to the service. This element is of type <xref:System.ServiceModel.Configuration.X509InitiatorCertificateClientElement>.|
54-
|[\<httpDigest>](httpdigest-element.md)|Specifies a digest used to authenticate the client to the service. This element is of type <xref:System.ServiceModel.Configuration.HttpDigestClientElement>.|
55-
|[\<issuedToken>](issuedtoken.md)|Specifies a custom token type used to authenticate the client to a Secure Token Service (STS). This element is of type <xref:System.ServiceModel.Configuration.IssuedTokenClientElement>.|
56-
|[\<peer>](peer-of-clientcredentials-element.md)|Specifies a current peer credential. This element is of type <xref:System.ServiceModel.Configuration.PeerCredentialElement>.|
57-
|[\<serviceCertificate>](servicecertificate-of-clientcredentials-element.md)|Specifies the certificate used to authenticate the service to the client and provides a structure for setting certificate options. This certificate must be supplied out-of-band from the service to the client. This element is of type <xref:System.ServiceModel.Configuration.X509RecipientCertificateClientElement>.|
58-
|[\<windows>](windows-of-clientcredentials-element.md)|Specifies a Windows credential. The default is the credential of the current thread. This element is of type <xref:System.ServiceModel.Configuration.WindowsClientElement>.|
59-
60-
### Parent Elements
61-
62-
|Element|Description|
63-
|-------------|-----------------|
64-
|[\<behavior>](behavior-of-endpointbehaviors.md)|Specifies an endpoint behavior.|
65-
66-
## Remarks
67-
68-
Client credentials are used to authenticate the client to services in cases where mutual authentication is required. This configuration section can also be used to specify service certificates for scenarios where the client must secure messages to a service with the service's certificate.
69-
36+
```
37+
38+
## Attributes and Elements
39+
40+
The following sections describe attributes, child elements, and parent elements.
41+
42+
### Attributes
43+
44+
|Attribute|Description|
45+
|---------------|-----------------|
46+
|`supportInteractive`|A Boolean value that specifies whether an interactive user can be involved in selecting a client credential at run time. The default value is `true`.|
47+
|`type`|A string that specifies the type of this configuration element.|
48+
49+
### Child Elements
50+
51+
|Element|Description|
52+
|-------------|-----------------|
53+
|[\<clientCertificate>](clientcertificate-of-clientcredentials-element.md)|Specifies the certificate used to authenticate the client to the service. This element is of type <xref:System.ServiceModel.Configuration.X509InitiatorCertificateClientElement>.|
54+
|[\<httpDigest>](httpdigest-element.md)|Specifies a digest used to authenticate the client to the service. This element is of type <xref:System.ServiceModel.Configuration.HttpDigestClientElement>.|
55+
|[\<issuedToken>](issuedtoken.md)|Specifies a custom token type used to authenticate the client to a Security Token Service (STS). This element is of type <xref:System.ServiceModel.Configuration.IssuedTokenClientElement>.|
56+
|[\<peer>](peer-of-clientcredentials-element.md)|Specifies a current peer credential. This element is of type <xref:System.ServiceModel.Configuration.PeerCredentialElement>.|
57+
|[\<serviceCertificate>](servicecertificate-of-clientcredentials-element.md)|Specifies the certificate used to authenticate the service to the client and provides a structure for setting certificate options. This certificate must be supplied out-of-band from the service to the client. This element is of type <xref:System.ServiceModel.Configuration.X509RecipientCertificateClientElement>.|
58+
|[\<windows>](windows-of-clientcredentials-element.md)|Specifies a Windows credential. The default is the credential of the current thread. This element is of type <xref:System.ServiceModel.Configuration.WindowsClientElement>.|
59+
60+
### Parent Elements
61+
62+
|Element|Description|
63+
|-------------|-----------------|
64+
|[\<behavior>](behavior-of-endpointbehaviors.md)|Specifies an endpoint behavior.|
65+
66+
## Remarks
67+
68+
Client credentials are used to authenticate the client to services in cases where mutual authentication is required. This configuration section can also be used to specify service certificates for scenarios where the client must secure messages to a service with the service's certificate.
69+
7070
## See also
7171

7272
- <xref:System.ServiceModel.Configuration.ClientCredentialsElement>

docs/framework/configure-apps/file-schema/wcf/defaultcertificate-element.md

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -6,82 +6,82 @@ ms.assetid: f1ddf364-9a00-45d3-b989-ff381c154ce6
66
---
77
# \<defaultCertificate> Element
88

9-
Specifies an X.509 certificate to be used when a service or STS does not provide one via a negotiation protocol.
10-
9+
Specifies an X.509 certificate to be used when security token service (STS) doesn't provide one via a negotiation protocol.
10+
1111
[**\<configuration>**](../configuration-element.md)\
1212
&nbsp;&nbsp;[**\<system.serviceModel>**](system-servicemodel.md)\
1313
&nbsp;&nbsp;&nbsp;&nbsp;[**\<behaviors>**](behaviors.md)\
1414
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<endpointBehaviors>**](endpointbehaviors.md)\
1515
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<behavior>**](behavior-of-endpointbehaviors.md)\
1616
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<clientCredentials>**](clientcredentials.md)\
1717
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[**\<serviceCertificate>**](servicecertificate-of-clientcredentials-element.md)\
18-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**\<defaultCertificate>**
19-
20-
## Syntax
21-
22-
```xml
18+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**\<defaultCertificate>**
19+
20+
## Syntax
21+
22+
```xml
2323
<defaultCertificate findValue="String"
2424
storeLocation=" CurrentUser/LocalMachine"
2525
storeName="AddressBook/AuthRoot/CertificateAuthority/Disallowed/My/Root/TrustedPeople/TrustedPublisher"
2626
x509FindType="FindByThumbPrint/FindBySubjectName/FindBySubjectDistinguishedName/FindByIssuerName/FindByIssuerDistinguishedName/FindBySerialiNumber/FindByTimeValid/FindByTimeNotYetValid/FindByTimeExpired/FindByTemplateName/FindByApplicationPolicy/FindByCertificatePolicy/FindByExtension/FindByKeyUsage/FindBySubjectKeyIdentifier" />
27-
```
28-
29-
## Attributes and Elements
30-
31-
The following sections describe attributes, child elements, and parent elements
32-
33-
### Attributes
34-
35-
|Attribute|Description|
36-
|---------------|-----------------|
37-
|findValue|String. The value to search for.|
38-
|x509FindType|Enumeration. One of the certificate fields to search.|
39-
|storeLocation|Enumeration. One of the two system store locations to search.|
40-
|storeName|Enumeration. One of the system stores to search.|
41-
42-
## findValue Attribute
43-
44-
|Value|Description|
45-
|-----------|-----------------|
46-
|String|The value depends on the field (specified by the X509FindType attribute) being searched. For example, if searching for a thumbprint, the value must be a string of hexadecimal numbers.|
47-
48-
## x509FindType Attribute
49-
50-
|Value|Description|
51-
|-----------|-----------------|
52-
|Enumeration|Values include: FindByThumbprint, FindBySubjectName, FindBySubjectDistinguishedName, FindByIssuerName, FindByIssuerDistinguishedName, FindBySerialNumber, FindByTimeValid, FindByTimeNotYetValid, FindBySerialNumber, FindByTimeExpired, FindByTemplateName, FindByApplicationPolicy, FindByCertificatePolicy, FindByExtension, FindByKeyUsage, FindBySubjectKeyIdentifier.|
53-
54-
## storeLocation Attribute
55-
56-
|Value|Description|
57-
|-----------|-----------------|
58-
|Enumeration|CurrentUser or LocalMachine.|
59-
60-
## storeName Attribute
61-
62-
|Value|Description|
63-
|-----------|-----------------|
64-
|Enumeration|Values include: AddressBook, AuthRoot, CertificateAuthority, Disallowed, My, Root, TrustedPeople, and TrustedPublisher.|
65-
66-
### Child Elements
67-
68-
None.
69-
70-
### Parent Elements
71-
72-
|Element|Description|
73-
|-------------|-----------------|
74-
|[\<serviceCertificate>](servicecertificate-of-clientcredentials-element.md)|Specifies a certificate to use when authenticating a service to the client.|
75-
76-
## Remarks
77-
78-
For bindings that use certificate-based message security, certificate specified by this configuration element is used to encrypt messages to the service and is expected to be used by the service for signing replies to the client. It stores a single certificate to be used when no certificate is specified by a service.
79-
80-
## Example
81-
82-
The following example specifies a certificate to use for endpoints whose URI begins with `http://www.contoso.com` and a certificate to use for all other endpoints that do not perform certificate negotiation.
83-
84-
```xml
27+
```
28+
29+
## Attributes and Elements
30+
31+
The following sections describe attributes, child elements, and parent elements
32+
33+
### Attributes
34+
35+
|Attribute|Description|
36+
|---------------|-----------------|
37+
|findValue|String. The value to search for.|
38+
|x509FindType|Enumeration. One of the certificate fields to search.|
39+
|storeLocation|Enumeration. One of the two system store locations to search.|
40+
|storeName|Enumeration. One of the system stores to search.|
41+
42+
## findValue Attribute
43+
44+
|Value|Description|
45+
|-----------|-----------------|
46+
|String|The value depends on the field (specified by the X509FindType attribute) being searched. For example, if searching for a thumbprint, the value must be a string of hexadecimal numbers.|
47+
48+
## x509FindType Attribute
49+
50+
|Value|Description|
51+
|-----------|-----------------|
52+
|Enumeration|Values include: FindByThumbprint, FindBySubjectName, FindBySubjectDistinguishedName, FindByIssuerName, FindByIssuerDistinguishedName, FindBySerialNumber, FindByTimeValid, FindByTimeNotYetValid, FindBySerialNumber, FindByTimeExpired, FindByTemplateName, FindByApplicationPolicy, FindByCertificatePolicy, FindByExtension, FindByKeyUsage, FindBySubjectKeyIdentifier.|
53+
54+
## storeLocation Attribute
55+
56+
|Value|Description|
57+
|-----------|-----------------|
58+
|Enumeration|CurrentUser or LocalMachine.|
59+
60+
## storeName Attribute
61+
62+
|Value|Description|
63+
|-----------|-----------------|
64+
|Enumeration|Values include: AddressBook, AuthRoot, CertificateAuthority, Disallowed, My, Root, TrustedPeople, and TrustedPublisher.|
65+
66+
### Child Elements
67+
68+
None.
69+
70+
### Parent Elements
71+
72+
|Element|Description|
73+
|-------------|-----------------|
74+
|[\<serviceCertificate>](servicecertificate-of-clientcredentials-element.md)|Specifies a certificate to use when authenticating a service to the client.|
75+
76+
## Remarks
77+
78+
For bindings that use certificate-based message security, certificate specified by this configuration element is used to encrypt messages to the service and is expected to be used by the service for signing replies to the client. It stores a single certificate to be used when no certificate is specified by a service.
79+
80+
## Example
81+
82+
The following example specifies a certificate to use for endpoints whose URI begins with `http://www.contoso.com` and a certificate to use for all other endpoints that do not perform certificate negotiation.
83+
84+
```xml
8585
<serviceCertificate>
8686
<defaultCertificate findValue="www.contoso.com"
8787
storeLocation="LocalMachine"
@@ -97,8 +97,8 @@ Specifies an X.509 certificate to be used when a service or STS does not provide
9797
<authentication revocationMode="Online"
9898
trustedStoreLocation="LocalMachine" />
9999
</serviceCertificate>
100-
```
101-
100+
```
101+
102102
## See also
103103

104104
- <xref:System.ServiceModel.Configuration.X509DefaultServiceCertificateElement>

0 commit comments

Comments
 (0)