Merge lp:~josephjamesmills/ubuntu-packaging-guide/fixed-bug975026 into lp:ubuntu-packaging-guide

[Joseph Mills]

Made gpg section more clear

[Daniel Holbach (dholbach)]

A few small things I noticed.

 - can you add a space (" ") after each sentence and closed parentheses?
 - I'm not sure we'd want to recommend "testing emails" - if we do, we
   should also explain how to add new key IDs or remove ones you don't
   like any more
 - maybe we should link to some password advice instead of giving it
   ourselves - I immediately thought of http://xkcd.com/936/ :-)
 - personally I think I'd prefer "which" to "what" in the first
   sentence, but I'm not a native speaker, so somebody else might want
   to weigh in.

Thanks for your work on this, you made this easier to read! :)

review: Needs Fixing

[Daniel Holbach (dholbach)]

I'll mark these merge proposals as 'work in progress' to get them off the review list.

[Simon Quigley (tsimonq2)]

Rejecting due to the fact that this has been rewritten and feedback was requested but nothing was done to fix it.

Unmerged revisions

100. By Joseph Mills on 2012-05-19

Bug Bug #975026 changed lines Changed lines 82 thou 93 in the file ubuntu-packaging-guide/getting-set-up.rst

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-12 22:28:59 +0000
+++ debian/changelog	2012-05-23 07:22:19 +0000
@@ -1,3 +1,9 @@
+ubuntu-packaging-guide (0.1ubuntu1) quantal; urgency=low
+
+  * ubuntu-packaging-guide/getting-set-up.rst: Changed lines 82 thou 93 and made backup called getting-set-up.rst~ (LP: #975026)
+
+ -- Joseph Mills <[e-mail]>  Sat, 19 May 2012 02:28:39 -0400
+
 ubuntu-packaging-guide (0.1) UNRELEASED; urgency=low
 
   * Initial release.

=== modified file 'ubuntu-packaging-guide/getting-set-up.rst'
--- ubuntu-packaging-guide/getting-set-up.rst	2012-03-20 22:02:49 +0000
+++ ubuntu-packaging-guide/getting-set-up.rst	2012-05-23 07:22:19 +0000
@@ -79,15 +79,18 @@
 
     $ gpg --gen-key
 
-GPG will first ask you which kind of key you want to generate. Choosing the
-default (RSA and DSA) is fine. Next it will ask you about the keysize. The
-default (currently 2048) is fine, but 4096 is more secure. Afterwards, it will
-ask you if you want it to expire the key at some stage. It is safe to say "0",
-which means the key will never expire. The last questions will be about your
-name and email address. Just pick the ones you are going to use for Ubuntu
-development here, you can add additional email addresses later on. Adding a
-comment is not necessary. Then you will have to set a passphrase, choose a
-safe one (a passphrase is just a password which is allowed to include spaces). 
+GPG will first ask you what kind of key you would like to generate. Choosing
+the default RSA and DSA (options 1)is fine.GPG will now ask you about the
+keysize, that you would like to create. The default (currently 2048) is fine,
+but 4096 is better because it is more secure. GPG will now ask how long you
+would like to keep this GPG key. It is safe to say “0”, which means the key
+will never expire.GPG will now ask for your email address.It is best that you
+enter in the email address that you use to sign into Launchpad. Or if you
+like you may pick a "testing" one for now, As you can add additional email
+addresses later on.Next GPG will ask if you would like too add a comment but
+this is not necessary.You will now have to set a passphrase. A passphrase is
+a fancy word for a password that can contain spaces and charecters like *#)&:.
+Please choose a strong password.
 
 Now GPG will create a key for you, which can take a little bit of time; it 
 needs random bytes, so if you give the system some work to do it will be