aboutsummaryrefslogtreecommitdiff
path: root/docs/chapters
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-03-19 08:52:17 +0100
committerGuido Guenther <agx@sigxcpu.org>2008-03-19 08:52:17 +0100
commit2c892110655858c6a9c331b77c9558d937bbef66 (patch)
tree37d1855260329a14d4cbaa1a0112e0bc76ebbf82 /docs/chapters
parent53333544367945a82a56866b633b087cfdbcf0da (diff)
fix typos in documentation
Closes: #471582 Thanks: Michael Biebl
Diffstat (limited to 'docs/chapters')
-rw-r--r--docs/chapters/intro.sgml8
1 files changed, 4 insertions, 4 deletions
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