openstack/openstack-manuals
Code Issues Proposed changes

[install-guide] Minor edits to overview and index.rst

Browse Source 
Change-Id: Idffa7bfe3f26b8c22918fb3c83c4c569957ac5b7
This commit is contained in:
Alexandra Settle 2017-01-26 13:37:23 +00:00 committed by Brian Moss
parent 504e696ab5
commit cf2861d9bd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/install-guide/source/index.rst
View File

@ -93,7 +93,7 @@ or as connected entities.
Explanations of configuration options and sample configuration files Explanations of configuration options and sample configuration files
are included. are included.
This guide documents the OpenStack Newton release. This guide documents the OpenStack Ocata release.
.. warning:: .. warning::

6
doc/install-guide/source/overview.rst
View File

@ -64,7 +64,7 @@ Controller
The controller node runs the Identity service, Image service, management The controller node runs the Identity service, Image service, management
portions of Compute, management portion of Networking, various Networking portions of Compute, management portion of Networking, various Networking
agents, and the dashboard. It also includes supporting services such as agents, and the Dashboard. It also includes supporting services such as
an SQL database, :term:`message queue`, and :term:`NTP <Network Time Protocol an SQL database, :term:`message queue`, and :term:`NTP <Network Time Protocol
(NTP)>`. (NTP)>`.
@ -131,13 +131,13 @@ for layer-3 (routing) services. Additionally, a :term:`DHCP<Dynamic Host
Configuration Protocol (DHCP)>` service provides IP address information to Configuration Protocol (DHCP)>` service provides IP address information to
instances. instances.
.. note:: .. warning::
This option lacks support for self-service (private) networks, layer-3 This option lacks support for self-service (private) networks, layer-3
(routing) services, and advanced services such as (routing) services, and advanced services such as
:term:`LBaaS <Load-Balancer-as-a-Service (LBaaS)>` and :term:`LBaaS <Load-Balancer-as-a-Service (LBaaS)>` and
:term:`FWaaS<FireWall-as-a-Service (FWaaS)>`. :term:`FWaaS<FireWall-as-a-Service (FWaaS)>`.
Consider the self-service networks option if you desire these features. Consider the self-service networks option below if you desire these features.
.. _figure-network1-services: .. _figure-network1-services: