From b61b0f58d443f5906494c2ff86828fcfa783ecb4 Mon Sep 17 00:00:00 2001
From: Patrick <W7PEA@users.noreply.github.com>
Date: Mon, 18 Jan 2016 20:09:00 -0800
Subject: [PATCH 1/2] default --output to content

Currrently the default output folder is output, and this conflicts with the usage of the output folder as the output from pelican. Instead the imported posts should go into the content folder.
---
 pelican/tools/pelican_import.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 204ab7b0..84026e31 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -789,9 +789,9 @@ def main():
     parser.add_argument(
         '-o', '--output', dest='output', default='output',
         help='Output path')
-    parser.add_argument(
-        '-m', '--markup', dest='markup', default='rst',
-        help='Output markup format (supports rst & markdown)')
+    parser.add_argument('-o', '--output', dest='output', default='content',
+        help=('Where to output the generated markup files. If not specified, a '
+            'directory will be created, named "content" in the current path.'))
     parser.add_argument(
         '--dir-cat', action='store_true', dest='dircat',
         help='Put files in directories with categories name')

From 3c2228f593529a00e8b4aa12035156f7a2c1abb2 Mon Sep 17 00:00:00 2001
From: Patrick <W7PEA@users.noreply.github.com>
Date: Mon, 18 Jan 2016 20:12:07 -0800
Subject: [PATCH 2/2] --output defaults to content

Added the new -h output and updated the examples.
---
 docs/importer.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/importer.rst b/docs/importer.rst
index 83f4e112..f1303b4c 100644
--- a/docs/importer.rst
+++ b/docs/importer.rst
@@ -63,7 +63,9 @@ Optional arguments
   --tumblr              Tumblr API (default: False)
   --feed                Feed to parse (default: False)
   -o OUTPUT, --output OUTPUT
-                        Output path (default: output)
+                        Where to output the generated markup files. If not
+                        specified, a directory will be created, named
+                        "content" in the current path. (default: content)
   -m MARKUP, --markup MARKUP
                         Output markup format (supports rst & markdown)
                         (default: rst)
@@ -92,19 +94,19 @@ Examples
 
 For WordPress::
 
-    $ pelican-import --wpfile -o ~/output ~/posts.xml
+    $ pelican-import --wpfile ~/posts.xml
 
 For Dotclear::
 
-    $ pelican-import --dotclear -o ~/output ~/backup.txt
+    $ pelican-import --dotclear -o ~/markup-files ~/backup.txt
 
 for Posterous::
 
-    $ pelican-import --posterous -o ~/output --email=<email_address> --password=<password> <api_token>
+    $ pelican-import --posterous -o ~/content --email=<email_address> --password=<password> <api_token>
 
 For Tumblr::
 
-    $ pelican-import --tumblr -o ~/output --blogname=<blogname> <api_token>
+    $ pelican-import --tumblr -o ~/content --blogname=<blogname> <api_token>
 
 Tests
 =====