make the documented command line arguments match reality

1 files changed, 13 insertions, 4 deletions

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">