Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/ikiwiki/directive/testpagespec/discussion.mdwn b/doc/ikiwiki/directive/testpagespec/discussion.mdwn
new file mode 100644 (file)
index 0000000..572e4b1
--- /dev/null
+++ b/doc/ikiwiki/directive/testpagespec/discussion.mdwn
@@ -0,0 +1 @@
+How does one test a user identity?  I tried "pagename and user(username) for the match, and had a "no user specified" error.

diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn
index 0e1a7f7afb7e44950801edbf23718370021b5854..c1129a4358cc9a9e75364be6c3a837a54e617825 100644 (file)
--- a/doc/install/discussion.mdwn
+++ b/doc/install/discussion.mdwn
@@ -210,7 +210,21 @@ Any help would be greatly appreciated... --kent
 > If you can show me exactly what command you ran (the tested, working
 > commands on the parent page?) and how it failed, I can try to debug
 > your problem.
-> 
+
+Just today I noticed the "Bundle" subdirectory.  What a moron I am! :-)  Also, I misunderstood the PERL5LIB=`pwd` part -- 
+I glibly thought it indicated the sink for the installation of the modules, rather than the source, and I was running 
+the cpan command from another window in a different directory, and just spiraled down into error...
+
 > The real question in my mind is why you'd want to do this at all when
 > using Ubuntu, which incldues packages of ikiwiki and all its
-> dependencies. --[[Joey]] 
+> dependencies. --[[Joey]]
+
+For ubuntu 8.04: 
+
+    $ ikiwiki --version
+    ikiwiki version 2.32.3ubuntu2.1
+    $
+
+I was just trying to get the latest version.
+
+In any case, thanks for the help, and thanks for the superb software.  I really like it a lot.

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7b842584328a01a5f3d9f5daa1e9a9e0db11d31d..f160ad1d5f558b1edcfb58645afd962740000580 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,4 +1,4 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki.
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 ----