From 32102dae122d31a4599d5376461496b92f9fc14a Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Mon, 15 Nov 2010 18:58:54 +0000 Subject: [PATCH] Fix a FAQ mistake. --- README.rst | 8 ++++---- THANKS | 1 + pelican/contents.py | 1 + pelican/readers.py | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index b9851e56..cac2029b 100644 --- a/README.rst +++ b/README.rst @@ -161,10 +161,10 @@ FAQ Here are some frequently asqued questions. -How do I specify my site URL? I dont want to use the default "/home/…" folder. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +How can I specify the url of my website ? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Configure the `SITENAME` to your site base url, let's say +Configure the `SITEURL` to your site base url, let's say `http://myswebsite.tld`, in your settings file:: - SITENAME = "http://mywebsite.tld" + SITEURL = "http://mywebsite.tld" diff --git a/THANKS b/THANKS index 88799080..0054ae14 100644 --- a/THANKS +++ b/THANKS @@ -6,3 +6,4 @@ bugs or giving ideas. Thanks to them ! - Guillaume B (Gui13) - Ronny Pfannschmidt - Jérome Renard +- Nicolas Martin diff --git a/pelican/contents.py b/pelican/contents.py index 91cac20d..815a0cde 100644 --- a/pelican/contents.py +++ b/pelican/contents.py @@ -12,6 +12,7 @@ class Page(object): def __init__(self, content, metadatas={}, settings={}, filename=None): self.content = content + self.status = "published" # default value for key, value in metadatas.items(): setattr(self, key, value) diff --git a/pelican/readers.py b/pelican/readers.py index f18826a9..c8d43c08 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -11,7 +11,8 @@ from pelican.utils import get_date, open _METADATAS_FIELDS = {'tags': lambda x: x.split(', '), 'date': lambda x: get_date(x), 'category': lambda x: x, - 'author': lambda x: x} + 'author': lambda x: x, + 'status': lambda x:x.strip(),} class RstReader(object):