From 1c00fe4bb4cadfe990e97ffa73a0c445194cc4ca Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 26 Apr 2014 08:44:25 -0700 Subject: [PATCH] Fixed several typos in the docs. Found using: https://github.com/intgr/topy Change-Id: I4b6d1258ae0f9e73289c4a72c4e534263de7e665 --- doc/source/gerrit.rst | 4 ++-- doc/source/jeepyb.rst | 2 +- doc/source/jenkins.rst | 4 ++-- doc/source/nodepool.rst | 2 +- doc/source/openstackid.rst | 2 +- doc/source/project.rst | 2 +- doc/source/puppet.rst | 2 +- doc/source/stackforge.rst | 4 ++-- doc/source/third_party.rst | 2 +- doc/source/wiki.rst | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst index f7496b216f..f706f82d65 100644 --- a/doc/source/gerrit.rst +++ b/doc/source/gerrit.rst @@ -46,7 +46,7 @@ Cinder Volumes The Gerrit installation at /home/gerrit2 is located on a Cinder volume. See :ref:`cinder` for details on volume management. Note -that SSD volumes are used (and they have a mininum size of 100G). +that SSD volumes are used (and they have a minimum size of 100G). Gerrit Configuration -------------------- @@ -374,7 +374,7 @@ Manual Administrative Tasks =========================== The following sections describe tasks that individuals with root -access may need to perform on rare occations. +access may need to perform on rare occasions. Renaming a Project diff --git a/doc/source/jeepyb.rst b/doc/source/jeepyb.rst index 3465b8d6c7..503ac3e1d1 100644 --- a/doc/source/jeepyb.rst +++ b/doc/source/jeepyb.rst @@ -72,7 +72,7 @@ automatically. The above config gives puppet and its related scripts enough information to create new projects, but not enough to add access controls to each -project. To add access control you need to have have an ``acl-config`` +project. To add access control you need to have an ``acl-config`` option for the project in ``review.projects.yaml`` file. That option should have a value that is a path to the ``project.config`` for that project. diff --git a/doc/source/jenkins.rst b/doc/source/jenkins.rst index a541ab8049..33574457e7 100644 --- a/doc/source/jenkins.rst +++ b/doc/source/jenkins.rst @@ -137,14 +137,14 @@ hand: #. You will configure global scp and ftp credentials for static and docs sites respectively later, but as we haven't setup those sites - yet, thats not possible :). + yet, that's not possible :). Puppet takes care of the rest. Quirks ------ -Note that jenkins talks to it's slaves via ssh, the +Note that jenkins talks to its slaves via ssh, the modules/openstack_project/manifests/init.pp file contains the ssh public key that puppet installs on the slaves. diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index e4a6f83356..4e03ca7e51 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -30,7 +30,7 @@ Overview Once per day, for every image type (and provider) configured by nodepool, a new image with cached data for use by devstack. Nodepool spins up new instances and tears down old as tests are queued up and completed, always maintaining a -consistant number of available instances for tests up to the set limits of the +consistent number of available instances for tests up to the set limits of the CI infrastructure. Bad Images diff --git a/doc/source/openstackid.rst b/doc/source/openstackid.rst index 95447a3836..7637107fde 100644 --- a/doc/source/openstackid.rst +++ b/doc/source/openstackid.rst @@ -67,7 +67,7 @@ like app/config/dev/database.php Error Log Configuration _______________________ -Error log configuration is on file *app/config/log.php* but could be overriden per environment +Error log configuration is on file *app/config/log.php* but could be overridden per environment such as *app/config/dev/log.php* , here you set two variables: * to_email : The receiver of the error log email. diff --git a/doc/source/project.rst b/doc/source/project.rst index 6be10c8eac..8279ac5e55 100644 --- a/doc/source/project.rst +++ b/doc/source/project.rst @@ -54,7 +54,7 @@ triage bugs. To read about how our systems are managed and how to view or edit those configurations, see :ref:`sysadmin`. -We also have a a collection of `OpenStack Project Infrastructure Publications +We also have a collection of `OpenStack Project Infrastructure Publications `_ where we host slides for presentations team members have given about the infrastructure. diff --git a/doc/source/puppet.rst b/doc/source/puppet.rst index 2520939239..96363f985e 100644 --- a/doc/source/puppet.rst +++ b/doc/source/puppet.rst @@ -129,7 +129,7 @@ sequencing in any meaningful way. The entry point for this process is ``/opt/config/production/run_all.sh`` There are a set of nodes, which are configured in puppet as "override" nodes, -which are run in sequence before the rest of the nodes are run in parellel. +which are run in sequence before the rest of the nodes are run in parallel. At the moment, this allows creation of git repos on the git slaves before creation of the master repos on the gerrit server. diff --git a/doc/source/stackforge.rst b/doc/source/stackforge.rst index a93019d3f4..03ff42ba05 100644 --- a/doc/source/stackforge.rst +++ b/doc/source/stackforge.rst @@ -232,9 +232,9 @@ end of this file that looks like:: - master For more information about channel requirements and IRC services provided by -the infrasructure team, visit :ref:`irc` +the infrastructure team, visit :ref:`irc` -And thats it. At this point you will want to submit these edits as a +And that's it. At this point you will want to submit these edits as a change to review.openstack.org. When you do so, please use the ``new-project`` topic. You can do that using the ``-t`` option to ``git review``. diff --git a/doc/source/third_party.rst b/doc/source/third_party.rst index 00868e6cef..f541d223bb 100644 --- a/doc/source/third_party.rst +++ b/doc/source/third_party.rst @@ -10,7 +10,7 @@ Jenkins setup. It is also possible for these systems to feed information back into Gerrit and they can also leave non-gating votes on Gerrit review requests. An example of one such system is `Smokestack `_. -Smokestack reads the Gerrit event stream and runs it's own tests on the commits. +Smokestack reads the Gerrit event stream and runs its own tests on the commits. If one of the tests fails it will publish information and links to the failure on the review in Gerrit. diff --git a/doc/source/wiki.rst b/doc/source/wiki.rst index 91a7757a28..7945448d22 100644 --- a/doc/source/wiki.rst +++ b/doc/source/wiki.rst @@ -58,7 +58,7 @@ active Mediawiki install slot. To perform a Mediawiki upgrade: skin and openid. Any untracked extensions that we are not using should be removed. #. Update the untracked extensions that we are using - ``cd $EXTENSION_DIR && git pull origin master``. Note their may be + ``cd $EXTENSION_DIR && git pull origin master``. Note there may be conflicts doing this if security patches or bug fixes have been applied by hand. Refer to /srv/mediawiki/NOTES for info. #. Run the backup script ``/srv/mediawiki/backup.sh``. This will backup