payg and new window (#181)

Author: aimurphy

modules/ROOT/pages/contributions.adoc

@@ -12,14 +12,14 @@ Code contributions for those additional components are not open for PRs at this
 
 == {zdm-proxy} License
 
-{zdm-proxy} is licensed under the open-source https://github.com/datastax/zdm-proxy/blob/main/LICENSE[**Apache-2.0 license agreement**, window="_blank"].  
+{zdm-proxy} is licensed under the open-source https://github.com/datastax/zdm-proxy/blob/main/LICENSE[**Apache-2.0 license agreement**].
 
 == Contributor License Agreement
 
-Acceptance of the {company} https://cla.datastax.com/[Contributor License Agreement, window="_blank"] (CLA) is required before we can consider accepting your {zdm-proxy} code contribution.
-Refer to the https://cla.datastax.com/[CLA terms, window="_blank"] and, if you agree, indicate your acceptance on each Pull Request (PR) that you submit while using the https://github.com/datastax/zdm-proxy[{zdm-proxy} GitHub repository, window="_blank"]. 
+Acceptance of the {company} https://cla.datastax.com/[Contributor License Agreement] (CLA) is required before we can consider accepting your {zdm-proxy} code contribution.
+Refer to the https://cla.datastax.com/[CLA terms] and, if you agree, indicate your acceptance on each Pull Request (PR) that you submit while using the https://github.com/datastax/zdm-proxy[{zdm-proxy} GitHub repository].
 
-// You will see the CLA listed on the standard pull request checklist (TBS) 
+// You will see the CLA listed on the standard pull request checklist (TBS)
 // for the https://github.com/datastax/zdm-proxy[{zdm-proxy}] repository.
 
 == {zdm-proxy} code contributions

modules/ROOT/pages/create-target.adoc

@@ -33,9 +33,9 @@ To use a generic Cassandra or DSE cluster, you will have to:
 === Create an {astra-db-serverless} cluster
 
 Log into the Astra Portal and create a serverless Astra DB database.
-You can start with a Free plan, but consider upgrading during your migration project to an Astra DB Pay As You Go (PAYG) or Enterprise plan, to take advantage of additional functionality -- such as Exporting Metrics to external third-party applications, Bring Your Own Keys, and other features.
+You can start with a Free plan, but consider upgrading during your migration project to an Astra DB Pay As You Go or Enterprise plan, to take advantage of additional functionality -- such as Exporting Metrics to external third-party applications, Bring Your Own Keys, and other features.
 
-The PAYG and Enterprise plans have many benefits over the Free plan, such as the ability to lift rate limiting, and avoiding hibernation timeouts.
+The Pay As You Go and Enterprise plans have many benefits over the Free plan, such as the ability to lift rate limiting, and avoiding hibernation timeouts.
 
 Assign your preferred values for the serverless database:
 

modules/ROOT/pages/dsbulk-migrator.adoc

@@ -7,7 +7,7 @@ Use {dsbulk-migrator} to perform simple migration of smaller data quantities, wh
 
 * Install or switch to Java 11.
 * Install https://maven.apache.org/download.cgi[Maven] 3.9.x.
-* Optionally install https://docs.datastax.com/en/dsbulk/docs/installing/install.html[DSBulk Loader, window="_blank"], if you elect to reference your own external installation of DSBulk, instead of the embedded DSBulk that's in {dsbulk-migrator}.
+* Optionally install https://docs.datastax.com/en/dsbulk/docs/installing/install.html[DSBulk Loader], if you elect to reference your own external installation of DSBulk, instead of the embedded DSBulk that's in {dsbulk-migrator}.
 * Install https://github.com/datastax/simulacron#prerequisites[Simulacron] 0.12.x and its prerequisites, for integration tests.
 
 [[building-dsbulk-migrator]]

modules/ROOT/pages/feasibility-checklists.adoc

@@ -243,4 +243,4 @@ The default retry policy retries all requests in case of a connection error *reg
 
 Prior to version 2.5.0, this driver did *NOT* retry any requests after they have been written to the socket, it was up to the client application to handle these and retry them if they are suitable for a retry.
 
-With the release of 2.5.0, the driver retries requests that are set as `idempotent`. See this C++ 2.x https://docs.datastax.com/en/developer/cpp-driver/2.16/topics/configuration/#query-idempotence[query idempotence documentation section, window="_blank"].
+With the release of 2.5.0, the driver retries requests that are set as `idempotent`. See this C++ 2.x https://docs.datastax.com/en/developer/cpp-driver/2.16/topics/configuration/#query-idempotence[query idempotence documentation section].

modules/ROOT/pages/migrate-and-validate-data.adoc

@@ -38,9 +38,9 @@ A number of helpful assets are provided in each repo.
 
 In particular, the CDM repo provides two configuration templates, with embedded comments and default values, which you can customize to match your data migration's requirements:
 
-* https://github.com/datastax/cassandra-data-migrator/blob/main/src/resources/cdm.properties[cdm.properties, window="_blank"] provides a subset of configuration options with commonly required settings.
+* https://github.com/datastax/cassandra-data-migrator/blob/main/src/resources/cdm.properties[cdm.properties] provides a subset of configuration options with commonly required settings.
 
-* https://github.com/datastax/cassandra-data-migrator/blob/main/src/resources/cdm-detailed.properties[cdm-detailed.properties, window="_blank"] with all available options.
+* https://github.com/datastax/cassandra-data-migrator/blob/main/src/resources/cdm-detailed.properties[cdm-detailed.properties] with all available options.
 
 [[cstar-data-migrator-key-features]]
 == {cstar-data-migrator} features
@@ -61,7 +61,7 @@ The CDM capabilities are extensive:
 * Validate migration accuracy and performance using a smaller randomized data-set.
 * Support for adding custom fixed writetime.
 
-With new or enhanced capabilities in recent https://github.com/datastax/cassandra-data-migrator/packages/1832128[CDM v4.x releases, window="_blank"].
+With new or enhanced capabilities in recent https://github.com/datastax/cassandra-data-migrator/packages/1832128[CDM v4.x releases].
 
 * Column names can differ between Origin and Target.
 * UDTs can be migrated from Origin to Target, even when the keyspace names differ.

modules/ROOT/pages/release-notes.adoc

@@ -53,9 +53,9 @@ You can tune the heartbeat interval with the Ansible configuration variable `hea
 
 DataStax strongly recommends that you use version 2.1.0 (or newer) to benefit from this improvement, especially if you have a read-only workload.
 
-To verify which {zdm-proxy} version you're running, see this xref:troubleshooting-tips.adoc#_how_to_identify_the_zdm_proxy_version[topic, window="_blank"].
+To verify which {zdm-proxy} version you're running, see this xref:troubleshooting-tips.adoc#_how_to_identify_the_zdm_proxy_version[topic].
 
-To find out how to upgrade an existing {zdm-proxy} deployment, see xref:manage-proxy-instances.adoc#_upgrade_the_proxy_version[Upgrade the proxy version, window="_blank"].
+To find out how to upgrade an existing {zdm-proxy} deployment, see xref:manage-proxy-instances.adoc#_upgrade_the_proxy_version[Upgrade the proxy version].
 
 === {zdm-proxy} 2.1.0 changes
 
@@ -69,16 +69,16 @@ For the latest information about {zdm-proxy} new features and other changes, ple
 
 The following topics have been updated for the 2.1.0 release:
 
-* xref:feasibility-checklists.adoc#_read_only_applications[Feasibility checks for read-only applications, window="_blank"].
+* xref:feasibility-checklists.adoc#_read_only_applications[Feasibility checks for read-only applications].
 See the notes indicating that this issue is solved by the {zdm-proxy} 2.1.0 release.
 
-* xref:manage-proxy-instances.adoc#change-mutable-config-variable[Change a mutable configuration variable, window="_blank"].
+* xref:manage-proxy-instances.adoc#change-mutable-config-variable[Change a mutable configuration variable].
 See the `heartbeat_interval_ms` and `zdm-proxy_max_stream_ids` information.
 
-* xref:troubleshooting-scenarios.adoc#_async_read_timeouts_stream_id_map_exhausted[Async read timeouts, window="_blank"].
+* xref:troubleshooting-scenarios.adoc#_async_read_timeouts_stream_id_map_exhausted[Async read timeouts].
 See the clarification in the *Workaround* section indicating that this issue is solved by the {zdm-proxy} 2.1.0 release.
 
-* xref:metrics.adoc#_node_level_metrics[Node-level metrics, window="_blank"].
+* xref:metrics.adoc#_node_level_metrics[Node-level metrics].
 See the "Number of Used Stream Ids" section.
 
 

modules/ROOT/pages/troubleshooting-scenarios.adoc

@@ -61,8 +61,8 @@ If you are using spring boot and/or spring-data-cassandra then an upgrade of the
 Alternatively, you can force the protocol version on the driver to the max supported version by both clusters.
 V4 is a good recommendation that usually fits all but if the user is migrating from DSE to DSE then DSE_V1 should be used for DSE 5.x and DSE_V2 should be used for DSE 6.x.
 
-To force the protocol version on the Java driver, check this section of the https://docs.datastax.com/en/developer/java-driver/3.11/manual/native_protocol/#controlling-the-protocol-version[driver manual, window="_blank"].
-We don't believe this issue affects Java driver 3.x, but here are the https://docs.datastax.com/en/developer/java-driver/3.11/manual/native_protocol/#controlling-the-protocol-version[instructions, window="_blank"] on how to force the version on 3.x, if necessary.
+To force the protocol version on the Java driver, check this section of the https://docs.datastax.com/en/developer/java-driver/3.11/manual/native_protocol/#controlling-the-protocol-version[driver manual].
+We don't believe this issue affects Java driver 3.x, but here are the https://docs.datastax.com/en/developer/java-driver/3.11/manual/native_protocol/#controlling-the-protocol-version[instructions] on how to force the version on 3.x, if necessary.
 
 == Protocol errors in the proxy logs but clients can connect successfully
 
@@ -238,7 +238,7 @@ The driver might also have it enabled for Astra DB depending on what server vers
 === Solution or Workaround
 
 These log messages are harmless but if your need to get rid of them, you can disable the DSE Insights driver feature through the driver configuration.
-Refer to https://github.com/datastax/java-driver/blob/65d2c19c401175dcc6c370560dd5f783d05b05b9/core/src/main/resources/reference.conf#L1328[this property, window="_blank"] for Java driver 4.x.
+Refer to https://github.com/datastax/java-driver/blob/65d2c19c401175dcc6c370560dd5f783d05b05b9/core/src/main/resources/reference.conf#L1328[this property] for Java driver 4.x.
 
 
 
@@ -344,7 +344,7 @@ The Astra DevOps API is likely temporarily unavailable.
 === Solution or Workaround
 
 Download the Astra DB Secure Connect Bundle (SCB) manually and provide its path to the {zdm-automation} as explained xref:deploy-proxy-monitoring.adoc#_core_configuration[here].
-For information about the SCB, see https://docs.datastax.com/en/astra-serverless/docs/connect/secure-connect-bundle.html[working with Secure Connect Bundle, window="_blank"].
+For information about the SCB, see https://docs.datastax.com/en/astra-serverless/docs/connect/secure-connect-bundle.html[working with Secure Connect Bundle].
 
 == Metadata service (Astra) returned not successful status code 4xx or 5xx
 
@@ -372,7 +372,7 @@ If it is `Hibernated`, click the “Resume” button and wait for it to become `
 If it is `Active` already, then it is likely an issue with permissions.
 
 We recommend starting with a token that has the Database Administrator role in Astra DB to confirm that it is a permissions issue.
-Refer to https://docs.datastax.com/en/astra/astra-db-vector/administration/manage-database-access.html[Manage user permissions, window="_blank"].
+Refer to https://docs.datastax.com/en/astra/astra-db-vector/administration/manage-database-access.html[Manage user permissions].
 
 [[_async_read_timeouts_stream_id_map_exhausted]]
 == Async read timeouts / stream id map exhausted
@@ -407,7 +407,7 @@ Starting in version 2.1.0, you can now tune the maximum number of stream ids ava
 You can increase it to match your driver configuration through the xref:manage-proxy-instances.adoc#zdm_proxy_max_stream_ids[zdm_proxy_max_stream_ids] property.
 
 If these errors are being constantly written to the log files (for minutes or even hours) then it is likely that only an application OR {zdm-proxy} restart will fix it.
-If you find an issue like this please submit an https://github.com/datastax/zdm-proxy/issues[Issue, window="_blank"] in our GitHub repo.
+If you find an issue like this please submit an https://github.com/datastax/zdm-proxy/issues[Issue] in our GitHub repo.
 
 == Client application closed connection errors every 10 minutes when migrating to Astra DB
 

modules/ROOT/partials/interactive-lab.adoc

@@ -8,7 +8,7 @@ We've built a complementary learning resource that is a companion to this compre
 
 [NOTE]
 ====
-To run the lab, all major browsers are supported, except Safari. For more, see the lab's https://www.datastax.com/dev/zdm[start page, window="_blank"].
+To run the lab, all major browsers are supported, except Safari. For more, see the lab's https://www.datastax.com/dev/zdm[start page].
 ====
 
 We encourage you to explore this free hands-on interactive lab from {company} Academy. It's an excellent, detailed view of the migration process. The lab describes and demonstrates all the steps and automation performed to prepare for, and complete, a migration from any Cassandra/DSE/{astra_db} database to another Cassandra/DSE/{astra_db} database across clusters.