Latest amalgamated hosts file, with 27,140 unique entries.

diff --git a/hosts b/hosts
index 4afdcb8b92e928539b80fb82271c54334ea56e6d..9f5e65067b34fca7aa70150dd6ccb8b49d26e708 100644 (file)
--- a/hosts
+++ b/hosts
@@ -1,6 +1,8 @@
 # This file is a merged collection of hosts from reputable sources,
 # with a dash of crowd sourcing via Github
 #
+# Latest version of this file: https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
+#
 # Project home page: https://github.com/StevenBlack/hosts
 #
 # ===============================================================
@@ -17363,7 +17365,7 @@
 # Please forward any additions, corrections or comments by email to
 # hosts@someonewhocares.org
 
-# Last updated: Fri, 12 Feb 2016 at 09:06:33 GMT
+# Last updated: Mon, 15 Feb 2016 at 10:27:37 GMT
 
 # Use this file to prevent your computer from connecting to selected
 # internet hosts. This is an easy and effective way to protect you from 
@@ -25005,6 +25007,7 @@
 0.0.0.0 www.agkn.com
 0.0.0.0 www.alexxe.com
 0.0.0.0 www.allosponsor.com
+0.0.0.0 www.amazing-opportunities.info
 0.0.0.0 www.annuaire-autosurf.com
 0.0.0.0 www.apparelncs.com
 0.0.0.0 www.apparel-offer.com

diff --git a/readme.md b/readme.md
index e2c5aef38c20f6be453dc82bb37527c68b027800..dd22cbfb9157ceb4610d06bac91508160995c9df 100644 (file)
--- a/readme.md
+++ b/readme.md
@@ -3,17 +3,17 @@
 This repo consolidates several reputable `hosts` files and merges them into a single
 amalgamated hosts file with duplicates removed.
 
-**Currently this amalgamated hosts file contains 27,139 unique entries.**
+**Currently this amalgamated hosts file contains 27,140 unique entries.**
 
 ## Goals of this amalgamated hosts file
 
-The goals of this repo are to
+The goals of this repo are to:
 
-1) automatically combine high-quality lists of hosts,
+1. automatically combine high-quality lists of hosts,
 
-2) de-dupe the resultant combined list,
+2. de-dupe the resultant combined list,
 
-3) and keep the resultant file reasonably sized.
+3. and keep the resultant file reasonably sized.
 
 A high-quality source is defined here as one that is actively curated.  A hosts source should be frequently
 updated by its maintainers with both additions and removals.  The larger the hosts file, the higher the level of
@@ -38,27 +38,33 @@ monthly, or thereabouts.
 * Peter Lowe at [http://pgl.yoyo.org/adservers/](http://pgl.yoyo.org/adservers/), updated regularly.
 * My own small list in raw form [here](https://raw.github.com/StevenBlack/hosts/master/data/StevenBlack/hosts).
 
-You can add additional sources by placing them in the `data/` directory. Provide a copy of that new
-`hosts` file, and place its update url in `update.info`. The `updateHostsFile.py` routine will
-automatically refresh the `hosts` file from source each time a new amalgamated file is generated.
+## Generate your own amalgamated hosts file
 
-## How do I incorporate my own hosts?
+The `updateHostsFile.py` script, which is python 2.7 and Python 3-compatible, will generate an amalgamated hosts file 
+based on the sources in the local `data/` subfolder.  The script will prompt ask you if it should fetch updated versions 
+over the web (defined by the update.info text file in each source's folder), or it will use the `hosts` file that's 
+already there.
 
-If you have custom host records, place them in file `myhosts`.  The contents of this file are prepended to the
-amalgamated hosts file during the update process.
+**Usage**
+
+    python updateHostsFile.py [--auto]
+
+Command line options:
 
-## Using updateHostsFile.py
+`--auto`, `-a`: run the script without prompting. When `--auto` is invoked,
 
-This Python script will generate a unique hosts file based on the sources in the `data/` folder.
-You can either have the script go out and fetch an updated version over the web (defined by the
-update.info text file in the source's directory), or it will use the `hosts` file that's already
-there.
+* Host data sources are updated.
+* Your active hosts file is *not* replaced.
 
-Usage
+## How do I control which sources are amalgamated?
 
-    python updateHostsFile.py
+You can add additional sources by placing each in a subfolder of the `data/` folder. Provide a copy of that new
+`hosts` file, and place its update url in `update.info`. 
 
-**TAKE NOTE** this script is tested with Python version 2.7.10.
+## How do I incorporate my own hosts?
+
+If you have custom host records, place them in file `myhosts`.  The contents of this file are prepended to the
+amalgamated hosts file during the update process.
 
 ## What is a hosts file?
 
@@ -82,7 +88,7 @@ file will do it:
     # etc...
 
 
-## Why use `0.0.0.0` instead of `127.0.0.1`?
+## We recommend using `0.0.0.0` instead of `127.0.0.1`
 Using `0.0.0.0` is faster because you don't have to wait for a timeout. It also does not interfere
 with a web server that may be running on the local PC.