aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-07 19:38:35 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-07 19:38:35 +0000
commit1cd1f073fff6be0300dec80cf1571ca247ce24ab (patch)
treede9d2933b39cd926951e65696d3bdc64186ac919
parent42ffdb661c4a070cd0291bc27b4609f51c3777a2 (diff)
downloadikiwiki-1cd1f073fff6be0300dec80cf1571ca247ce24ab.tar
ikiwiki-1cd1f073fff6be0300dec80cf1571ca247ce24ab.tar.gz
web commit from 127.0.0.1
-rw-r--r--doc/features.mdwn10
-rw-r--r--doc/sandbox.mdwn4
-rw-r--r--doc/serverless.mdwn3
-rw-r--r--doc/todo/terminalclient.mdwn20
4 files changed, 33 insertions, 4 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 9e9e9195d..1406f5a1b 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -38,9 +38,10 @@ Some of ikiwiki's features:
unchanged by ikiwiki as it builds your wiki. So you can check in an image,
program, or other special file and link to it from your wiki pages.
-* [[SubPage]]s
+* [[SubPages|SubPage]]
- Arbitrarily deep hierarchies of pages with fairly simple and useful [[SubPage/LinkingRules]]
+ Arbitrarily deep hierarchies of pages with fairly simple and useful
+ [[SubPage/LinkingRules]]
* [[blogging|blog]]
@@ -135,6 +136,11 @@ Some of ikiwiki's features:
After rather a lot of fiddling, we think that ikiwiki correctly and fully
supports utf8 everywhere.
+* [[serverless]] mode
+
+ Can be set up so that w3m can be used to browse a wiki and edit pages
+ without using a web server.
+
----
It also has some [[TODO]] items and [[Bugs]].
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6bd9fa072..538d03403 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -48,6 +48,8 @@ Bulleted list
*one
*one
+hi, mom!
+
----
[[haiku hint="sandbox play"]]
@@ -67,4 +69,4 @@ Bulleted list
This sandbox is also a [[blog]]!
-[[inline pages="sandbox/*" rootpage="sandbox" show="5"]] \ No newline at end of file
+[[inline pages="sandbox/*" rootpage="sandbox" show="5"]]
diff --git a/doc/serverless.mdwn b/doc/serverless.mdwn
new file mode 100644
index 000000000..2cbf6e2f7
--- /dev/null
+++ b/doc/serverless.mdwn
@@ -0,0 +1,3 @@
+It's possible to use all of ikiwiki's web features (page editing, etc) in
+the `w3m` web browser without using a web server. `w3m` supports local CGI
+scripts, and ikiwiki can be set up to run that way.
diff --git a/doc/todo/terminalclient.mdwn b/doc/todo/terminalclient.mdwn
index 1a3908305..8c802888b 100644
--- a/doc/todo/terminalclient.mdwn
+++ b/doc/todo/terminalclient.mdwn
@@ -3,4 +3,22 @@ and $EDITOR. Browse around a wiki, select pages to edit and get dropped
right into the editor and have the page committed to svn automatically.
Less grandiosely, a simple command line util to add a new page would be
-useful, especially if it made it easy to add blog entries to the wiki. I have a special purpose version of this in my [blog script](http://kitenet.net/~joey/code/bin.html).
+useful, especially if it made it easy to add blog entries to the wiki. I
+have a special purpose version of this in my [blog
+script](http://kitenet.net/~joey/code/bin.html).
+
+----
+
+w3m's cgi mode requires that cgis be in /usr/lib/w3m/cgi-bin/, and the url
+for it can be $LIB/script. This presents a problem, since a regular user
+can't add an ikiwiki wrapper to there (nor should they). But,
+/usr/lib/w3m/cgi-bin/ikiwiki could be a meta-wrapper, that is passed the
+path to the real wrapper in PATH_INFO, validates it, and runs the real
+wrapper. So:
+
+<a href="file:///$LIB/ikiwiki.cgi/home/joey/.ikiwiki/wrappers/ikiwiki.cgi">
+
+Validation is important, because we don't want just any html document
+including an evil w3m cgi that gets unintentionally run. The validation I'm
+thinking of is that the ikiwiki meta-wrapper only runs wrappers in
+$HOME/.ikiwiki/wrappers/, which the user presumably controls.