restored content + other fixes #5773

mairaw · 2018-06-04T03:29:58Z

Fixes #5665

/cc @bradygaster

Fixes done:

Restored content missed during migration
Acrolinx suggestions
Fixed values for WebSocketTransportUsage

Better to hide whitespace changes on the diff to better see changes

rpetrusha

This looks good, @mairaw. There's a broken xref, though, and I've left a number of nits and comments,.

rpetrusha · 2018-06-04T15:29:16Z

docs/framework/wcf/system-provided-bindings.md

+
+|Binding|Configuration Element|Description|
+|-------------|---------------------------|-----------------|
+|<xref:System.ServiceModel.BasicHttpBinding>|[\<basicHttpBinding>](../configure-apps/file-schema/wcf/basichttpbinding.md)|A binding that is suitable for communicating with WS-Basic Profile conformant Web services, for example, ASP.NET Web services (ASMX)-based services. This binding uses HTTP as the transport and text/XML as the default message encoding.|


nit: hyphen between "Profile" and "conformant"

rpetrusha · 2018-06-04T15:30:57Z

docs/framework/wcf/system-provided-bindings.md

+|<xref:System.ServiceModel.BasicHttpBinding>|[\<basicHttpBinding>](../configure-apps/file-schema/wcf/basichttpbinding.md)|A binding that is suitable for communicating with WS-Basic Profile conformant Web services, for example, ASP.NET Web services (ASMX)-based services. This binding uses HTTP as the transport and text/XML as the default message encoding.|
+|<xref:System.ServiceModel.WSHttpBinding>|[\<wsHttpBinding>](../configure-apps/file-schema/wcf/wshttpbinding.md)|A secure and interoperable binding that is suitable for non-duplex service contracts.|
+|<xref:System.ServiceModel.WSDualHttpBinding>|[\<wsDualHttpBinding>](../configure-apps/file-schema/wcf/wsdualhttpbinding.md)|A secure and interoperable binding that is suitable for duplex service contracts or communication through SOAP intermediaries.|
+|<xref:System.ServiceModel.WSFederationHttpBinding>|[\<wsFederationHttpBinding>](../configure-apps/file-schema/wcf/wsfederationhttpbinding.md)|A secure and interoperable binding that supports the WS-Federation protocol that enables organizations that are in a federation to efficiently authenticate and authorize users.|


There is one too many "that" here. I think "WS-Federation protocol, which enables..."

rpetrusha · 2018-06-04T15:32:57Z

docs/framework/wcf/system-provided-bindings.md

+|<xref:System.ServiceModel.NetMsmqBinding>|[\<netMsmqBinding>](../configure-apps/file-schema/wcf/netmsmqbinding.md)|A queued binding that is suitable for cross-machine communication between WCF applications.|
+|<xref:System.ServiceModel.NetPeerTcpBinding>|[\<netPeerTcpBinding>](../configure-apps/file-schema/wcf/netpeertcpbinding.md)|A binding that enables secure, multiple machine communication.|
+|<xref:System.ServiceModel.MsmqIntegration.MsmqIntegrationBinding>|[\<msmqIntegrationBinding>](../configure-apps/file-schema/wcf/msmqintegrationbinding.md)|A binding that is suitable for cross-machine communication between a WCF application and existing Message Queuing applications.|
+|<xref:System.ServiceModel.BasicHttpContextBinding>|[\<basicHttpContextBinding>](../configure-apps/file-schema/wcf/basichttpcontextbinding.md)|A binding that is suitable for communicating with WS-Basic Profile conformant Web services that enables HTTP cookies to be used to exchange context.|


Two occurrences of "that" make this sentence hard to parse. Better: "A binding suitable for communicating...that enables..."

rpetrusha · 2018-06-04T15:33:37Z

docs/framework/wcf/system-provided-bindings.md

