From 530fecd13a7d655b29a39fe7204a85a32409cd93 Mon Sep 17 00:00:00 2001 From: Justin Mayer <entrop@gmail.com> Date: Wed, 1 Aug 2012 15:28:15 -0700 Subject: [PATCH] Minor fixes. Add .gitignore to repo. --- .gitignore | 8 ++++++++ README.rst | 14 +++++++------- content/news/blog.rst | 20 ++++++++++---------- pelicanconf.py | 10 +++++----- 4 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..748deb9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +*~ +._* +*.lock +*.DS_Store +*.swp +*.out +*.py[cod] +output diff --git a/README.rst b/README.rst index d3102ce..a5ef43a 100644 --- a/README.rst +++ b/README.rst @@ -1,12 +1,12 @@ -The pelican's blog -################## +The Pelican Blog +################ -This is the pelican's project weblog. You can add content to it by forking it -or pushing direcly on the pelican server. +This is the Pelican project's weblog. You can add content to it by forking it +or pushing directly to the Pelican blog's server. -The makefile has a rule to do that for you, when you're ready to publish, and -if you have the rights, you just have to type:: +The Makefile has a rule to do that for you if you have access to the blog's +server. When you're ready to publish, you just have to type:: make upload -and it will generate the content locally and upload it on the server :) +... which will generate the content locally and upload it on the server. :) diff --git a/content/news/blog.rst b/content/news/blog.rst index cf23db5..2cdc9ac 100644 --- a/content/news/blog.rst +++ b/content/news/blog.rst @@ -3,16 +3,16 @@ Pelican now has a blog of its own! :date: 2012-07-23 -Since Alexis started working on this almost two years ago, a bunch of happy -hackers joined the effort to make pelican a better tool, again and again. Into -other people we have `Kyle <http://kylefuller.co.uk/>`_, `Justin -<https://github.com/justinmayer>`_ and `tBunnyMan <http://bunnyman.info/>`_ who -have done an amazing job recently. +Since Alexis started working on the project almost two years ago, a bunch of +happy hackers have joined the effort to make Pelican an even better tool. Among +these contributors are `Kyle <http://kylefuller.co.uk/>`_, `Justin +<http://hackercodex.com/>`_, and `tBunnyMan <http://bunnyman.info/>`_, all of +whom have done an amazing job recently. -I thought having a project blog would be a good idea to keep users and -developers updated on the status of pelican's development. +We thought having a project blog would be a good way to keep users and +developers updated on the status of Pelican's development. -We have a 3.0 version coming with *a lot* of niceties in there which will -hopefully be ready by the end of the week. Kyle is working on py3k support for +We have version 3.0 coming soon with *a lot* of niceties that will +hopefully be ready by the end of the week. Kyle is working on Py3k support for integration after 3.0, and we are getting rid of old things that don't make -sense anymore for 3.0, so expect some change :) +sense anymore for 3.0, so expect some changes. :) diff --git a/pelicanconf.py b/pelicanconf.py index c488661..f879fa5 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -1,20 +1,20 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -AUTHOR = u"Pelican contributors" -SITENAME = u"Pelican's development blog" +AUTHOR = u"Pelican Contributors" +SITENAME = u"Pelican Development Blog" SITEURL = '' TIMEZONE = 'Europe/Paris' DEFAULT_LANG = 'en' -LOCALE = 'en_US.utf8' +LOCALE = 'en_US.UTF-8' MENUITEMS = (('documentation', 'http://docs.getpelican.com'), ) # Blogroll LINKS = (('Pelican', 'http://docs.getpelican.com'), - ('Python.org', 'http://python.org'), - ('Jinja2', 'http://jinja.pocoo.org')) + ('Python.org', 'http://python.org'), + ('Jinja2', 'http://jinja.pocoo.org')) DEFAULT_PAGINATION = 5