summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/plugins/attachment.mdwn6
-rw-r--r--doc/plugins/write.mdwn3
-rw-r--r--doc/roadmap.mdwn11
3 files changed, 10 insertions, 10 deletions
diff --git a/doc/plugins/attachment.mdwn b/doc/plugins/attachment.mdwn
index 524a233fa..b04a04ad2 100644
--- a/doc/plugins/attachment.mdwn
+++ b/doc/plugins/attachment.mdwn
@@ -20,9 +20,9 @@ Bear in mind that if you let anyone upload a particular kind of file
contains html as a web page; including running any malicious javascript
embedded in that page.
-If you enable this plugin, be sure to lock that down, by entering an
-[[enhanced_PageSpec|ikiwiki/pagespec/attachment]] in the "Allowed
-Attachments" field of the wiki admin's preferences page.
+If you enable this plugin, be sure to lock it down, via the
+`allowed_attachments` setup file option. This is a special
+[[enhanced_PageSpec|ikiwiki/pagespec/attachment]].
This plugin will use the [[!cpan File::MimeInfo::Magic]] perl module, if
available, for mimetype checking.
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 77210d35c..255be4207 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -396,11 +396,12 @@ describing the option. For example:
rebuild => 0,
},
-* `type` can be "boolean", "string", "integer", "pagespec", or "internal"
+* `type` can be "boolean", "string", "integer", or "internal"
(used for values that are not user-visible). The type is the type of
the leaf values; the `%config` option may be an array or hash of these.
* `example` can be set to an example value.
* `description` is a short description of the option.
+* `description_html` is an optional short description, that can contain html
* `safe` should be false if the option should not be displayed in unsafe
configuration methods, such as the web interface. Anything that specifies
a command to run, a path on disk, or a regexp should be marked as unsafe.
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 32752715d..6447e8c52 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -39,21 +39,20 @@ backwards compatability.
# 3.0
-Still in the early planning stages, version 3.0 will be an opportunity to
-make significant transitions.
+Version 3.0 will be an opportunity to make significant transitions.
* Default to using `prefix_directives`.
* Default to using `aggregateinternal`.
+* Remove deprecated prefs form settings for `allowed_attachments` and
+ `locked_pages`.
----
# future goals
-* Improved [[todo/html]] stylesheets and templates.
- _(status: [[css_market]] exists; it could always provide more stylesheets. No alternate templates yet, though.)_
-* More documentation in the basewiki, including documentation for all enabled plugins. Probably need some solution for [[todo/conditional_underlay_files]], too.
+* More documentation in the basewiki, including documentation for all enabled plugins.
* Conversion support for existing other wikis.
(Being worked on for MoinMoin and TWiki by [[Josh_Triplett|JoshTriplett]]
and Jamey Sharp; support for other wikis should fit into the same
framework.)
-* [[TODO]], [[bugs]], [[soc]], ...
+* [[TODO]], [[bugs]], ...