+|<xref:System.ServiceModel.BasicHttpContextBinding>|[\<basicHttpContextBinding>](../configure-apps/file-schema/wcf/basichttpcontextbinding.md)|A binding that is suitable for communicating with WS-Basic Profile conformant Web services that enables HTTP cookies to be used to exchange context.|
+|<xref:System.ServiceModel.NetTcpContextBinding>|[\<netTcpContextBinding>](../configure-apps/file-schema/wcf/nettcpcontextbinding.md)|A secure and optimized binding suitable for cross-machine communication between WCF applications that enables SOAP headers to be used to exchange context.|
+|<xref:System.ServiceModel.WebHttpBinding>|[\<webHttpBinding>](../configure-apps/file-schema/wcf/webhttpbinding.md)|A binding used to configure endpoints for WCF Web services that are exposed through HTTP requests instead of SOAP messages.|
+|<xref:System.ServiceModel.WSHttpContextBinding>|[\<wsHttpContextBinding>](../configure-apps/file-schema/wcf/wshttpcontextbinding.md)|A secure and interoperable binding that is suitable for non-duplex service contracts that enables SOAP headers to be used to exchange context.|


same as previous comment

rpetrusha · 2018-06-04T15:47:15Z

docs/framework/wcf/system-provided-bindings.md

- [Endpoint Creation Overview](../../../docs/framework/wcf/endpoint-creation-overview.md)  
- [Using Bindings to Configure Services and Clients](../../../docs/framework/wcf/using-bindings-to-configure-services-and-clients.md)  
- [Basic WCF Programming](../../../docs/framework/wcf/basic-wcf-programming.md)
+> <xref:System.ServiceModel.NetHttpBinding> is a binding designed for consuming HTTP or WebSocket services and uses binary encoding by default. <xref:System.ServiceModel.NetHttpBinding> detects whether it is used with a request-reply contract or duplex contract and change its behavior to match - it uses HTTP for request-reply and WebSockets for duplex. This behavior can be overridden using the <xref:System.ServiceModel.NetHttpBinding.WebSocketTransportUsage> binding setting: Allowed - This is the default value and behaves as described above. Never - This prevents WebSockets from being used. Attempting to use a duplex contract with this setting will result in an exception. Always - This forces WebSockets to be used even for request-reply contracts. NetHttpBinding supports reliable sessions in both HTTP mode and WebSocket mode. In WebSocket mode sessions are provided by the transport.


change its behavior --> changes its behavior

the hyphen between "match" and "it" should be a semicolon.

the xref is broken; it's <xref:System.ServiceModel.Channels.WebSocketTransportUsage>. But there's no Allowed value. I think the value is WhenDuplex. See https://docs.microsoft.com/en-us/dotnet/api/system.servicemodel.channels.websockettransportusage?view=netframework-4.7.2.

rpetrusha · 2018-06-04T15:50:32Z

docs/framework/wcf/system-provided-bindings.md

+|<xref:System.ServiceModel.WSHttpBinding>|[\<wsHttpBinding>](../configure-apps/file-schema/wcf/wshttpbinding.md)|A secure and interoperable binding that is suitable for non-duplex service contracts.|
+|<xref:System.ServiceModel.WSDualHttpBinding>|[\<wsDualHttpBinding>](../configure-apps/file-schema/wcf/wsdualhttpbinding.md)|A secure and interoperable binding that is suitable for duplex service contracts or communication through SOAP intermediaries.|
+|<xref:System.ServiceModel.WSFederationHttpBinding>|[\<wsFederationHttpBinding>](../configure-apps/file-schema/wcf/wsfederationhttpbinding.md)|A secure and interoperable binding that supports the WS-Federation protocol that enables organizations that are in a federation to efficiently authenticate and authorize users.|
+|<xref:System.ServiceModel.NetHttpBinding>|\<netHttpBinding>|A binding designed for consuming HTTP or WebSocket services that uses binary encoding by default.|


This <netHttpBinding> should be s link. The URL is https://docs.microsoft.com/en-us/dotnet/framework/configure-apps/file-schema/wcf/nethttpbinding.

rpetrusha · 2018-06-04T15:52:03Z

docs/framework/wcf/system-provided-bindings.md

