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 pull request #2251 from fgallaire/content

Browse source 
Change imported content directory name to "content". Fixes #2250
This commit is contained in:
Justin Mayer 2017-11-12 08:10:23 -08:00 • committed by GitHub
commit 34103cd5dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/importer.rst
View file

@ -63,7 +63,7 @@ Optional arguments
--tumblr Tumblr API (default: False) --tumblr Tumblr API (default: False)
--feed Feed to parse (default: False) --feed Feed to parse (default: False)
-o OUTPUT, --output OUTPUT -o OUTPUT, --output OUTPUT
Output path (default: output) Output path (default: content)
-m MARKUP, --markup MARKUP -m MARKUP, --markup MARKUP
Output markup format (supports rst & markdown) Output markup format (supports rst & markdown)
(default: rst) (default: rst)

2
pelican/tools/pelican_import.py
View file

@ -789,7 +789,7 @@ def main():
'--feed', action='store_true', dest='feed', '--feed', action='store_true', dest='feed',
help='Feed to parse') help='Feed to parse')
parser.add_argument( parser.add_argument(
'-o', '--output', dest='output', default='output', '-o', '--output', dest='output', default='content',
help='Output path') help='Output path')
parser.add_argument( parser.add_argument(
'-m', '--markup', dest='markup', default='rst', '-m', '--markup', dest='markup', default='rst',