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 /docs/chapters/releases.sgml | |
| parent | eb00b2cf3daf31e4faa60dbeea3bc066d905f363 (diff) | |
correct several typos in the manual (Closes: #464582, #464583, #464617)
Diffstat (limited to 'docs/chapters/releases.sgml')
| -rw-r--r-- | docs/chapters/releases.sgml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/chapters/releases.sgml b/docs/chapters/releases.sgml index 07195a15..1509ae10 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> |