diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2008-02-08 15:24:45 +0100 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2008-02-08 15:24:45 +0100 |
| commit | 23ab1e047c77b1c7dd2c73612f22d8099ca5fddd (patch) | |
| tree | e146a61c40557cf5062574ad3036c19c4c82ea77 | |
| parent | eb00b2cf3daf31e4faa60dbeea3bc066d905f363 (diff) | |
correct several typos in the manual (Closes: #464582, #464583, #464617)
| -rw-r--r-- | docs/chapters/building.sgml | 2 | ||||
| -rw-r--r-- | docs/chapters/releases.sgml | 2 | ||||
| -rw-r--r-- | docs/chapters/special.sgml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml index 0bbc836..a5c66cc 100644 --- a/docs/chapters/building.sgml +++ b/docs/chapters/building.sgml @@ -13,7 +13,7 @@ found it uses the tip of the current <option>upstream-branch</option>. Any other treeish objecto to create the upstream tarball from can be given with the <option>--upstream-branch</option> option.</para> - <para>Once you're satisfied with the build and want to do a relese you commit all + <para>Once you're satisfied with the build and want to do a release you commit all your changes and issue:</para> <screen> &git-buildpackage; <option>--git-tag</option> diff --git a/docs/chapters/releases.sgml b/docs/chapters/releases.sgml index 07195a1..1509ae1 100644 --- a/docs/chapters/releases.sgml +++ b/docs/chapters/releases.sgml @@ -2,7 +2,7 @@ <title>Releases and Snapshots</title> <para>When branching and merging frequently, the different Debian changelog entries on the different branches tend to get into the way of the automatic - merge and the the merge fails - leaving the (patholigical) merge to the + merge and the the merge fails - leaving the (pathological) merge to the committer. In order to avoid this &git-dch; offers a way for creating changelog entries from &git; commits before doing a release or anytime between releases.</para> diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml index 3ab3bc3..951e378 100644 --- a/docs/chapters/special.sgml +++ b/docs/chapters/special.sgml @@ -49,7 +49,7 @@ cleanup-script.sh </screen> <para> To import an NMU instead of a new upstream version simply import the - unpacked NUMs source tree into your repository using &git-import-orig: + unpacked NMUs source tree into your repository using &git-import-orig: </para> <screen> &gitcmd; checkout <replaceable>master</replaceable> |