Merge remote-tracking branch 'origin/setup' into setup

.ssh/authorized_keys

@@ -1,3 +1,4 @@
+command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICfFntnesZcYz2B2T41ay45igfckXRSh5uVffkuCQkLv joey@darkstar
 command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA37vjmeOfUQL9EO0JFOEIHfvE1xRx0vEMaxUNtxE85kyEIfgzN8uVJ66RPQwPI18EWM4ewJ00DM+WMuW9yCZQvdIhuYJvPWHWkX/4GcFTqPvYmzy5uTKT3GqpELv4FxbFM///2ewWRMsDoS0OOjnsTidUL/yzbfUD7n1oYsFEvakngwMRgM3g+WsMPXkk2K83cTSPWs7h8FMz6LnGQZndzEgW7ezOMyE0fZk3zAPu5ThIxc+/Tj6MoRO0aPoh6Ifzdx68EnU7yD0tyiBwv/vBUR16Q4vuAvDqqFL2nYJg5erLlSHyZ93yyrCZloJk8omRbMmBc+olVMc7vT9VMdj2Bw==
 command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArWtxJCzXFdGwpBOzW4vOjXOGySEVuLWlyF9qTXVPw0yoLP8H4XokgAwzdHd6/qb2kNgL8/igy1eFy7aDrXABbPzD6449lNzIYeI6bV5+jMG+pmcCGIzDasFAx9iF0cKM7+7gxlmQZZ/QvW5nc6UhbmtTThvp2TS/4qhiAXecJRsPgnMjEOayy2FVLtmB5vymtH5BrjPZxWwPDGdACqS0uh4ydvVgIt4aoeQog3cjPPg6mZ7xvDLa3mmv8MTWvsPvl3qaAICsMnWLW49PkmZx9259v3XTD2ZSathC9rqCmzWeknutbnTCLBdA4dJI54dxvQw+faNl1qJIyO1ZDJmjAQ==
 command="iki-git-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty,no-user-rc ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzHSsklzM1JeY8umxE/t9GJnMDTd6Jy7sFbASeSWw6BTSi+X1Qdm9VRmjTsdv26RIGzBOQdAybqO3BQj1cEZ51UJ/kTSXRzy92SUj7WuEdJu9ckOSs0sLld94b4dFLbG3bmSKBx4svUrGNJwedOOhRxXdV0rryOduy7HZVEq63q/aEquEgwfPo9bAOEhtdzVoLZco7eMSZFizLYQAPfmr9mJ3nhAcYZScPDWlLu37tqPxm9N4ZJ7syb13uSj2PcBxrDk1NXaPawg2itF1l61x1jDTLPrpQK0U24O1RI22XwQuE7P0qw63cPEuv4X9zscNgAPmtrGO3VstzovhmFxNrQ==

ikiwiki.setup

@@ -134,7 +134,7 @@ libdirs: []
 # extra library and plugin directory (searched after libdirs)
 libdir: /home/b-git-annex/.ikiwiki
 # environment variables
-ENV: {}
+#ENV: ''
 # time zone name
 timezone: GMT
 # regexp of normally excluded files to include
@@ -193,7 +193,6 @@ gitmaster_branch: master
 # gitpush plugin
 # git repository urls that changes are pushed to
 git_push_to:
-- git@github.com:joeyh/git-annex.git
 - joey@git.kitenet.net:/srv/git/git-annex
 
 # htmlscrubber plugin
@@ -299,6 +298,10 @@ langdefdir: /usr/share/highlight/langDefs
 #multimarkdown: 0
 # disable use of markdown discount?
 #nodiscount: 0
+# enable footnotes in Markdown (where supported)?
+mdwn_footnotes: 1
+# interpret line like 'A. First item' as ordered list when using Discount?
+mdwn_alpha_lists: 0
 
 # po plugin
 # master language (non-PO files)
@@ -344,8 +347,8 @@ po_link_to: default
 
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
-#    goto, mirrorlist, remove, rename, repolist, search, theme, userlist,
+#   (404, attachment, comments, editdiff, edittemplate, google, goto,
+#    mirrorlist, remove, rename, repolist, search, theme, userlist,
 #    websetup, wmd)
 ######################################################################
 
@@ -373,10 +376,6 @@ comments_commit: 1
 # Restrict formats for comments to (no restriction if empty)
 comments_allowformats: ''
 
-# getsource plugin
-# Mime type for returned source.
-#getsource_mimetype: text/plain; charset=utf-8
-
 # mirrorlist plugin
 # list of mirrors
 #mirrorlist: {}