diff --git a/docs/development.pod b/docs/development.pod index 0f345e1..a77e00e 100644 --- a/docs/development.pod +++ b/docs/development.pod @@ -11,12 +11,12 @@ Subscribe by sending mail to qpsmtpd-subscribe@perl.org We use git for version control. -Ask owns the master repository at git://github.com/abh/qpsmtpd.git +Ask owns the master repository at git://github.com/smtpd/qpsmtpd.git We suggest using github to host your repository -- it makes your changes easily accessible for pulling into the master. After you create a github account, go to -http://github.com/abh/qpsmtpd/tree/master and click on the "fork" +http://github.com/smtpd/qpsmtpd/tree/master and click on the "fork" button to get your own repository. =head3 Making a working Copy @@ -83,11 +83,11 @@ them to a git repository (for example on github). =head3 Merging changes back in from the master repository -Tell git about the master repository. We're going to call it 'abh' +Tell git about the master repository. We're going to call it 'smtpd' for now, but you could call it anything you want. You only have to do this once. - git remote add abh git://github.com/abh/qpsmtpd.git + git remote add smtpd git://github.com/smtpd/qpsmtpd.git Pull in data from all remote branches @@ -95,7 +95,7 @@ Pull in data from all remote branches Forward-port local commits to the updated upstream head - git rebase abh/master + git rebase smtpd/master If you have a change that conflicts with an upstream change (git will let you know) you have two options.