ubuntu-packaging-guide-team team mailing list archive

[Don Kirkby <donkirkby+launpd@xxxxxxxxx>]

Don Kirkby has proposed merging lp:~donkirkby/ubuntu-packaging-guide/typos into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)

For more details, see:
https://code.launchpad.net/~donkirkby/ubuntu-packaging-guide/typos/+merge/122760

Fix several typos.
-- 
https://code.launchpad.net/~donkirkby/ubuntu-packaging-guide/typos/+merge/122760
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~donkirkby/ubuntu-packaging-guide/typos into lp:ubuntu-packaging-guide.

=== modified file 'README'
--- README	2012-05-12 02:03:03 +0000
+++ README	2012-09-04 21:01:21 +0000
@@ -41,7 +41,7 @@
 The power of Sphinx is that it can generate documentation in many formats.
 Running 'make all' will generate the guide in html, dirhtml, singlehtml, pickle,
 json, htmlhelp, qthelp, devhelp, epub, latex, latexpdf, text, and man formats.
-They will be outputted to the '_build' directory.
+They will be written to the '_build' directory.
 
 Not all of these formats are important to us. You can build an individual
 format with, for example, 'make html'. Run 'make help' for a list of all

=== modified file 'ubuntu-packaging-guide/getting-set-up.rst'
--- ubuntu-packaging-guide/getting-set-up.rst	2012-05-27 07:02:55 +0000
+++ ubuntu-packaging-guide/getting-set-up.rst	2012-09-04 21:01:21 +0000
@@ -51,14 +51,14 @@
 * ``gnupg`` -- `GNU Privacy Guard`_ contains tools you will need to create a
   cryptographic key with which you will sign files you want to upload to
   Launchpad.
-* ``pbuilder`` -- a tool to do a reproducible builds of a package in a
+* ``pbuilder`` -- a tool to do reproducible builds of a package in a
   clean and isolated environment.
 * ``ubuntu-dev-tools`` (and ``devscripts``, a direct dependency) -- a
   collection of tools that make many packaging tasks easier.
 * ``bzr-builddeb`` (and ``bzr``, a dependency) -- distributed version control
   with Bazaar, a new way of working with packages for Ubuntu that will make it
   easy for many developers to collaborate and work on the same code while
-  keeping it trivial to merge each others work.
+  keeping it trivial to merge each other's work.
 * ``apt-file`` provides an easy way to find the binary package that contains a
   given file.
 

=== modified file 'ubuntu-packaging-guide/introduction-to-ubuntu-development.rst'
--- ubuntu-packaging-guide/introduction-to-ubuntu-development.rst	2012-05-04 07:50:53 +0000
+++ ubuntu-packaging-guide/introduction-to-ubuntu-development.rst	2012-09-04 21:01:21 +0000
@@ -44,7 +44,7 @@
 stakeholders and a specification is written that contains detailed 
 information about its assumptions, implementation, the necessary changes in 
 other places, how to test it and so on. This is all done in an open and 
-transparent fashion, so even if you can not attend the event in person, you 
+transparent fashion, so even if you cannot attend the event in person, you 
 can participate remotely and listen to a streamcast, chat with attendants and 
 subscribe to changes of specifications, so you are always up to date.
 

=== modified file 'ubuntu-packaging-guide/packaging-new-software.rst'
--- ubuntu-packaging-guide/packaging-new-software.rst	2012-07-23 15:10:07 +0000
+++ ubuntu-packaging-guide/packaging-new-software.rst	2012-09-04 21:01:21 +0000
@@ -91,7 +91,7 @@
 recent version which is ``8``.
 
 ``control`` contains all the metadata of the package.  The first paragraph
-describes the source package. The second and and following paragraphs describe
+describes the source package. The second and following paragraphs describe
 the binary packages to be built.  We will need to add the packages needed to
 compile the application to ``Build-Depends:``. For ``hello``, make sure that it
 includes at least::
@@ -135,7 +135,7 @@
     $ cd ../../
 
 ``bzr builddeb`` is a command to build the package in its current location.
-The ``-us -uc`` tell it there is not need to GPG sign the compile.  The result
+The ``-us -uc`` tell it there is no need to GPG sign the compile.  The result
 will be placed in ``..``.  
 
 You can view the contents of the package with::

=== modified file 'ubuntu-packaging-guide/udd-intro.rst'
--- ubuntu-packaging-guide/udd-intro.rst	2012-02-29 10:05:20 +0000
+++ ubuntu-packaging-guide/udd-intro.rst	2012-09-04 21:01:21 +0000
@@ -43,10 +43,10 @@
 archive are automatically imported into Bazaar branches on our code hosting
 site Launchpad.  Changes can be made directly to these branches in
 incremental steps and by anyone with commit access.  Changes can also be made
-in forked branched and merged back in with Merge Proposals when they are large
+in forked branches and merged back in with Merge Proposals when they are large
 enough to need review or if they are by someone without direct commit access.
 
-UDD branches are all in a standard location so doing a checkout is easy::
+UDD branches are all in a standard location, so doing a checkout is easy::
 
     $ bzr branch ubuntu:kdetoys
 
@@ -71,7 +71,7 @@
 Debian package into our branches.  In the *kdetoys* branch above the Debian
 versions from *unstable* are from the merge with blue circles while those from
 *Debian experimental* are from the merge with yellow circles.  Debian
-released are tagged with their version number e.g. ``4:4.2.2-1``.
+releases are tagged with their version number, e.g., ``4:4.2.2-1``.
 
 So from a UDD branch you can see the complete history of changes to the package
 and compare any two versions.  For example, to see the changes between version