diff --git a/specification/appendices/identifier_grammar.rst b/specification/appendices/identifier_grammar.rst
index 9487374b..7156c7d5 100644
--- a/specification/appendices/identifier_grammar.rst
+++ b/specification/appendices/identifier_grammar.rst
@@ -25,8 +25,7 @@ number of identifiers, as described below.
 The server name represents the address at which the homeserver in question can
 be reached by other homeservers. The complete grammar is::
 
-    server_name = dns_name [ ":" port]
-    dns_name = host
+    server_name = host [ ":" port]
     port = *DIGIT
 
 where ``host`` is as defined by `RFC3986, section 3.2.2
diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst
index 74b37aaa..30cf45ab 100644
--- a/specification/server_server_api.rst
+++ b/specification/server_server_api.rst
@@ -23,7 +23,7 @@ Federation API
 
 Matrix homeservers use the Federation APIs (also known as server-server APIs)
 to communicate with each other. Homeservers use these APIs to push messages to
-each other in real-time, to 
+each other in real-time, to
 historic messages from each other, and to
 query profile and presence information about users on each other's servers.
 
@@ -78,22 +78,21 @@ Server Discovery
 Resolving Server Names
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Each matrix homeserver is identified by a server name consisting of a DNS name
+Each matrix homeserver is identified by a server name consisting of a hostname
 and an optional TLS port.
 
 .. code::
 
-    server_name = dns_name [ ":" tls_port]
-    dns_name = <host, see [RFC 3986], Section 3.2.2>
+    server_name = hostname [ ":" tls_port]
     tls_port = *DIGIT
 
 .. **
 
 If the port is present then the server is discovered by looking up an AAAA or
-A record for the DNS name and connecting to the specified TLS port. If the port
+A record for the hostname and connecting to the specified TLS port. If the port
 is absent then the server is discovered by looking up a ``_matrix._tcp`` SRV
-record for the DNS name. If this record does not exist then the server is
-discovered by looking up an AAAA or A record on the DNS name and taking the
+record for the hostname. If this record does not exist then the server is
+discovered by looking up an AAAA or A record on the hostname and taking the
 default fallback port number of 8448.
 Homeservers may use SRV records to load balance requests between multiple TLS
 endpoints or to failover to another endpoint if an endpoint fails.
@@ -630,7 +629,7 @@ if this optimisation fails.
 
 Once the joining server has the room ID and the join candidates, it then needs
 to obtain enough information about the room to fill in the required fields of
-the ``m.room.member`` event. It obtains this by selecting a resident from the
+the ``m.room.member`` event. It obtains this by selecting a resident from t
 candidate list, and using the ``GET /make_join`` endpoint. The resident server
 will then reply with enough information for the joining server to fill in the
 event.