Update notes and make the manual pages (#2970)

* Update notes and make the manual pages

Signed-off-by: Miek Gieben <miek@miek.nl>

* better

Signed-off-by: Miek Gieben <miek@miek.nl>

2 files changed, 10 insertions, 8 deletions

diff --git a/man/coredns-template.7 b/man/coredns-template.7
index eea407b9e..c79cee38f 100644
--- a/man/coredns-template.7
+++ b/man/coredns-template.7
@@ -1,5 +1,5 @@
 .\" Generated by Mmark Markdown Processer - mmark.nl
-.TH "COREDNS-TEMPLATE" 7 "June 2019" "CoreDNS" "CoreDNS Plugins"
+.TH "COREDNS-TEMPLATE" 7 "July 2019" "CoreDNS" "CoreDNS Plugins"
 
 .SH "NAME"
 .PP
@@ -20,7 +20,6 @@ template CLASS TYPE [ZONE...] {
     additional RR
     authority RR
     rcode CODE
-    upstream
     fallthrough [ZONE...]
 }
 
@@ -44,8 +43,6 @@ built by a Go template
 .IP \(bu 4
 \fB\fCrcode\fR \fBCODE\fP A response code (\fB\fCNXDOMAIN, SERVFAIL, ...\fR). The default is \fB\fCSUCCESS\fR.
 .IP \(bu 4
-\fB\fCupstream\fR defines the upstream resolvers used for resolving CNAMEs. CoreDNS will resolve CNAMEs against itself.
-.IP \(bu 4
 \fB\fCfallthrough\fR Continue with the next plugin if the zone matched but no regex matched.
 If specific zones are listed (for example \fB\fCin-addr.arpa\fR and \fB\fCip6.arpa\fR), then only queries for
 those zones will be subject to fallthrough.
@@ -79,6 +76,9 @@ Each resource record is a full-featured Go template
 \fB\fC.Message\fR the complete incoming DNS message.
 .IP \(bu 4
 \fB\fC.Question\fR the matched question section.
+.IP \(bu 4
+\fB\fC.Meta\fR a function that takes a metadata name and returns the value, if the
+metadata plugin is enabled. For example, \fB\fC.Meta "kubernetes/client-namespace"\fR
 
 
 .PP
diff --git a/notes/coredns-1.5.2.md b/notes/coredns-1.5.2.md
index 8e7ad8900..d6224a0b5 100644
--- a/notes/coredns-1.5.2.md
+++ b/notes/coredns-1.5.2.md
@@ -14,24 +14,26 @@ Small bugfixes and a change to Caddy's important path.
 
 # Plugins
 
-* For all plugins the `upstream` directive was removed from the documentation; it's still accepted
-  but is a noop.
-* The [*file*](/plugins/file) closes the connection after an AXFR. It also loads secondary zones
+* For all plugins that use the `upstream` directive it use removed from the documentation; it's still accepted
+  but is a noop. Currently these plugins use CoreDNS to resolve external queries.
+* The [*template*](/plugins/template) plugin now supports meta data.
+* The [*file*](/plugins/file) plugin closes the connection after an AXFR. It also loads secondary zones
   lazily on startup.
 
 ## Brought to You By
 
 bcebere,
+John Belamaric,
 JINMEI Tatuya,
 Miek Gieben,
 Timoses,
 Yong Tang.
 
-
 ## Noteworthy Changes
 
 * plugin/file: close correctlty after AXFR (https://github.com/coredns/coredns/pull/2943)
 * plugin/file: load secondary zones lazily on startup (https://github.com/coredns/coredns/pull/2944)
+* plugin/template: support metadata (https://github.com/coredns/coredns/pull/2958)
 * build: Update Caddy to 1.0.1, and update import path (https://github.com/coredns/coredns/pull/2961)
 * plugins: set upstream unconditionally (https://github.com/coredns/coredns/pull/2956)
 * tls: hardening (https://github.com/coredns/coredns/pull/2938)