From 46f03589359ab74a7d667aef5bb2a2c33d00135d Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 20 Jan 2016 13:25:53 -0800 Subject: [PATCH] add --markup back to the file Added --markup back and removed duplicate --output --- 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 d16bff38..5315a408 100755 --- a/pelican/tools/pelican_import.py +++ b/pelican/tools/pelican_import.py @@ -786,14 +786,14 @@ def main(): parser.add_argument( '--feed', action='store_true', dest='feed', help='Feed to parse') - parser.add_argument( - '-o', '--output', dest='output', default='output', - help='Output path') 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( + '-m', '--markup', dest='markup', default='rst', + help='Output markup format (supports rst & markdown)') parser.add_argument( '--dir-cat', action='store_true', dest='dircat', help='Put files in directories with categories name')