Minor doc cleanup

Author: oschwald

geoip2/database.py

@@ -17,9 +17,7 @@ class Reader(object):
     Instances of this class provide a reader for the GeoIP2 database format.
     IP addresses can be looked up using the ``country`` and ``city`` methods.
     We also provide ``city_isp_org`` and ``omni`` methods to ease
-    compatibility with the web service client, although we may offer the
-    ability to specify additional databases to replicate these web services in
-    the future (e.g., the ISP/Org database).
+    compatibility with the web service client.
 
      Usage
      -----
@@ -49,7 +47,7 @@ def __init__(self, filename, locales=None):
         self._locales = locales
 
     def country(self, ip_address):
-        """Get the Country record object for the IP address
+        """Get the Country object for the IP address
 
         :param ip_address: IPv4 or IPv6 address as a string.
 
@@ -60,7 +58,7 @@ def country(self, ip_address):
         return self._model_for(geoip2.models.Country, ip_address)
 
     def city(self, ip_address):
-        """Get the City record object for the IP address
+        """Get the City object for the IP address
 
         :param ip_address: IPv4 or IPv6 address as a string.
 
@@ -70,7 +68,7 @@ def city(self, ip_address):
         return self._model_for(geoip2.models.City, ip_address)
 
     def city_isp_org(self, ip_address):
-        """Get the CityISPOrg record object for the IP address
+        """Get the CityISPOrg object for the IP address
 
         :param ip_address: IPv4 or IPv6 address as a string. If no address
           is provided.
@@ -82,7 +80,7 @@ def city_isp_org(self, ip_address):
         return self._model_for(geoip2.models.CityISPOrg, ip_address)
 
     def omni(self, ip_address):
-        """Get the Omni record object for the IP address
+        """Get the Omni object for the IP address
 
         :param ip_address: IPv4 or IPv6 address as a string.
 

geoip2/models.py

@@ -16,7 +16,7 @@
 
 class Country(object):
 
-    """Model class for the GeoIP2 Country Web Service or Database
+    """Model class for the GeoIP2 Country
 
     This class provides the following attributes:
 
@@ -92,7 +92,7 @@ def __init__(self, raw_response, locales=None):
 
 class City(Country):
 
-    """Model class for the GeoIP2 Precision City Web Service or City Database
+    """Model class for the GeoIP2 Precision City
 
     .. attribute:: city
 
@@ -170,7 +170,7 @@ def __init__(self, raw_response, locales=None):
 
 class CityISPOrg(City):
 
-    """Model class for the GeoIP2 Precision City/ISP/Org end point
+    """Model class for the GeoIP2 Precision City/ISP/Org
 
     .. attribute:: city
 
@@ -236,7 +236,7 @@ class CityISPOrg(City):
 
 class Omni(CityISPOrg):
 
-    """Model class for the GeoIP2 Precision Omni end point
+    """Model class for the GeoIP2 Precision Omni
 
     .. attribute:: city
 
@@ -302,7 +302,7 @@ class Omni(CityISPOrg):
 
 class ConnectionType(object):
 
-    """Model class for the GeoIP2 Connection-Type Database
+    """Model class for the GeoIP2 Connection-Type
 
     This class provides the following attribute:
 
@@ -334,7 +334,7 @@ def __init__(self, raw):
 
 class Domain(object):
 
-    """Model class for the GeoIP2 Domain Database
+    """Model class for the GeoIP2 Domain
 
     This class provides the following attribute:
 
@@ -360,7 +360,7 @@ def __init__(self, raw):
 
 class ISPOrg(object):
 
-    """Model class for the GeoIP2 ISP-Org Database
+    """Model class for the GeoIP2 ISP-Org
 
     This class provides the following attribute: