From e978ab7894e966579fcd372d7cba9e051ba90150 Mon Sep 17 00:00:00 2001
From: "Dr. Matthias St. Pierre" <matthias.st.pierre@ncp-e.com>
Date: Sun, 10 May 2020 02:42:58 +0200
Subject: [PATCH] doc: fix trace category names

The `ENGINE_CONF` and `PROVIDER_CONF` trace categories were merged
into a single `CONF` category (see bc362b9b7202 and 71849dff56d6).

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11806)
---
 doc/man1/openssl.pod                | 4 ++--
 doc/man3/OSSL_trace_set_channel.pod | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index 7170a98448..4bf1a00b0e 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -1298,9 +1298,9 @@ General SSL/TLS.
 
 SSL/TLS cipher.
 
-=item B<ENGINE_CONF>
+=item B<CONF>
 
-ENGINE configuration.
+Show details about provider and engine configuration.
 
 =item B<ENGINE_TABLE>
 
diff --git a/doc/man3/OSSL_trace_set_channel.pod b/doc/man3/OSSL_trace_set_channel.pod
index 1105479af2..57a5a1c8c9 100644
--- a/doc/man3/OSSL_trace_set_channel.pod
+++ b/doc/man3/OSSL_trace_set_channel.pod
@@ -178,9 +178,9 @@ point during evaluation.
 
 Traces BIGNUM context operations.
 
-=item C<OSSL_TRACE_CATEGORY_PROVIDER_CONF>
+=item C<OSSL_TRACE_CATEGORY_CONF>
 
-Traces the OSSL_PROVIDER configuration.
+Traces details about the provider and engine configuration.
 
 =back
 
-- 
2.25.1