link updates

master
joey 2006-05-04 14:59:30 +00:00
parent 5edeedfc80
commit 253c4a9acc
3 changed files with 9 additions and 7 deletions

View File

@ -22,6 +22,9 @@ HTML is generated from W. rcs_update() will update from M to W.
CGI operates on W. rcs_commit() will commit from W to M. CGI operates on W. rcs_commit() will commit from W to M.
For all the gory details of how ikiwiki handles this behind the scenes,
see [[commit-internals]].
You browse and web-edit the wiki on W. You browse and web-edit the wiki on W.
@ -45,11 +48,11 @@ There is a working copy of R1: R2.
CGI operates on R2. rcs_commit() will push from R2 to R1. CGI operates on R2. rcs_commit() will push from R2 to R1.
You browse the wiki on R1 and web-edit it on R2. This means for example You browse the wiki on R1 and web-edit it on R2. This means for example
that R2 needs to be updated from R1 if you are going the web-edit a page, that R2 needs to be updated from R1 if you are going to web-edit a page,
as the user otherwise might be irritated otherwise... as the user otherwise might be irritated otherwise...
How do changes get from R1 to R2? Currently only internally in How do changes get from R1 to R2? Currently only internally in
rcs_commit(). Is rcs_prepedit() suitable? rcs\_commit(). Is rcs\_prepedit() suitable?
It follows that the HTML rendering and the CGI handling can be completely It follows that the HTML rendering and the CGI handling can be completely
separated parts in ikiwiki. separated parts in ikiwiki.
@ -62,11 +65,11 @@ darcs is a distributed RCS, which means that every checkout of a
repository is equal to the repository it was checked-out from. There is repository is equal to the repository it was checked-out from. There is
no forced hierarchy. no forced hierarchy.
R1 is the nevertheless called the master repository. It's used for R1 is nevertheless called the master repository. It's used for
collecting all the changes and publishing them: on the one hand via the collecting all the changes and publishing them: on the one hand via the
rendered HTML and on the other via the standard darcs RCS interface. rendered HTML and on the other via the standard darcs RCS interface.
R2, the repository where CGI operates on, is just a checkout of R1 and R2, the repository the CGI operates on, is just a checkout of R1 and
doesn't really differ from the other checkouts that people will branch doesn't really differ from the other checkouts that people will branch
off from R1. off from R1.

View File

@ -97,9 +97,6 @@ Some of ikiwiki's features:
shown in the file to resolve the conflict, so if you're already familiar shown in the file to resolve the conflict, so if you're already familiar
with that there's no new commit marker syntax to learn. with that there's no new commit marker syntax to learn.
For all the gory details of how ikiwiki handles this behind the scenes,
see [[commit-internals]].
* page locking * page locking
Wiki admins can lock pages so that only other admins can edit them. Wiki admins can lock pages so that only other admins can edit them.

View File

@ -147,3 +147,5 @@ modules. These are in the `IkiWiki::RCS` namespace, for example
Each RCS plugin must support all the IkiWiki::rcs\_* functions. Each RCS plugin must support all the IkiWiki::rcs\_* functions.
See IkiWiki::RCS::Stub for the full list of functions. It's ok if See IkiWiki::RCS::Stub for the full list of functions. It's ok if
rcs\_getctime does nothing except for throwing an error. rcs\_getctime does nothing except for throwing an error.
See [[about_RCS_backends]] for some more info.