diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ikiwiki.setup | 3 | ||||
| -rw-r--r-- | doc/todo.mdwn | 5 | ||||
| -rw-r--r-- | doc/usage.mdwn | 13 |
3 files changed, 13 insertions, 8 deletions
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index 7167e6e57..d0a2829a1 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -15,7 +15,8 @@ use IkiWiki::Setup::Standard { url => "http://myhost/wiki", cgiurl => "http://myhost/ikiwiki.cgi", - #historyurl => "http://svn.myhost/trunk/[[]]", + #historyurl => "http://svn.myhost/trunk/[[file]]", + #diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]", # Whether to integrate with svn. svn => 1, diff --git a/doc/todo.mdwn b/doc/todo.mdwn index 3e2374a4f..39d4604d7 100644 --- a/doc/todo.mdwn +++ b/doc/todo.mdwn @@ -87,11 +87,6 @@ design goals for ikiwiki: keeping as much markup as possible out of the wiki and not adding nonstandard markup. And it's not significantly hard to type "--\[[Joey]]", and as to the date, we do have page history. -## recentchanges links to commit diffs - -Would take a bit more viewcvs integration, let the be a "[diff]" link in -recentchanges that goes to the diff for any listed change. - ## recentchanges more than 100 Possibly add "next 100" link to it, but OTOH, you can just use svn log if diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 75e3aa246..debe04e1f 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -76,9 +76,18 @@ flags such as --verbose can be negated with --no-verbose. Specifies the url to the ikiwiki [[CGI]] script [[wrapper]]. Required when building the wiki for links to the cgi script to be generated. -* --historyurl http://svn.someurl/trunk/[[]]?root=wiki +* --historyurl http://svn.someurl/trunk/\[[file]]?root=wiki - Specifies the url to link to for page history browsing. In the url, "[[]]" is replaced with the page to browse. It's common to use [[ViewCVS]] for this. + Specifies the url to link to for page history browsing. In the url, + "\[[file]]" is replaced with the file to browse. It's common to use + [[ViewCVS]] for this. + +* --diffurl http://svn.someurl/trunk/\[[file]]?root=wiki&r1=\[[r1]]&r2=\[[r2]] + + Specifies the url to link to for a diff of changes to a page. In the url, + "\[[file]]" is replaced with the file to browse, "\[[r1]]" is the old + revision of the page, and "\[[r2]]" is the new revision. It's common to use + [[ViewCVS]] for this. * --exclude regexp |