syncing changes

Author: LHL407

articles/event-hubs/schema-registry-client-side-enforcement.md

@@ -11,7 +11,7 @@ ms.author: spelluru
 
 Client-side schema enforcement ensures that data is validated against schemas defined in the schema registry on the client side rather than the broker/server side. The producer application can use schemas to validate and serialize data before sending the data to an event hub. Similarly, a consumer application can deserialize and validate data after it receives events from an event hub.
 
-Client-side schema enforcement ensures that data is validated on the client side. The producer application sends the data and the consumer application receives it. That data is validated against schemas defined in the schema registry on the client side rather than the broker/server side.
+Client-side schema enforcement ensures that data is validated on the client side. The producer application sends the data, and the consumer application receives it. That data is validated against schemas defined in the schema registry on the client side rather than the broker/server side.
 
 This diagram illustrates the flow:
 

articles/event-hubs/schema-registry-concepts.md

@@ -50,7 +50,7 @@ Schema formats are used to determine the manner in which a schema is structured
 To learn more about using Avro schema format with an Event Hubs schema registry, see:
 
 * [How to use Schema Registry with Kafka and Avro](schema-registry-kafka-java-send-receive-quickstart.md)
-* [How to use Schema Registry with Event Hubs, .NET, an SDK (Advanced Message Queuing Protocol or AMQP), and Avro.](schema-registry-dotnet-send-receive-quickstart.md)
+* [How to use Schema Registry with Event Hubs, .NET, an SDK (AMQP), and Avro](schema-registry-dotnet-send-receive-quickstart.md)
 
 ##### JSON schema
 
@@ -133,9 +133,18 @@ To learn how to create and register an application by using the Azure portal, se
 ## Related content
 
 * To learn how to create a schema registry by using the Azure portal, see [Create an Event Hubs schema registry by using the Azure portal](create-schema-registry.md).
+<<<<<<< HEAD
 * See the following **schema registry Avro client library** samples.
 * [.NET](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/schemaregistry/Microsoft.Azure.Data.SchemaRegistry.ApacheAvro/tests/Samples)
 * [Java](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/src/samples)
 * [JavaScript](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/schemaregistry/schema-registry-avro/samples)
 * [Python](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/schemaregistry/azure-schemaregistry-avroencoder/samples)
 * [Kafka Avro Integration for Schema Registry](https://github.com/Azure/azure-schema-registry-for-kafka/tree/master/csharp/avro/samples)
+=======
+* See the following samples from the Schema Registry Avro client library:
+  * [.NET](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/schemaregistry/Microsoft.Azure.Data.SchemaRegistry.ApacheAvro/tests/Samples)
+  * [Java](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/src/samples)
+  * [JavaScript](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/schemaregistry/schema-registry-avro/samples)
+  * [Python](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/schemaregistry/azure-schemaregistry-avroencoder/samples)
+  * [Kafka Avro Integration for Azure Schema Registry](https://github.com/Azure/azure-schema-registry-for-kafka/tree/master/csharp/avro/samples)
+>>>>>>> 95e1c58cbb350b46140387cf312efb05ce808641