diff --git a/docs/nmap.1 b/docs/nmap.1
index 17e7b9128..1d2e6b81c 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -1,11 +1,11 @@
.\" Title: nmap
.\" Author: Gordon \(lqFyodor\(rq Lyon
.\" Generator: DocBook XSL Stylesheets v1.73.2
-.\" Date: April 9, 2008
+.\" Date: May 24, 2008
.\" Manual: Nmap Network Scanning (PRE-RELEASE BETA VERSION)
.\" Source: Insecure.Org Zero Day
.\"
-.TH "NMAP" "1" "April 9, 2008" "Insecure.Org Zero Day" "Nmap Network Scanning (PRE-REL"
+.TH "NMAP" "1" "May 24, 2008" "Insecure.Org Zero Day" "Nmap Network Scanning (PRE-REL"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@@ -102,7 +102,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
.sp
.RS 4
.nf
-Nmap 4\.62 ( http://nmap\.org )
+Nmap 4\.65 ( http://nmap\.org )
Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc\.
@@ -145,7 +145,7 @@ SERVICE/VERSION DETECTION:
\-\-version\-all: Try every single probe (intensity 9)
\-\-version\-trace: Show detailed version scan activity (for debugging)
SCRIPT SCAN:
- \-sC: equivalent to \-\-script=safe,intrusive
+ \-sC: equivalent to \-\-script=default
\-\-script=: is a comma separated list of
directories, script\-files or script\-categories
\-\-script\-args=: provide arguments to scripts
@@ -733,7 +733,9 @@ IP protocol scan allows you to determine which IP protocols (TCP, ICMP, IGMP, et
\fB\-p\fR
option to select scanned protocol numbers, reports its results within the normal port table format, and even uses the same underlying scan engine as the true port scanning methods\. So it is close enough to a port scan that it belongs here\.
.sp
-Besides being useful in its own right, protocol scan demonstrates the power of open source software\. While the fundamental idea is pretty simple, I had not thought to add it nor received any requests for such functionality\. Then in the summer of 2000, Gerhard Rieger conceived the idea, wrote an excellent patch implementing it, and sent it to the nmap\-hackers mailing list\. I incorporated that patch into the Nmap tree and released a new version the next day\. Few pieces of commercial software have users enthusiastic enough to design and contribute their own improvements!
+Besides being useful in its own right, protocol scan demonstrates the power of open source software\. While the fundamental idea is pretty simple, I had not thought to add it nor received any requests for such functionality\. Then in the summer of 2000, Gerhard Rieger conceived the idea, wrote an excellent patch implementing it, and sent it to the
+nmap\-hackers
+mailing list\. I incorporated that patch into the Nmap tree and released a new version the next day\. Few pieces of commercial software have users enthusiastic enough to design and contribute their own improvements!
.sp
Protocol scan works in a similar fashion to UDP scan\. Instead of iterating through the port number field of a UDP packet, it sends IP packet headers and iterates through the 8\-bit IP protocol field\. The headers are usually empty, containing no data and not even the proper header for the claimed protocol\. The three exceptions are TCP, UDP, and ICMP\. A proper protocol header for those is included since some systems won\'t send them otherwise and because Nmap already has functions to create them\. Instead of watching for ICMP port unreachable messages, protocol scan is on the lookout for ICMP
\fIprotocol\fR
@@ -840,7 +842,7 @@ open|filtered
TCP ports are treated the same way\. Note that the Nmap
\fB\-A\fR
option enables version detection among other things\. A paper documenting the workings, usage, and customization of version detection is available at
-\fI\%http://nmap.org/vscan/\fR\.
+\fI\%http://nmap.org/book/vscan.html\fR\.
.PP
When Nmap receives responses from a service but cannot match them to its database, it prints out a special fingerprint and a URL for you to submit if to if you know for sure what is running on the port\. Please take a couple minutes to make the submission so that your find can benefit everyone\. Thanks to these submissions, Nmap has about 3,000 pattern matches for more than 350 protocols such as SMTP, FTP, HTTP, etc\.
.PP
@@ -915,7 +917,7 @@ or
class, which means that they increment the ID field in the IP header for each packet they send\. This makes them vulnerable to several advanced information gathering and spoofing attacks\.
.PP
A paper documenting the workings, usage, and customization of OS detection is available at
-\fI\%http://nmap.org/osdetect/\fR\.
+\fI\%http://nmap.org/book/osdetect.html\fR\.
.PP
OS detection is enabled and controlled with the following options:
.PP
@@ -951,7 +953,7 @@ value (such as 1) speeds Nmap up, though you miss out on retries which could pot
.PP
The Nmap Scripting Engine (NSE) combines the efficiency of Nmap\'s network handling with the versatility of the lightweight scripting language
\fILua\fR\&[8], thus providing innumerable opportunities\. A more extensive documentation of the NSE (including its API) can be found at:
-\fI\%http://nmap.org/nse/\fR\. The target of the NSE is to provide Nmap with a flexible infrastructure for extending its capabilities and offering its users a simple way of creating customized tests\. Uses for the NSE include (but definitely are not limited to):
+\fI\%http://nmap.org/book/nse.html\fR\. The target of the NSE is to provide Nmap with a flexible infrastructure for extending its capabilities and offering its users a simple way of creating customized tests\. Uses for the NSE include (but definitely are not limited to):
.PP
\fIEnhanced version detection\fR
@@ -1002,12 +1004,12 @@ or
ssl), the service running behind that port, and optionally information from a version\-scan\. NSE scripts by convention have an
nse
extension\. Although you are not required to follow this for the moment, this may change in the future\. Nmap will issue a warning if a file has any other extension\. More extensive documentation on the NSE, including a description of its API can be found at
-\fI\%http://nmap.org/nse/\fR\.
+\fI\%http://nmap.org/book/nse.html\fR\.
.PP
\fB\-sC\fR
.RS 4
-performs a script scan using the default set of scripts\. it is equivalent to
-\fB\-\-script=safe,intrusive\fR
+Performs a script scan using the default set of scripts\. It is equivalent to
+\fB\-\-script=default\fR\. Some of the scripts in this category are considered intrusive and should not be run against a target network without permission\.
.RE
.PP
\fB\-\-script