diff --git a/docs/nmap.1 b/docs/nmap.1
index d14f4b9f6..ebe1facfb 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.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/15/2010
+.\"      Date: 07/17/2010
 .\"    Manual: Nmap Reference Guide
 .\"    Source: Nmap
 .\"  Language: English
 .\"
-.TH "NMAP" "1" "07/15/2010" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "07/17/2010" "Nmap" "Nmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -111,7 +111,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .RS 4
 .\}
 .nf
-Nmap 5\&.35DC1 ( http://nmap\&.org )
+Nmap 5\&.35DC18 ( http://nmap\&.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc\&.
@@ -165,8 +165,8 @@ OS DETECTION:
   \-\-osscan\-limit: Limit OS detection to promising targets
   \-\-osscan\-guess: Guess OS more aggressively
 TIMING AND PERFORMANCE:
-  Options which take <time> are in milliseconds, unless you append \'s\'
-  (seconds), \'m\' (minutes), or \'h\' (hours) to the value (e\&.g\&. 30m)\&.
+  Options which take <time> are in seconds, or append \'ms\' (milliseconds),
+  \'s\' (seconds), \'m\' (minutes), or \'h\' (hours) to the value (e\&.g\&. 30m)\&.
   \-T<0\-5>: Set timing template (higher is faster)
   \-\-min\-hostgroup/max\-hostgroup <size>: Parallel host scan group sizes
   \-\-min\-parallelism/max\-parallelism <numprobes>: Probe parallelization
@@ -207,7 +207,7 @@ OUTPUT:
   \-\-no\-stylesheet: Prevent associating of XSL stylesheet w/XML output
 MISC:
   \-6: Enable IPv6 scanning
-  \-A: Enables OS detection and Version detection, Script scanning and Traceroute
+  \-A: Enable OS detection, version detection, script scanning, and traceroute
   \-\-datadir <dirname>: Specify custom Nmap data file location
   \-\-send\-eth/\-\-send\-ip: Send using raw ethernet frames or IP packets
   \-\-privileged: Assume that the user is fully privileged
@@ -1374,8 +1374,7 @@ and
 \fB\-\-initial\-rtt\-timeout\fR
 than the defaults can cut scan times significantly\&. This is particularly true for pingless (\fB\-Pn\fR) scans, and those against heavily filtered networks\&. Don\'t get too aggressive though\&. The scan can end up taking longer if you specify such a low value that many probes are timing out and retransmitting while the response is in transit\&.
 .sp
-If all the hosts are on a local network, 100 milliseconds (\fB\-\-max\-rtt\-timeout 100ms\fR) is a reasonable aggressive value\&. If routing is involved, ping a host on the network first with the ICMP ping utility, or with a custom packet crafter such as
-\fBhping2\fR.\" hping2
+If all the hosts are on a local network, 100 milliseconds (\fB\-\-max\-rtt\-timeout 100ms\fR) is a reasonable aggressive value\&. If routing is involved, ping a host on the network first with the ICMP ping utility, or with a custom packet crafter such as Nping.\" Nping
 that is more likely to get through a firewall\&. Look at the maximum round trip time out of ten packets or so\&. You might want to double that for the
 \fB\-\-initial\-rtt\-timeout\fR
 and triple or quadruple it for the
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index ba14bad80..5e7aecf14 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 5.35DC1 ( http://nmap.org )
+Nmap 5.35DC18 ( http://nmap.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
@@ -52,8 +52,8 @@ OS DETECTION:
   --osscan-limit: Limit OS detection to promising targets
   --osscan-guess: Guess OS more aggressively
 TIMING AND PERFORMANCE:
-  Options which take <time> are in milliseconds, unless you append 's'
-  (seconds), 'm' (minutes), or 'h' (hours) to the value (e.g. 30m).
+  Options which take <time> are in seconds, or append 'ms' (milliseconds),
+  's' (seconds), 'm' (minutes), or 'h' (hours) to the value (e.g. 30m).
   -T<0-5>: Set timing template (higher is faster)
   --min-hostgroup/max-hostgroup <size>: Parallel host scan group sizes
   --min-parallelism/max-parallelism <numprobes>: Probe parallelization
diff --git a/docs/zenmap.1 b/docs/zenmap.1
index be33d8be6..8faaae00e 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.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/15/2010
+.\"      Date: 07/17/2010
 .\"    Manual: Zenmap Reference Guide
 .\"    Source: Zenmap
 .\"  Language: English
 .\"
-.TH "ZENMAP" "1" "07/15/2010" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "07/17/2010" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index 1cb62ded3..10c7b6434 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.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/15/2010
+.\"      Date: 07/17/2010
 .\"    Manual: User Commands
 .\"    Source: Ndiff
 .\"  Language: English
 .\"
-.TH "NDIFF" "1" "07/15/2010" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "07/17/2010" "Ndiff" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -125,8 +125,8 @@ Let\'s use Ndiff to compare the output of two Nmap scans that use different opti
 # nmap \-F scanme\&.nmap\&.org \-oX scanme\-1\&.xml
 # nmap \-\-script=html\-title scanme\&.nmap\&.org \-oX scanme\-2\&.xml
 $ ndiff \-v scanme\-1\&.xml scanme\-2\&.xml
-\-Nmap 4\&.90RC2 at 2009\-07\-16 13:29
-+Nmap 4\&.90RC2 at 2009\-07\-16 13:33
+\-Nmap 5\&.35DC1 at 2010\-07\-16 12:09
++Nmap 5\&.35DC1 at 2010\-07\-16 12:13
 
  scanme\&.nmap\&.org (64\&.13\&.134\&.52):
  Host is up\&.
@@ -153,7 +153,7 @@ or
 at the beginning of a line\&. We can see from the output that the scan without the
 \fB\-F\fR
 fast scan option found two additional ports: 70 and 31337\&. The
-html\-title\&.nse
+html\-title
 script produced some additional output for port 80\&. From the port counts, we may infer that the fast scan scanned 100 ports (95 filtered, 3 open, and 2 closed), while the normal scan scanned 1000 (993 filtered, 3 open, and 4 closed)\&.
 .PP
 The
@@ -163,7 +163,7 @@ The
 \fB\-v\fR, they would not have been shown\&.
 .SH "OUTPUT"
 .PP
-There are two output modes: text and XML\&. Text output is the default, and is also selected with the
+There are two output modes: text and XML\&. Text output is the default, and can also be selected with the
 \fB\-\-text\fR
 option\&. Text output resembles a unified diff of Nmap\'s normal terminal output\&. Each line is preceded by a character indicating whether and how it changed\&.
 \-
diff --git a/nmap.h b/nmap.h
index 9b4603a32..4e3bd3af2 100644
--- a/nmap.h
+++ b/nmap.h
@@ -252,8 +252,8 @@ void *realloc();
 #ifndef NMAP_VERSION
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
-#define NMAP_VERSION "5.35DC1"
-#define NMAP_NUM_VERSION "5.35.0.1"
+#define NMAP_VERSION "5.35DC18"
+#define NMAP_NUM_VERSION "5.35.0.18"
 #endif
 
 /* User configurable #defines: */