Make the setup automator create YAML formatted files.

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 2dcb424e56c57826900a50a413243a48ce840132..671438710e4444de5dd2f1aacef7183659ccadb1 100644 (file)
--- 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 7f1888198827e0081b06715f6d386fe5a66a942f..647a03f9a918dccffb94e1c3425f622b93d98fba 100644 (file)
--- 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 <joeyh@debian.org>  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 272d85d845fce591a05021b8cbcba05eb7617204..05fba7eac86b28bffddce8b4a5177686df9f75b6 100644 (file)
--- 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]]