Improved the readme.nmd files in subfolders.

alternates/gambling-porn-social/readme.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file with gambling, porn, social extensions
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 * Extensions: **gambling, porn, social**.
 * Contains: **33,272 unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

alternates/gambling-porn/readme.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file with gambling, porn extensions
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 * Extensions: **gambling, porn**.
 * Contains: **33,217 unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

alternates/gambling-social/readme.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file with gambling, social extensions
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 * Extensions: **gambling, social**.
 * Contains: **28,022 unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

alternates/gambling/readme.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file with gambling extensions
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 * Extensions: **gambling**.
 * Contains: **27,967 unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

alternates/porn-social/readme.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file with porn, social extensions
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 * Extensions: **porn, social**.
 * Contains: **32,559 unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

alternates/porn/readme.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file with porn extensions
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 * Extensions: **porn**.
 * Contains: **32,504 unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

alternates/social/readme.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file with social extensions
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 * Extensions: **social**.
 * Contains: **27,309 unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

makeHosts

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This creates a vanilla hosts file
-python updateHostsFile.py -a -n
+python updateHostsFile.py -a
 
 # These create various alternate hosts files by combining and adding the gambling, porn, and social media extensions.
 python updateHostsFile.py -a -n -o alternates/gambling -e gambling

readme.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file 
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 * Extensions: **none**.
 * Contains: **27,254 unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

readme_template.md

@@ -1,4 +1,4 @@
-#Unified hosts file
+#Unified hosts file @EXTENSIONS_HEADER@
 
 This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file
 with duplicates removed.
@@ -9,8 +9,8 @@ with duplicates removed.
 @EXTENSIONS@
 * Contains: **@NUM_ENTRIES@ unique entries**.
 
-You can [download the resultant unified hosts file](https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts)
-or clone this repo and generate your own using the Python or bash scripts provided.
+See the [`alternates` folder](https://github.com/StevenBlack/hosts/tree/master/alternates) for variants of this hosts
+file, extended in different ways.
 
 ## Sources of host data unified here
 
@@ -62,7 +62,7 @@ force replacement.
 containing additional category-specific hosts files to include in the amalgamation. Example: `--extensions porn` or
 `-e social porn`.
 
-`--noupdate`, or `-n`: skip frtching updates from hosts data sources.
+`--noupdate`, or `-n`: skip fetching updates from hosts data sources.
 
 `--output <subfolder>`, or `-o <subfolder>`: place the generated source file in a subfolder.  If the subfolder does not
 exist, it will be created.

updateHostsFile.py

@@ -389,13 +389,16 @@ def writeOpeningHeader(finalFile):
 
 def updateReadme(numberOfRules):
     extensionsStr = "* Extensions: **none**."
+    extensionsHeader = ""
     if extensions:
       extensionsStr = "* Extensions: **" + ", ".join(extensions) + "**."
+      extensionsHeader = "with "+ ", ".join(extensions) + " extensions"
 
     with open(os.path.join(outputPath,README_FILENAME), "wt") as out:
         for line in open(README_TEMPLATE):
             line = line.replace( '@GEN_DATE@', time.strftime("%B %d %Y", time.gmtime()))
             line = line.replace( '@EXTENSIONS@', extensionsStr )
+            line = line.replace( '@EXTENSIONS_HEADER@', extensionsHeader )
             out.write(line.replace('@NUM_ENTRIES@', "{:,}".format(numberOfRules)))
 
 def moveHostsFileIntoPlace(finalFile):