Merge pull request #500 from maxmind/greg/stf-555

Use 'GeoIP'/'GeoLite' branding in documentation

Author: horgh

.goreleaser.yml

@@ -167,7 +167,7 @@ nfpms:
     vendor: 'MaxMind, Inc.'
     homepage: https://www.maxmind.com/
     maintainer: 'MaxMind, Inc. <support@maxmind.com>'
-    description: Program to perform automatic updates of GeoIP2 and GeoLite2 binary databases.
+    description: Program to perform automatic updates of GeoIP and GeoLite binary databases.
     license: Apache 2.0 or MIT
     formats:
       - deb

README.md

@@ -1,7 +1,7 @@
 # GeoIP Update
 
-The GeoIP Update program performs automatic updates of GeoIP2 and GeoLite2
-binary databases. CSV databases are _not_ supported.
+The GeoIP Update program performs automatic updates of GeoIP and GeoLite binary
+databases. CSV databases are _not_ supported.
 
 ## Installation
 

client/client.go

@@ -1,4 +1,4 @@
-// Package client is a client for downloading GeoIP2 and GeoLite2 MMDB
+// Package client is a client for downloading GeoIP and GeoLite MMDB
 // databases.
 package client
 
@@ -7,7 +7,7 @@ import (
 	"net/http"
 )
 
-// Client downloads GeoIP2 and GeoLite2 MMDB databases.
+// Client downloads GeoIP and GeoLite MMDB databases.
 //
 // After creation, it is valid for concurrent use.
 //

doc/GeoIP.conf.md

@@ -5,7 +5,7 @@ GeoIP.conf - Configuration file for geoipupdate
 # SYNOPSIS
 
 This file allows you to configure your `geoipupdate` program to
-download GeoIP2 and GeoLite2 databases.
+download GeoIP and GeoLite databases.
 
 # DESCRIPTION
 
@@ -31,7 +31,7 @@ sensitive.
 
 :   List of space-separated database edition IDs. Edition IDs may consist
     of letters, digits, and dashes.  For example, `GeoIP2-City` would
-    download the GeoIP2 City database (`GeoIP2-City`). This can be overridden
+    download the GeoIP City database (`GeoIP2-City`). This can be overridden
     at run time by the `GEOIPUPDATE_EDITION_IDS` environment variable. Note:
     this was formerly called `ProductIds`.
 

doc/docker.md

@@ -16,7 +16,7 @@ An account ID, a license key, and edition ID(s) to update must be provided.
 2. Or they can be set via environment variables:
   * `GEOIPUPDATE_EDITION_IDS` - List of space-separated database edition
     IDs. Edition IDs may consist of letters, digits, and dashes. For
-    example. `GeoIP2-City` would download the GeoIP2 City database
+    example. `GeoIP2-City` would download the GeoIP City database
     (`GeoIP2-City`).
   * One of:
     * `GEOIPUPDATE_ACCOUNT_ID` - Your MaxMind account ID.

doc/geoipupdate.md

@@ -1,14 +1,14 @@
 # NAME
 
-geoipupdate - GeoIP2 and GeoLite2 Update Program
+geoipupdate - GeoIP and GeoLite Update Program
 
 # SYNOPSIS
 
 **geoipupdate** [-Vvh] [-f *CONFIG_FILE*] [-d *TARGET_DIRECTORY*]
 
 # DESCRIPTION
 
-`geoipupdate` automatically updates GeoIP2 and GeoLite2 databases. The
+`geoipupdate` automatically updates GeoIP and GeoLite databases. The
 program connects to the MaxMind GeoIP Update server to check for new
 databases. If a new database is available, the program will download and
 install it.
@@ -91,7 +91,7 @@ the MIT License, at your option.
 # MORE INFORMATION
 
 Visit [our website](https://www.maxmind.com/en/geoip2-services-and-databases)
-to learn more about the GeoIP2 databases or to sign up for a subscription.
+to learn more about the GeoIP databases or to sign up for a subscription.
 
 # SEE ALSO