Merge branch 'master' into po

[git.ikiwiki.info.git] / doc / todo / using_meta_titles_for_parentlinks.html

diff --git a/doc/todo/using_meta_titles_for_parentlinks.html b/doc/todo/using_meta_titles_for_parentlinks.html
index 651b7fa0fc4e02233c2740455ae55f1d1d494a3b..6da40a415156352b8425124b7e95b3016c83d1e0 100644 (file)
--- a/doc/todo/using_meta_titles_for_parentlinks.html
+++ b/doc/todo/using_meta_titles_for_parentlinks.html
@@ -82,9 +82,9 @@ diff -c /usr/share/perl5/IkiWiki/Plugin/meta.pm.distrib /usr/share/perl5/IkiWiki
 *** 289,294 ****
 --- 290,319 ----
         }
-  } #}}}
+  }
   
-+ sub IkiWiki::pagetitle ($;$) { #{{{
++ sub IkiWiki::pagetitle ($;$) {
 +       my $page=shift;
 +       my $unescaped=shift;
 + 
@@ -106,11 +106,17 @@ diff -c /usr/share/perl5/IkiWiki/Plugin/meta.pm.distrib /usr/share/perl5/IkiWiki
 +       }
 + 
 +       return $page;
-+ } #}}}
++ }
 + 
   package IkiWiki::PageSpec;
   
-  sub match_title ($$;@) { #{{{
+  sub match_title ($$;@) {
 
 
 </pre>
+
+<p>
+This is actually a duplicate for
+[[bugs/pagetitle_function_does_not_respect_meta_titles]], where I'm
+following up a bit. --[[intrigeri]]
+</p>
\ No newline at end of file