fixing conflicts (#33)

config/adapter/adapter.appidentityandaccessadapter.config.pb.html

@@ -1,6 +1,6 @@
 ---
-title: App Identity and Access Adapter
-description: Adapter to enforce authentication and authorization policies for frontend and backend applications.
+title: App Identity and Access
+description: Adapter to enforce authentication and authorization policies for web apps and APIs.
 location: https://istio.io/docs/reference/config/policy-and-telemetry/adapters/app-identity-access-adapter.html
 layout: protoc-gen-docs
 generator: protoc-gen-docs
@@ -12,7 +12,7 @@
 istio_versions: "1.1.x, 1.2.x"
 number_of_entries: 0
 ---
-<p>With the App Identity and Access Istio adapter, you can use any OIDC compliant identity provider to
+<p>With the App Identity and Access Istio adapter, you can use any OIDC compliant identity provider, such as <a href="https://www.ibm.com/cloud/app-id">IBM Cloud App ID</a>, to
 protect your APIs and containerized web apps. Without any change to your code or the need to redeploy
 your app, you can enforce authentication and authorization policies in all of your environments.
 To get started with sample configurations see the <a href="https://cloud.ibm.com/docs/services/appid?topic=appid-istio-adapter">docs</a>.</p>

config/adapter/config.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
-// $title: App Identity and Access Adapter
-// $description: Adapter to enforce authentication and authorization policies for frontend and backend applications.
+// $title: App Identity and Access
+// $description: Adapter to enforce authentication and authorization policies for web apps and APIs.
 // $location: https://istio.io/docs/reference/config/policy-and-telemetry/adapters/app-identity-access-adapter.html
 // $provider: IBM Cloud
 // $contact_email: [email protected]
@@ -11,7 +11,7 @@ syntax = "proto3";
 // $istio_versions: "1.1.x, 1.2.x"
 
 
-// With the App Identity and Access Istio adapter, you can use any OIDC compliant identity provider to
+// With the App Identity and Access Istio adapter, you can use any OIDC compliant identity provider, such as [IBM Cloud App ID](https://www.ibm.com/cloud/app-id), to
 // protect your APIs and containerized web apps. Without any change to your code or the need to redeploy
 // your app, you can enforce authentication and authorization policies in all of your environments.
 // To get started with sample configurations see the [docs] (https://cloud.ibm.com/docs/services/appid?topic=appid-istio-adapter).