Merge commit 'upstream/master' into prv/po

2 files changed, 26 insertions, 0 deletions

diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
index a30ab0fa3..77c86eba1 100644
--- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
+++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
@@ -1,3 +1,12 @@
 The `IkiWiki::pagetitle` function does not respect title changes via `meta.title`. It really should, so that links rendered with `htmllink` get the proper title in the link text.
 
 --[[madduck]]
+
+> Agreed. [[todo/using_meta_titles_for_parentlinks]] contains a beginning of
+> solution. A few quick notes about it:
+
+> - Using <code>inline</code> would avoid the redefinition + code duplication.
+> - A few plugins would need to be upgraded.
+> - It may be necessary to adapt the testsuite in `t/pagetitle.t`, as well.
+
+> --[[intrigeri]]
diff --git a/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn b/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
new file mode 100644
index 000000000..d2d5a46ed
--- /dev/null
+++ b/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn
@@ -0,0 +1,17 @@
+When applying my usual copyright and licensing header to a [[plugins/txt]]
+page, garbled output is created.
+
+Here is the header:
+
+    \[[meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 2008 Free
+    Software Foundation, Inc."]]
+    
+    \[[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable
+    id="license" text="Permission is granted to copy, distribute and/or modify
+    this document under the terms of the GNU Free Documentation License,
+    Version 1.2 or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled
+    [[GNU_Free_Documentation_License|/fdl]]."]]"""]]
+
+--[[tschwinge]]