Merge remote-tracking branch 'giskard/master'
authorBernie Innocenti <bernie@codewiz.org>
Sat, 18 Apr 2015 04:56:35 +0000 (00:56 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Sat, 18 Apr 2015 04:56:35 +0000 (00:56 -0400)
Conflicts:
geekigeeki.py

1  2 
geekigeeki.py

diff --cc geekigeeki.py
index 9d443fc6997d5cdf0c39ee774d3c91b3ade82804,1891fdd8c5842cea4357d5339009ad40f90134d6..f6163110b35b15c6b8d313158a8f42d9145303ca
@@@ -643,10 -646,10 +643,10 @@@ class Page
          if title_done: return
  
          # HEAD
 -        emit_header(self._mtime())
 +        emit_header(name and self._mtime())
          print('<!doctype html>\n<html lang="en">')
          print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
-         print(' <meta charset="UTF-8">')
+         print(' <meta charset="utf-8">')
          if not name:
              print(' <meta name="robots" content="noindex,nofollow" />')
  
          editable = name and self.can_write() and is_privileged()
          if editable:
              print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
 -                % relative_url('?a=edit&q=' + name, privileged=True))
 +                % relative_url(name + '?a=edit', privileged=True))
  
-         history = config_get('history_url')
-         if history is not None:
-             print(' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
-                 % relative_url(history + '?a=rss'))
+         print(' <link rel="alternate" type="application/atom+xml" title="Atom feed" href="%s" />' \
+             % relative_url(name + '?a=atom'))
  
          print('</head>')