From 58e4f8d587d50c023538cac31b4cd44dbb1800d3 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Mon, 10 Feb 2014 00:06:24 -0800
Subject: [PATCH 01/14] Update nmap.md

Added "Help Text."
---
 tools/nmap.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/nmap.md b/tools/nmap.md
index b0bf38e..9fbf461 100644
--- a/tools/nmap.md
+++ b/tools/nmap.md
@@ -7,6 +7,7 @@ Nmap(“Network Mapper”) is a security scanner originally written by Gordon Ly
 
 Help Text
 -------
+nmap -h, nmap --h
 
 Example Usage
 -------

From 0e94f1af1f310f889177010a9e160d34285178f4 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Wed, 12 Feb 2014 22:50:20 +0000
Subject: [PATCH 02/14] Update nmap.md

---
 tools/nmap.md | 117 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/tools/nmap.md b/tools/nmap.md
index 9fbf461..6b63f93 100644
--- a/tools/nmap.md
+++ b/tools/nmap.md
@@ -7,7 +7,122 @@ Nmap(“Network Mapper”) is a security scanner originally written by Gordon Ly
 
 Help Text
 -------
-nmap -h, nmap --h
+nmap -h, nmap --h, nmap -help
+
+nmap -help
+
+Nmap 6.25 ( http://nmap.org )
+Usage: nmap [Scan Type(s)] [Options] {target specification}
+TARGET SPECIFICATION:
+  Can pass hostnames, IP addresses, networks, etc.
+  Ex: scanme.nmap.org, microsoft.com/24, 192.168.0.1; 10.0.0-255.1-254
+  -iL <inputfilename>: Input from list of hosts/networks
+  -iR <num hosts>: Choose random targets
+  --exclude <host1[,host2][,host3],...>: Exclude hosts/networks
+  --excludefile <exclude_file>: Exclude list from file
+HOST DISCOVERY:
+  -sL: List Scan - simply list targets to scan
+  -sn: Ping Scan - disable port scan
+  -Pn: Treat all hosts as online -- skip host discovery
+  -PS/PA/PU/PY[portlist]: TCP SYN/ACK, UDP or SCTP discovery to given ports
+  -PE/PP/PM: ICMP echo, timestamp, and netmask request discovery probes
+  -PO[protocol list]: IP Protocol Ping
+  -n/-R: Never do DNS resolution/Always resolve [default: sometimes]
+  --dns-servers <serv1[,serv2],...>: Specify custom DNS servers
+  --system-dns: Use OS's DNS resolver
+  --traceroute: Trace hop path to each host
+SCAN TECHNIQUES:
+  -sS/sT/sA/sW/sM: TCP SYN/Connect()/ACK/Window/Maimon scans
+  -sU: UDP Scan
+  -sN/sF/sX: TCP Null, FIN, and Xmas scans
+  --scanflags <flags>: Customize TCP scan flags
+  -sI <zombie host[:probeport]>: Idle scan
+  -sY/sZ: SCTP INIT/COOKIE-ECHO scans
+  -sO: IP protocol scan
+  -b <FTP relay host>: FTP bounce scan
+PORT SPECIFICATION AND SCAN ORDER:
+  -p <port ranges>: Only scan specified ports
+    Ex: -p22; -p1-65535; -p U:53,111,137,T:21-25,80,139,8080,S:9
+  -F: Fast mode - Scan fewer ports than the default scan
+  -r: Scan ports consecutively - don't randomize
+  --top-ports <number>: Scan <number> most common ports
+  --port-ratio <ratio>: Scan ports more common than <ratio>
+SERVICE/VERSION DETECTION:
+  -sV: Probe open ports to determine service/version info
+  --version-intensity <level>: Set from 0 (light) to 9 (try all probes)
+  --version-light: Limit to most likely probes (intensity 2)
+  --version-all: Try every single probe (intensity 9)
+  --version-trace: Show detailed version scan activity (for debugging)
+SCRIPT SCAN:
+  -sC: equivalent to --script=default
+  --script=<Lua scripts>: <Lua scripts> is a comma separated list of 
+           directories, script-files or script-categories
+  --script-args=<n1=v1,[n2=v2,...]>: provide arguments to scripts
+  --script-args-file=filename: provide NSE script args in a file
+  --script-trace: Show all data sent and received
+  --script-updatedb: Update the script database.
+  --script-help=<Lua scripts>: Show help about scripts.
+           <Lua scripts> is a comma separted list of script-files or
+           script-categories.
+OS DETECTION:
+  -O: Enable 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 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
+  --min-rtt-timeout/max-rtt-timeout/initial-rtt-timeout <time>: Specifies
+      probe round trip time.
+  --max-retries <tries>: Caps number of port scan probe retransmissions.
+  --host-timeout <time>: Give up on target after this long
+  --scan-delay/--max-scan-delay <time>: Adjust delay between probes
+  --min-rate <number>: Send packets no slower than <number> per second
+  --max-rate <number>: Send packets no faster than <number> per second
+FIREWALL/IDS EVASION AND SPOOFING:
+  -f; --mtu <val>: fragment packets (optionally w/given MTU)
+  -D <decoy1,decoy2[,ME],...>: Cloak a scan with decoys
+  -S <IP_Address>: Spoof source address
+  -e <iface>: Use specified interface
+  -g/--source-port <portnum>: Use given port number
+  --data-length <num>: Append random data to sent packets
+  --ip-options <options>: Send packets with specified ip options
+  --ttl <val>: Set IP time-to-live field
+  --spoof-mac <mac address/prefix/vendor name>: Spoof your MAC address
+  --badsum: Send packets with a bogus TCP/UDP/SCTP checksum
+OUTPUT:
+  -oN/-oX/-oS/-oG <file>: Output scan in normal, XML, s|<rIpt kIddi3,
+     and Grepable format, respectively, to the given filename.
+  -oA <basename>: Output in the three major formats at once
+  -v: Increase verbosity level (use -vv or more for greater effect)
+  -d: Increase debugging level (use -dd or more for greater effect)
+  --reason: Display the reason a port is in a particular state
+  --open: Only show open (or possibly open) ports
+  --packet-trace: Show all packets sent and received
+  --iflist: Print host interfaces and routes (for debugging)
+  --log-errors: Log errors/warnings to the normal-format output file
+  --append-output: Append to rather than clobber specified output files
+  --resume <filename>: Resume an aborted scan
+  --stylesheet <path/URL>: XSL stylesheet to transform XML output to HTML
+  --webxml: Reference stylesheet from Nmap.Org for more portable XML
+  --no-stylesheet: Prevent associating of XSL stylesheet w/XML output
+MISC:
+  -6: Enable IPv6 scanning
+  -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
+  --unprivileged: Assume the user lacks raw socket privileges
+  -V: Print version number
+  -h: Print this help summary page.
+EXAMPLES:
+  nmap -v -A scanme.nmap.org
+  nmap -v -sn 192.168.0.0/16 10.0.0.0/8
+  nmap -v -iR 10000 -Pn -p 80
+SEE THE MAN PAGE (http://nmap.org/book/man.html) FOR MORE OPTIONS AND EXAMPLES
+
 
 Example Usage
 -------

From d80b832b0646749e5d5a7b79de084ac0d2042180 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Wed, 12 Feb 2014 23:25:29 +0000
Subject: [PATCH 03/14] Update nmap.md

---
 tools/nmap.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/nmap.md b/tools/nmap.md
index 6b63f93..ebfd026 100644
--- a/tools/nmap.md
+++ b/tools/nmap.md
@@ -7,10 +7,8 @@ Nmap(“Network Mapper”) is a security scanner originally written by Gordon Ly
 
 Help Text
 -------
-nmap -h, nmap --h, nmap -help
-
-nmap -help
-
+```
+root@kali:~# nmap -help
 Nmap 6.25 ( http://nmap.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
@@ -122,6 +120,7 @@ EXAMPLES:
   nmap -v -sn 192.168.0.0/16 10.0.0.0/8
   nmap -v -iR 10000 -Pn -p 80
 SEE THE MAN PAGE (http://nmap.org/book/man.html) FOR MORE OPTIONS AND EXAMPLES
+root@kali:~# 
 
 
 Example Usage

From 89bcca685284f3ed83720501f41e0769d41c7842 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Wed, 12 Feb 2014 23:28:15 +0000
Subject: [PATCH 04/14] Update nmap.md

---
 tools/nmap.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/nmap.md b/tools/nmap.md
index ebfd026..1d9c8d7 100644
--- a/tools/nmap.md
+++ b/tools/nmap.md
@@ -152,5 +152,4 @@ Nmap done: 1 IP address (1 host up) scanned in 5.58 seconds
 
 Links
 -------
-
-http://nmap.org/
+* Source: http://nmap.org/

From 3630a96ed2bde21f6b5d8ecc2162489df9070dcc Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Wed, 12 Feb 2014 23:30:32 +0000
Subject: [PATCH 05/14] Update nmap.md

---
 tools/nmap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nmap.md b/tools/nmap.md
index 1d9c8d7..45c291f 100644
--- a/tools/nmap.md
+++ b/tools/nmap.md
@@ -152,4 +152,4 @@ Nmap done: 1 IP address (1 host up) scanned in 5.58 seconds
 
 Links
 -------
-* Source: http://nmap.org/
+*Source: http://nmap.org/

From ad8c4326497587fccaadadfa8b42a0428f7a6f81 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Wed, 12 Feb 2014 23:31:17 +0000
Subject: [PATCH 06/14] Update nmap.md

---
 tools/nmap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nmap.md b/tools/nmap.md
index 45c291f..51e04f2 100644
--- a/tools/nmap.md
+++ b/tools/nmap.md
@@ -152,4 +152,4 @@ Nmap done: 1 IP address (1 host up) scanned in 5.58 seconds
 
 Links
 -------
-*Source: http://nmap.org/
+*Video: http://nmap.org/

From 1d40d9b39cd0020a4b0c91fab165a04aef4297bf Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Wed, 12 Feb 2014 23:31:56 +0000
Subject: [PATCH 07/14] Update nmap.md

---
 tools/nmap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nmap.md b/tools/nmap.md
index 51e04f2..77696e2 100644
--- a/tools/nmap.md
+++ b/tools/nmap.md
@@ -152,4 +152,4 @@ Nmap done: 1 IP address (1 host up) scanned in 5.58 seconds
 
 Links
 -------
-*Video: http://nmap.org/
+http://nmap.org/

From 39d6f261c2203d1299974bd65bda2e50101f8607 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Wed, 12 Feb 2014 23:39:26 +0000
Subject: [PATCH 08/14] Create airmon-ng

---
 wifi/airmon-ng | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 wifi/airmon-ng

diff --git a/wifi/airmon-ng b/wifi/airmon-ng
new file mode 100644
index 0000000..dbc8c0a
--- /dev/null
+++ b/wifi/airmon-ng
@@ -0,0 +1,5 @@
+```
+root@kali:~# airmon-ng -help
+
+
+usage: airmon-ng <start|stop|check> <interface> [channel or frequency]

From 5bc8ca510517d83e43f769deec9dc93724a26d36 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Wed, 12 Feb 2014 23:39:59 +0000
Subject: [PATCH 09/14] Rename airmon-ng to airmon-ng.md

---
 wifi/{airmon-ng => airmon-ng.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename wifi/{airmon-ng => airmon-ng.md} (100%)

diff --git a/wifi/airmon-ng b/wifi/airmon-ng.md
similarity index 100%
rename from wifi/airmon-ng
rename to wifi/airmon-ng.md

From 0eb0cd0667eec5de5f10fc6f826a4eaaab3848a6 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Thu, 13 Feb 2014 21:18:34 -0800
Subject: [PATCH 10/14] Update index.md

---
 infogathering/index.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/infogathering/index.md b/infogathering/index.md
index e37a7fc..d66120f 100644
--- a/infogathering/index.md
+++ b/infogathering/index.md
@@ -49,9 +49,12 @@ Live Host Identification
 Network Scanners
 ------------
 
- * [first]()
- * [second]()
- * [third]()
+ * [dmitry](../tools/dmitry.md)
+ * [dnmap-client](../tools/dnmap-client.md)
+ * [dnmap-server](../tools/dnmap-server.md)
+ * [netdiscover](../tools/netdiscover.md)
+ * [nmap](../tools/nmap.md)
+ * [zenmap](../tools/zenmap.md)
 
 OS Fingerprinting
 ------------

From 1a3a90965ecb867ddca204eed066e8c8ed58f88a Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Thu, 13 Feb 2014 21:25:50 -0800
Subject: [PATCH 11/14] Update index.md

---
 infogathering/index.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/infogathering/index.md b/infogathering/index.md
index d66120f..1d5f8b9 100644
--- a/infogathering/index.md
+++ b/infogathering/index.md
@@ -59,9 +59,12 @@ Network Scanners
 OS Fingerprinting
 ------------
 
- * [first]()
- * [second]()
- * [third]()
+ * [dnmap-client](../tools/dnmap-client.md)
+ * [dnmap-server](../tools/dnmap-server.md)
+ * [miranda](../tools/miranda.md)
+ * [nmap](../tools/nmap.md)
+ * [zenmap](../tools/zenmap.md)
+ 
 
 OSINT Analysis
 ------------

From 2acfc1dfb22eabad459931dc7c1b1d2919d2da7b Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Thu, 13 Feb 2014 21:42:36 -0800
Subject: [PATCH 12/14] Update index.md

Started adding more links.
---
 infogathering/index.md | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/infogathering/index.md b/infogathering/index.md
index 1d5f8b9..c7a2cfb 100644
--- a/infogathering/index.md
+++ b/infogathering/index.md
@@ -65,13 +65,18 @@ OS Fingerprinting
  * [nmap](../tools/nmap.md)
  * [zenmap](../tools/zenmap.md)
  
-
-OSINT Analysis
+ OSINT Analysis
 ------------
 
- * [first]()
- * [second]()
- * [third]()
+ * [casefile](../tools/casefile.md)
+ * [creepy](../tools/creepy.md)
+ * [dmitry](../tools/dmistry.md)
+ * [jigsaw](../tools/jigsaw.md)
+ * [maltego](../tools/maltego.md)
+ * [metagoofil](../tools/metagoofil.md)
+ * [theharvester](../tools/theharvester.md)
+ * [twofi](../tools/twofi.md)
+ * [urlcrazy](../tools/urlcrazy.md)
 
 Route Analysis
 ------------

From 56a68ab4efc4acd477b980b3574dfeb2100a8213 Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Thu, 13 Feb 2014 21:53:56 -0800
Subject: [PATCH 13/14] Update index.md

Adding links...
---
 infogathering/index.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/infogathering/index.md b/infogathering/index.md
index c7a2cfb..84f3561 100644
--- a/infogathering/index.md
+++ b/infogathering/index.md
@@ -65,7 +65,7 @@ OS Fingerprinting
  * [nmap](../tools/nmap.md)
  * [zenmap](../tools/zenmap.md)
  
- OSINT Analysis
+OSINT Analysis
 ------------
 
  * [casefile](../tools/casefile.md)
@@ -81,9 +81,12 @@ OS Fingerprinting
 Route Analysis
 ------------
 
- * [first]()
- * [second]()
- * [third]()
+ * [Otrace](../tools/0trace.md)
+ * [dnmap-client](../tools/dnmap-client.md)
+ * [dnmap-server](../tools/dnmap-server.md)
+ * [intrace](../tools/intrace.md)
+ * [netmask](../tools/netmask.md)
+ * [trace6](../tools/trace6.md)
 
 Service Fingerprinting
 ------------

From ac38ff8e48f9a85a8ad22f2036c835016eb20f5c Mon Sep 17 00:00:00 2001
From: codings9 <codings9@users.noreply.github.com>
Date: Sun, 16 Feb 2014 09:09:03 -0800
Subject: [PATCH 14/14] Update index.md

Added more links...
---
 infogathering/index.md | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/infogathering/index.md b/infogathering/index.md
index 84f3561..c8c8e0e 100644
--- a/infogathering/index.md
+++ b/infogathering/index.md
@@ -91,16 +91,24 @@ Route Analysis
 Service Fingerprinting
 ------------
 
- * [first]()
- * [second]()
- * [third]()
+ * [dnmap-client](../tools/dnmap-client.md)
+ * [dnmap-server](../tools/dnmap-server.md)
+ * [implementation6](../tools/implementation6.md)
+ * [implementation6d](../tools/implementation6d.md)
+ * [ncat](../tools/ncat.md)
+ * [nmap](../tools/nmap.md)
+ * [sslscan](../tools/sslscan.md)
+ * [sslyze](../tools/sslyze.md)
+ * [tlssled](../tools/tlssled.md)
+ * [zenmap](../tools/zenmap.md)
 
 SMB Analysis
 ------------
 
- * [first]()
- * [second]()
- * [third]()
+ * [acccheck](../tools/acccheck.md)
+ * [nbtscan](../tools/nbtscan.md)
+ * [nmap](../tools/nmap.md)
+ * [zenmap](../tools.zenmap.md)
 
 SMTP Analysis
 ------------