Merge pull request #12908 from wwijkander/master

Add note to pdnsutil manpage on how to remove zone from catalog zone

diff --cc docs/catalog.rst
index 744bdd33071beac90cbb215327f72997feb4e1d0,47f233502240fa87a7a5456eadebbc6a36af7e89..c3b6f5fee5463371d6e9501cda4d6d3f5fa5a5ca
--- 1/docs/catalog.rst
--- 2/docs/catalog.rst
+++ b/docs/catalog.rst
@@@ -103,8 -103,9 +103,9 @@@ In the example below ``example.com`` i
    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.
 +Each member zone may have one or more additional properties as defined in the RFC.
  PowerDNS currently supports the following properties:
  
  - coo - A single DNSName

diff --cc pdns/pdnsutil.cc
Simple merge