Merge conflict documentation HTML -> MD change

apache · Oct 1, 2024 · 1a25bba · 1a25bba
1 parent f30c2cc
commit 1a25bba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...able-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java b/...able-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java
@@ -112,6 +112,7 @@ public class QueryAirtableTable extends AbstractProcessor {
     // API Keys are deprecated, Airtable now provides Personal Access Tokens instead.
     static final PropertyDescriptor PAT = new PropertyDescriptor.Builder()
             .name("pat")
+            .displayName("Personal Access Token")
             .description("The Personal Access Token (PAT) to use in queries. Should be generated on Airtable's account page.")
             .required(true)
             .sensitive(true)

diff --git a/...ocs/org.apache.nifi.processors.airtable.QueryAirtableTable/additionalDetails.md b/...ocs/org.apache.nifi.processors.airtable.QueryAirtableTable/additionalDetails.md
@@ -23,10 +23,11 @@ processor can query records from a single base and table via Airtable's REST API
 able to handle a large number of records. It can also split large record sets to multiple FlowFiles just like a database
 processor.
 
-### API Key
+### Personal Access Token
 
-Airtable REST API calls requires an API Key that needs to be passed in a request. An Airtable account is required to
-generate an API Key.
+Please note that API Keys were deprecated, Airtable now provides Personal Access Tokens (PATs) instead.
+Airtable REST API calls requires a PAT (Personal Access Token) that needs to be passed in a request. An Airtable account
+is required to generate the PAT.
 
 ### API rate limit
 
@@ -37,6 +38,6 @@ is recommended to start off with the default settings and to increase both param
 
 ### Metadata API
 
-Currently the Metadata API of Airtable is unstable, and we don't provide a way to use it. Until it becomes stable you
+Currently, the Metadata API of Airtable is unstable, and we don't provide a way to use it. Until it becomes stable you
 can set up a ConvertRecord or MergeRecord processor with a JsonTreeReader to read the content and convert it into a
 Record with schema.