diff options
| -rw-r--r-- | doc/patchqueue/index.html_allowed.mdwn | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/patchqueue/index.html_allowed.mdwn b/doc/patchqueue/index.html_allowed.mdwn index 1c8aad9ad..c8b3b6b2b 100644 --- a/doc/patchqueue/index.html_allowed.mdwn +++ b/doc/patchqueue/index.html_allowed.mdwn @@ -241,6 +241,7 @@ How about doing the index stuff only on the output side? (Or does the latter pat >>>> Just do `svn co svn://ikiwiki.kitenet.net/ikiwiki/trunk ikiwiki` then `cd ikiwiki && patch -p0 <use_dirs.diff`. :-) Same would work with a tarball as well. +>>>>> Sorry, I'm dumb. I'm so used to doing -p1 that doing -p0 never occurred to me; I thought the patch format generated by svn diff was just "wrong". --Ethan ---- @@ -265,6 +266,10 @@ I'll attach an updated and slightly modified version below. * As we discussed in email, this will break handling of `foo/index.mdwn` pages. Needs to be changed to generate `foo/index/index.html` for such pages (though not for the toplevel `index`). + + >> Can someone elaborate on this? What's broken about it? Will pages + >> foo/index/index.html include foo/index in their parentlinks? --Ethan + * This does make the resulting wikis much less browsable directly on the filesystem, since `dir` to `dir/index.html` conversion is only handled by web servers and so you end up browsing to a directory index all the time. |