23 files changed, 43 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 2df5a727c..0c210b64d 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -140,10 +140,18 @@ sub preprocess (@) { #{{{
 		if (exists $params{server} && safeurl($params{server})) {
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
 				'" rel="openid.server" />';
+			push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
+				'" rel="openid2.provider" />';
 		}
 		if (safeurl($value)) {
 			push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
 				'" rel="openid.delegate" />';
+			push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
+				'" rel="openid2.local_id" />';
+		}
+		if (exists $params{xrds-location} && safeurl($params{xrds-location})) {
+			push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
+				'content="'.encode_entities($params{xrds-location}).'" />';
 		}
 	}
 	elsif ($key eq 'redir') {
diff --git a/debian/changelog b/debian/changelog
index 80d938927..bd72e9fc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ ikiwiki (2.41) UNRELEASED; urgency=low
   [ martin f. krafft ]
   * The meta plugin now allows for the robots tag to be specified without the
     risk of it being scrubbed.
+  * Let meta.openid set X-XRDS-Location header
+  * Make makerepo set the Git merge remote.
+    branch.master.remote previously used to default to origin, which has
+    recently been changed; it now needs to be set explicitly, which this
+    patch does. Closes: #470517
+  * meta: Also generate openid2 headers.
 
   [ Joey Hess ]
   * Add recentchangesdiff plugin that adds diffs to the recentchanges feeds.
diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index 9f8693ec4..485ac8826 100644
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 [[!if test="enabled(version)"
      then="(Currently running version [[!version ]].)"
diff --git a/doc/ikiwiki/blog.mdwn b/doc/ikiwiki/blog.mdwn
index 6a206bb62..f1293ece8 100644
--- a/doc/ikiwiki/blog.mdwn
+++ b/doc/ikiwiki/blog.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 [[!if test="enabled(inline)"
      then="This wiki has the inline plugin **enabled**."
      else="This wiki has the inline plugin **disabled**."]]
diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index dc1fa77fd..29dbce181 100644
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -1,4 +1,5 @@
 [[!meta title="Formatting wiki pages"]]
+[[!meta robots="noindex, follow"]]
 
 Text on this wiki is, by default, written in a form very close to how you
 might write text for an email message. This style of text formatting is
diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn
index 73aee9c16..7c3b71f70 100644
--- a/doc/ikiwiki/markdown.mdwn
+++ b/doc/ikiwiki/markdown.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 [Markdown](http://daringfireball.net/projects/markdown/)
 is a minimal markup language that resembles plain text as used in
 email messages. It is the markup language used by this wiki by default.
diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn
index 01a4b32b7..8fd708659 100644
--- a/doc/ikiwiki/openid.mdwn
+++ b/doc/ikiwiki/openid.mdwn
@@ -1,4 +1,5 @@
 [[!meta title="OpenID"]]
+[[!meta robots="noindex, follow"]]
 
 [[!if test="enabled(openid)"
      then="This wiki has OpenID **enabled**."
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 3cd6bb9f4..156e3f6ca 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 To select a set of pages, such as pages that are locked, pages
 whose commit emails you want subscribe to, or pages to combine into a
 blog, the wiki uses a PageSpec. This is an expression that matches
diff --git a/doc/ikiwiki/preprocessordirective.mdwn b/doc/ikiwiki/preprocessordirective.mdwn
index 2cb602ebe..743c0d9f5 100644
--- a/doc/ikiwiki/preprocessordirective.mdwn
+++ b/doc/ikiwiki/preprocessordirective.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 Preprocessor directives are similar to a [[WikiLink]] in form, except they
 begin with `!` and may contain parameters. The general form is:
 
diff --git a/doc/ikiwiki/subpage.mdwn b/doc/ikiwiki/subpage.mdwn
index 43669209c..e047b860c 100644
--- a/doc/ikiwiki/subpage.mdwn
+++ b/doc/ikiwiki/subpage.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 ikiwiki supports placing pages in a directory hierarchy. For example,
 this page, [[SubPage]] has some related pages placed under it, like
 [[SubPage/LinkingRules]]. This is a useful way to add some order to your
diff --git a/doc/ikiwiki/subpage/linkingrules.mdwn b/doc/ikiwiki/subpage/linkingrules.mdwn
index c1062304a..e547f3090 100644
--- a/doc/ikiwiki/subpage/linkingrules.mdwn
+++ b/doc/ikiwiki/subpage/linkingrules.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 To link to or from a [[SubPage]], you can normally use a regular
 [[WikiLink]] that does not contain the name of the parent directory of
 the [[SubPage]]. Ikiwiki descends the directory hierarchy looking for a
diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index debbe7305..bd5e3d185 100644
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 WikiLinks provide easy linking between pages of the wiki. To create a
 [[WikiLink]], just put the name of the page to link to in double brackets.
 For example `\[[WikiLink]]`.
@@ -32,4 +33,4 @@ in WikiLinks, and must replace spaces with underscores.  The newer
 syntax, enabled with the `prefix_directives` option in an ikiwiki
 setup file, prefixes directives with `!`, and thus does not prevent
 links with spaces.  Future versions of ikiwiki will turn this option
-on by default.
-\ No newline at end of file
+on by default.
diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index b503e4511..0a934fc5c 100644
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -64,10 +64,15 @@ Supported fields:
 * openid
 
   Adds html &lt;link&gt; tags to perform OpenID delegation to an external
-  OpenID server. This lets you use an ikiwiki page as your OpenID. Example:
+  OpenID server (for `openid` and `openid2`). An optional `xrds-location`
+  parameter lets you specify the location of any [eXtensible Resource
+  DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).
 
-  	\\[[meta openid="http://joeyh.myopenid.com/"
-	server="http://www.myopenid.com/server"]]
+  This lets you use an ikiwiki page as your OpenID. Example:
+
+	\\[[meta openid="http://joeyh.myopenid.com/"
+	server="http://www.myopenid.com/server"
+	xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]]
 
 * link
 
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 205cb5b04..58d5d1146 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]
 [[!if test="enabled(template)"
 then="This wiki has templates **enabled**."
 else="This wiki has templates **disabled**."
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index a97c060c2..6ae3e28a3 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -62,6 +62,7 @@ git)
 	git commit -m "initial commit"
 	git remote add origin "$repository"
 	git config branch.master.merge refs/heads/master
+	git config branch.master.remote origin
 	git push --all
 	echo "Directory $srcdir is now a clone of $rcs repository $repository"
 ;;
diff --git a/underlays/basewiki/blog.mdwn b/underlays/basewiki/blog.mdwn
index c0c3ef5f2..d9faeb84a 100644
--- a/underlays/basewiki/blog.mdwn
+++ b/underlays/basewiki/blog.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/blog delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/blog|ikiwiki/blog]]. Please update your
 links, as this redirection page will be removed in a future ikiwiki
diff --git a/underlays/basewiki/helponformatting.mdwn b/underlays/basewiki/helponformatting.mdwn
index 437a2466d..9e7987613 100644
--- a/underlays/basewiki/helponformatting.mdwn
+++ b/underlays/basewiki/helponformatting.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/formatting delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/formatting|ikiwiki/formatting]]. Please
 update your links, as this redirection page will be removed in a future
diff --git a/underlays/basewiki/markdown.mdwn b/underlays/basewiki/markdown.mdwn
index 03ce25745..cefd2f598 100644
--- a/underlays/basewiki/markdown.mdwn
+++ b/underlays/basewiki/markdown.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/markdown delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/markdown|ikiwiki/markdown]]. Please update
 your links, as this redirection page will be removed in a future ikiwiki
