3 files changed, 15 insertions, 6 deletions
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml
index 27f8d42..26dc523 100644
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.sgml
@@ -12,7 +12,7 @@
       </varlistentry>
       <varlistentry>
       <term>.git/gbp.conf</term>
-      <listitem><para>per repository configuration</para></listitem> 
+      <listitem><para>per working copy configuration</para></listitem> 
       </varlistentry> 
     </variablelist>
     All three have the same format. They consist of (at most) four sections, all of them are optional:
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 8ba1719..1420999 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -17,16 +17,25 @@
     <sect1 id="gbp.import.new.upstream">
     <title>Importing a new upstream version</title>
     <para>Change into your git repository, make sure it has all local
-    modifications committed and do:
+    modifications committed and run either of:
     <screen>
 &git-import-orig; /path/to/package_0.2.orig.tar.gz
+&git-import-orig; /path/to/package_0.2.tar.bz2
+&git-import-orig; /path/to/package-0.2/
     </screen>
-    This puts the upstream souces onto the <emphasis>upsream</emphasis> branch
-    using &git_load_dirs; to handle file removals and renames. The result of
+    This puts the upstream souces onto the <emphasis>upstream</emphasis> branch
+    using &gitloaddirs; to handle file removals and renames. The result of
     this is then merged onto the <emphasis>master</emphasis> branch and a new
-    changelog entry gets created. You can again specify different branch names
+    changelog entry is created. You can again specify different branch names
     via the <option>--upstream-branch</option> and
     <option>--debian-branch</option> options.
+    </para> 
+    <para>
+    If you expect a merge conflict you can delay the merge to
+    <emphasis>master</emphasis> via the <option>--no-merge</option> and pull in
+    the changes from the <emphasis>upstream</emphasis> branch any time later.
+    </para>
+    <para>
     </para>
     </sect1>
     <sect1 id="gbp.import.convert">
diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml
index 5fff3d3..9fa7874 100644
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.sgml
@@ -16,7 +16,7 @@
     </para>
     <screen>
 &git-import-orig; --no-merge nondfsg-clean-package_10.4.orig.tar.gz
-&gitcmd; tag; 10.4
+&gitcmd; tag 10.4
     </screen>
     <para>
     After the import you can switch to the dfsg branch and get the newly