+|<xref:System.ServiceModel.WSDualHttpBinding>|[\<wsDualHttpBinding>](../configure-apps/file-schema/wcf/wsdualhttpbinding.md)|A secure and interoperable binding that is suitable for duplex service contracts or communication through SOAP intermediaries.|
+|<xref:System.ServiceModel.WSFederationHttpBinding>|[\<wsFederationHttpBinding>](../configure-apps/file-schema/wcf/wsfederationhttpbinding.md)|A secure and interoperable binding that supports the WS-Federation protocol that enables organizations that are in a federation to efficiently authenticate and authorize users.|
+|<xref:System.ServiceModel.NetHttpBinding>|\<netHttpBinding>|A binding designed for consuming HTTP or WebSocket services that uses binary encoding by default.|
+|<xref:System.ServiceModel.NetHttpsBinding>|\<netHttpsBinding>|A secure binding designed for consuming HTTP or WebSocket services that uses binary encoding by default.|


This <netHttpsBinding> should be a link. The URL is https://docs.microsoft.com/en-us/dotnet/framework/configure-apps/file-schema/wcf/nethttpsbinding.

rpetrusha · 2018-06-04T15:55:06Z

docs/framework/wcf/system-provided-bindings.md

+|<xref:System.ServiceModel.BasicHttpContextBinding>|Basic Profile 1.1|(None), Transport, Message, Mixed|(None)|(None)|n/a|Text, (MTOM)|Yes<br />(buffered)|
+|<xref:System.ServiceModel.NetTcpContextBinding>|.NET|(Transport), Message, None, Mixed|(Transport), Reliable Session, Security Session|(None), Yes|Yes|Binary|Yes<br />(buffered)|
+|<xref:System.ServiceModel.WSHttpContextBinding>|WS|Transport, (Message), Mixed|(None), Reliable Session, Security Session|(None), Yes|n/a|Text, (MTOM)|No|
+|<xref:System.ServiceModel.UdpBinding>|.NET <br /><br /> **Note:**  Interoperability can be achieved by implementing the standard SOAP-over-UDP spec which this binding implements.|(None)|(None)|(None)|n/a|(Text)|No|


nit: moving the note to the first column might improve the table's appearance.

mairaw · 2018-06-04T22:28:45Z

Thanks for your careful review @rpetrusha. I believe I've addressed all your comments.

rpetrusha

This looks really good. Thanks for making the additional changes, @mairaw, especially those unrelated to your PR. It's ready to merge.

restored content + other fixes

90d2b63

mairaw requested review from mconnew and zhenlan June 4, 2018 03:29

removed dupe heading

f5749d3

rpetrusha suggested changes Jun 4, 2018

View reviewed changes

mconnew approved these changes Jun 4, 2018

View reviewed changes

feedback

07b066e

mairaw added the changes-addressed label Jun 4, 2018

rpetrusha approved these changes Jun 5, 2018

View reviewed changes

mairaw merged commit 866e03e into dotnet:master Jun 5, 2018

mairaw deleted the wcf-bindings branch June 5, 2018 17:07

mairaw removed the changes-addressed label Aug 8, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

restored content + other fixes #5773

restored content + other fixes #5773

Uh oh!

mairaw commented Jun 4, 2018 •

edited

Loading

Uh oh!

rpetrusha left a comment

Uh oh!

rpetrusha Jun 4, 2018

Uh oh!

rpetrusha Jun 4, 2018

Uh oh!

rpetrusha Jun 4, 2018

Uh oh!

rpetrusha Jun 4, 2018

Uh oh!

rpetrusha Jun 4, 2018

Uh oh!

rpetrusha Jun 4, 2018

Uh oh!

rpetrusha Jun 4, 2018

Uh oh!

rpetrusha Jun 4, 2018

Uh oh!

mairaw commented Jun 4, 2018

Uh oh!

rpetrusha left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

restored content + other fixes #5773

restored content + other fixes #5773

Uh oh!

Conversation

mairaw commented Jun 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rpetrusha left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mairaw commented Jun 4, 2018

Uh oh!

rpetrusha left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mairaw commented Jun 4, 2018 •

edited

Loading