Merge pull request #11 from p-l-/upstream

Sync with upstream

README.md

@@ -613,3 +613,19 @@ at which they perform this calculation, making `masscan` much faster.
 This tool created by Robert Graham:
 email: robert_david_graham@yahoo.com
 twitter: @ErrataRob
+
+# License
+
+Copyright (c) 2013 Robert David Graham
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, version 3 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.

data/exclude.conf

@@ -77,7 +77,7 @@
 #organization scan our network at all.
 #
 #If you fail to do that we will block whole traffic from ASN 10439, and we
-#will fail a police report after that.
+#will file a police report after that.
 #
 #Let me know when you stop, since we still receive the attack from you, and
 #by the way your scan are not going anywhere, it's was dropped from our edge

doc/faq/FAQ0001-slow.md

@@ -21,9 +21,9 @@ The speed is determined by the operating system. The amount of CPU used by `mass
 itself is insignificant.
 
 My theory is various configuration options within the operating system that can make
-packet tranmission very slow. Simple features that would not otherwise impact network
+packet transmission very slow. Simple features that would not otherwise impact network
 stacks that run at lower rates become really important at high rates.
 
-One way around this is to install `PF_RING` and decidate a network adapter to packet
+One way around this is to install `PF_RING` and dedicate a network adapter to packet
 transmission completely bypassing the operating system. In that case, packet transmission
 rates can reach 15 million packets-per-second.

doc/faq/FAQ0002-drops.md

@@ -27,5 +27,5 @@ rates rather than overloading network equipment.
 
 # Issues
 
-- (#546 fast scan get result)[https://github.com/robertdavidgraham/masscan/issues/546]
+- [#546 fast scan get result](https://github.com/robertdavidgraham/masscan/issues/546)
 

doc/faq/README.md

@@ -5,5 +5,5 @@ questions
 
  - 1 - [Why is it not as fast as I expect?](FAQ0001-slow.md)
  - 2 - [Why are many results missing that I expect?](FAQ0002-drops.md)
- - 3 - [How can I add my IPs to an official exlude list, to get people to stop scanning me?](FAQ0003-excludelist.md)
+ - 3 - [How can I add my IPs to an official exclude list, to get people to stop scanning me?](FAQ0003-excludelist.md)
  - 4 - [Why is this in my server logs?](FAQ0004-serverlogs.md)