diff --git a/README-WIN32 b/README-WIN32
index 345bc9fcc..a1125cad2 100644
--- a/README-WIN32
+++ b/README-WIN32
@@ -1,4 +1,4 @@
-Details on installation, compilation, and limitation of the Nmap
-Security Scanner on the Windows platform is now available in the Nmap
-Installation Guide at https://nmap.org/install/ .
-
+Details on installation, compilation, and limitation of the Nmap
+Security Scanner on the Windows platform is now available in the Nmap
+Installation Guide at https://nmap.org/install/ .
+
diff --git a/docs/nmap-update.1 b/docs/nmap-update.1
index 3bae091f1..cac752328 100644
--- a/docs/nmap-update.1
+++ b/docs/nmap-update.1
@@ -2,12 +2,12 @@
.\" Title: nmap-update
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 07/19/2016
+.\" Date: 09/29/2016
.\" Manual: nmap-update Reference Guide
.\" Source: nmap-update
.\" Language: English
.\"
-.TH "NMAP\-UPDATE" "1" "07/19/2016" "nmap\-update" "nmap\-update Reference Guide"
+.TH "NMAP\-UPDATE" "1" "09/29/2016" "nmap\-update" "nmap\-update Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/nmap.1 b/docs/nmap.1
index 431692759..2e385e2fa 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,12 +2,12 @@
.\" Title: nmap
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 07/22/2016
+.\" Date: 09/29/2016
.\" Manual: Nmap Reference Guide
.\" Source: Nmap
.\" Language: English
.\"
-.TH "NMAP" "1" "07/22/2016" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "09/29/2016" "Nmap" "Nmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -707,6 +707,8 @@ or an IPv6 scan\&. Using multiple DNS servers is often faster, especially if you
This option also comes in handy when scanning private networks\&. Sometimes only a few name servers provide proper rDNS information, and you may not even know where they are\&. You can scan the network for port 53 (perhaps with version detection), then try Nmap list scans (\fB\-sL\fR) specifying each name server one at a time with
\fB\-\-dns\-servers\fR
until you find one which works\&.
+.sp
+This option might not be honored if the DNS response exceeds the size of a UDP packet\&. In such a situation our DNS resolver will make the best effort to extract a response from the truncated packet, and if not successful it will fall back to using the system resolver\&. Also, responses that contain CNAME aliases will fall back to the system resolver\&.
.RE
.\"
.SH "PORT SCANNING BASICS"
@@ -1163,7 +1165,7 @@ Scans all ports in
nmap\-services
file with a ratio greater than the one given\&.
\fIratio\fR
-must be between 0\&.0 and 1\&.1\&.
+must be between 0\&.0 and 1\&.0\&.
.RE
.PP
\fB\-\-top\-ports \fR\fB\fIn\fR\fR
@@ -1672,6 +1674,16 @@ with the maximum amount of time you are willing to wait\&. For example, specify
to ensure that Nmap doesn\*(Aqt waste more than half an hour on a single host\&. Note that Nmap may be scanning other hosts at the same time during that half an hour, so it isn\*(Aqt a complete loss\&. A host that times out is skipped\&. No port table, OS detection, or version detection results are printed for that host\&.
.RE
.PP
+\fB\-\-script\-timeout \fR\fB\fItime\fR\fR
+.\" --script-timeout
+.RS 4
+Some scripts take
+\fIlong\fR
+time before they complete their execution, this can happen due to many reasons maybe some bug in script, delay in the network or nature of the script itself(example:http\-slowloris)\&. If you want to keep some limit on time for which script should run then you need to specify
+\fB\-\-script\-timeout\fR
+with the maximum amount of time for which script should be run\&. Note that all scripts will have same timeout\&. Once script gets timed out no output for that script will be shown\&. Whether a script has timed out or not, can be seen in debug output\&.
+.RE
+.PP
\fB\-\-scan\-delay \fR\fB\fItime\fR\fR; \fB\-\-max\-scan\-delay \fR\fB\fItime\fR\fR (Adjust delay between probes)
.\" --scan-delay .\" --max-scan-delay
.RS 4
@@ -1915,7 +1927,7 @@ to generate
\fInumber\fR
addresses\&.
.sp
-Note that the hosts you use as decoys should be up or you might accidentally SYN flood your targets\&. Also it will be pretty easy to determine which host is scanning if only one is actually up on the network\&. You might want to use IP addresses instead of names (so the decoy networks don\*(Aqt see you in their nameserver logs)\&.
+Note that the hosts you use as decoys should be up or you might accidentally SYN flood your targets\&. Also it will be pretty easy to determine which host is scanning if only one is actually up on the network\&. You might want to use IP addresses instead of names (so the decoy networks don\*(Aqt see you in their nameserver logs)\&. Right now random IP address generation is only supported with IPv4
.sp
Decoys are used both in the initial ping scan (using ICMP, SYN, ACK, or whatever) and during the actual port scanning phase\&. Decoys are also used during remote OS detection (\fB\-O\fR)\&. Decoys do not work with version detection or TCP connect scan\&. When a scan delay is in effect, the delay is enforced between each batch of spoofed probes, not between each individual probe\&. Because decoys are sent as a batch all at once, they may temporarily violate congestion control limits\&.
.sp
diff --git a/docs/zenmap.1 b/docs/zenmap.1
index a74e17fcf..d679adf8e 100644
--- a/docs/zenmap.1
+++ b/docs/zenmap.1
@@ -2,12 +2,12 @@
.\" Title: zenmap
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 07/19/2016
+.\" Date: 09/29/2016
.\" Manual: Zenmap Reference Guide
.\" Source: Zenmap
.\" Language: English
.\"
-.TH "ZENMAP" "1" "07/19/2016" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "09/29/2016" "Zenmap" "Zenmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1
index 18782c06c..f4bc62d57 100644
--- a/ncat/docs/ncat.1
+++ b/ncat/docs/ncat.1
@@ -2,12 +2,12 @@
.\" Title: Ncat
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 07/19/2016
+.\" Date: 09/29/2016
.\" Manual: Ncat Reference Guide
.\" Source: Ncat
.\" Language: English
.\"
-.TH "NCAT" "1" "07/19/2016" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "09/29/2016" "Ncat" "Ncat Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index c8a73c325..93be2daab 100644
--- a/ndiff/docs/ndiff.1
+++ b/ndiff/docs/ndiff.1
@@ -2,12 +2,12 @@
.\" Title: ndiff
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 07/19/2016
+.\" Date: 09/29/2016
.\" Manual: User Commands
.\" Source: Ndiff
.\" Language: English
.\"
-.TH "NDIFF" "1" "07/19/2016" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "09/29/2016" "Ndiff" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/nmap-services b/nmap-services
index dee63ff5e..9eb404192 100644
--- a/nmap-services
+++ b/nmap-services
@@ -3,7 +3,7 @@
# Well known service port numbers -*- mode: fundamental; -*-
# From the Nmap Security Scanner ( http://nmap.org )
#
-# $Id: nmap-services 9746 2008-08-26 18:45:24Z fyodor $
+# $Id$
#
# Derived from IANA data and our own research
# This collection of service data is (C) 1996-2011 by Insecure.Com
diff --git a/nping/docs/nping.1 b/nping/docs/nping.1
index 6f0f9025c..5882b8d58 100644
--- a/nping/docs/nping.1
+++ b/nping/docs/nping.1
@@ -2,12 +2,12 @@
.\" Title: nping
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 07/19/2016
+.\" Date: 09/29/2016
.\" Manual: Nping Reference Guide
.\" Source: Nping
.\" Language: English
.\"
-.TH "NPING" "1" "07/19/2016" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "09/29/2016" "Nping" "Nping Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------