Updated from openstack-manuals

Change-Id: I6698d2787dedc14e3e3cb430431642a4778662dc

doc/source/common/app-support.rst

@@ -182,8 +182,8 @@ Documentation feedback
 
 To provide feedback on documentation, join our IRC channel ``#openstack-doc``
 on the Freenode IRC network, or `report a bug in Launchpad
-<https://bugs.launchpad.net/openstack/+filebug/+login>`_ and choose
+<https://bugs.launchpad.net/openstack/+filebug>`_ and choose the particular
-the particular project that the documentation is a part of.
+project that the documentation is a part of.
 
 The OpenStack IRC channel
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -194,7 +194,7 @@ feedback for urgent and pressing issues. To install an IRC client or use
 a browser-based client, go to
 `https://webchat.freenode.net/ <https://webchat.freenode.net>`_. You can
 also use `Colloquy <http://colloquy.info/>`_ (Mac OS X),
-`mIRC <https://www.mirc.com/>`_ (Windows),
+`mIRC <http://www.mirc.com/>`_ (Windows),
 or XChat (Linux). When you are in the IRC channel
 and want to share code or command output, the generally accepted method
 is to use a Paste Bin. The OpenStack project has one at `Paste

doc/source/common/conventions.rst

@@ -35,8 +35,6 @@ Command prompts
 
    $ command
 
-.. end
-
 Any user, including the ``root`` user, can run commands that are
 prefixed with the ``$`` prompt.
 
@@ -44,8 +42,6 @@ prefixed with the ``$`` prompt.
 
    # command
 
-.. end
-
 The ``root`` user must run commands that are prefixed with the ``#``
 prompt. You can also prefix these commands with the :command:`sudo`
 command, if available, to run them.

doc/source/common/glossary.rst

@@ -2695,7 +2695,7 @@ O
    Ocata
 
       The code name for the fifteenth release of OpenStack. The
-      design summit will take place in Barcelona, Spain. Ocata is
+      design summit took place in Barcelona, Spain. Ocata is
       a beach north of Barcelona.
 
    Octavia
@@ -2754,7 +2754,8 @@ O
       Each OpenStack release has a code name. Code names ascend in
       alphabetical order: Austin, Bexar, Cactus, Diablo, Essex,
       Folsom, Grizzly, Havana, Icehouse, Juno, Kilo, Liberty,
-      Mitaka, Newton, Ocata, Pike, Queens, and Rocky.
+      Mitaka, Newton, Ocata, Pike, Queens, Rocky, Stein,
+      and Train.
       Code names are cities or counties near where the
       corresponding OpenStack design summit took place. An
       exception, called the Waldon exception, is granted to
@@ -2857,8 +2858,8 @@ P
 
    Pike
 
-      The code name for the sixteenth release of OpenStack. The design
+      The code name for the sixteenth release of OpenStack. The OpenStack
-      summit will take place in Boston, Massachusetts, US. The release
+      summit took place in Boston, Massachusetts, US. The release
       is named after the Massachusetts Turnpike, abbreviated commonly
       as the Mass Pike, which is the easternmost stretch of
       Interstate 90.
@@ -3048,7 +3049,7 @@ Q
    Queens
 
       The code name for the seventeenth release of OpenStack. The
-      design summit will take place in Sydney, Australia. The release
+      OpenStack summit took place in Sydney, Australia. The release
       is named after the Queens Pound river in the South Coast region
       of New South Wales.
 
@@ -3247,7 +3248,7 @@ R
    Rocky
 
       The code name for the eightteenth release of OpenStack. The
-      design summit will take place in Vancouver, Kanada. The release
+      OpenStack summit took place in Vancouver, Canada. The release
       is named after the Rocky Mountains.
 
    role
@@ -3620,6 +3621,12 @@ S
       WSGI middleware component of Object Storage that serves
       container data as a static web page.
 
+   Stein
+
+      The code name for the nineteenth release of OpenStack. The
+      OpenStack Summit took place in Berlin, Germany. The release is
+      named after the street Steinstraße in Berlin.
+
    storage back end
 
       The method that a service uses for persistent storage, such as
@@ -3801,6 +3808,22 @@ T
       Community project used to run automated tests against the
       OpenStack API.
 
+   Train
+
+      The code name for the twentieth release of OpenStack. The
+      OpenStack Infrastructure Summit will take place in Denver,
+      Colorado, US.
+
+      Two Project Team Gathering meetings in Denver were held at a
+      hotel next to the train line from downtown to the airport. The
+      crossing signals there had some sort of malfunction in the past
+      causing them to not stop the cars when a train was coming
+      properly. As a result the trains were required to blow their
+      horns when passing through that area. Obviously staying in a
+      hotel, by trains that are blowing their horns 24/7 was less than
+      ideal. As a result, many jokes popped up about Denver and
+      trains - and thus the release is called train.
+
    transaction ID
 
       Unique ID assigned to each Object Storage request; used for