Fixed page_name call to adapt to the link structure provided by the

Settings file. Also updated the documentation accordingly.

Update documentation to cover new page_name behavior

Fixed page_name to adapt to the links provided by the Settings file. Includes documentation updates as well.

Updated terms to maintain better syntax and consistancy

Added docstring to _from_settings() to clarify the get_page_name argument that was added. Explains why/when this argument is used.

Revert contents.py back to commit 2f29c51

Re-added docstring to _get_settings method, but this time not deleting things I shouldn't

Corrected readability change that was altered during revert.
This commit is contained in:
Trae Blain 2012-06-23 16:39:02 -05:00
commit 41fdfa63b1
4 changed files with 31 additions and 22 deletions

View file

@ -152,12 +152,12 @@ Setting name (default value) what does it do?
use the default language.
`PAGE_LANG_SAVE_AS` ('pages/{slug}-{lang}.html') The location we will save the page which doesn't
use the default language.
`AUTHOR_URL` ('author/{name}.html') The URL to use for an author.
`AUTHOR_SAVE_AS` ('author/{name}.html') The location to save an author.
`CATEGORY_URL` ('category/{name}.html') The URL to use for a category.
`CATEGORY_SAVE_AS` ('category/{name}.html') The location to save a category.
`TAG_URL` ('tag/{name}.html') The URL to use for a tag.
`TAG_SAVE_AS` ('tag/{name}.html') The location to save the tag page.
`AUTHOR_URL` ('author/{slug}.html') The URL to use for an author.
`AUTHOR_SAVE_AS` ('author/{slug}.html') The location to save an author.
`CATEGORY_URL` ('category/{slug}.html') The URL to use for a category.
`CATEGORY_SAVE_AS` ('category/{slug}.html') The location to save a category.
`TAG_URL` ('tag/{slug}.html') The URL to use for a tag.
`TAG_SAVE_AS` ('tag/{slug}.html') The location to save the tag page.
`<DIRECT_TEMPLATE_NAME>_SAVE_AS` The location to save content generated from direct
templates. Where <DIRECT_TEMPLATE_NAME> is the
upper case template name.