fix up 'make publish' for docs, plus re-add the commit about how backends should...

diff --git a/pdns/docs/Makefile b/pdns/docs/Makefile
index 6bad2457fd2e9c7c9a7d1231e95831ad937a9864..3b4fe6199c1794fde813c160193faa39180f85b2 100644 (file)
--- a/pdns/docs/Makefile
+++ b/pdns/docs/Makefile
@@ -37,14 +37,8 @@ html.tar.gz: html/index.html
        asciidoc -b xhtml11 -d manpage  $<
                         
 publish:
-       rsync --rsync-path=./rsync --exclude "*.png" --copy-links --delete -avrze 'ssh -p 2222' ./html pdns.txt pdns.pdf html.tar.gz \
-               localhost:/opt/websites/downloads.powerdns.com/www/documentation/
-#      ssh localhost -p 2222 cp /usr/share/doc/libboost-doc/HTML/doc/html/images/*.png \
-#              /opt/websites/downloads.powerdns.com/www/documentation/html/
-
-publish2:
-       rsync --copy-links --delete -avrze ssh ./html pdns.txt pdns.pdf \
-       ds9a.nl:/var/www/ds9a.nl/tmp/pdns-docs/
+       rsync --exclude "*.png" --copy-links --delete -avrz ./html pdns.txt pdns.pdf html.tar.gz \
+               xs.powerdns.com:/var/www/doc.powerdns.com/
 
 publish3:
        rsync --exclude "*.png" --copy-links --delete -avrz ./html pdns.txt pdns.pdf html.tar.gz \

diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index 40f0212d6b4afea061b50489132498c9dff7a5ae..a0b485a1b76030c03bbbecbe4c557b53cda67182 100644 (file)
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -15927,7 +15927,9 @@ local-ip-address is the ip-address that was queried locally. edns-subnet-address
 is the actual client subnet as provided via edns-subnet support. Note that for the SOA
 query that precedes an AXFR, edns-subnet is always set to 0.0.0.0/0.
 </para>
-
+<para><note><para>Queries for wildcard names should be answered literally, without expansion. So, 
+      if a backend gets a question for "*.powerdns.com", it should only answer with data if there is
+      an actual "*.powerdns.com" name</para></note></para>
 <para>
 AXFR-queries look like this:
 <screen>
@@ -19953,6 +19955,10 @@ Now add TLSRecordContent::report() to <ulink url="http://wiki.powerdns.com/trac/
        The semantics are simple. Each instance of your class only handles one (1) query at a time. There is no need for locking as PDNS guarantees
        that your backend will never be called reentrantly. 
       </para>
+      <para><note><para>Queries for wildcard names should be answered literally, without expansion. So, 
+      if a backend gets a question for "*.powerdns.com", it should only answer with data if there is
+      an actual "*.powerdns.com" name</para></note></para>
+
       <para>
        Some examples, a more formal specification is down below. A normal lookup starts like this: