aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/freesoftware.mdwn2
-rw-r--r--doc/todo/Case.mdwn4
-rw-r--r--doc/todo/case.mdwn11
-rw-r--r--doc/usage.mdwn8
4 files changed, 11 insertions, 14 deletions
diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index bcbfe38dc..5d231de58 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1 +1 @@
-ikiwiki is licensed under the terms of the GNU [GPL](GPL). \ No newline at end of file
+ikiwiki is licensed under the terms of the GNU [[GPL]].
diff --git a/doc/todo/Case.mdwn b/doc/todo/Case.mdwn
new file mode 100644
index 000000000..a19dbb2a6
--- /dev/null
+++ b/doc/todo/Case.mdwn
@@ -0,0 +1,4 @@
+ikiwiki should support pages that have uppercase in their filenames.
+However, links to such pages should not need to exactly preserve the case.
+
+[[todo/done]]
diff --git a/doc/todo/case.mdwn b/doc/todo/case.mdwn
deleted file mode 100644
index 6148b48e9..000000000
--- a/doc/todo/case.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-Being case insensative is handy, but it does make the [[BackLinks]] and
-[[blog]] links a bit ugly compared to other links. It should be possible to
-support pagenames that have uppercase, while still allowing them to be
-linked to using any case.
-
-Also, newly created pagenames that include upper case characters should
-perhaps not automatically be converted to lower case then.
-
-Also, it's currently possible to check in a filename with uppercase and
-ikiwiki will render it that way, but fail to edit it online, fail to link to
-it properly from other pages, etc.
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index aab5330b6..048072df6 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -75,6 +75,10 @@ These options control the mode that ikiwiki is operating in.
along with this one. --rebuild will also force feeds to be polled even if
they were polled recently.
+* --version
+
+ Print ikiwiki version number.
+
# CONFIG OPTIONS
These options configure the wiki. Note that plugins can add additional
@@ -160,7 +164,7 @@ configuration options of their own.
Specifies the url to the ikiwiki [[CGI]] script wrapper. Required when
building the wiki for links to the cgi script to be generated.
-* --historyurl http://url/trunk/\[[file]]?root=wiki
+* --historyurl url
Specifies the url to link to for page history browsing. In the url,
"\[[file]]" is replaced with the file to browse. It's common to use
@@ -170,7 +174,7 @@ configuration options of their own.
Specifies the email address that ikiwiki should use for sending email.
-* --diffurl http://url/trunk/\[[file]]?root=wiki&r1=\[[r1]]&r2=\[[r2]]
+* --diffurl url
Specifies the url to link to for a diff of changes to a page. In the url,
"\[[file]]" is replaced with the file to browse, "\[[r1]]" is the old