From afcd4a6307efd7920f679b888462c4b06d6ec55c Mon Sep 17 00:00:00 2001 From: "Ian Y. Choi" Date: Sat, 22 Oct 2016 02:14:43 +0900 Subject: [PATCH] [upstream] Correction with standard English Since official Documentation writing guidelines recommend to use standard English, this commit changes some words. Also, this commit fixes several typos. Change-Id: Ie4a0118c2cecca4c0ec707744ecc3cd726fc59e3 --- ...-changed.png => sandbox-lp-assignee-changed.png} | Bin .../source/slides/howitsmade-governance.rst | 8 ++++---- .../source/slides/howitsmade-release-cycle.rst | 6 +++--- .../source/slides/intro-introduction.rst | 2 +- .../source/slides/workflow-using-sandbox.rst | 4 ++-- doc/upstream-training/source/website/index.rst | 2 +- doc/upstream-training/source/website/irc.rst | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) rename doc/upstream-training/source/slides/_assets/{sandbox-lp-assignnee-changed.png => sandbox-lp-assignee-changed.png} (100%) diff --git a/doc/upstream-training/source/slides/_assets/sandbox-lp-assignnee-changed.png b/doc/upstream-training/source/slides/_assets/sandbox-lp-assignee-changed.png similarity index 100% rename from doc/upstream-training/source/slides/_assets/sandbox-lp-assignnee-changed.png rename to doc/upstream-training/source/slides/_assets/sandbox-lp-assignee-changed.png diff --git a/doc/upstream-training/source/slides/howitsmade-governance.rst b/doc/upstream-training/source/slides/howitsmade-governance.rst index b43e2fc8..ce26e3e6 100644 --- a/doc/upstream-training/source/slides/howitsmade-governance.rst +++ b/doc/upstream-training/source/slides/howitsmade-governance.rst @@ -14,7 +14,7 @@ OpenStack Foundation - Individual members: all of us - Institutional members: Platinum and Gold sponsors - - Further supporting companies and organisations + - Further supporting companies and organizations - Multi-layer group of leadership @@ -25,7 +25,7 @@ OpenStack Foundation Board of Directors ================== -- Startegic and financial oversight +- Strategic and financial oversight - Representatives are elected from - Platinum member companies @@ -54,8 +54,8 @@ Technical Committee ("TC") - https://www.openstack.org/foundation/tech-committee/ -User Committe ("UC") -==================== +User Committee ("UC") +===================== - Represents OpenStack users - Gathers feedback and consolidates requirements diff --git a/doc/upstream-training/source/slides/howitsmade-release-cycle.rst b/doc/upstream-training/source/slides/howitsmade-release-cycle.rst index 08842aca..7d8d00af 100644 --- a/doc/upstream-training/source/slides/howitsmade-release-cycle.rst +++ b/doc/upstream-training/source/slides/howitsmade-release-cycle.rst @@ -31,7 +31,7 @@ Exercise - Look up the release schedule for the current and past two OpenStack release cycles -- Identify common caracteristics of these cycles +- Identify common characteristics of these cycles - Milestones - Deadlines @@ -62,10 +62,10 @@ Planning - Design - Design activity is a continuous effort - Planning for a release cycle starts at the end of the previous cycle -- It depends on each project how to organise the work at each cycle +- It depends on each project how to organize the work at each cycle - Spec/blueprint freeze - - Prioritising items + - Prioritizing items - Generic intention behind planning diff --git a/doc/upstream-training/source/slides/intro-introduction.rst b/doc/upstream-training/source/slides/intro-introduction.rst index ad022521..4c391f9c 100644 --- a/doc/upstream-training/source/slides/intro-introduction.rst +++ b/doc/upstream-training/source/slides/intro-introduction.rst @@ -67,7 +67,7 @@ Agenda - Day 2, afternoon - Code deep dive - - Devstack + - DevStack - Exercises - Docco deep dive diff --git a/doc/upstream-training/source/slides/workflow-using-sandbox.rst b/doc/upstream-training/source/slides/workflow-using-sandbox.rst index 71f92e8b..9aba75cd 100644 --- a/doc/upstream-training/source/slides/workflow-using-sandbox.rst +++ b/doc/upstream-training/source/slides/workflow-using-sandbox.rst @@ -44,7 +44,7 @@ Learning example with two Sandboxes - Reviewing the revised patch and merging the patch .. note:: - - Try to emphazise the synergy of using repository integration + - Try to emphasize the synergy of using repository integration with bug management to students! Sandbox Launchpad Bug list @@ -99,7 +99,7 @@ Bug Assigned - (Other people will think that someone working on the bug.) -.. image:: ./_assets/sandbox-lp-assignnee-changed.png +.. image:: ./_assets/sandbox-lp-assignee-changed.png :width: 80% :align: center diff --git a/doc/upstream-training/source/website/index.rst b/doc/upstream-training/source/website/index.rst index 310493e5..619ceb3d 100644 --- a/doc/upstream-training/source/website/index.rst +++ b/doc/upstream-training/source/website/index.rst @@ -135,7 +135,7 @@ Code Deep Dive Archive of additional training activities ----------------------------------------- -.. note:: Activities listed here are not realised at every Upstream training. +.. note:: Activities listed here are not realized at every Upstream training. * `Lego applied to Free Software contributions `_ diff --git a/doc/upstream-training/source/website/irc.rst b/doc/upstream-training/source/website/irc.rst index 05be3991..b5a266df 100644 --- a/doc/upstream-training/source/website/irc.rst +++ b/doc/upstream-training/source/website/irc.rst @@ -9,12 +9,12 @@ Install an IRC Program ---------------------- We'll install an IRC program called Hexchat. -For a linux distributions like Debian, Ubuntu, or Mint open a terminal and +For a Linux distributions like Debian, Ubuntu, or Mint open a terminal and type:: sudo apt install hexchat -For a linux distributions like Redhat, Fedora 21 or earlier, or CentOS open +For a Linux distributions like Redhat, Fedora 21 or earlier, or CentOS open a terminal and type:: sudo yum install hexchat @@ -23,7 +23,7 @@ For Fedora 22 or later open a terminal and type:: sudo dnf install hexchat -Now open the hexchat program just like you would for any linux program. +Now open the hexchat program just like you would for any Linux program. Edit Nick Name Settings