From ccfddb1c32779919851b7ae4cf0ba5c4159a860d Mon Sep 17 00:00:00 2001 From: Leona Date: Mon, 16 Nov 2015 10:51:48 -0800 Subject: [PATCH] fixing files upstream to be able to merge --- README.rst | 6 +++--- source/openstack_environment-messaging.rst | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index c8c4026f..bb92357e 100644 --- a/README.rst +++ b/README.rst @@ -12,7 +12,7 @@ Building with `Sphinx`_, however, requires a few prerequisites: * `PIP`_ The instructions for installing these varies according to OS. On a basic -out-of-the-box Ubuntu-like (which usually has Python installed by default), +out-of-the-box Ubuntu-like OS (which usually has Python installed by default), you might need something like: .. codeblock:: shell-session @@ -64,7 +64,7 @@ a series of questions. The main things to be conscious of here: will generate *another* :file:`source/` directory, which can be confusing. What follows here is a log from a successful :command:`sphinx-quickstart` build started from -within the :file:`project-docs/` directory. +within the :file:`project-docs/` directory. Blank answers indicate default used. .. codeblock:: shell-session @@ -132,7 +132,7 @@ within the :file:`project-docs/` directory. > viewcode: include links to the source code of documented Python objects (y/n) [n]: y A Makefile and a Windows command file can be generated for you so that you - only have to run e.g. `make html' instead of invoking sphinx-build + only have to run e.g. "make html" instead of invoking sphinx-build directly. > Create Makefile? (y/n) [y]: y > Create Windows command file? (y/n) [n]: n diff --git a/source/openstack_environment-messaging.rst b/source/openstack_environment-messaging.rst index 25a9237b..4da91656 100644 --- a/source/openstack_environment-messaging.rst +++ b/source/openstack_environment-messaging.rst @@ -24,7 +24,7 @@ Complete the following steps to configure the message broker service: 1. Message broker service needs to be able to resolve to itself. Add the following line to :file:`/etc/hosts` - .. code-block:: literal + .. code-block:: raw 127.0.0.1 controller