summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2018-11-24 14:10:21 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2018-11-24 14:10:21 +0000
commita3e1dd0672918db07f9c346f42ce87b72b79e55c (patch)
treeb44c8d367b90a40bdb6d839dde5f0d2889420637
parent8a707f5e068786d9145623384cadcc89e19eb745 (diff)
Updated from openstack-manuals
Notes
Notes (review): Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Workflow+1: Andreas Jaeger <jaegerandi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 24 Nov 2018 14:45:01 +0000 Reviewed-on: https://review.openstack.org/619886 Project: openstack/operations-guide Branch: refs/heads/master
-rw-r--r--doc/source/common/app-support.rst6
-rw-r--r--doc/source/common/conventions.rst4
-rw-r--r--doc/source/common/glossary.rst35
3 files changed, 32 insertions, 13 deletions
diff --git a/doc/source/common/app-support.rst b/doc/source/common/app-support.rst
index ea26475..3c8f960 100644
--- a/doc/source/common/app-support.rst
+++ b/doc/source/common/app-support.rst
@@ -182,8 +182,8 @@ Documentation feedback
182 182
183To provide feedback on documentation, join our IRC channel ``#openstack-doc`` 183To provide feedback on documentation, join our IRC channel ``#openstack-doc``
184on the Freenode IRC network, or `report a bug in Launchpad 184on the Freenode IRC network, or `report a bug in Launchpad
185<https://bugs.launchpad.net/openstack/+filebug/+login>`_ and choose 185<https://bugs.launchpad.net/openstack/+filebug>`_ and choose the particular
186the particular project that the documentation is a part of. 186project that the documentation is a part of.
187 187
188The OpenStack IRC channel 188The OpenStack IRC channel
189~~~~~~~~~~~~~~~~~~~~~~~~~ 189~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -194,7 +194,7 @@ feedback for urgent and pressing issues. To install an IRC client or use
194a browser-based client, go to 194a browser-based client, go to
195`https://webchat.freenode.net/ <https://webchat.freenode.net>`_. You can 195`https://webchat.freenode.net/ <https://webchat.freenode.net>`_. You can
196also use `Colloquy <http://colloquy.info/>`_ (Mac OS X), 196also use `Colloquy <http://colloquy.info/>`_ (Mac OS X),
197`mIRC <https://www.mirc.com/>`_ (Windows), 197`mIRC <http://www.mirc.com/>`_ (Windows),
198or XChat (Linux). When you are in the IRC channel 198or XChat (Linux). When you are in the IRC channel
199and want to share code or command output, the generally accepted method 199and want to share code or command output, the generally accepted method
200is to use a Paste Bin. The OpenStack project has one at `Paste 200is to use a Paste Bin. The OpenStack project has one at `Paste
diff --git a/doc/source/common/conventions.rst b/doc/source/common/conventions.rst
index 0f86d09..b3cbabb 100644
--- a/doc/source/common/conventions.rst
+++ b/doc/source/common/conventions.rst
@@ -35,8 +35,6 @@ Command prompts
35 35
36 $ command 36 $ command
37 37
38.. end
39
40Any user, including the ``root`` user, can run commands that are 38Any user, including the ``root`` user, can run commands that are
41prefixed with the ``$`` prompt. 39prefixed with the ``$`` prompt.
42 40
@@ -44,8 +42,6 @@ prefixed with the ``$`` prompt.
44 42
45 # command 43 # command
46 44
47.. end
48
49The ``root`` user must run commands that are prefixed with the ``#`` 45The ``root`` user must run commands that are prefixed with the ``#``
50prompt. You can also prefix these commands with the :command:`sudo` 46prompt. You can also prefix these commands with the :command:`sudo`
51command, if available, to run them. 47command, if available, to run them.
diff --git a/doc/source/common/glossary.rst b/doc/source/common/glossary.rst
index 404e0d6..2b06d04 100644
--- a/doc/source/common/glossary.rst
+++ b/doc/source/common/glossary.rst
@@ -2695,7 +2695,7 @@ O
2695 Ocata 2695 Ocata
2696 2696
2697 The code name for the fifteenth release of OpenStack. The 2697 The code name for the fifteenth release of OpenStack. The
2698 design summit will take place in Barcelona, Spain. Ocata is 2698 design summit took place in Barcelona, Spain. Ocata is
2699 a beach north of Barcelona. 2699 a beach north of Barcelona.
2700 2700
2701 Octavia 2701 Octavia
@@ -2754,7 +2754,8 @@ O
2754 Each OpenStack release has a code name. Code names ascend in 2754 Each OpenStack release has a code name. Code names ascend in
2755 alphabetical order: Austin, Bexar, Cactus, Diablo, Essex, 2755 alphabetical order: Austin, Bexar, Cactus, Diablo, Essex,
2756 Folsom, Grizzly, Havana, Icehouse, Juno, Kilo, Liberty, 2756 Folsom, Grizzly, Havana, Icehouse, Juno, Kilo, Liberty,
2757 Mitaka, Newton, Ocata, Pike, Queens, and Rocky. 2757 Mitaka, Newton, Ocata, Pike, Queens, Rocky, Stein,
2758 and Train.
2758 Code names are cities or counties near where the 2759 Code names are cities or counties near where the
2759 corresponding OpenStack design summit took place. An 2760 corresponding OpenStack design summit took place. An
2760 exception, called the Waldon exception, is granted to 2761 exception, called the Waldon exception, is granted to
@@ -2857,8 +2858,8 @@ P
2857 2858
2858 Pike 2859 Pike
2859 2860
2860 The code name for the sixteenth release of OpenStack. The design 2861 The code name for the sixteenth release of OpenStack. The OpenStack
2861 summit will take place in Boston, Massachusetts, US. The release 2862 summit took place in Boston, Massachusetts, US. The release
2862 is named after the Massachusetts Turnpike, abbreviated commonly 2863 is named after the Massachusetts Turnpike, abbreviated commonly
2863 as the Mass Pike, which is the easternmost stretch of 2864 as the Mass Pike, which is the easternmost stretch of
2864 Interstate 90. 2865 Interstate 90.
@@ -3048,7 +3049,7 @@ Q
3048 Queens 3049 Queens
3049 3050
3050 The code name for the seventeenth release of OpenStack. The 3051 The code name for the seventeenth release of OpenStack. The
3051 design summit will take place in Sydney, Australia. The release 3052 OpenStack summit took place in Sydney, Australia. The release
3052 is named after the Queens Pound river in the South Coast region 3053 is named after the Queens Pound river in the South Coast region
3053 of New South Wales. 3054 of New South Wales.
3054 3055
@@ -3247,7 +3248,7 @@ R
3247 Rocky 3248 Rocky
3248 3249
3249 The code name for the eightteenth release of OpenStack. The 3250 The code name for the eightteenth release of OpenStack. The
3250 design summit will take place in Vancouver, Kanada. The release 3251 OpenStack summit took place in Vancouver, Canada. The release
3251 is named after the Rocky Mountains. 3252 is named after the Rocky Mountains.
3252 3253
3253 role 3254 role
@@ -3620,6 +3621,12 @@ S
3620 WSGI middleware component of Object Storage that serves 3621 WSGI middleware component of Object Storage that serves
3621 container data as a static web page. 3622 container data as a static web page.
3622 3623
3624 Stein
3625
3626 The code name for the nineteenth release of OpenStack. The
3627 OpenStack Summit took place in Berlin, Germany. The release is
3628 named after the street Steinstra├če in Berlin.
3629
3623 storage back end 3630 storage back end
3624 3631
3625 The method that a service uses for persistent storage, such as 3632 The method that a service uses for persistent storage, such as
@@ -3801,6 +3808,22 @@ T
3801 Community project used to run automated tests against the 3808 Community project used to run automated tests against the
3802 OpenStack API. 3809 OpenStack API.
3803 3810
3811 Train
3812
3813 The code name for the twentieth release of OpenStack. The
3814 OpenStack Infrastructure Summit will take place in Denver,
3815 Colorado, US.
3816
3817 Two Project Team Gathering meetings in Denver were held at a
3818 hotel next to the train line from downtown to the airport. The
3819 crossing signals there had some sort of malfunction in the past
3820 causing them to not stop the cars when a train was coming
3821 properly. As a result the trains were required to blow their
3822 horns when passing through that area. Obviously staying in a
3823 hotel, by trains that are blowing their horns 24/7 was less than
3824 ideal. As a result, many jokes popped up about Denver and
3825 trains - and thus the release is called train.
3826
3804 transaction ID 3827 transaction ID
3805 3828
3806 Unique ID assigned to each Object Storage request; used for 3829 Unique ID assigned to each Object Storage request; used for