From b61b0f58d443f5906494c2ff86828fcfa783ecb4 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 18 Jan 2016 20:09:00 -0800 Subject: [PATCH] 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')