9d10726d48 2008-07-29       drh: <h1>Wiki In <a href="index.wiki">Fossil</a></h1>
9d10726d48 2008-07-29       drh: 
9d10726d48 2008-07-29       drh: Fossil uses <a href="../../../wiki_rules">wiki markup</a> for many
9d10726d48 2008-07-29       drh: things:
9d10726d48 2008-07-29       drh: 
9d10726d48 2008-07-29       drh:    *  Stand-alone wiki pages.
9d10726d48 2008-07-29       drh:    *  Description and comments in <a href="bugtheory.wiki">bug reports</a>.
9d10726d48 2008-07-29       drh:    *  Check-in comments.
9d10726d48 2008-07-29       drh:    *  <a href="embeddeddoc.wiki">Embedded documentation</a> files whose
9d10726d48 2008-07-29       drh:       name ends in "wiki".
9d10726d48 2008-07-29       drh: 
9d10726d48 2008-07-29       drh: The <a href="../../../wiki_rules">formatting rules</a> for fossil wiki
9d10726d48 2008-07-29       drh: are designed to be simple and intuitive.  The idea is that wiki provides
9d10726d48 2008-07-29       drh: paragaph breaks, numbered and bulletted lists, and hyperlinking for
9d10726d48 2008-07-29       drh: simple documents together with a safe subset of HTML for more complex
9d10726d48 2008-07-29       drh: formatting tasks.
9d10726d48 2008-07-29       drh: 
9d10726d48 2008-07-29       drh: <h2>Stand-alone Wiki Pages</h2>
9d10726d48 2008-07-29       drh: 
9d10726d48 2008-07-29       drh: Each wiki page has its own revision history which is independent of
9d10726d48 2008-07-29       drh: the sequence of baselines (check-ins).  Wiki pages can branch and merge
9d10726d48 2008-07-29       drh: just like baselines, though as of this writing (2008-07-29) there is
9d10726d48 2008-07-29       drh: no mechanism in the user interface to support branching and merging.
c8893c69ac 2008-10-05       drh: The current implementation of the wiki shows the version of the wiki
9d10726d48 2008-07-29       drh: pages that has the most recent timestamp.
9d10726d48 2008-07-29       drh: 
9d10726d48 2008-07-29       drh: In other words, if two users make unrelated changes to the same wiki
9d10726d48 2008-07-29       drh: page on separate repositories, then those repositories are synced,
9d10726d48 2008-07-29       drh: the wiki page will fork.  The web interface will display whichever edit
9d10726d48 2008-07-29       drh: was checked in last.  The other edit can be found in the history.  The
9d10726d48 2008-07-29       drh: file format will support merging the branches back together, but there
9d10726d48 2008-07-29       drh: is no mechanism in the user interface (yet) to perform the merge.
9d10726d48 2008-07-29       drh: 
9d10726d48 2008-07-29       drh: Every change to a wiki page is a separate
9d10726d48 2008-07-29       drh: <a href="fileformat.wiki">control artifact</a>
9d10726d48 2008-07-29       drh: of type <a href="fileformat.wiki#wikichng">"Wiki Page"</a>.
9d10726d48 2008-07-29       drh: 
9d10726d48 2008-07-29       drh: <i>To be continued...</i>