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

8 files changed, 33 insertions, 0 deletions

diff --git a/doc/bugs/Can__39__t_create_root_page.mdwn b/doc/bugs/Can__39__t_create_root_page.mdwn
index f07619db5..0ef7e314c 100644
--- a/doc/bugs/Can__39__t_create_root_page.mdwn
+++ b/doc/bugs/Can__39__t_create_root_page.mdwn
@@ -1,3 +1,5 @@
 This is a link to a non-existent page in the root directory: [[/root_page_test]] (\[[/root\_page\_test]])
 
 When you click on it to create the page, you get *Error: bad page name*.  It's a valid [[wikilink]], shouldn't it create the page? --[[sabr]]
+
+> This type of page name (with leading slash) also gets created by the aggregate plugin: /cgi-bin/ikiwiki.cgi?page=%2FCalculated_Risk&from=news%2FAll_Stories&do=create  I'm now pretty convinced that Iki should handle this without error.  I'll investigate if I can find the time.
diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn
index ab05e3e78..e306f643a 100644
--- a/doc/ikiwiki/pagespec/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/discussion.mdwn
@@ -50,3 +50,16 @@ public\_html/index.html
 >> I can't reproduce "/index and /downloads" causing the login webpage to
 >> be shown repeatedly. Sure you weren't having some independent issue with
 >> logging in? --[[Joey]]
+
+----
+
+I have a page for a tag.  On that page I want to list every page on my wiki that has been so tagged.  Easy enough, right?
+
+> \[[!inline pages="link(Categories/Ikiwiki_Plugins)" feeds=no archive=yes sort=title template=titlepage]]
+
+> (I'm using tagbase => "Categories" because I'm converting from Mediawiki) 
+
+This works beautifully in my sandbox: <http://iki.u32.net/sandbox>  But it is totally blank on the page where I actually do want output!  <http://iki.u32.net/Categories/Ikiwiki_Plugins>
+
+How can I fix this?  --[[sabr]]
+
diff --git a/doc/sandbox/testpage.mdwn b/doc/sandbox/testpage.mdwn
new file mode 100644
index 000000000..b9439ad02
--- /dev/null
+++ b/doc/sandbox/testpage.mdwn
@@ -0,0 +1 @@
+Test page content.
diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 8d537cbc3..06d5c0a21 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -112,3 +112,9 @@ want to merge with, and 'branch.master.merge' in your configuration file does no
     error: failed to push to '/home/git/repos/myikiwiki.git'
 
 If I do a git clone ssh://odin/path/to/$REPOSITORY from another machine and try to edit I get the same error sequence.  What am I doing wrong?
+
+-----
+
+I follow every steps of the setup procedure, change some templates and tried to modify some page through the web but was not able to do so. Every page seems to be locked by the adminuser user. When I remove the adminuser in the setup file, every ran fine. Did I miss something ? What is exactly the adminuser supposed to be allowed to ? Is he the only user allowed to modify pages ?
+
+
diff --git a/doc/todo/dynamic_rootpage.mdwn b/doc/todo/dynamic_rootpage.mdwn
index fe95aff56..fa0e23254 100644
--- a/doc/todo/dynamic_rootpage.mdwn
+++ b/doc/todo/dynamic_rootpage.mdwn
@@ -19,3 +19,7 @@ What's your opinion, Joey? I hope it's also useful for another ikiwiki lovers :)
 >> No, but I don't know of a way to do it that feels flexible and right.. 
 >> Using functions as in your example doesn't feel right somehow.
 >> --[[Joey]]
+
+>>> Seems like a job for good ol' string interpolation.  rootpage="post/$current_year/$current_month/$current_day"
+>>> Ikiwiki could provide some vars, and it would be nice to write plugins to also provide vars.  Sort of like templates.
+>>> Does that feel OK? --[[sabr]]
diff --git a/doc/users/sabr.mdwn b/doc/users/sabr.mdwn
index fcbc94e80..8741c6f36 100644
--- a/doc/users/sabr.mdwn
+++ b/doc/users/sabr.mdwn
@@ -25,3 +25,8 @@ feedonly=yes rss=no atom=yes]]
 * Can I create this page?  [[/root_page_test]]
   * no, it's a bug: [[/bugs/Can__39__t_create_root_page]]
 * This page has a [[plugins/toc]].  Why doesn't it appear in the edit preview? [[plugins/toc/discussion]]
+* Add two subpages: [[sub1]] and [[sub2]] to try to produce a directory listing as discussed in [[todo/pagespec_expansions]].  Will it list?
+
+> [[!inline pages="./sabr/* and !./sabr/*/*" template="titlepage" archive="yes" feeds="no"]]
+
+> How very strange that I need to put the name of my own page in there.  I don't understand that.  But it does seem to work.
diff --git a/doc/users/sabr/sub1.mdwn b/doc/users/sabr/sub1.mdwn
new file mode 100644
index 000000000..85bfe26bc
--- /dev/null
+++ b/doc/users/sabr/sub1.mdwn
@@ -0,0 +1 @@
+one sabr sub
diff --git a/doc/users/sabr/sub2.mdwn b/doc/users/sabr/sub2.mdwn
new file mode 100644
index 000000000..f63487d30
--- /dev/null
+++ b/doc/users/sabr/sub2.mdwn
@@ -0,0 +1 @@
+two sabr sub