Merged from master

infogathering/index.md

@@ -71,30 +71,47 @@ OS Fingerprinting
 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
 ------------
 
- * [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
 ------------
 
- * [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
 ------------

tools/nmap.md

@@ -6,7 +6,7 @@ Notes
 Help Text
 -------
 ```
-Nmap 6.40 ( http://nmap.org )
+Nmap 6.25 ( http://nmap.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
@@ -118,7 +118,6 @@ EXAMPLES:
   nmap -v -iR 10000 -Pn -p 80
 SEE THE MAN PAGE (http://nmap.org/book/man.html) FOR MORE OPTIONS AND EXAMPLES
 ```
-
 Example Usage
 -------
 # nmap -O -v scanme.nmap.org
@@ -148,5 +147,4 @@ Nmap done: 1 IP address (1 host up) scanned in 5.58 seconds
 
 Links
 -------
-
 http://nmap.org/

wifi/airmon-ng.md

@@ -0,0 +1,5 @@
+```
+root@kali:~# airmon-ng -help
+
+
+usage: airmon-ng <start|stop|check> <interface> [channel or frequency]