From 67b2beb1b00ea5c82446533edab07cc6e9e18876 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Nov 2011 16:01:50 -0400 Subject: Make the setup automator create YAML formatted files. --- IkiWiki/Setup/Automator.pm | 2 +- debian/changelog | 1 + doc/todo/Auto-setup_should_default_to_YAML.mdwn | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 2dcb424e5..671438710 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -38,7 +38,7 @@ sub sanitize_wikiname ($) { sub import (@) { my $this=shift; - $config{setuptype}='Standard'; + $config{setuptype}='Yaml'; IkiWiki::Setup::merge({@_}); if (! $config{force_overwrite}) { diff --git a/debian/changelog b/debian/changelog index 7f1888198..647a03f9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.20110906) UNRELEASED; urgency=low subdirectory. * rst: import docutils lazily, to avoid errors during ikiwiki --setup. Closes: #637604 (Thanks, smcv) + * Make the setup automator create YAML formatted files. -- Joey Hess Tue, 27 Sep 2011 10:47:13 -0400 diff --git a/doc/todo/Auto-setup_should_default_to_YAML.mdwn b/doc/todo/Auto-setup_should_default_to_YAML.mdwn index 272d85d84..05fba7eac 100644 --- a/doc/todo/Auto-setup_should_default_to_YAML.mdwn +++ b/doc/todo/Auto-setup_should_default_to_YAML.mdwn @@ -1 +1,3 @@ I think that the auto-generated setup files generated by /etc/ikiwiki/*.setup should be created in the new YAML format. + +> Ah, I missed that. [[done]] --[[Joey]] -- cgit v1.2.3