ubuntu-packaging-guide-team team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Daniel Holbach has proposed merging lp:~dholbach/ubuntu-packaging-guide/small-changes into lp:ubuntu-packaging-guide.

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

For more details, see:
https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/small-changes/+merge/55936

Only cosmetic changes.
-- 
https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/small-changes/+merge/55936
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~dholbach/ubuntu-packaging-guide/small-changes into lp:ubuntu-packaging-guide.

=== modified file 'fixing-a-bug.rst'
--- fixing-a-bug.rst	2011-03-09 13:02:02 +0000
+++ fixing-a-bug.rst	2011-04-01 14:09:36 +0000
@@ -107,6 +107,7 @@
 * bugs or package uploads of Debian or other distributions.
 
 .. XXX: Link to 'update to a new version' article.
+.. XXX: Link to 'send stuff upstream/Debian' article. (Launchpad bug 704845)
 
 If you find a patch to fix the problem, say, attached to a bug report, running
 this command in the source directory should apply the patch::

=== modified file 'getting-set-up.rst'
--- getting-set-up.rst	2011-03-22 09:24:45 +0000
+++ getting-set-up.rst	2011-04-01 14:09:36 +0000
@@ -33,8 +33,8 @@
 =========================
 
 There are a number of tools that will make your life as an Ubuntu developer
-much easier.  You'll encounter these tools later in this guide.  To install
-most of the tools you'll need, run this command::
+much easier.  You will encounter these tools later in this guide.  To install
+most of the tools you will need, run this command::
 
     $ sudo apt-get install gnupg pbuilder ubuntu-dev-tools bzr-builddeb apt-file
 
@@ -112,7 +112,7 @@
     $ ssh-keygen -t rsa
 
 The default file name usually makes sense, so you can just leave it as it is.
-For security purposes, it's highly recommended that you use a passphrase.
+For security purposes, it is highly recommended that you use a passphrase.
 
 We will use the SSH key to securely push code changes to Launchpad.
 
@@ -148,7 +148,7 @@
 Set up your development environment
 ===================================
 
-There are a few things you'll need to set up in your development environment
+There are a few things you will need to set up in your development environment
 before you can start working on packages.
 
 
@@ -158,7 +158,7 @@
 Launchpad is the central piece of infrastructure we use in Ubuntu. It stores
 not only our packages and our code, but also things like translations, bug
 reports, information about the people who work on Ubuntu and which teams they
-are part of.  You'll also use Launchpad to publish your proposed fixes, and
+are part of.  You will also use Launchpad to publish your proposed fixes, and
 get other Ubuntu developers to review and sponsor them.
 
 You will need to register with Launchpad and provide a minimal amount of
@@ -174,7 +174,7 @@
 find this out by going to https://launchpad.net/people/+me and looking for the
 part after the `~` in the URL.
 
-Launchpad's registration process will ask you to choose a display name. It's
+Launchpad's registration process will ask you to choose a display name. It is
 encouraged for you to use your real name here. so that your Ubuntu developer
 colleagues will be able to get to know you better.
 

=== modified file 'index.rst'
--- index.rst	2011-03-09 13:01:41 +0000
+++ index.rst	2011-04-01 14:09:36 +0000
@@ -13,7 +13,7 @@
   into specific bits of our tools and workflows.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    introduction-to-ubuntu-development
    getting-set-up