From 6969ca5b246bcc8da7faf506c1d60efbf48de9bd Mon Sep 17 00:00:00 2001 From: Olena Logvinova Date: Thu, 14 Jan 2016 14:01:44 +0200 Subject: [PATCH] [contributor guide] Add lifecycle to Word choice section This patch: - adds a word 'lifecycle' to the Word choice section as it has different spelling in Merriam Webster and IBM Terminology dics. - corrects a grammar mistake (continously -> continuously). Change-Id: If3e77afdf72be31395b4e5c7d7e0bdbebbf4f4c3 --- doc/contributor-guide/source/docs-builds.rst | 6 +++--- doc/contributor-guide/source/writing-style/word-choice.rst | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/contributor-guide/source/docs-builds.rst b/doc/contributor-guide/source/docs-builds.rst index d12851628d..608e123c53 100644 --- a/doc/contributor-guide/source/docs-builds.rst +++ b/doc/contributor-guide/source/docs-builds.rst @@ -7,7 +7,7 @@ Documentation builds Documentation source and target locations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Most documents are continously published, they are published only from the +Most documents are continuously published, they are published only from the master branch and there is no specific version for a stable release, instead they document the releases that the OpenStack community currently maintains. There are also version dependent documents. @@ -17,7 +17,7 @@ openstack-manuals and other repositories indicate where docs are published. For example, from the stable/liberty release branch, doc source files are published to docs.openstack.org/liberty, and from the master branch, doc source files are published for versioned documents to -docs.openstack.org/draft and for continously published documents to +docs.openstack.org/draft and for continuously published documents to docs.openstack.org/ by our lovely Jenkins butlers always at the ready. Some content is completely generated using openstack-doc-tools, such as the @@ -102,7 +102,7 @@ Guides for deployers and administrators .. note:: The Configuration Reference and the Networking Guide are versioned, - all other guides are continously published. + all other guides are continuously published. Guides for end users -------------------- diff --git a/doc/contributor-guide/source/writing-style/word-choice.rst b/doc/contributor-guide/source/writing-style/word-choice.rst index 5369125c33..1714af223b 100644 --- a/doc/contributor-guide/source/writing-style/word-choice.rst +++ b/doc/contributor-guide/source/writing-style/word-choice.rst @@ -54,6 +54,8 @@ The following table lists the preferred word or phrase choice. +----------------+----------------------+ | host name | hostname, Hostname | +----------------+----------------------+ +| lifecycle | life cycle | ++----------------+----------------------+ | login (noun) | logon, log-in | +----------------+----------------------+ | log in (verb) | login |