pelicanconf: organize a little by sessions and...

- disable all atom/rss to be generated
- set page and article to be in the root instead of /pages

note: this temporary breaks the build due the change of html path

1 files changed, 51 insertions, 46 deletions

diff --git a/pelicanconf.py b/pelicanconf.py
index dc88ab9..39ccc85 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -1,72 +1,77 @@
 # -*- coding: utf-8 -*- #
 from __future__ import unicode_literals
 
-AUTHOR = u'spice-team'
+# Pelican configuration
+#######################
+AUTHOR   = u'spice-team'
 SITENAME = u'SPICE'
-SITEURL = ''
-THEME = 'spice-space'
-FOOTER_IMAGE_PATH = SITEURL + '/theme/images/icons/et_logo.png'
-
-PATH = 'content'
-
+SITEURL  = ''
+THEME    = 'spice-space'
 TIMEZONE = 'Europe/Paris'
+PATH     = 'content'
 
-DEFAULT_LANG = u'en'
-
-PLUGIN_PATHS = ["plugins"]
-PLUGINS = ["asciidoc_reader", "tipue_search", "sitemap"]
-SITEMAP = {'format' : 'xml'}
-
-ASCIIDOC_OPTIONS = ["-f asciidoc.conf", "-a iconsdir="+SITEURL + "/theme/images/icons"]
-ASCIIDOC_BACKEND = "html5"
+DEFAULT_LANG  = u'en'
+RELATIVE_URLS = False
 
 # Static content that we reference in our site goes into folders appointed
 # by this path
 STATIC_PATHS = ['static/docs', 'static/images']
+
+# Templates that are used directly to render content
 DIRECT_TEMPLATES = ['search']
 
-# Feed generation is usually not desired when developing
-FEED_ALL_ATOM = None
-CATEGORY_FEED_ATOM = None
-TRANSLATION_FEED_ATOM = None
-AUTHOR_FEED_ATOM = None
-AUTHOR_FEED_RSS = None
+# ATOM/RSS not used. Disable so they are not generated (and not warned)
+FEED_DOMAIN = TRANSLATION_FEED_ATOM = None
 
-# Blogroll
-# LINKS = (('Pelican', 'http://getpelican.com/'),
-#          ('Python.org', 'http://python.org/'),
-#          ('Jinja2', 'http://jinja.pocoo.org/'),
-#          ('You can modify those links in your config file', '#'),)
+FEED_ATOM          = FEED_RSS          = None
+FEED_ALL_ATOM      = FEED_ALL_RSS      = None
+CATEGORY_FEED_ATOM = CATEGORY_FEED_RSS = None
+AUTHOR_FEED_ATOM   = AUTHOR_FEED_RSS   = None
+TAG_FEED_ATOM      = TAG_FEED_RSS      = None
 
-# Social widget
-# SOCIAL = (('You can add links in your config file', '#'),
-#           ('Another social link', '#'),)
 
-DEFAULT_PAGINATION = False
+PAGE_URL         = PAGE_SAVE_AS         = '{slug}.html'
+PAGE_LANG_URL    = PAGE_LANG_SAVE_AS    = '{lang}/{slug}.html'
+ARTICLE_URL      = ARTICLE_SAVE_AS      = '{slug}.html'
+ARTICLE_LANG_URL = ARTICLE_LANG_SAVE_AS = '{lang}/{slug}.html'
+CATEGORY_URL     = CATEGORY_SAVE_AS     = None
 
-# Uncomment following line if you want document-relative URLs when developing
-#RELATIVE_URLS = True
+# Theme-related configuration
+#############################
+DEFAULT_PAGINATION = False
+FOOTER_IMAGE_PATH = SITEURL + '/theme/images/icons/et_logo.png'
 
 MENUITEMS = [
-	("HOME", "pages/home.html"),
-	("FAQ", "pages/faq.html"),
-	("Documentation", "pages/documentation.html"),
-	("Download", "pages/download.html"),
-	("Developers", "pages/developers.html"),
-	("Contact", "pages/contact.html"),
+	("HOME", "home.html"),
+	("FAQ", "faq.html"),
+	("Documentation", "documentation.html"),
+	("Download", "download.html"),
+	("Developers", "developers.html"),
+	("Contact", "contact.html"),
 ]
 
 SUBMENUS = {
 	"documentation" : [
-		("Introduction", "pages/introduction.html"),
-		("Overview", "pages/documentation.html"),
-		("Manual", "pages/spice-user-manual.html"),
-		("spice-gtk API", "pages/spice-gtk.html"),
-		("Support", "pages/support.html"),
-		("Features", "pages/features.html"),
+		("Introduction", "introduction.html"),
+		("Overview", "documentation.html"),
+		("Manual", "spice-user-manual.html"),
+		("spice-gtk API", "spice-gtk.html"),
+		("Support", "support.html"),
+		("Features", "features.html"),
 	],
 	"download" : [
-		("Download", "pages/download.html"),
-		("Repositories", "pages/repositories.html"),
+		("Download", "download.html"),
+		("Repositories", "repositories.html"),
 	],
 }
+
+# Plugins configuration
+#######################
+PLUGIN_PATHS = ["plugins"]
+PLUGINS = ["asciidoc_reader", "tipue_search", "sitemap"]
+
+SITEMAP = {'format' : 'xml'}
+
+ASCIIDOC_OPTIONS = ["-f asciidoc.conf",
+                    "-a iconsdir=" + SITEURL + "/theme/images/icons"]
+ASCIIDOC_BACKEND = "html5"