diff --git a/underlays/basewiki/openid.mdwn b/underlays/basewiki/openid.mdwn
index 7fe832e11..5a462c92c 100644
--- a/underlays/basewiki/openid.mdwn
+++ b/underlays/basewiki/openid.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/openid delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/openid|ikiwiki/openid]]. Please update your
 links, as this redirection page will be removed in a future ikiwiki
diff --git a/underlays/basewiki/pagespec.mdwn b/underlays/basewiki/pagespec.mdwn
index 4a82eff84..c3caf596c 100644
--- a/underlays/basewiki/pagespec.mdwn
+++ b/underlays/basewiki/pagespec.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/pagespec delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/pagespec|ikiwiki/pagespec]]. Please update
 your links, as this redirection page will be removed in a future ikiwiki
diff --git a/underlays/basewiki/preprocessordirective.mdwn b/underlays/basewiki/preprocessordirective.mdwn
index 7c5d0c3e0..842ebfb78 100644
--- a/underlays/basewiki/preprocessordirective.mdwn
+++ b/underlays/basewiki/preprocessordirective.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/preprocessordirective delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to
 [[ikiwiki/preprocessordirective|ikiwiki/preprocessordirective]]. Please
diff --git a/underlays/basewiki/subpage.mdwn b/underlays/basewiki/subpage.mdwn
index 2de27a1ad..64598b53d 100644
--- a/underlays/basewiki/subpage.mdwn
+++ b/underlays/basewiki/subpage.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/subpage delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/subpage|ikiwiki/subpage]]. Please update your
 links, as this redirection page will be removed in a future ikiwiki
diff --git a/underlays/basewiki/wikilink.mdwn b/underlays/basewiki/wikilink.mdwn
index ce5920a57..b5a1a8e52 100644
--- a/underlays/basewiki/wikilink.mdwn
+++ b/underlays/basewiki/wikilink.mdwn
@@ -1,4 +1,5 @@
 [[!meta redir=ikiwiki/wikilink delay=10]]
+[[!meta robots="noindex, follow"]]
 
 This page has moved to [[ikiwiki/wikilink|ikiwiki/wikilink]]. Please update
 your links, as this redirection page will be removed in a future ikiwiki