From 3712a4539907a05a98e289cfc48a6c62adccd686 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 11 Jun 2014 09:48:43 -0700
Subject: [PATCH] Further (and different, and better) standardisation

---
 ConfigParser.py          | 10 +++++-----
 README.md                |  2 +-
 starttls-everywhere.json |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ConfigParser.py b/ConfigParser.py
index aba4eb23f..dbc244b25 100755
--- a/ConfigParser.py
+++ b/ConfigParser.py
@@ -47,7 +47,7 @@ class Config:
         self.timestamp = parse_timestamp(val)
       elif atr == "expires":
         self.expires = parse_timestamp(val)
-      elif atr == "security-policies":
+      elif atr == "tls-policies":
         self.tls_policies = {}
         for domain,policies in self.check_tls_policy_domains(val):
           if type(policies) != dict:
@@ -67,18 +67,18 @@ class Config:
 
   def check_tls_policy_domains(self, val):
     if type(val) != dict:
-      raise TypeError, "security-policies should be a dict" + `val`
+      raise TypeError, "tls-policies should be a dict" + `val`
     for domain, policies in val.items():
       try:
         assert type(domain) == unicode
         d = str(domain) # convert from unicode
       except:
-        raise TypeError, "security-policy domain not a string" + `domain`
+        raise TypeError, "tls-policy domain not a string" + `domain`
       if not d.startswith("*."):
-        raise ValueError, "security-policy domains must start with *.; try *."+d
+        raise ValueError, "tls-policy domains must start with *.; try *."+d
       d = d.partition("*.")[2]
       if not looks_like_a_domain(d):
-        raise ValueError, "security-policy for something that a domain? " + d
+        raise ValueError, "tls-policy for something that a domain? " + d
       yield (d, policies)
 
 if __name__ == "__main__":
diff --git a/README.md b/README.md
index 79e0ed30d..2f0a410a1 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ The basic file format will be JSON with comments (http://blog.getify.com/json-co
       // "timestamp": 1401414363,  : also acceptable
       "author": "Electronic Frontier Foundation https://eff.org",
       "expires": "2014-06-06T14:30:16+00:00",
-      "security-policies": {
+      "tls-policies": {
         // These match on the MX domain.
         "*.yahoodns.net": {
            "require-valid-certificate": true,
diff --git a/starttls-everywhere.json b/starttls-everywhere.json
index 4c91866d5..d0e656186 100644
--- a/starttls-everywhere.json
+++ b/starttls-everywhere.json
@@ -1,5 +1,5 @@
 {
-  "mx-domains": {
+  "tls-policies": {
     "*.mx.aol.com": {
       "min-tls-version": "TLSv1", 
       "require-tls": true
@@ -49,7 +49,7 @@
       "require-tls": true
     }
   }, 
-  "address-domains": {
+  "acceptable-mxs": {
     "wp.pl": {
       "accept-mx-domains": [
         "*.wp.pl"