Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
commit
4035c7f396
|
@ -59,3 +59,17 @@ Bulleted list
|
||||||
This **SandBox** is also a [[blog]]!
|
This **SandBox** is also a [[blog]]!
|
||||||
|
|
||||||
[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
|
[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
|
||||||
|
|
||||||
|
----
|
||||||
|
|
||||||
|
|
||||||
|
[[!toggleable id="foobar" text="""
|
||||||
|
foo
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
[[!toggleable id="foobar" text="""
|
||||||
|
bar
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
[[!toggle id="foobar" text="foo/bar"]]
|
||||||
|
|
||||||
|
|
|
@ -34,3 +34,13 @@ there), and so I need to choose the more secure solution. --Ivan Z.
|
||||||
>> The easiest way though is probably
|
>> The easiest way though is probably
|
||||||
>> to add your ssh key to the special user's `.ssh/authorized_keys`
|
>> to add your ssh key to the special user's `.ssh/authorized_keys`
|
||||||
>> and push that way. --[[Joey]]
|
>> and push that way. --[[Joey]]
|
||||||
|
|
||||||
|
## apache2 - run from userdir
|
||||||
|
Followed instructions but couldn't get it right to run from user dir (running ubuntu jaunty),
|
||||||
|
Finally got it working once I've sym linked as follow (& restarted apache):
|
||||||
|
\# ln -s ../mods-available/userdir.load .
|
||||||
|
\# ln -s ../mods-available/userdir.conf .
|
||||||
|
\# pwd
|
||||||
|
/etc/apache2/mods-enabled
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
[[!tag wishlist]]
|
||||||
|
|
||||||
|
It would be nice to have pagespecs support "link(.)" as syntax.
|
||||||
|
This would match pages that link to the page that invokes the pagespec.
|
||||||
|
The use case is a blog with tags, and having a page for each tag
|
||||||
|
which uses !inline to list all posts with the tag.
|
||||||
|
|
||||||
|
Joey said on IRC that "probably changing the derel() function in
|
||||||
|
IkiWiki.pm is the best way to do it".
|
||||||
|
|
Loading…
Reference in New Issue