Add mentions to docs about removing zones from a catalog zone

diff --git a/docs/catalog.rst b/docs/catalog.rst
index e0ffbdabb776cc5cf37f752b13b602913d748d70..47f233502240fa87a7a5456eadebbc6a36af7e89 100644 (file)
--- a/docs/catalog.rst
+++ b/docs/catalog.rst
@@ -103,6 +103,7 @@ In the example below ``example.com`` is the member and ``catalog.example`` is th
   pdnsutil set-catalog example.com catalog.example
 
 Setting catalog values is supported in the :doc:`API <http-api/zone>`, by setting the ``catalog`` property in the zone properties.
+Setting the catalog to an empty ``""`` removes the member zone from the catalog it is in.
 
 Each member zone may have one or more additional properties as defined in the draft.
 PowerDNS currently supports the following properties:

diff --git a/docs/manpages/pdnsutil.1.rst b/docs/manpages/pdnsutil.1.rst
index 4a7ec6e55940bc1e12664246029397847ef595a7..4dcdfef79d756dd882a8441ec9d722a7998de2b1 100644 (file)
--- a/docs/manpages/pdnsutil.1.rst
+++ b/docs/manpages/pdnsutil.1.rst
@@ -253,7 +253,7 @@ set-options-json *ZONE* *JSON*
 set-option *ZONE* [*producer*|*consumer*] [*coo*|*unique*|*group*] *VALUE* [*VALUE* ...]
     Set or remove an option for *ZONE*. Providing an empty value removes an option.
 set-catalog *ZONE* *CATALOG*
-    Change the catalog of *ZONE* to *CATALOG*
+    Change the catalog of *ZONE* to *CATALOG*. Setting *CATALOG* to an empty "" removes *ZONE* from the catalog it is in.
 set-account *ZONE* *ACCOUNT*
     Change the account (owner) of *ZONE* to *ACCOUNT*.
 add-meta *ZONE* *ATTRIBUTE* *VALUE* [*VALUE*]...

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 6e0466a9705f78323bebd7f4dc32a6999bdc1ae7..3247804d7c85d9d1cc0d604210334ef05b404dad 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -2622,7 +2622,7 @@ try
     cout << "  [producer|consumer]" << endl;
     cout << "  [coo|unique|group] VALUE" << endl;
     cout << "  [VALUE ...]" << endl;
-    cout << "set-catalog ZONE CATALOG           Change the catalog of ZONE to CATALOG" << endl;
+    cout << "set-catalog ZONE CATALOG           Change the catalog of ZONE to CATALOG. Setting CATALOG to an empty "" removes ZONE from the catalog it is in" << endl;
     cout << "set-account ZONE ACCOUNT           Change the account (owner) of ZONE to ACCOUNT" << endl;
     cout << "set-nsec3 ZONE ['PARAMS' [narrow]] Enable NSEC3 with PARAMS. Optionally narrow" << endl;
     cout << "set-presigned ZONE                 Use presigned RRSIGs from storage" << endl;