Merge branch 'main' into test-branch-do-not-merge

Author: stevebream

antora.yml

@@ -1,7 +1,8 @@
-name: docs
+name: 1.4
 title: DataStax Pulsar Connector Documentation 
-version: "1.4"
-display_version: "1.4"
+# jfb, turning off versioning for a bit
+version: "master"
+#display_version: "1.4"
 
 nav:
 - modules/ROOT/nav.adoc

modules/ROOT/nav.adoc

@@ -49,3 +49,4 @@
 ***** xref:cfgRefPulsarAuthLdap.adoc[]
 **** xref:cfgRefPulsarSsl.adoc[]
 **** xref:cfgPulsarConfigureErrorHandling.adoc[]
+

modules/ROOT/pages/cfgPulsarColumnWritetimeTimestamp.adoc

@@ -1,6 +1,6 @@
 = Specify writetime timestamp column 
 
-In the Apache® Pulsar topic mapping, you can optionally specify which column should be used to note the timestamp when the Pulsar-produced record was inserted into any of the xref:index.adoc#supported-databases[supported databases].
+In the Apache Pulsar™ topic mapping, you can optionally specify which column should be used to note the timestamp when the Pulsar-produced record was inserted into any of the xref:index.adoc#supported-databases[supported databases].
 
 The mapping setting provides a special property, `__timestamp`.
 The format is:

modules/ROOT/pages/cfgPulsarConfigTasksMax.adoc

@@ -1,3 +1,3 @@
 = Configuring parallelism 
 
-For information on configuring parallelism for the DataStax Apache® Pulsar Connector, see xref:opsPulsarScaling.adoc[].
+For information on configuring parallelism for the DataStax Apache Pulsar™ Connector, see xref:opsPulsarScaling.adoc[].

modules/ROOT/pages/cfgPulsarConfigureErrorHandling.adoc

@@ -1,6 +1,6 @@
 = Configure error handling 
 
-The DataStax Apache® Pulsar Connector provides an optional parameter, `ignoreErrors`.
+The DataStax Apache Pulsar™ Connector provides an optional parameter, `ignoreErrors`.
 When set to `true`, it allows the connector to continue processing records even after an error occurred on the prior record.
 
 [#ignoreErrors]

modules/ROOT/pages/cfgPulsarDisplayingTopic.adoc

@@ -1,6 +1,6 @@
 = Determining topic data structure 
 
-You can use the Apache® Pulsar `pulsar-client` command line client to examine the structure of Pulsar messages for a topic.
+You can use the Apache Pulsar™ `pulsar-client` command line client to examine the structure of Pulsar messages for a topic.
 
 link:https://pulsar.apache.org/docs/en/reference-cli-tools/#consume/[]
 

modules/ROOT/pages/cfgPulsarJsonMessageSchema.adoc

@@ -1,6 +1,6 @@
 = Mapping JSON messages 
 
-The DataStax Apache® Pulsar Connector supports mapping JSON messages with or without a schema.
+The DataStax Apache Pulsar™ Connector supports mapping JSON messages with or without a schema.
 In this example, the key is regular JSON without schema.
 The value is also JSON but contains a schema and a payload.
 The type of the payload is Map and the connector is able to access the individual fields of that map.
@@ -63,7 +63,7 @@ cqlsh -e "CREATE TABLE stocks_keyspace.stocks_table ( \
 nodetool describering -- keyspace\_name
 ----
 
-. In the DataStax Apache® Pulsar Connector configuration file:
+. In the DataStax Apache Pulsar™ Connector configuration file:
 
 .. Add the topic name to xref:cfgPulsarDseTable.adoc#topics[topics].
 .. Define the topic-to-table map xref:cfgRefPulsarDseTable.adoc#prefix[prefix].

modules/ROOT/pages/cfgPulsarMapAvroMessages.adoc

@@ -1,6 +1,6 @@
 = Mapping Avro messages 
 
-The DataStax Apache® Pulsar Connector supports mapping individual fields from https://avro.apache.org/docs/1.8.1/gettingstartedjava.html[Avro] formatted key or values.
+The DataStax Apache Pulsar™ Connector supports mapping individual fields from https://avro.apache.org/docs/1.8.1/gettingstartedjava.html[Avro] formatted key or values.
 
 In this example, the key is a basic string and the value is Avro format.
 The Pulsar topic name is `users_topic` and have the following records:

modules/ROOT/pages/cfgPulsarMapJson.adoc

@@ -1,6 +1,6 @@
 = Mapping a message that contain JSON fields 
 
-When the data format for the key or value is JSON, the DataStax Apache® Pulsar Connector mapping can include individual fields in the JSON structure.
+When the data format for the key or value is JSON, the DataStax Apache Pulsar™ Connector mapping can include individual fields in the JSON structure.
 
 NOTE: JSON records in Pulsar can also have a schema associated with them.
 

modules/ROOT/pages/cfgPulsarMapKeyPair.adoc

@@ -40,7 +40,7 @@ cqlsh -e "CREATE TABLE world_table (recordid int PRIMARY KEY, continent text);"
 nodetool describering -- keyspace_name
 ----
 
-. In the DataStax Apache® Pulsar Connector configuration file:
+. In the DataStax Apache Pulsar™ Connector configuration file:
 .. Add the topic name to xref:cfgRefPulsarDseTable.adoc#topics[topics].
 .. Define the topic-to-table map xref:cfgRefPulsarDseTable.adoc#prefix[prefix].
 .. Define the xref:cfgRefPulsarDseTable.adoc#mapping[field-to-column map].