github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3c2228f593 into c2b2def1c8

Browse source
This commit is contained in:
Patrick 2017-04-25 13:54:54 +00:00 • committed by GitHub
commit e9579e5aba
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
docs/importer.rst
View file

@ -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
=====

6
pelican/tools/pelican_import.py
View file

@ -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')