summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile.PL2
-rw-r--r--auto.setup (renamed from simple.setup)4
-rw-r--r--debian/changelog2
-rw-r--r--doc/setup.mdwn2
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 04ed70502..a805f41a2 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,7 +50,7 @@ extra_clean:
extra_install:
install -d $(DESTDIR)/etc/ikiwiki
install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
- install -m 0644 simple.setup $(DESTDIR)/etc/ikiwiki
+ install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
diff --git a/simple.setup b/auto.setup
index 60934b5f6..38514d554 100644
--- a/simple.setup
+++ b/auto.setup
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# Simple ikiwiki setup.
+# Ikiwiki setup automator.
#
# This setup file causes ikiwiki to create a wiki, check it into revision
# control, generate a setup file for the new wiki, and set everything up.
@@ -40,4 +40,4 @@ IkiWiki::Setup::Automator->import(
syslog => 1,
prefix_directives => 1,
hardlink => 1,
-);
+)
diff --git a/debian/changelog b/debian/changelog
index 865544786..7b4bc4215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
ikiwiki (2.60) UNRELEASED; urgency=low
- * Starting with this version, "ikiwiki -setup /etc/ikiwiki/simple.setup"
+ * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
can be used set up a new wiki in seconds.
* Add getsetup hook, all plugins that add fields to %config should use it.
* ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 09ca55038..2989485f9 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -12,7 +12,7 @@ If you're not, see the [[download]] and [[install]] pages.
If you'd like to set up a wiki now, and learn more later, just run this command
and answer a couple of questions.
- % ikiwiki -setup /etc/ikiwiki/simple.setup
+ % ikiwiki -setup /etc/ikiwiki/auto.setup
What will the wiki be named? mywiki
What revision control system to use? git
What wiki user (or openid) will be wiki admin? joey