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 branch 'master' of github.com:ametaireau/pelican

Browse source
This commit is contained in:
Alexis Metaireau 2011-04-26 13:47:45 +01:00
commit afda2fcbbd
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/themes.rst
View file

@ -39,7 +39,7 @@ Templates and variables
=======================
It's using a simple syntax, that you can embbed into your html pages.
This document describes which templates should exists on a theme, and which
This document describes which templates should exist on a theme, and which
variables will be passed to each template, while generating it.
All templates will receive the variables defined in your settings file, if they
@ -114,7 +114,7 @@ page_name 'category/`category_name`'. Useful for pagination
article.html
-------------
This template will be processed for each article. .html files will be outputed
This template will be processed for each article. .html files will be output
in output/`article_name`.html. Here are the specific variables it gets.
============= ===================================================
@ -152,8 +152,8 @@ page_name 'tag/`tag_name`'. Useful for pagination links.
Include skribit script
======================
In order to support skribit scripts in your themes, you must following these
actions :
In order to support skribit scripts in your themes, you must perform these
actions:
* Copy `skribit_tab_script.html` and `skribit_widget_script.html` in your
templates directory.

8
pelican/__init__.py
View file

@ -91,14 +91,14 @@ def main():
parser.add_argument(dest='path', nargs='?',
help='Path where to find the content files')
parser.add_argument('-t', '--theme-path', dest='theme',
help='Path where to find the theme templates. If not specified, it will'
'use the default one included with pelican.')
help='Path where to find the theme templates. If not specified, it'
'will use the default one included with pelican.')
parser.add_argument('-o', '--output', dest='output',
help='Where to output the generated files. If not specified, a directory'
' will be created, named "output" in the current path.')
parser.add_argument('-m', '--markup', default=None, dest='markup',
help='the list of markup language to use (rst or md). Please indicate them'
'separated by commas')
help='the list of markup language to use (rst or md). Please indicate '
'them separated by commas')
parser.add_argument('-s', '--settings', dest='settings',
help='the settings of the application. Default to None.')
parser.add_argument('-k', '--keep-output-directory', dest='keep',