Package: git-buildpackage
Version: 0.4.21
Severity: minor
Tags: patch
Hi,
while reading through the docs, I noticed a few typos.
Please find the attached patch.
Cheers,
Michael
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (300, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.24.3
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.19 scripts to make the life of a Debi
ii git-core 1:1.5.4.4-1 fast, scalable, distributed revisi
ii python 2.4.4-6 An interactive high-level object-o
ii python-support 0.7.7 automated rebuilding support for P
git-buildpackage recommends no packages.
-- no debconf information
diff --git a/docs/chapters/intro.sgml b/docs/chapters/intro.sgml
index 32e9b83..c5a5621 100644
--- a/docs/chapters/intro.sgml
+++ b/docs/chapters/intro.sgml
@@ -11,8 +11,8 @@
<listitem><para>Import an existing &debian; package into
&git;</para></listitem>
<listitem><para>Import new upstream versions, NMUs etc. with optional
filters</para></listitem>
<listitem><para>Automatic upstream tarball generation</para></listitem>
- <listitem><para>Maintain a consistent branch an tag naming across
- repositires or across a team of developers</para></listitem>
+ <listitem><para>Maintain a consistent branch and tag naming across
+ repositories or across a team of developers</para></listitem>
<listitem><para>Automatically sign tags</para></listitem>
<listitem><para>Automatically push changes to remote
repositories</para></listitem>
<listitem><para>Make sure you have committed all changes to the right
@@ -51,11 +51,11 @@
and you can work with an arbitrary number of branches.
For example branches like <emphasis>nmu</emphasis>,
<emphasis>bpo</emphasis> or <emphasis>stable</emphasis> might
- (temporarilly or permanent) become your <option>debian-branch</option>
+ (temporarily or permanent) become your <option>debian-branch</option>
and branches like <emphasis>dfsg_free</emphasis> or
<emphasis>snapshots</emphasis> might become your
<option>upstream-branch</option> - it doesn't matter if these branches
- are maintend with &git-import-orig; or not.</para>
+ are maintained with &git-import-orig; or not.</para>
<para>Since Git-Buildpackage only works with local &git;-repositories
you have to use <command>git-push</command> in order to publish your
changes to remote repositories like <ulink
diff --git a/gbp.conf b/gbp.conf
index 0508209..b9a65bb 100644
--- a/gbp.conf
+++ b/gbp.conf
@@ -24,7 +24,7 @@
#keyid = 0xdeadbeef
# push to a remote repository after a successful tag:
#posttag = git-push git.example.com
-# use this for more svn-buildpackage like bahaviour:
+# use this for more svn-buildpackage like behaviour:
#export-dir = ../build-area/
#tarball-dir = ../tarballs/
