From: Nicholas D Steeves Date: Sun, 29 Jan 2017 23:00:16 +0000 (-0700) Subject: docs: Fix typos X-Git-Tag: archive/debian/3.10~2 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0bf80beae83322d4b9ce77cb47220519d2d964f5;hp=bc0c5d92e3f9fff9de05afbb7519bb29c25ac74f;p=dgit.git docs: Fix typos Signed-off-by: Nicholas D Steeves --- diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod index 3ebc68a4..0d2525fc 100644 --- a/dgit-nmu-simple.7.pod +++ b/dgit-nmu-simple.7.pod @@ -56,10 +56,10 @@ consult the appropriate C workflow tutorial, =head1 WHAT KIND OF CHANGES AND COMMITS TO MAKE When preparing an NMU, the git commits you make on the dgit branch -should be simple linear series of commmits with good commit messages. +should be simple linear series of commits with good commit messages. The commit messages will be published in various ways, including perhaps being used as the cover messages for -genrated quilt patches. +generated quilt patches. Do not make merge commits. Do not try to rebase to drop patches - if you need to revert a diff --git a/dgit-user.7.pod b/dgit-user.7.pod index d7b61098..aacdf4d4 100644 --- a/dgit-user.7.pod +++ b/dgit-user.7.pod @@ -232,7 +232,7 @@ that are in debian/patches before you do anything else! Debian package builds are often quite messy: they may modify files which are also committed to git, -or leave outputs and teporary files not covered by C<.gitignore>. +or leave outputs and temporary files not covered by C<.gitignore>. If you always commit, you can use