From: Steven Black <redacted>
Date: Sun, 28 Feb 2016 01:16:41 +0000 (-0500)
Subject: Amalgamated -> Unified.
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=76fe64ba9023a17683084b0df4a6234aac97d9af;p=stevenblack-hosts.git

Amalgamated -> Unified.
---

diff --git a/extensions/readme.md b/extensions/readme.md
index d9b1c678c..ddf2baafa 100644
--- a/extensions/readme.md
+++ b/extensions/readme.md
@@ -1,8 +1,8 @@
 # Extensions
 
-Use subfolders under the `extensions` folder to house extensions to the final amalgamated hosts file.
+Use subfolders under the `extensions` folder to house extensions to the final unified hosts file.
 
-Currently this repo includes a `porn` extension which you can optionally add to your final amalgamated file.
+Currently this repo includes a `porn` extension which you can optionally add to your final unified file.
 
 Here's a sample call to include the `porn` extension.
 
diff --git a/updateHostsFile.py b/updateHostsFile.py
index 427f2a32a..deb0e6e57 100644
--- a/updateHostsFile.py
+++ b/updateHostsFile.py
@@ -100,7 +100,7 @@ extensions = []
 
 def main():
 
-    parser = argparse.ArgumentParser(description="Creates an amalgamated hosts file from hosts stored in data subfolders.")
+    parser = argparse.ArgumentParser(description="Creates a unified hosts file from hosts stored in data subfolders.")
     parser.add_argument("--auto", "-a", dest="auto", default=False, action='store_true', help="Run without prompting.")
     parser.add_argument("--replace", "-r", dest="replace", default=False, action='store_true', help="Replace your active hosts file with this new hosts file.")
     parser.add_argument("--ip", "-i", dest="targetIP", default="0.0.0.0", help="Target IP address. Default is 0.0.0.0.")