Merge branch 'dependency-types'

Conflicts:
	doc/todo/dependency_types.mdwn

diff --git a/doc/plugins/lockedit/discussion.mdwn b/doc/plugins/lockedit/discussion.mdwn
index 8a08edaadfd4041680701ce8f2a87ed787bc4d5f..867fc6a51010b4cf25b5ecf46c0bc0bccd94cf9c 100644 (file)
--- a/doc/plugins/lockedit/discussion.mdwn
+++ b/doc/plugins/lockedit/discussion.mdwn
@@ -6,3 +6,13 @@ calls needsignin ].
 > page is that you are not logged in. And without the jump to logging the
 > user in, there is no way for the user to log in, without navigating away
 > from the page they were trying to edit. --[[Joey]] 
+
+>> Ok, but the problem is that when you don't want any signin form you end up
+>> with a lone login button. That might happend if you lock pages only on IP
+>> adresses, if you use another cookie from another webapp...
+
+>> That happends to me and I had to reimplement lockedit in my private auth
+>> plugin.
+
+>> Perhaps you could return undef on that case and let another plugin do the
+>> needsignin call ? -- [[Jogo]]

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 0501f443a732a75d866a0613b70bdfbaec7d8e35..32a8f6de2e92d8b3f162fa88651fb41e14fb0c77 100644 (file)
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -1,3 +1,5 @@
+I have copied over the ikiwiki.setup file from /usr/share/doc/ikiwiki/ to /etc/ikiwiki/ and run it after editing. My site gets built but when I click on the 'edit' button, firefox and google chrome download the cgi file instead of creating a way to edit it. The permissions on my ikiwiki.cgi script look like this: -rwsr-sr-x  1 root root 13359 2009-10-13 19:21 ikiwiki.cgi. Is there something I should do, i.e. change permissions, so I can get it to run correctly? (jeremiah)
+
 I just went through the standard procedure described for setup, copied the blog directory from examples into my source directory, ran ikiwiki, and everything seems to have worked, except that none of the 
 [[!meta ... ]] tags get converted. They simply show up in the html files unformatted, with no exclamation point, and with p tags around them. Any ideas? using ikiwiki version 2.40 on freebsd --mjg
 

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index b84d71c3dabf1cb79d624080b5e9456068fbb6d0..54dd0fdb1eadfac386b31b2dd2f014349a54184a 100644 (file)
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -60,6 +60,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
 * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
+* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the

diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn
index da9b5e6cf1859ff7848183fce3e2af22c9f6b428..4db633eadfa3bcef58d16f70a0f4cf911848b4ed 100644 (file)
--- a/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@ -553,29 +553,16 @@ operators. Currently, this turns into roughly:
 `FailReason() & SuccessReason(patch)`
 
 Let's say that the glob instead returns a HardFailReason, which when
-ANDed with another object, drops their influences. (But when ORed, combines
-them.) Fixes the above, but does it always work?
+ANDed with another object, blocks their influences. (But when ORed,
+combines them.)
 
-"(bugs/* or link(patch)) and backlink(index)" =>
-`( HardFailReason() | SuccessReason(page) ) & SuccessReason(index)`` =>
-`SuccessReason(page & SuccessReason(index)` =>
-SuccessReason(page, index) => right
+Question: Are all pagespec terms that return reason objects w/o any
+influence info, suitable to block influence in this way? 
 
-"(bugs/* and link(patch)) or backlink(index)" =>
-`( HardFailReason() & SuccessReason(page) ) | SuccessReason(index)`` =>
-`HardFailReason() | SuccessReason(index)` =>
-`SuccessReason(index)` => right
-
-Ok so far, but:
-
-"!bugs/* and link(patch)" =>
-`!SuccessReason() | SuccessReason(bugs/foo)` =>  
-'FailReason() | SuccessReason(bugs/foo)
-`FailReason(bugs/foo)` => wrong!
-
-This could be fixed by adding a HardSuccessReason that glob also returns.
-Maybe just a field of the object that is set if it is "hard" is a better
-approach though.
+To be suitable to block, a term should never change from failing to match a
+page to successfully matching it, unless that page is directly changed in a
+way that influences are not needed for ikiwiki to notice. But, if a term
+did not meet these criteria, it would have an influence. QED.
 
 #### Influence types