Merge "Rename endpoint type to interface"

2 files changed, 10 insertions, 10 deletions

diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index b603eee4..de3f84ee 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -78,7 +78,7 @@ The keys match the :program:`openstack` global options but without the
           username: openstack
           password: xyzpdq!lazydog
         region_name: DFW,ORD,IAD
-        endpoint_type: internal
+        interface: internal
 
 In the above example, the ``auth_url`` for the ``rackspace`` cloud is taken
 from :file:`clouds-public.yaml` (see below).
@@ -97,7 +97,7 @@ to the following options if the ``rackspace`` entry in :file:`clouds-public.yaml
     --os-username openstack
     --os-password xyzpdq!lazydog
     --os-region-name DFW
-    --os-endpoint-type internal
+    --os-interface internal
 
 and can be selected on the command line::
 
@@ -107,9 +107,9 @@ Note that multiple regions are listed in the ``rackspace`` entry.  An otherwise
 identical configuration is created for each region.  If ``-os-region-name`` is not
 specified on the command line, the first region in the list is used by default.
 
-The selection of ``endpoint_type`` (as seen above in the ``rackspace`` entry)
+The selection of ``interface`` (as seen above in the ``rackspace`` entry)
 is optional.  For this configuration to work, every service for this cloud
-instance must already be configured to support this type of endpoint.
+instance must already be configured to support this type of interface.
 
 clouds-public.yaml
 ~~~~~~~~~~~~~~~~~~
diff --git a/doc/source/man/openstack.rst b/doc/source/man/openstack.rst
index 9d711527..53bf3629 100644
--- a/doc/source/man/openstack.rst
+++ b/doc/source/man/openstack.rst
@@ -67,7 +67,7 @@ OPTIONS
     The authentication plugin type to use when connecting to the Identity service.
     If this option is not set, :program:`openstack` will attempt to guess the
     authentication method to use based on the other options.
-    If this option is set, its version must match :option:`--os-identity-api-version` 
+    If this option is set, its version must match :option:`--os-identity-api-version`
 
 :option:`--os-auth-url` <auth-url>
     Authentication URL
@@ -120,8 +120,8 @@ OPTIONS
 :option:`--os-XXXX-api-version` <XXXX-api-version>
     Additional API version options will be available depending on the installed API libraries.
 
-:option:`--os-endpoint-type` <endpoint-type>
-    Endpoint type. Valid options are `public`, `admin` and `internal`.
+:option:`--os-interface` <interface>
+    Interface type. Valid options are `public`, `admin` and `internal`.
 
 COMMANDS
 ========
@@ -299,7 +299,7 @@ The following environment variables can be set to alter the behaviour of :progra
     The name of a cloud configuration in ``clouds.yaml``.
 
 :envvar:`OS_AUTH_PLUGIN`
-    The authentication plugin to use when connecting to the Identity service, its version must match the Identity API version 
+    The authentication plugin to use when connecting to the Identity service, its version must match the Identity API version
 
 :envvar:`OS_AUTH_URL`
     Authentication URL
@@ -346,8 +346,8 @@ The following environment variables can be set to alter the behaviour of :progra
 :envvar:`OS_XXXX_API_VERSION`
     Additional API version options will be available depending on the installed API libraries.
 
-:envvar:`OS_ENDPOINT_TYPE`
-    Endpoint type. Valid options are `public`, `admin` and `internal`.
+:envvar:`OS_INTERFACE`
+    Interface type. Valid options are `public`, `admin` and `internal`.
 
 
 BUGS