From 5b3b8a1e70bc1a2062d6e080b607c409feb57b0c Mon Sep 17 00:00:00 2001
From: Dilip Kumar <dilipkumarb@google.com>
Date: Mon, 6 Jul 2026 12:57:05 +0530
Subject: [PATCH] doc: Add catalog documentation for logical replication
 conflict log settings

Document the pg_subscription catalog columns subconflictlogrelid and
subconflictlogdest in catalogs.sgml, which were introduced as part of the
configurable conflict log table feature.

Also update ddl.sgml to use proper <firstterm> markup for the term "conflict
schema".
---
 doc/src/sgml/catalogs.sgml | 26 ++++++++++++++++++++++++++
 doc/src/sgml/ddl.sgml      |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 4b474c13917..7cdd9bd564a 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -8737,6 +8737,32 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</replaceable>:<replaceable>&l
       </para></entry>
      </row>
 
+     <row>
+      <entry role="catalog_table_entry"><para role="column_definition">
+       <structfield>subconflictlogrelid</structfield> <type>oid</type>
+       (references <link linkend="catalog-pg-class"><structname>pg_class</structname></link>.<structfield>oid</structfield>)
+      </para>
+      <para>
+       OID of the subscription conflict log table created in the
+       <literal>pg_conflict</literal> namespace, or zero if
+       <link linkend="sql-createsubscription-params-with-conflict-log-destination"><literal>conflict_log_destination</literal></link>
+       is set to <literal>log</literal>.
+      </para></entry>
+     </row>
+
+     <row>
+      <entry role="catalog_table_entry"><para role="column_definition">
+       <structfield>subconflictlogdest</structfield> <type>text</type>
+      </para>
+      <para>
+       The destination for conflict logging: <literal>log</literal> (server
+       log only), <literal>table</literal> (conflict log table only), or
+       <literal>all</literal> (both). See
+       <link linkend="sql-createsubscription-params-with-conflict-log-destination"><literal>conflict_log_destination</literal></link>
+       for details.
+      </para></entry>
+     </row>
+
      <row>
       <entry role="catalog_table_entry"><para role="column_definition">
        <structfield>subconninfo</structfield> <type>text</type>
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 9d36a8b08f3..f133eb3e501 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -3769,7 +3769,7 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
 
    <para>
     The <literal>pg_conflict</literal> schema (sometimes referred to as the
-    <emphasis>conflict schema</emphasis>) contains system-managed conflict
+    <firstterm>conflict schema</firstterm>) contains system-managed conflict
     log tables used for logical replication conflict tracking.
     These tables are created and maintained by the system and are not intended for
     direct user manipulation. Unlike <literal>pg_catalog</literal>, the
-- 
2.49.0