From 5aaec4ffa9f77537a17fc00d9892680015a1f90b Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sat, 16 Dec 2017 08:17:46 +0100 Subject: Typo fixes Thanks: Ludovic Rousseau --- debian/changelog | 6 +++--- docs/chapters/releases.xml | 6 +++--- docs/chapters/special.xml | 2 +- docs/manpages/gbp-import-srpm.xml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5de7ed46..4e3520d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1594,7 +1594,7 @@ git-buildpackage (0.6.14) unstable; urgency=medium * [949ce84] Slightly improve usage output * [045e607] gbp pq: document --force * [817976e] Handle version format errors more gracefully. - * [b0390d1] Fix comitter vs committer typos. + * [b0390d1] Fix committer vs committer typos. Thanks to Sandro Tosi (Closes: #748339) * [dc231f2] Document that the patches must apply without fuzz * [de77df7] pq: Print proper error message if we fail to apply the tree @@ -2543,7 +2543,7 @@ git-buildpackage (0.6.0~git20120315) unstable; urgency=low * [3cac77f] docs: Fix path to gbp-configure-unpatched-source. Thanks to Tobias Frost (Closes: #664063) - * [2f08cbd] Parse author and comitter from changelog for native package too + * [2f08cbd] Parse author and committer from changelog for native package too (Closes: #662993) -- Guido Günther Thu, 15 Mar 2012 22:39:00 +0100 @@ -2991,7 +2991,7 @@ git-buildpackage (0.5.18) experimental; urgency=low level. * [9054ae1] git.force_head: quiet git reset so we don't see pointless 'HEAD is now at ...' messages during imports. - * [d36077c] Add --author-is-comitter and --author-date-is-comitter-date + * [d36077c] Add --author-is-committer and --author-date-is-committer-date commandline options (Closes: #610381) [ Jonathan Nieder ] diff --git a/docs/chapters/releases.xml b/docs/chapters/releases.xml index 1bf99ab1..3fc8ec02 100644 --- a/docs/chapters/releases.xml +++ b/docs/chapters/releases.xml @@ -68,9 +68,9 @@ have a changelog entry with UNRELEASED that has the same version number for all commits you do during the development cycle of your package. Although this is common - practice in &debian; is means that also all your test builds + practice in &debian; it means that also all your test builds have the same version number which makes them hard to - distinguish in e.g. continous integration pipelines. + distinguish in e.g. continuous integration pipelines. @@ -98,7 +98,7 @@ git-buildpackage (0.3.7~1.gbp470ce2) UNRELEASED; urgency=low version number will continue to increase. Since the snapshot banner contains the commit id of the current branch HEAD, &gbp-dch; can figure out what to append to the changelog by itself - (even without comitting the changelog first): + (even without committing the changelog first): &gbp-dch; diff --git a/docs/chapters/special.xml b/docs/chapters/special.xml index 7f2b8f2f..8e4ec3f4 100644 --- a/docs/chapters/special.xml +++ b/docs/chapters/special.xml @@ -215,7 +215,7 @@ means. not abort if you have changes in your current working copy. If you're still getting an error about unexpected - upstream changes make sure you have no uncomitted + upstream changes make sure you have no uncommitted changes in you workig copy (changes in the debian/ directory are o.k.) and no files that are ignored by git diff --git a/docs/manpages/gbp-import-srpm.xml b/docs/manpages/gbp-import-srpm.xml index ead40e67..fcc3eb38 100644 --- a/docs/manpages/gbp-import-srpm.xml +++ b/docs/manpages/gbp-import-srpm.xml @@ -179,7 +179,7 @@ - Use the author identity as the comitter when importing upstream + Use the author identity as the committer when importing upstream sources and packaging files. -- cgit v1.2.3