summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-01-21 23:04:48 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-01-21 23:04:48 -0500
commit7c00c46bcabccd38173faa6269f9faeaf4a56f76 (patch)
treed52cfbdc30d5c51b6a5fddb79bca3d37823e3bb8
parentfd03fd9e0ad1d51a358d4d2953e68e12e8885afe (diff)
parenta2738b949a31228ee33e954cfa96b93ddc35f11c (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/ikiwiki/directive/testpagespec/discussion.mdwn1
-rw-r--r--doc/install/discussion.mdwn18
-rw-r--r--doc/sandbox.mdwn2
3 files changed, 18 insertions, 3 deletions
diff --git a/doc/ikiwiki/directive/testpagespec/discussion.mdwn b/doc/ikiwiki/directive/testpagespec/discussion.mdwn
new file mode 100644
index 000000000..572e4b183
--- /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 0e1a7f7af..c1129a435 100644
--- 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 7b8425843..f160ad1d5 100644
--- 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 ]]).
----