From: Kees Monshouwer Date: Fri, 10 Oct 2014 20:21:17 +0000 (+0200) Subject: remove priority in docs X-Git-Tag: rec-3.7.0-rc1~189^2~5^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc366927e7169187fdbda6f31385ecdb1bee5840;p=thirdparty%2Fpdns.git remove priority in docs --- diff --git a/pdns/docs/httpapi/api_spec.md b/pdns/docs/httpapi/api_spec.md index 77bce6e5c1..9200ef43ca 100644 --- a/pdns/docs/httpapi/api_spec.md +++ b/pdns/docs/httpapi/api_spec.md @@ -411,7 +411,6 @@ Client body for PATCH: { "content": , "name": , - "priority": , "ttl": , "type": , "disabled": diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml index 3ab0469552..18baaf807b 100644 --- a/pdns/docs/pdns.xml +++ b/pdns/docs/pdns.xml @@ -22074,7 +22074,7 @@ Response: Reply: - array of <qtype,qname,content,ttl,domain_id,priority,scopeMask,auth> + array of <qtype,qname,content,ttl,domain_id,scopeMask,auth> Optional values: @@ -22145,7 +22145,7 @@ Content-Type: text/javascript; charset=utf-8 Reply: - array of <qtype,qname,content,ttl,domain_id,priority,scopeMask,auth> + array of <qtype,qname,content,ttl,domain_id,scopeMask,auth> Optional values: @@ -22173,7 +22173,7 @@ to appropriate value, otherwise things can go wrong. {"result":[ {"qtype":"SOA", "qname":"example.com", "content":"dns1.icann.org. hostmaster.icann.org. 2012081600 7200 3600 1209600 3600", "ttl": 3600}, {"qtype":"NS", "qname":"example.com", "content":"ns1.example.com", "ttl": 60}, - {"qtype":"MX", "qname":"example.com", "content":"mx1.example.com.", "ttl": 60, "priority":10}, + {"qtype":"MX", "qname":"example.com", "content":"10 mx1.example.com.", "ttl": 60}, {"qtype":"A", "qname":"www.example.com", "content":"192.168.1.2", "ttl": 60}, {"qtype":"A", "qname":"ns1.example.com", "content":"192.168.0.2", "ttl": 60}, {"qtype":"A", "qname":"mx1.example.com", "content":"192.168.0.3", "ttl": 60} @@ -22198,7 +22198,7 @@ X-RemoteBackend-domain-id: -1 HTTP/1.1 200 OK Content-Type: text/javascript; charset=utf-8 -{"result":[{"qtype":"SOA", "qname":"example.com", "content":"dns1.icann.org. hostmaster.icann.org. 2012081600 7200 3600 1209600 3600", "ttl": 3600},{"qtype":"NS", "qname":"example.com", "content":"ns1.example.com", "ttl": 60},{"qtype":"MX", "qname":"example.com", "content":"mx1.example.com.", "ttl": 60, "priority":10},{"qtype":"A", "qname":"www.example.com", "content":"192.168.1.2", "ttl": 60},{"qtype":"A", "qname":"ns1.example.com", "content":"192.168.0.2", "ttl": 60},{"qtype":"A", "qname":"mx1.example.com", "content":"192.168.0.3", "ttl": 60}]} +{"result":[{"qtype":"SOA", "qname":"example.com", "content":"dns1.icann.org. hostmaster.icann.org. 2012081600 7200 3600 1209600 3600", "ttl": 3600},{"qtype":"NS", "qname":"example.com", "content":"ns1.example.com", "ttl": 60},{"qtype":"MX", "qname":"example.com", "content":"10 mx1.example.com.", "ttl": 60},{"qtype":"A", "qname":"www.example.com", "content":"192.168.1.2", "ttl": 60},{"qtype":"A", "qname":"ns1.example.com", "content":"192.168.0.2", "ttl": 60},{"qtype":"A", "qname":"mx1.example.com", "content":"192.168.0.3", "ttl": 60}]} @@ -23070,7 +23070,7 @@ Creates new domain with given record(s) as master servers. IP address is the add Query: -{"method":"superMasterBackend","parameters":{"ip":"10.0.0.1","domain":"example.com","nsset":[{"qtype":"NS","qname":"example.com","qclass":1,"content":"ns1.example.com","ttl":300,"priority":0,"auth":true},{"qtype":"NS","qname":"example.com","qclass":1,"content":"ns2.example.com","ttl":300,"priority":0,"auth":true}]}} +{"method":"superMasterBackend","parameters":{"ip":"10.0.0.1","domain":"example.com","nsset":[{"qtype":"NS","qname":"example.com","qclass":1,"content":"ns1.example.com","ttl":300,"auth":true},{"qtype":"NS","qname":"example.com","qclass":1,"content":"ns2.example.com","ttl":300,"auth":true}]}} @@ -23095,7 +23095,7 @@ POST /dnsapi/supermasterbackend/10.0.0.1/example.com Content-Type: application/x-www-form-urlencoded Content-Length: 317 -nsset[1][qtype]=NS&nsset[1][qname]=example.com&nsset[1][qclass]=1&nsset[1][content]=ns1.example.com&nsset[1][ttl]=300&nsset[1][priority]=0&nsset[1][auth]=true&nsset[2][qtype]=NS&nsset[2][qname]=example.com&nsset[2][qclass]=1&nsset[2][content]=ns2.example.com&nsset[2][ttl]=300&nsset[2][priority]=0&nsset[2][auth]=true +nsset[1][qtype]=NS&nsset[1][qname]=example.com&nsset[1][qclass]=1&nsset[1][content]=ns1.example.com&nsset[1][ttl]=300&nsset[1][auth]=true&nsset[2][qtype]=NS&nsset[2][qname]=example.com&nsset[2][qclass]=1&nsset[2][content]=ns2.example.com&nsset[2][ttl]=300&nsset[2][auth]=true @@ -23212,7 +23212,7 @@ This method replaces a given resource record with new set. The new qtype can be Query: -{"method":"replaceRRSet","parameters":{"domain_id":2,"qname":"replace.example.com","qtype":"A","trxid":1370416133,"rrset":[{"qtype":"A","qname":"replace.example.com","qclass":1,"content":"1.1.1.1","ttl":300,"priority":0,"auth":true}]}} +{"method":"replaceRRSet","parameters":{"domain_id":2,"qname":"replace.example.com","qtype":"A","trxid":1370416133,"rrset":[{"qtype":"A","qname":"replace.example.com","qclass":1,"content":"1.1.1.1","ttl":300,"auth":true}]}} @@ -23233,7 +23233,7 @@ PATCH /dnsapi/replacerrset/2/replace.example.com/A Content-Type: application/x-www-form-urlencoded Content-Length: 135 -trxid=1370416133&rrset[qtype]=A&rrset[qname]=replace.example.com&rrset[qclass]=1&rrset[content]=1.1.1.1&rrset[priority]=0&rrset[auth]=1 +trxid=1370416133&rrset[qtype]=A&rrset[qname]=replace.example.com&rrset[qclass]=1&rrset[content]=1.1.1.1&rrset[auth]=1 @@ -23276,7 +23276,7 @@ Asks to feed new record into system. If startTransaction was called, trxId ident Query: -{"method":"feedRecord","parameters":{"rr":{"qtype":"A","qname":"replace.example.com","qclass":1,"content":"127.0.0.1","ttl":300,"priority":0,"auth":true},"trxid":1370416133}} +{"method":"feedRecord","parameters":{"rr":{"qtype":"A","qname":"replace.example.com","qclass":1,"content":"127.0.0.1","ttl":300,"auth":true},"trxid":1370416133}} @@ -23297,7 +23297,7 @@ PATCH /dnsapi/feedrecord/1370416133 Content-Type: application/x-www-form-urlencoded Content-Length: 117 -rr[qtype]=A&rr[qname]=replace.example.com&rr[qclass]=1&rr[content]=127.0.0.1&rr[ttl]=300&rr[priority]=0&rr[auth]=true +rr[qtype]=A&rr[qname]=replace.example.com&rr[qclass]=1&rr[content]=127.0.0.1&rr[ttl]=300&rr[auth]=true @@ -23723,7 +23723,6 @@ Reply: "qname": "example.com", "content": "dns1.icann.org. hostmaster.icann.org. 2012080849 7200 3600 1209600 3600", "ttl": 3600, - "priority": 0, "domain_id": -1 } ] @@ -23747,7 +23746,6 @@ Reply: "qname": "example.com", "content": "dns1.icann.org. hostmaster.icann.org. 2012080849 7200 3600 1209600 3600", "ttl": 3600, - "priority": 0, "domain_id": -1 } ] @@ -24322,9 +24320,6 @@ static RandomLoader randomloader; string contentASCII representation of right hand side - - uint16_t prioritypriority of an MX record. - uint32_t ttlTime To Live of this record diff --git a/pdns/docs/web-api.md b/pdns/docs/web-api.md index 302c403502..d98aec8495 100644 --- a/pdns/docs/web-api.md +++ b/pdns/docs/web-api.md @@ -17,8 +17,8 @@ To get you started, try on the Authoritative Server: $ curl 'http://127.0.0.1:8081/jsonstat?command=get-zone&zone=unsigned.workbench.sidnlabs.nl' [{"content":"nsd.sidnlabs.nl. hostmaster.sidnlabs.nl. 2013061100 3600 600 1814400 3600", - "name":"unsigned.workbench.sidnlabs.nl","priority":"0","ttl":"86400","type":"SOA"}, - {"content":"nsd.sidnlabs.nl","name":"unsigned.workbench.sidnlabs.nl","priority":"0","ttl":"3600","type":"NS"},... + "name":"unsigned.workbench.sidnlabs.nl","ttl":"86400","type":"SOA"}, + {"content":"nsd.sidnlabs.nl","name":"unsigned.workbench.sidnlabs.nl","ttl":"3600","type":"NS"},... Common API calls