minor updates and clarifications

2 files changed, 13 insertions, 16 deletions

diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 18c331cb..13b6ae67 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -3,23 +3,24 @@
 
     <sect1 id="gbp.import.existing">
     <title>Importing already existing &debian; packages</title>
-    <para>Imporing an already exsting debian package into a git repository is as easy as:
+    <para>Importing an already exsting debian package into a git repository is as easy as:
     <screen>
 &git-import-dsc; package_0.1-1.dsc
     </screen>
-    This will put the upstream sources onto the <emphasis>upstream</emphasis>
-    branch and the debian patch on the <emphasis>master</emphasis> branch. In case
-    of a debian native package only the <emphasis>master</emphasis> branch is being
-    used.
+    This will create a new git repository named after the imported package, put
+    the upstream sources onto the <emphasis>upstream</emphasis> branch and the
+    debian patch on the <emphasis>master</emphasis> branch. In case of a debian
+    native package only the <emphasis>master</emphasis> branch is being used.
     You can specify different branch names via the
-    <option>--upstream-branch</option> and <option>--debian-branch</option> options.
+    <option>--upstream-branch</option> and <option>--debian-branch</option>
+    options.
     </para>
     </sect1>
 
     <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 run either of:
+    <para>Change into your git repository (which can be empty), make sure it
+    has all local 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
diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml
index e63da062..6c2207f1 100644
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.sgml
@@ -10,7 +10,7 @@
     <para>
     This creates the <emphasis>dfsg_clean</emphasis> branch from the tip of
     your <emphasis>upstream</emphasis> branch.  Then, when importing a new
-    upstream version you import the new version on the
+    upstream version, you import the new version on the
     <emphasis>upstream</emphasis> branch as usual and just don't merge to the
     master branch by default:
     </para>
@@ -46,22 +46,18 @@ cleanup-script.sh
 &gitcmd; <option>branch</option> <replaceable>nmu</replaceable>
     </screen>
     <para>
-    To import an NMU instead of a new upstream version you can use:
+    To import an NMU instead of a new upstream version simply import the
+    unpacked NUMs source tree into your repository:
     </para>
     <screen>
 &gitcmd; checkout master
-&git-import-orig; -u 10-1.1 --upstream-branch=nmu nmu-10-1.1.tar.gz
+&git-import-orig; -u 10-1.1 --upstream-branch=nmu /path/to/nmu-10/
     </screen>
     <para>
     This will import the NMU on the <emphasis>nmu</emphasis> branch instead of
     the <emphasis>upstream</emphasis> branch but merge the changes to the
     <emphasis>master</emphasis> branch as usual.
     </para>
-    <note>
-    <para>
-    You need to have the NMU as a single tar.gz, you can't use the
-    dsc and diff.gz here, this will be fixed in a later version.
-    <para>
     </note>
     </sect1>