Release 1.1.4v1.1.4

2 files changed, 6 insertions, 3 deletions

diff --git a/man/coredns-forward.7 b/man/coredns-forward.7
index ac29637fb..dd95866b9 100644
--- a/man/coredns-forward.7
+++ b/man/coredns-forward.7
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "COREDNS\-FORWARD" "7" "May 2018" "CoreDNS" "CoreDNS plugins"
+.TH "COREDNS\-FORWARD" "7" "June 2018" "CoreDNS" "CoreDNS plugins"
 .
 .SH "NAME"
 \fIforward\fR \- facilitates proxying DNS messages to upstream resolvers\.
@@ -114,6 +114,9 @@ forward FROM TO\.\.\. {
 .P
 Also note the TLS config is "global" for the whole forwarding proxy if you need a different \fBtls\-name\fR for different upstreams you\'re out of luck\.
 .
+.P
+On each endpoint, the timeouts of the communication are set by default and automatically tuned depending early results\. \- dialTimeout by default is 30 sec, and can decrease automatically down to 100ms \- readTimeout by default is 2 sec, and can decrease automatically down to 10ms
+.
 .SH "METRICS"
 If monitoring is enabled (via the \fIprometheus\fR directive) then the following metric are exported:
 .
diff --git a/man/coredns-rewrite.7 b/man/coredns-rewrite.7
index 8750e87c3..14c7ec497 100644
--- a/man/coredns-rewrite.7
+++ b/man/coredns-rewrite.7
@@ -258,10 +258,10 @@ rewrite [continue|stop] name regex STRING STRING answer name STRING STRING
 Using FIELD edns0, you can set, append, or replace specific EDNS0 options on the request\.
 .
 .IP "\(bu" 4
-\fBreplace\fR will modify any matching (what that means may vary based on EDNS0 type) option with the specified option
+\fBreplace\fR will modify any "matching" option with the specified option\. The criteria for "matching" varies based on EDNS0 type\.
 .
 .IP "\(bu" 4
-\fBappend\fR will add the option regardless of what options already exist
+\fBappend\fR will add the option only if no matching option exists
 .
 .IP "\(bu" 4
 \fBset\fR will modify a matching option or add one if none is found