diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-01-29 19:56:19 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-01-29 19:56:19 -0500 |
| commit | e050f35261fe453b70294b58bc6c87bfe57cf231 (patch) | |
| tree | 86017806a4899670ed9b07869abcecde94eec201 /doc/rcs | |
| parent | 4284719464cf2ed24546e87e8b4dfb4f36d8be4c (diff) | |
doc updates for bzr
Diffstat (limited to 'doc/rcs')
| -rw-r--r-- | doc/rcs/bzr.mdwn | 8 | ||||
| -rw-r--r-- | doc/rcs/details.mdwn | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/rcs/bzr.mdwn b/doc/rcs/bzr.mdwn new file mode 100644 index 000000000..19a7ae395 --- /dev/null +++ b/doc/rcs/bzr.mdwn @@ -0,0 +1,8 @@ +[Bazaar](http://bazaar-vcs.org/) is a distributed revison control +system developed by Canonical Ltd. Ikiwiki supports storing a wiki in a +bzr repository. + +Ikiwiki can run as a post-update hook to update a wiki whenever commits +come in. When running as a [[cgi]] with bzr, ikiwiki automatically +commits edited pages, and uses the bzr history to generate the +[[RecentChanges]] page. diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index 6b9ffb91f..449e129bd 100644 --- a/doc/rcs/details.mdwn +++ b/doc/rcs/details.mdwn @@ -352,3 +352,5 @@ merge again with a merger that inserts conflict markers. It commits this new revision with conflict markers to the repository. It then returns the text to the user for cleanup. This is less neat than it could be, in that a conflict marked revision gets committed to the repository. + +## [[bzr]] |