diff --git a/sd/using.mdwn b/sd/using.mdwn
index 7cd63f1..9da9b0d 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -1,3 +1,12 @@
+Explore endless possibilities with NSFW AI art from Kink AI, creating personalized erotic artwork tailored to your fantasies using advanced AI technology.
+
+<a href="https://chat.kink.ai/">nsfw ai art</a>
+
+
+
+<<<<<<< HEAD
+
+
 Transform your fitness journey with Motive Training ATX! This South Austin gym offers more than just personal training; it delivers long-term solutions for joint pain, muscle building, and injury recovery. With a team that’s fully committed to your success, you’ll finally see the results you’ve been hoping for!
 
 

diff --git a/sd/using.mdwn b/sd/using.mdwn
index 0942c43..7cd63f1 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -1,3 +1,14 @@
+Transform your fitness journey with Motive Training ATX! This South Austin gym offers more than just personal training; it delivers long-term solutions for joint pain, muscle building, and injury recovery. With a team that’s fully committed to your success, you’ll finally see the results you’ve been hoping for!
+
+
+<a href="www.motivetrainingatx.com">austin personal trainer</a>
+
+
+
+<<<<<<< HEAD
+
+
+
 Step into the future with <a href="https://www.happyml.com/">Happyml</a>
 's state-of-the-art chatbots. Designed for scalability and security, these bots ensure a seamless and efficient customer service experience, catering to a broad audience with diverse needs.
 

diff --git a/sd/using.mdwn b/sd/using.mdwn
index 351cf7d..0942c43 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -3,6 +3,10 @@ Step into the future with <a href="https://www.happyml.com/">Happyml</a>
 
 
 <<<<<<< HEAD
+
+<a href="https://exclusive-creators.com/">Onlyfans Creators</a>
+
+
 <a href="https://www.happyml.com/">Happyml</a>
 <<<<<<< HEAD
 >>>>>>> 2348c77422ee93f8feead387b55206a944e9b0fc

diff --git a/sd/using.mdwn b/sd/using.mdwn
index f1f015d..351cf7d 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -1,11 +1,13 @@
-Step into the future with Happyml's state-of-the-art chatbots. Designed for scalability and security, these bots ensure a seamless and efficient customer service experience, catering to a broad audience with diverse needs.
+Step into the future with <a href="https://www.happyml.com/">Happyml</a>
+'s state-of-the-art chatbots. Designed for scalability and security, these bots ensure a seamless and efficient customer service experience, catering to a broad audience with diverse needs.
 
-<<<<<<< HEAD
-=======
 
+<<<<<<< HEAD
 <a href="https://www.happyml.com/">Happyml</a>
 <<<<<<< HEAD
 >>>>>>> 2348c77422ee93f8feead387b55206a944e9b0fc
 =======
 >>>>>>> 0c416f78dedab933ff77035e1d7768fd6509c144
 
+=======
+>>>>>>> 53cd4c5f4a7b0c6bf80b6366041083114673f4ee

diff --git a/sd/using.mdwn b/sd/using.mdwn
index 04b31a2..f1f015d 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -4,6 +4,8 @@ Step into the future with Happyml's state-of-the-art chatbots. Designed for scal
 =======
 
 <a href="https://www.happyml.com/">Happyml</a>
+<<<<<<< HEAD
 >>>>>>> 2348c77422ee93f8feead387b55206a944e9b0fc
+=======
+>>>>>>> 0c416f78dedab933ff77035e1d7768fd6509c144
 
-https://www.happyml.com/

diff --git a/sd/using.mdwn b/sd/using.mdwn
index 11c2a27..04b31a2 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -1,4 +1,9 @@
 Step into the future with Happyml's state-of-the-art chatbots. Designed for scalability and security, these bots ensure a seamless and efficient customer service experience, catering to a broad audience with diverse needs.
 
+<<<<<<< HEAD
+=======
+
+<a href="https://www.happyml.com/">Happyml</a>
+>>>>>>> 2348c77422ee93f8feead387b55206a944e9b0fc
 
 https://www.happyml.com/

diff --git a/sd/using.mdwn b/sd/using.mdwn
index bc16791..11c2a27 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -1,732 +1,4 @@
-[[!meta title="Using SD"]]
+Step into the future with Happyml's state-of-the-art chatbots. Designed for scalability and security, these bots ensure a seamless and efficient customer service experience, catering to a broad audience with diverse needs.
 
-Getting started with SD
-==========
-
-SD is a peer to peer ticket tracking system built on the Prophet
-distributed database. SD is designed to make it easy to work with tickets
-and to share ticket databases with your collaborators.
-
-You can watch this Youtube video of SD in action: [http://youtu.be/w2e-TL_Vtwc](http://youtu.be/w2e-TL_Vtwc)
-
-To get started with SD, you need a ticket database. To get a ticket
-database, you have two options: You can clone an existing database
-or start a new one.
-
-SD will store its local database replica in the path specified by the
-SD\_REPO environment variable. Generally, you will want to use a shell
-script or alias wrapper to set this variable if you have more than one
-SD replica. Two scripts distributed with SD will set SD\_REPO from the
-VCS of the project directory you're currently in: git-sd and darcs-sd.
-If you write a wrapper for another VCS, please contribute it back!
-
-To clone a ticket database:
-
->     sd clone --from http://example.com/path/to/sd
-
-To start a new ticket database:
-
->     sd init
-
-Or, using the git-sd script within a project checkout:
-
->     git sd init
-
-To configure your project's name, milestones and components:
-
->     sd settings edit
-
-To create a ticket, run:
-
->     sd ticket create
-
-To list all tickets in your database:
-
->     sd ticket list
-
-To publish your database:
-
->     sd publish joeuser@myhost.example.com:public\_html/mydb
-
-To learn a bit more about what you can do with SD:
-
->     sd help
-
-Searching for and displaying tickets
-==========
-
->     sd ticket search
-<p class="code-annotation">      List all tickets with a status that does not match 'closed'.
-      Note that 'list' is an alias for 'search'.
-</p>
-
->     sd ticket search --regex abc
-<p class="code-annotation">      List all tickets with content (in any property) matching 'abc'. Regular
-      expressions are Perl regexes.
-</p>
-
->     sd ticket search -- status!=closed summary =~ http
-<p class="code-annotation">      List all tickets with a status property that does not match closed and a
-      summary matching 'http'.
-</p>
-
->     sd ticket search --group owner
-    sd ticket search -g owner
-       List all tickets with a status property that does not match 'closed',
-       grouped by owner.
-
->     sd ticket search --sort due
-    sd ticket search -s due
-       List all tickets with a status property that does not match 'closed',
-       sorted by due date.
-
->     sd ticket basics 1234
-<p class="code-annotation">      Show basic information (metadata only) for the ticket with local id 1234.
-</p>
-
->     sd ticket show 1234
-<p class="code-annotation">      Show basic information and history and list attachments for the ticket
-      with local id 1234.
-</p>
-
->     sd ticket details 1234
-<p class="code-annotation">      Show basic information, comments, and history, and list attachments for
-      the ticket with local id 1234.
-</p>
-
->     sd ticket show 1234 --all-props
-    sd ticket show 1234 -a
-<p class="code-annotation">      Show all properties of the given ticket, even if they aren't in
-      the database setting common\_ticket\_props (or local configuration
-      variable 'ticket.common\_props' if it exists).
-</p>
-
->     sd ticket show 1234 --skip-history
-    sd ticket show 1234 -s
-<p class="code-annotation">      Show only metadata and a list of attachments for the ticket 1234 (but
-      not history).
-</p>
-
->     sd ticket show 1234 --with-history
-    sd ticket show 1234 -h
-<p class="code-annotation">      Override the ticket.no-implicit-history-display config option if it is
-      set for this replica. (See 'sd help config' for more info.)
-</p>
-
->     sd ticket history 1234
-<p class="code-annotation">      Show history for the ticket with local id 1234.
-</p>
-
->     sd ticket delete 1234
-<p class="code-annotation">      Delete ticket with local id 1234.
-</p>
-
-Creating and Updating tickets
-==========
-
->     sd ticket create
-<p class="code-annotation">      Invokes a text editor with a ticket creation template.
-      Note that 'new' is an alias for 'create'.
-</p>
-
->     sd ticket create --verbose
-    sd ticket create -v
-<p class="code-annotation">      Invokes a text editor with a ticket creation template
-      and also shows descriptions and valid values for
-      properties.
-</p>
-
->     sd ticket create -- summary="This is a summary" status=open
-<p class="code-annotation">      Create a new ticket non-interactively.
-</p>
-
->     sd ticket update 123 -- status=closed
-<p class="code-annotation">      Sets the status of the ticket with local id 123 to closed.
-      Note that 'edit' is an alias for 'update'.
-</p>
-
->     sd ticket update 123
-<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
-      editor.
-</p>
-
->     sd ticket update 123 --verbose
-    sd ticket update 123 -v
-<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
-      editor and show descriptions and valid values for props.
-</p>
-
->     sd ticket update 123 --all-props
-    sd ticket update 123 -a
-<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
-      editor, presenting all the props of the record for editing instead of
-      just those specified by the database setting 'common\_ticket\_props'
-      (or local configuration variable 'common\_ticket\_props' if it exists).
-</p>
-
->     sd ticket update fad5849a-67f1-11dd-bde1-5b33d3ff2799 -- status=closed
-<p class="code-annotation">      Sets the status of the ticket with uuid
-      fad5849a-67f1-11dd-bde1-5b33d3ff2799 to closed.
-</p>
-
->     sd ticket take 123
-<p class="code-annotation">      Sets the owner of ticket 123 to you (your email address is taken
-      from either the 'email\_address' local config variable or the
-      EMAIL environmental variable). An alias of 'take' is 'claim'.
-</p>
-
->     sd ticket give 123 nobody@example.com
-<p class="code-annotation">      Sets the owner of ticket 123 to nobody@example.com.
-      An alias of 'give' is 'assign'.
-</p>
-
->     sd ticket resolve 123
-    sd ticket close 123
-<p class="code-annotation">      Sets the status of the ticket with local id 123 to closed.
-</p>
-
->     sd ticket resolve 123 --edit
-    sd ticket resolve 123 -e
-<p class="code-annotation">      Sets the status of the ticket with local id 123 to closed,
-      allowing you to edit any properties in an editor and
-      optionally add a comment in the process.
-</p>
-

(Diff truncated)

diff --git a/diezelsun.mdwn b/diezelsun.mdwn
index 84d8524..00f8a18 100644
--- a/diezelsun.mdwn
+++ b/diezelsun.mdwn
@@ -1,5 +1,5 @@
-DiezelSun, Александр Татарников - популярный 3d моделлер, игровой дизайнер.
+Diezel Sun, Александр Татарников - популярный 3d моделлер, игровой дизайнер.
 
-DiezelSun  - artist, illustrator, game designer. In his creativity there are paintings executed on game engines, such as unity. The paintings are made in the style of a computer, they have their esoteric meaning. The game takes place on the engine design unity, the similarity SCP horror games.
+Diezel Sun  - artist, illustrator, game designer. In his creativity there are paintings executed on game engines, such as unity. The paintings are made in the style of a computer, they have their esoteric meaning. The game takes place on the engine design unity, the similarity SCP horror games.
 
 Links

diff --git a/diezelsun.mdwn b/diezelsun.mdwn
new file mode 100644
index 0000000..84d8524
--- /dev/null
+++ b/diezelsun.mdwn
@@ -0,0 +1,5 @@
+DiezelSun, Александр Татарников - популярный 3d моделлер, игровой дизайнер.
+
+DiezelSun  - artist, illustrator, game designer. In his creativity there are paintings executed on game engines, such as unity. The paintings are made in the style of a computer, they have their esoteric meaning. The game takes place on the engine design unity, the similarity SCP horror games.
+
+Links

diff --git a/prophet/download.mdwn b/prophet/download.mdwn
index 1eb5115..7416103 100644
--- a/prophet/download.mdwn
+++ b/prophet/download.mdwn
@@ -1,29 +1,41 @@
 [[!meta title="Get Prophet"]]
 
-Released versions of Prophet are available on CPAN and in
-[Debian](http://packages.debian.org/sid/libprophet-perl) and
-[Ubuntu](http://packages.ubuntu.com/oneiric/libprophet-perl). If you're
-running one of these operating systems, you can install the latest
+Prophet is currently undergoing a major refactoring, so we recommend installing
+the released packages if you just want to try using it.
+
+# Releases
+
+## CPAN
+
+https://metacpan.org/module/Prophet
+
+## Distibution Packages
+* [Debian](http://packages.debian.org/libprophet-perl)
+* [Ubuntu](http://packages.ubuntu.com/libprophet-perl).
+If you're running one of these operating systems, you can install the latest
 prophet release like this:
 
 >apt-get install libprophet-perl
 
-Prophet is currently undergoing rapid development however, so we
-recommend installing directly from Git if you can.
+# Git
 
 The following command will get you a copy of the source tree you can install:
 
 >git clone git://gitorious.org/prophet/prophet.git
 
-Once you've downloaded Prophet, you can install it:
+The development branches require [Dist::Zilla](https://metacpan.org/module/Dist::Zilla)
+to build.
+
+Starting from v0.751, the tagged releases are already prepared by Dist::Zilla
+and can be built with:
 
 >cd prophet
 
->PERL_MM_USE_DEFAULT=1 perl Makefile.PL
+>perl Build.PL
 
->make test
+>./Build test
 
->make install
+>./Build install
 
 In the hopefully unlikely event that Prophet doesn't pass its tests,
 please [tell the developers](/contact/) about it so we can improve things.

diff --git a/sd/using.mdwn b/sd/using.mdwn
index a53afc4..bc16791 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -317,16 +317,16 @@ tracker, you should get in touch with SD's developers (see
 
 The RT server is specified as as rt:serveraddress|Queue|Query
 
->     sd clone --from "rt:[http://rt3.fsck.com](http://rt3.fsck.com)|rt3|Owner='jesse'"
+>     sd clone --from "rt:http://rt3.fsck.com|rt3|Owner='jesse'"
 <p class="code-annotation">      Create a local replica and pull data from a foreign replica.
 </p>
 
->     sd push --to "rt:[http://rt3.fsck.com](http://rt3.fsck.com)|rt3|Owner='jesse'"
+>     sd push --to "rt:http://rt3.fsck.com|rt3|Owner='jesse'"
 <p class="code-annotation">      Push changes to the given foreign replica. Foreign replica
       schemas will vary based on the replica type.
 </p>
 
->     sd pull --from "rt:[http://rt3.fsck.com](http://rt3.fsck.com)|rt3|Owner='jesse'"
+>     sd pull --from "rt:http://rt3.fsck.com|rt3|Owner='jesse'"
 <p class="code-annotation">      Pull changes from a foreign replica to be merged into the
       local replica.
 </p>

diff --git a/index.mdwn b/index.mdwn
index ec6877b..0b5416b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,7 +2,7 @@
 
 News
 ====
-y.kawasaki edited
+
 2009-08-28
 ----------------
 

diff --git a/index.mdwn b/index.mdwn
index 0b5416b..ec6877b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,7 +2,7 @@
 
 News
 ====
-
+y.kawasaki edited
 2009-08-28
 ----------------
 

diff --git a/sd.mdwn b/sd.mdwn
index e8be93c..75632fe 100644
--- a/sd.mdwn
+++ b/sd.mdwn
@@ -14,7 +14,6 @@ trackers that SD supports.
  * [Trac](http://trac.edgewall.com/)
  * [GitHub](http://github.com/)
  * [Google Code](http://code.google.com/)
- * [Redmine](http://redmine.org/)
 * Command-line interface, including an interactive shell
 * Git and Darcs VCS integration
 * Local, single-user web UI

diff --git a/sd/foreign-replicas.mdwn b/sd/foreign-replicas.mdwn
index 96ef68f..bc11e8b 100644
--- a/sd/foreign-replicas.mdwn
+++ b/sd/foreign-replicas.mdwn
@@ -10,12 +10,12 @@ Edit me! Keep me up-to-date!
 <tr><td>RT</td><td>??</td><td>??</td><td>??</td></tr>
 <tr><td>Hiveminder</td><td>good</td><td>??</td><td>??</td><td>bugs closed not via
 SD will not be updated in SD (fix waiting on Hiveminder API change)</td></tr>
-<tr><td>Trac</td><td></td><td></td><td></td></tr>
-<tr><td>GitHub</td><td></td><td></td><td></td></tr>
-<tr><td>Google Code</td><td></td><td</td><td></td></tr>
-<tr><td>JIRA</td><td>??</td><td>??</td><td>Not Started</td></tr>
-<tr><td>Lighthouse</td><td></td><td</td><td></td></tr>
-<tr><td>Redmine</td><td></td><td></td><td></td></tr>
+<tr><td>Trac</td><td>??</td><td>??</td><td>??</td><td>??</td></tr>
+<tr><td>GitHub</td><td>??</td><td>??</td><td>??</td><td>??</td></tr>
+<tr><td>Google Code</td><td>??</td><td>??</td><td>??</td><td>??</td></tr>
+<tr><td>JIRA</td><td>??</td><td>??</td><td>??</td><td>Not Started</td></tr>
+<tr><td>Lighthouse</td><td>??</td><td>??</td><td>??</td><td>??</td></tr>
+<tr><td>Redmine</td><td>??</td><td>??</td><td>??</td><td>??</td></tr>
 <tr><td>Debbugs</td><td>started</td><td>not started</td><td>not started</td><td></td></tr>
 </tbody>
 </table>

diff --git a/sd/foreign-replicas.mdwn b/sd/foreign-replicas.mdwn
index 466d3bf..96ef68f 100644
--- a/sd/foreign-replicas.mdwn
+++ b/sd/foreign-replicas.mdwn
@@ -13,7 +13,7 @@ SD will not be updated in SD (fix waiting on Hiveminder API change)</td></tr>
 <tr><td>Trac</td><td></td><td></td><td></td></tr>
 <tr><td>GitHub</td><td></td><td></td><td></td></tr>
 <tr><td>Google Code</td><td></td><td</td><td></td></tr>
-<tr><td>JIRA</td><td></td><td</td><td>Not started</td></tr>
+<tr><td>JIRA</td><td>??</td><td>??</td><td>Not Started</td></tr>
 <tr><td>Lighthouse</td><td></td><td</td><td></td></tr>
 <tr><td>Redmine</td><td></td><td></td><td></td></tr>
 <tr><td>Debbugs</td><td>started</td><td>not started</td><td>not started</td><td></td></tr>

diff --git a/sd/foreign-replicas.mdwn b/sd/foreign-replicas.mdwn
index 46b3db3..466d3bf 100644
--- a/sd/foreign-replicas.mdwn
+++ b/sd/foreign-replicas.mdwn
@@ -13,6 +13,7 @@ SD will not be updated in SD (fix waiting on Hiveminder API change)</td></tr>
 <tr><td>Trac</td><td></td><td></td><td></td></tr>
 <tr><td>GitHub</td><td></td><td></td><td></td></tr>
 <tr><td>Google Code</td><td></td><td</td><td></td></tr>
+<tr><td>JIRA</td><td></td><td</td><td>Not started</td></tr>
 <tr><td>Lighthouse</td><td></td><td</td><td></td></tr>
 <tr><td>Redmine</td><td></td><td></td><td></td></tr>
 <tr><td>Debbugs</td><td>started</td><td>not started</td><td>not started</td><td></td></tr>

diff --git a/sd/using.mdwn b/sd/using.mdwn
index 8889942..a53afc4 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -301,19 +301,19 @@ Sharing ticket databases
 SD can sync to external systems as well as itself. Currently, there 
 are foreign replica types for:
 
->     RT ([http://bestpractical.com/rt](http://bestpractical.com/rt))
-    Hiveminder ([http://hiveminder.com/](http://hiveminder.com/))
-    Trac ([http://trac.edgewall.com](http://trac.edgewall.com))
-    Google Code ([http://code.google.com](http://code.google.com))
-    GitHub ([http://github.com](http://github.com)). 
+- RT (<http://bestpractical.com/rt>)
+- Hiveminder (<http://hiveminder.com/>)
+- Trac (<http://trac.edgewall.com>)
+- Google Code (<http://code.google.com>)
+- GitHub (<http://github.com>)
 
 Read-only support is available for:
 
-     Redmine ([http://redmine.org](http://redmine.org))
+Redmine (<http://redmine.org>)
 
 If you're interested in building a replica type for your bug 
 tracker, you should get in touch with SD's developers (see
-[http://syncwith.us/contact](http://syncwith.us/contact)).
+<http://syncwith.us/contact>).
 
 The RT server is specified as as rt:serveraddress|Queue|Query
 

diff --git a/sd/foreign-replicas.mdwn b/sd/foreign-replicas.mdwn
index 7dc6f73..46b3db3 100644
--- a/sd/foreign-replicas.mdwn
+++ b/sd/foreign-replicas.mdwn
@@ -8,13 +8,13 @@ Edit me! Keep me up-to-date!
 </thead>
 <tbody>
 <tr><td>RT</td><td>??</td><td>??</td><td>??</td></tr>
-<tr><td>Hiveminder</td><td>good</td><td>??</td>??<td>bugs closed not via
+<tr><td>Hiveminder</td><td>good</td><td>??</td><td>??</td><td>bugs closed not via
 SD will not be updated in SD (fix waiting on Hiveminder API change)</td></tr>
 <tr><td>Trac</td><td></td><td></td><td></td></tr>
 <tr><td>GitHub</td><td></td><td></td><td></td></tr>
 <tr><td>Google Code</td><td></td><td</td><td></td></tr>
 <tr><td>Lighthouse</td><td></td><td</td><td></td></tr>
 <tr><td>Redmine</td><td></td><td></td><td></td></tr>
-<tr><td>Debbugs</td>started<td>not started</td><td>not started</td><td></td></tr>
+<tr><td>Debbugs</td><td>started</td><td>not started</td><td>not started</td><td></td></tr>
 </tbody>
 </table>

diff --git a/sd/foreign-replicas.mdwn b/sd/foreign-replicas.mdwn
new file mode 100644
index 0000000..7dc6f73
--- /dev/null
+++ b/sd/foreign-replicas.mdwn
@@ -0,0 +1,20 @@
+[[!meta title="Foreign ticket tracker status for SD"]]
+
+Edit me! Keep me up-to-date!
+
+<table>
+<thead>
+<tr><th>ticket tracker</th><th>Pull/Clone</th><th>Push</th><th>Tests</th><th>Notes</th></tr>
+</thead>
+<tbody>
+<tr><td>RT</td><td>??</td><td>??</td><td>??</td></tr>
+<tr><td>Hiveminder</td><td>good</td><td>??</td>??<td>bugs closed not via
+SD will not be updated in SD (fix waiting on Hiveminder API change)</td></tr>
+<tr><td>Trac</td><td></td><td></td><td></td></tr>
+<tr><td>GitHub</td><td></td><td></td><td></td></tr>
+<tr><td>Google Code</td><td></td><td</td><td></td></tr>
+<tr><td>Lighthouse</td><td></td><td</td><td></td></tr>
+<tr><td>Redmine</td><td></td><td></td><td></td></tr>
+<tr><td>Debbugs</td>started<td>not started</td><td>not started</td><td></td></tr>
+</tbody>
+</table>

diff --git a/sd.mdwn b/sd.mdwn
index 19c8089..e8be93c 100644
--- a/sd.mdwn
+++ b/sd.mdwn
@@ -27,6 +27,10 @@ trackers that SD supports.
 
 Visit the [Get SD](/sd/download/) page to learn how to get and install SD.
 
+# Foreign ticket tracker compatibility
+
+[More details on the state of SD's various foreign ticket tracker bridges.](/sd/foreign-replicas)
+
 # Support
 
 If you have a problem using SD, submit a bug report or ask for help on *#prophet* on *irc.freenode.net* or SD’s mailing list.

diff --git a/sd/using.mdwn b/sd/using.mdwn
index e553dd8..8889942 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -7,7 +7,7 @@ SD is a peer to peer ticket tracking system built on the Prophet
 distributed database. SD is designed to make it easy to work with tickets
 and to share ticket databases with your collaborators.
 
-You can watch this video of YouTube in action: [http://youtu.be/w2e-TL_Vtwc](http://youtu.be/w2e-TL_Vtwc)
+You can watch this Youtube video of SD in action: [http://youtu.be/w2e-TL_Vtwc](http://youtu.be/w2e-TL_Vtwc)
 
 To get started with SD, you need a ticket database. To get a ticket
 database, you have two options: You can clone an existing database

diff --git a/sd/using.mdwn b/sd/using.mdwn
index 00fe176..e553dd8 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -7,6 +7,8 @@ SD is a peer to peer ticket tracking system built on the Prophet
 distributed database. SD is designed to make it easy to work with tickets
 and to share ticket databases with your collaborators.
 
+You can watch this video of YouTube in action: [http://youtu.be/w2e-TL_Vtwc](http://youtu.be/w2e-TL_Vtwc)
+
 To get started with SD, you need a ticket database. To get a ticket
 database, you have two options: You can clone an existing database
 or start a new one.

diff --git a/sd/contributing.mdwn b/sd/contributing.mdwn
index d6b4a4e..c1c1ca8 100644
--- a/sd/contributing.mdwn
+++ b/sd/contributing.mdwn
@@ -73,7 +73,7 @@ After you've sent us a patch that looks good, you're eligible to get commit
 access to the repository, if you want it. [Ask us](/contact/) if we forget to
 ask you.
 
-Contributors
+Contributors (as of 20 May 2011)
 -------------
 * Jesse Vincent	504 (39.72%)
 * Christine Spang	307 (24.19%)

diff --git a/sd/contributing.mdwn b/sd/contributing.mdwn
index a79cadd..d6b4a4e 100644
--- a/sd/contributing.mdwn
+++ b/sd/contributing.mdwn
@@ -72,3 +72,27 @@ Getting commit access
 After you've sent us a patch that looks good, you're eligible to get commit
 access to the repository, if you want it. [Ask us](/contact/) if we forget to
 ask you.
+
+Contributors
+-------------
+* Jesse Vincent	504 (39.72%)
+* Christine Spang	307 (24.19%)
+* sunnavy	138 (10.87%)
+* Shawn Moore	116 (9.14%)
+* Ruslan Zakirov	83 (6.54%)
+* Kang-min Liu	31 (2.44%)
+* Shawn M Moore	25 (1.97%)
+* franck cuny	15 (1.18%)
+* c9s	7 (0.55%)
+* Alec Clews	7 (0.55%)
+* Kevin Falcone	6 (0.47%)
+* Casey West	5 (0.39%)
+* Alex Vandiver	5 (0.39%)
+* Arjen Laarhoven	3 (0.24%)
+* Thomas Sibley	2 (0.16%)
+* Nelson Elhage	2 (0.16%)
+* Michael G. Schwern	2 (0.16%)
+* Hans Dieter Pearcey	2 (0.16%)
+* Chia-liang Kao	2 (0.16%)
+* Yanick Champoux	1 (0.08%)
+

diff --git a/sd.mdwn b/sd.mdwn
index 87712a5..19c8089 100644
--- a/sd.mdwn
+++ b/sd.mdwn
@@ -33,4 +33,5 @@ If you have a problem using SD, submit a bug report or ask for help on *#prophet
 
 # Contributors
 
-Without the contributions of the community SD could not exist so we thank the people on out [Contributors](/sd/contributors) page.
+Without the contributions of the community SD could not exist so we thank the people on our [Contributing](/sd/contributing) page.
+

diff --git a/sd.mdwn b/sd.mdwn
index f991691..87712a5 100644
--- a/sd.mdwn
+++ b/sd.mdwn
@@ -30,3 +30,7 @@ Visit the [Get SD](/sd/download/) page to learn how to get and install SD.
 # Support
 
 If you have a problem using SD, submit a bug report or ask for help on *#prophet* on *irc.freenode.net* or SD’s mailing list.
+
+# Contributors
+
+Without the contributions of the community SD could not exist so we thank the people on out [Contributors](/sd/contributors) page.

diff --git a/sd/bugs.mdwn b/sd/bugs.mdwn
index 51f53bb..51e87f5 100644
--- a/sd/bugs.mdwn
+++ b/sd/bugs.mdwn
@@ -5,11 +5,11 @@ have an installed copy of SD, you can create a local clone of the current live
 database by running the following command from a checkout of SD's git
 repository:
 
-> git sd clone --from http://fsck.com/~jesse/sd-bugs/
+> git sd clone --from http://spang.cc/data/sd-bugs/
 
 Or, if you don't have or want a local checkout of SD:
 
-> SD\_REPO=~/sd-bugs sd clone --from http://fsck.com/~jesse/sd-bugs/
+> SD\_REPO=~/sd-bugs sd clone --from http://spang.cc/data/sd-bugs/
 
 You can update your copy of the buglist by running:
 

diff --git a/contact.mdwn b/contact.mdwn
index 17cfd1c..3449296 100644
--- a/contact.mdwn
+++ b/contact.mdwn
@@ -7,7 +7,7 @@ on IRC and can always contact us by email.
 IRC
 ===
 
-Prophet's developers hang out on #prophet on irc.freenode.net.
+Prophet's developers hang out on #prophet on irc.oftc.net.
 
 Electronic Mail
 ===========

diff --git a/prophet/download.mdwn b/prophet/download.mdwn
index a8a1fcf..1eb5115 100644
--- a/prophet/download.mdwn
+++ b/prophet/download.mdwn
@@ -1,6 +1,15 @@
-Released versions of Prophet are available on CPAN. Prophet is currently
-undergoing rapid development however, so we recommend installing
-directly from Git if you can.
+[[!meta title="Get Prophet"]]
+
+Released versions of Prophet are available on CPAN and in
+[Debian](http://packages.debian.org/sid/libprophet-perl) and
+[Ubuntu](http://packages.ubuntu.com/oneiric/libprophet-perl). If you're
+running one of these operating systems, you can install the latest
+prophet release like this:
+
+>apt-get install libprophet-perl
+
+Prophet is currently undergoing rapid development however, so we
+recommend installing directly from Git if you can.
 
 The following command will get you a copy of the source tree you can install:
 
diff --git a/sd/download.mdwn b/sd/download.mdwn
index 51b6dc1..3575c03 100644
--- a/sd/download.mdwn
+++ b/sd/download.mdwn
@@ -1,8 +1,15 @@
 [[!meta title="Get SD"]]
 
-Released versions of SD are available on CPAN. SD is currently
-undergoing rapid development however, so we recommend installing
-directly from Git if you can.
+Released versions of SD are available on CPAN and in
+[Debian](http://packages.debian.org/sid/sd) and
+[Ubuntu](http://packages.ubuntu.com/oneiric/sd). If you're
+running one of these operating systems, you can install the latest
+prophet release like this:
+
+>apt-get install sd
+
+SD is currently undergoing rapid development however, so we recommend
+installing directly from Git if you can.
 
 Before you install SD, you'll need to [install
 Prophet](/prophet/download/)..

diff --git a/index.mdwn b/index.mdwn
index 48c239e..0b5416b 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -43,7 +43,7 @@ can help make SD work better with your bug tracker,
 Installation
 ================
 
-Follow the installations on the [[Installation]] page to install Prophet
+Follow the instructions on the [[installation]] page to install Prophet
 and SD.
 
 *header photo original:

diff --git a/index.mdwn b/index.mdwn
index a2576da..48c239e 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -26,8 +26,6 @@ Prophet's buzzword-laden pitch reads something like this:
 The best place to start learning about Prophet is
 [a few recent slides decks and videos](/talks/).
 
-[Get Prophet](/prophet/download/)
-
 [[SD]] (Simple Defects)
 ===============
 

diff --git a/sd/download.mdwn b/sd/download.mdwn
index 7f1b956..51b6dc1 100644
--- a/sd/download.mdwn
+++ b/sd/download.mdwn
@@ -2,14 +2,14 @@
 
 Released versions of SD are available on CPAN. SD is currently
 undergoing rapid development however, so we recommend installing
-directly from Git if you can. SD's public mirror is currently hosted on
-GitHub.
+directly from Git if you can.
 
-Before you install SD, you'll need to install Prophet.
+Before you install SD, you'll need to [install
+Prophet](/prophet/download/)..
 
 The following command will get you a copy of the source tree you can install:
 
->git clone git://github.com/bestpractical/sd.git
+>git clone git://gitorious.org/prophet/sd.git
 
 Once you've downloaded SD, you can install it:
 
@@ -22,4 +22,4 @@ Once you've downloaded SD, you can install it:
 >make install
 
 In the hopefully unlikely event that SD doesn't pass its tests, please
-tell the developers about it so we can improve things.
+[tell the developers](/contact/) about it so we can improve things.

diff --git a/sd/download.mdwn b/sd/download.mdwn
index cb6e2d6..7f1b956 100644
--- a/sd/download.mdwn
+++ b/sd/download.mdwn
@@ -1,4 +1,9 @@
-Released versions of SD are available on CPAN. SD is currently undergoing rapid development however, so we recommend installing directly from Git if you can. SD's public mirror is currently hosted on GitHub.
+[[!meta title="Get SD"]]
+
+Released versions of SD are available on CPAN. SD is currently
+undergoing rapid development however, so we recommend installing
+directly from Git if you can. SD's public mirror is currently hosted on
+GitHub.
 
 Before you install SD, you'll need to install Prophet.
 
@@ -16,4 +21,5 @@ Once you've downloaded SD, you can install it:
 
 >make install
 
-In the hopefully unlikely event that SD doesn't pass its tests, please tell the developers about it so we can improve things.
+In the hopefully unlikely event that SD doesn't pass its tests, please
+tell the developers about it so we can improve things.

diff --git a/sd/bugs.mdwn b/sd/bugs.mdwn
index 78368fa..51f53bb 100644
--- a/sd/bugs.mdwn
+++ b/sd/bugs.mdwn
@@ -1,3 +1,5 @@
+[[!meta title="Tracking bugs in SD"]]
+
 It should come as no surprise that we use SD to track bugs in itself. If you
 have an installed copy of SD, you can create a local clone of the current live
 database by running the following command from a checkout of SD's git

diff --git a/sd/bugs.mdwn b/sd/bugs.mdwn
new file mode 100644
index 0000000..78368fa
--- /dev/null
+++ b/sd/bugs.mdwn
@@ -0,0 +1,22 @@
+It should come as no surprise that we use SD to track bugs in itself. If you
+have an installed copy of SD, you can create a local clone of the current live
+database by running the following command from a checkout of SD's git
+repository:
+
+> git sd clone --from http://fsck.com/~jesse/sd-bugs/
+
+Or, if you don't have or want a local checkout of SD:
+
+> SD\_REPO=~/sd-bugs sd clone --from http://fsck.com/~jesse/sd-bugs/
+
+You can update your copy of the buglist by running:
+
+> git sd pull --all
+
+Submitting bug reports to SD's developers
+=========================================
+
+For now, submit bug reports on SD against ["App-SD" on CPAN's Request
+Tracker](https://rt.cpan.org/Public/Dist/Display.html?Name=App-SD).  You can
+also send email to <bug-App-SD@rt.cpan.org>. We'll regularly sync
+SD's bug replica with the RT queue.

diff --git a/sd.mdwn b/sd.mdwn
index eccba32..f991691 100644
--- a/sd.mdwn
+++ b/sd.mdwn
@@ -25,8 +25,8 @@ trackers that SD supports.
 
 # Getting SD
 
-Visit the [[Get SD]] page to learn how to get and install SD.
+Visit the [Get SD](/sd/download/) page to learn how to get and install SD.
 
-#Support
+# Support
 
 If you have a problem using SD, submit a bug report or ask for help on *#prophet* on *irc.freenode.net* or SD’s mailing list.

diff --git a/sd.mdwn b/sd.mdwn
index 03ba422..eccba32 100644
--- a/sd.mdwn
+++ b/sd.mdwn
@@ -1,4 +1,9 @@
-SD is a peer-to-peer bug tracker that’s built for sharing and use both online and offline. With SD, you can sync your bugs back and forth between other instances of SD, and even between SD and other bug trackers that SD supports.
+[[!meta title="SD (Simple Defects)"]]
+
+SD is a peer-to-peer bug tracker that’s built for sharing and use both
+online and offline. With SD, you can sync your bugs back and forth
+between other instances of SD, and even between SD and other bug
+trackers that SD supports.
 
 # Features
 

diff --git a/sharecropping.mdwn b/sharecropping.mdwn
index 48c7631..dd8583a 100644
--- a/sharecropping.mdwn
+++ b/sharecropping.mdwn
@@ -1,3 +1,5 @@
+[[!meta title="Web 2.0 is Sharecropping"]]
+
 Social computing is a good thing. Being able to share data easily has
 led to astounding advances in what we all think of as the web over the
 past few years. It's unlikely that anyone reading this is unaware of all

diff --git a/sharecropping.mdwn b/sharecropping.mdwn
new file mode 100644
index 0000000..48c7631
--- /dev/null
+++ b/sharecropping.mdwn
@@ -0,0 +1,14 @@
+Social computing is a good thing. Being able to share data easily has
+led to astounding advances in what we all think of as the web over the
+past few years. It's unlikely that anyone reading this is unaware of all
+the cool stuff Web 2.0 has brought with it.
+
+What's worrying is how the current generation of Internet technology has
+increasingly centralized control of just about everything into very few
+hands. What we've seen is essentially a return to a sharecropping model
+where users neither own their tools nor the computers those tools run
+on.
+
+Prophet is one possible answer to the problems presented by current
+cloud computing systems. It's our deepest hope that we'll see a rich
+ecosystem of distributed social tools in the coming months and years.

diff --git a/prophet/download.mdwn b/prophet/download.mdwn
index afa9907..a8a1fcf 100644
--- a/prophet/download.mdwn
+++ b/prophet/download.mdwn
@@ -1,8 +1,10 @@
-Released versions of Prophet are available on CPAN. Prophet is currently undergoing rapid development however, so we recommend installing directly from Git if you can. Prophet's public mirror is currently hosted on GitHub.
+Released versions of Prophet are available on CPAN. Prophet is currently
+undergoing rapid development however, so we recommend installing
+directly from Git if you can.
 
 The following command will get you a copy of the source tree you can install:
 
->git clone git://github.com/bestpractical/prophet.git
+>git clone git://gitorious.org/prophet/prophet.git
 
 Once you've downloaded Prophet, you can install it:
 
@@ -14,5 +16,5 @@ Once you've downloaded Prophet, you can install it:
 
 >make install
 
-
-In the hopefully unlikely event that Prophet doesn't pass its tests, please tell the developers about it so we can improve things.
+In the hopefully unlikely event that Prophet doesn't pass its tests,
+please [tell the developers](/contact/) about it so we can improve things.

diff --git a/sidebar.mdwn b/sidebar.mdwn
index b58d1ab..af0d356 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,8 +1,7 @@
-* [Home](/)
+* [Prophet home](/)
+  * [Get Prophet](/prophet/download/)
 * [Why?](/sharecropping/)
 * [Presentations](/talks/)
-* Prophet
-  * [Get Prophet](/prophet/download/)
 * [SD](/sd/)
   * [Get SD](/sd/download/)
   * [Using SD](/sd/using/)

diff --git a/sd/using.mdwn b/sd/using.mdwn
index d18c10a..00fe176 100644
--- a/sd/using.mdwn
+++ b/sd/using.mdwn
@@ -22,95 +22,78 @@ To clone a ticket database:
 
 >     sd clone --from http://example.com/path/to/sd
 
-
 To start a new ticket database:
 
 >     sd init
 
-
 Or, using the git-sd script within a project checkout:
 
 >     git sd init
 
-
 To configure your project's name, milestones and components:
 
 >     sd settings edit
 
-
 To create a ticket, run:
 
 >     sd ticket create
 
-
 To list all tickets in your database:
 
 >     sd ticket list
 
-
 To publish your database:
 
 >     sd publish joeuser@myhost.example.com:public\_html/mydb
 
-
 To learn a bit more about what you can do with SD:
 
 >     sd help
 
-
 Searching for and displaying tickets
 ==========
 
 >     sd ticket search
-
 <p class="code-annotation">      List all tickets with a status that does not match 'closed'.
       Note that 'list' is an alias for 'search'.
 </p>
 
 >     sd ticket search --regex abc
-
 <p class="code-annotation">      List all tickets with content (in any property) matching 'abc'. Regular
       expressions are Perl regexes.
 </p>
 
 >     sd ticket search -- status!=closed summary =~ http
-
 <p class="code-annotation">      List all tickets with a status property that does not match closed and a
       summary matching 'http'.
 </p>
 
 >     sd ticket search --group owner
     sd ticket search -g owner
-
        List all tickets with a status property that does not match 'closed',
        grouped by owner.
 
 >     sd ticket search --sort due
     sd ticket search -s due
-
        List all tickets with a status property that does not match 'closed',
        sorted by due date.
 
 >     sd ticket basics 1234
-
 <p class="code-annotation">      Show basic information (metadata only) for the ticket with local id 1234.
 </p>
 
 >     sd ticket show 1234
-
 <p class="code-annotation">      Show basic information and history and list attachments for the ticket
       with local id 1234.
 </p>
 
 >     sd ticket details 1234
-
 <p class="code-annotation">      Show basic information, comments, and history, and list attachments for
       the ticket with local id 1234.
 </p>
 
 >     sd ticket show 1234 --all-props
     sd ticket show 1234 -a
-
 <p class="code-annotation">      Show all properties of the given ticket, even if they aren't in
       the database setting common\_ticket\_props (or local configuration
       variable 'ticket.common\_props' if it exists).
@@ -118,25 +101,21 @@ Searching for and displaying tickets
 
 >     sd ticket show 1234 --skip-history
     sd ticket show 1234 -s
-
 <p class="code-annotation">      Show only metadata and a list of attachments for the ticket 1234 (but
       not history).
 </p>
 
 >     sd ticket show 1234 --with-history
     sd ticket show 1234 -h
-
 <p class="code-annotation">      Override the ticket.no-implicit-history-display config option if it is
       set for this replica. (See 'sd help config' for more info.)
 </p>
 
 >     sd ticket history 1234
-
 <p class="code-annotation">      Show history for the ticket with local id 1234.
 </p>
 
 >     sd ticket delete 1234
-
 <p class="code-annotation">      Delete ticket with local id 1234.
 </p>
 
@@ -144,46 +123,39 @@ Creating and Updating tickets
 ==========
 
 >     sd ticket create
-
 <p class="code-annotation">      Invokes a text editor with a ticket creation template.
       Note that 'new' is an alias for 'create'.
 </p>
 
 >     sd ticket create --verbose
     sd ticket create -v
-
 <p class="code-annotation">      Invokes a text editor with a ticket creation template
       and also shows descriptions and valid values for
       properties.
 </p>
 
 >     sd ticket create -- summary="This is a summary" status=open
-
 <p class="code-annotation">      Create a new ticket non-interactively.
 </p>
 
 >     sd ticket update 123 -- status=closed
-
 <p class="code-annotation">      Sets the status of the ticket with local id 123 to closed.
       Note that 'edit' is an alias for 'update'.
 </p>
 
 >     sd ticket update 123
-
 <p class="code-annotation">      Interactively update the ticket with local id 123 in a text
       editor.
 </p>
 
 >     sd ticket update 123 --verbose
     sd ticket update 123 -v
-
 <p class="code-annotation">      Interactively update the ticket with local id 123 in a text
       editor and show descriptions and valid values for props.
 </p>
 
 >     sd ticket update 123 --all-props
     sd ticket update 123 -a
-
 <p class="code-annotation">      Interactively update the ticket with local id 123 in a text
       editor, presenting all the props of the record for editing instead of
       just those specified by the database setting 'common\_ticket\_props'
@@ -191,33 +163,28 @@ Creating and Updating tickets
 </p>
 
 >     sd ticket update fad5849a-67f1-11dd-bde1-5b33d3ff2799 -- status=closed
-
 <p class="code-annotation">      Sets the status of the ticket with uuid
       fad5849a-67f1-11dd-bde1-5b33d3ff2799 to closed.
 </p>
 
 >     sd ticket take 123
-
 <p class="code-annotation">      Sets the owner of ticket 123 to you (your email address is taken
       from either the 'email\_address' local config variable or the
       EMAIL environmental variable). An alias of 'take' is 'claim'.
 </p>
 
 >     sd ticket give 123 nobody@example.com
-
 <p class="code-annotation">      Sets the owner of ticket 123 to nobody@example.com.
       An alias of 'give' is 'assign'.
 </p>
 
 >     sd ticket resolve 123
     sd ticket close 123
-
 <p class="code-annotation">      Sets the status of the ticket with local id 123 to closed.
 </p>

(Diff truncated)

diff --git a/sd/using.mdwn b/sd/using.mdwn
new file mode 100644
index 0000000..d18c10a
--- /dev/null
+++ b/sd/using.mdwn
@@ -0,0 +1,847 @@
+[[!meta title="Using SD"]]
+
+Getting started with SD
+==========
+
+SD is a peer to peer ticket tracking system built on the Prophet
+distributed database. SD is designed to make it easy to work with tickets
+and to share ticket databases with your collaborators.
+
+To get started with SD, you need a ticket database. To get a ticket
+database, you have two options: You can clone an existing database
+or start a new one.
+
+SD will store its local database replica in the path specified by the
+SD\_REPO environment variable. Generally, you will want to use a shell
+script or alias wrapper to set this variable if you have more than one
+SD replica. Two scripts distributed with SD will set SD\_REPO from the
+VCS of the project directory you're currently in: git-sd and darcs-sd.
+If you write a wrapper for another VCS, please contribute it back!
+
+To clone a ticket database:
+
+>     sd clone --from http://example.com/path/to/sd
+
+
+To start a new ticket database:
+
+>     sd init
+
+
+Or, using the git-sd script within a project checkout:
+
+>     git sd init
+
+
+To configure your project's name, milestones and components:
+
+>     sd settings edit
+
+
+To create a ticket, run:
+
+>     sd ticket create
+
+
+To list all tickets in your database:
+
+>     sd ticket list
+
+
+To publish your database:
+
+>     sd publish joeuser@myhost.example.com:public\_html/mydb
+
+
+To learn a bit more about what you can do with SD:
+
+>     sd help
+
+
+Searching for and displaying tickets
+==========
+
+>     sd ticket search
+
+<p class="code-annotation">      List all tickets with a status that does not match 'closed'.
+      Note that 'list' is an alias for 'search'.
+</p>
+
+>     sd ticket search --regex abc
+
+<p class="code-annotation">      List all tickets with content (in any property) matching 'abc'. Regular
+      expressions are Perl regexes.
+</p>
+
+>     sd ticket search -- status!=closed summary =~ http
+
+<p class="code-annotation">      List all tickets with a status property that does not match closed and a
+      summary matching 'http'.
+</p>
+
+>     sd ticket search --group owner
+    sd ticket search -g owner
+
+       List all tickets with a status property that does not match 'closed',
+       grouped by owner.
+
+>     sd ticket search --sort due
+    sd ticket search -s due
+
+       List all tickets with a status property that does not match 'closed',
+       sorted by due date.
+
+>     sd ticket basics 1234
+
+<p class="code-annotation">      Show basic information (metadata only) for the ticket with local id 1234.
+</p>
+
+>     sd ticket show 1234
+
+<p class="code-annotation">      Show basic information and history and list attachments for the ticket
+      with local id 1234.
+</p>
+
+>     sd ticket details 1234
+
+<p class="code-annotation">      Show basic information, comments, and history, and list attachments for
+      the ticket with local id 1234.
+</p>
+
+>     sd ticket show 1234 --all-props
+    sd ticket show 1234 -a
+
+<p class="code-annotation">      Show all properties of the given ticket, even if they aren't in
+      the database setting common\_ticket\_props (or local configuration
+      variable 'ticket.common\_props' if it exists).
+</p>
+
+>     sd ticket show 1234 --skip-history
+    sd ticket show 1234 -s
+
+<p class="code-annotation">      Show only metadata and a list of attachments for the ticket 1234 (but
+      not history).
+</p>
+
+>     sd ticket show 1234 --with-history
+    sd ticket show 1234 -h
+
+<p class="code-annotation">      Override the ticket.no-implicit-history-display config option if it is
+      set for this replica. (See 'sd help config' for more info.)
+</p>
+
+>     sd ticket history 1234
+
+<p class="code-annotation">      Show history for the ticket with local id 1234.
+</p>
+
+>     sd ticket delete 1234
+
+<p class="code-annotation">      Delete ticket with local id 1234.
+</p>
+
+Creating and Updating tickets
+==========
+
+>     sd ticket create
+
+<p class="code-annotation">      Invokes a text editor with a ticket creation template.
+      Note that 'new' is an alias for 'create'.
+</p>
+
+>     sd ticket create --verbose
+    sd ticket create -v
+
+<p class="code-annotation">      Invokes a text editor with a ticket creation template
+      and also shows descriptions and valid values for
+      properties.
+</p>
+
+>     sd ticket create -- summary="This is a summary" status=open
+
+<p class="code-annotation">      Create a new ticket non-interactively.
+</p>
+
+>     sd ticket update 123 -- status=closed
+
+<p class="code-annotation">      Sets the status of the ticket with local id 123 to closed.
+      Note that 'edit' is an alias for 'update'.
+</p>
+
+>     sd ticket update 123
+
+<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
+      editor.
+</p>
+
+>     sd ticket update 123 --verbose
+    sd ticket update 123 -v
+
+<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
+      editor and show descriptions and valid values for props.
+</p>
+
+>     sd ticket update 123 --all-props
+    sd ticket update 123 -a
+
+<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
+      editor, presenting all the props of the record for editing instead of
+      just those specified by the database setting 'common\_ticket\_props'
+      (or local configuration variable 'common\_ticket\_props' if it exists).
+</p>
+
+>     sd ticket update fad5849a-67f1-11dd-bde1-5b33d3ff2799 -- status=closed
+

(Diff truncated)

diff --git a/using.mdwn b/using.mdwn
new file mode 100644
index 0000000..d18c10a
--- /dev/null
+++ b/using.mdwn
@@ -0,0 +1,847 @@
+[[!meta title="Using SD"]]
+
+Getting started with SD
+==========
+
+SD is a peer to peer ticket tracking system built on the Prophet
+distributed database. SD is designed to make it easy to work with tickets
+and to share ticket databases with your collaborators.
+
+To get started with SD, you need a ticket database. To get a ticket
+database, you have two options: You can clone an existing database
+or start a new one.
+
+SD will store its local database replica in the path specified by the
+SD\_REPO environment variable. Generally, you will want to use a shell
+script or alias wrapper to set this variable if you have more than one
+SD replica. Two scripts distributed with SD will set SD\_REPO from the
+VCS of the project directory you're currently in: git-sd and darcs-sd.
+If you write a wrapper for another VCS, please contribute it back!
+
+To clone a ticket database:
+
+>     sd clone --from http://example.com/path/to/sd
+
+
+To start a new ticket database:
+
+>     sd init
+
+
+Or, using the git-sd script within a project checkout:
+
+>     git sd init
+
+
+To configure your project's name, milestones and components:
+
+>     sd settings edit
+
+
+To create a ticket, run:
+
+>     sd ticket create
+
+
+To list all tickets in your database:
+
+>     sd ticket list
+
+
+To publish your database:
+
+>     sd publish joeuser@myhost.example.com:public\_html/mydb
+
+
+To learn a bit more about what you can do with SD:
+
+>     sd help
+
+
+Searching for and displaying tickets
+==========
+
+>     sd ticket search
+
+<p class="code-annotation">      List all tickets with a status that does not match 'closed'.
+      Note that 'list' is an alias for 'search'.
+</p>
+
+>     sd ticket search --regex abc
+
+<p class="code-annotation">      List all tickets with content (in any property) matching 'abc'. Regular
+      expressions are Perl regexes.
+</p>
+
+>     sd ticket search -- status!=closed summary =~ http
+
+<p class="code-annotation">      List all tickets with a status property that does not match closed and a
+      summary matching 'http'.
+</p>
+
+>     sd ticket search --group owner
+    sd ticket search -g owner
+
+       List all tickets with a status property that does not match 'closed',
+       grouped by owner.
+
+>     sd ticket search --sort due
+    sd ticket search -s due
+
+       List all tickets with a status property that does not match 'closed',
+       sorted by due date.
+
+>     sd ticket basics 1234
+
+<p class="code-annotation">      Show basic information (metadata only) for the ticket with local id 1234.
+</p>
+
+>     sd ticket show 1234
+
+<p class="code-annotation">      Show basic information and history and list attachments for the ticket
+      with local id 1234.
+</p>
+
+>     sd ticket details 1234
+
+<p class="code-annotation">      Show basic information, comments, and history, and list attachments for
+      the ticket with local id 1234.
+</p>
+
+>     sd ticket show 1234 --all-props
+    sd ticket show 1234 -a
+
+<p class="code-annotation">      Show all properties of the given ticket, even if they aren't in
+      the database setting common\_ticket\_props (or local configuration
+      variable 'ticket.common\_props' if it exists).
+</p>
+
+>     sd ticket show 1234 --skip-history
+    sd ticket show 1234 -s
+
+<p class="code-annotation">      Show only metadata and a list of attachments for the ticket 1234 (but
+      not history).
+</p>
+
+>     sd ticket show 1234 --with-history
+    sd ticket show 1234 -h
+
+<p class="code-annotation">      Override the ticket.no-implicit-history-display config option if it is
+      set for this replica. (See 'sd help config' for more info.)
+</p>
+
+>     sd ticket history 1234
+
+<p class="code-annotation">      Show history for the ticket with local id 1234.
+</p>
+
+>     sd ticket delete 1234
+
+<p class="code-annotation">      Delete ticket with local id 1234.
+</p>
+
+Creating and Updating tickets
+==========
+
+>     sd ticket create
+
+<p class="code-annotation">      Invokes a text editor with a ticket creation template.
+      Note that 'new' is an alias for 'create'.
+</p>
+
+>     sd ticket create --verbose
+    sd ticket create -v
+
+<p class="code-annotation">      Invokes a text editor with a ticket creation template
+      and also shows descriptions and valid values for
+      properties.
+</p>
+
+>     sd ticket create -- summary="This is a summary" status=open
+
+<p class="code-annotation">      Create a new ticket non-interactively.
+</p>
+
+>     sd ticket update 123 -- status=closed
+
+<p class="code-annotation">      Sets the status of the ticket with local id 123 to closed.
+      Note that 'edit' is an alias for 'update'.
+</p>
+
+>     sd ticket update 123
+
+<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
+      editor.
+</p>
+
+>     sd ticket update 123 --verbose
+    sd ticket update 123 -v
+
+<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
+      editor and show descriptions and valid values for props.
+</p>
+
+>     sd ticket update 123 --all-props
+    sd ticket update 123 -a
+
+<p class="code-annotation">      Interactively update the ticket with local id 123 in a text
+      editor, presenting all the props of the record for editing instead of
+      just those specified by the database setting 'common\_ticket\_props'
+      (or local configuration variable 'common\_ticket\_props' if it exists).
+</p>
+
+>     sd ticket update fad5849a-67f1-11dd-bde1-5b33d3ff2799 -- status=closed
+

(Diff truncated)

diff --git a/talks.mdwn b/talks.mdwn
index cc4a335..74afaa5 100644
--- a/talks.mdwn
+++ b/talks.mdwn
@@ -21,4 +21,9 @@ Prophet at YAPC::Asia 2008
 Jesse introduced Prophet at
 [YAPC::Asia in May 2008](http://conferences.yapcasia.org/ya2008/talk/985).
 
+<script type="text/javascript" src="http://www.nicovideo.jp/thumb_watch/sm3327042"></script><embed type="application/x-shockwave-flash" id="external_nico_0" name="external_nico_0" src="http://ext.nicovideo.jp/swf/thumbwatch.swf?ts=1213857307" allowscriptaccess="always" bgcolor="#000000" quality="high" flashvars="thumbWatch=1&amp;playerTimestamp=1216370172&amp;v=sm3327042&amp;thumbTitle=Step3%3A%20Prophet%20-%20Jesse%20Vincent&amp;thumbDescription=yapcasia2008%20day%3A1%20track%3A2%20(2008-05-15)%20Jesse%20Vincent%20%20%20next...&amp;thumbImage=http%3A%2F%2Ftn-skr1.smilevideo.jp%2Fsmile%3Fi%3D3327042&amp;thumbWidth=485&amp;thumbHeight=385&amp;mylist_counter=1&amp;movie_type=mp4&amp;wv_id=sm3327042&amp;thumbPlayKey=1216884494.aND4dSfYFWmAwx7WuKIeSLghWhE" height="385" width="485">
+
+Other Talks
+===========
+
 <div style="width:425px" id="__ss_409645"> <strong style="display:block;margin:12px 0 4px"><a href="http://www.slideshare.net/obrajesse/prophet-a-peer-to-peer-replicated-disconnected-database" title="Prophet - A peer to peer replicated disconnected database">Prophet - A peer to peer replicated disconnected database</a></strong> <iframe src="http://www.slideshare.net/slideshow/embed_code/409645" width="425" height="355" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe> <div style="padding:5px 0 12px"> View more <a href="http://www.slideshare.net/">presentations</a> from <a href="http://www.slideshare.net/obrajesse">obrajesse</a> </div> </div>

diff --git a/talks.mdwn b/talks.mdwn
index d8bb52f..cc4a335 100644
--- a/talks.mdwn
+++ b/talks.mdwn
@@ -7,8 +7,10 @@ Jesse presented this 55 slide rant as a 5 minute talk at [Ignite
 Boston in May
 2008](http://ignite.oreilly.com/2008/06/ignite-boston-3-files-uploaded.html").
 
+
 <div style="width:425px" id="__ss_436358"> <strong style="display:block;margin:12px 0 4px"><a href="http://www.slideshare.net/obrajesse/web-20-is-sharecropping" title="Web 2.0 is Sharecropping">Web 2.0 is Sharecropping</a></strong> <iframe src="http://www.slideshare.net/slideshow/embed_code/436358" width="425" height="355" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe> <div style="padding:5px 0 12px"> View more <a href="http://www.slideshare.net/">presentations</a> from <a href="http://www.slideshare.net/obrajesse">obrajesse</a> </div> </div>
 
+
 You can watch
 [a video of Jesse's
 talk](http://cachefly.oreilly.com/ignite/boston3/IgniteTranscripts/12\_Jesse\_Vincent.m4v).

diff --git a/talks.mdwn b/talks.mdwn
index 94b51e0..d8bb52f 100644
--- a/talks.mdwn
+++ b/talks.mdwn
@@ -7,23 +7,7 @@ Jesse presented this 55 slide rant as a 5 minute talk at [Ignite
 Boston in May
 2008](http://ignite.oreilly.com/2008/06/ignite-boston-3-files-uploaded.html").
 
-<div style="width:425px;text-align:left" id="__ss_436358"><a
-style="font:14px Helvetica,Arial,Sans-serif;display:block;margin:12px 0
-3px 0;text-decoration:underline;"
-href="http://www.slideshare.net/obrajesse/web-20-is-sharecropping?src=embed"
-title="Web 2.0 is Sharecropping">Web 2.0 is Sharecropping</a><object
-style="margin:0px" width="425" height="355"><param name="movie"
-value="http://static.slideshare.net/swf/ssplayer2.swf?doc=igniteboston-1212114248086547-9"/><param
-name="allowFullScreen" value="true"/><param name="allowScriptAccess"
-value="always"/><embed
-src="http://static.slideshare.net/swf/ssplayer2.swf?doc=igniteboston-1212114248086547-9"
-type="application/x-shockwave-flash" allowscriptaccess="always"
-allowfullscreen="true" width="425" height="355"></embed></object><div
-style="font-size:11px;font-family:tahoma,arial;height:26px;padding-top:2px;">view
-<a
-href="http://www.slideshare.net/obrajesse/web-20-is-sharecropping?src=embed"
-title="View Web 2.0 is Sharecropping on
-SlideShare">presentation</a></div></div>
+<div style="width:425px" id="__ss_436358"> <strong style="display:block;margin:12px 0 4px"><a href="http://www.slideshare.net/obrajesse/web-20-is-sharecropping" title="Web 2.0 is Sharecropping">Web 2.0 is Sharecropping</a></strong> <iframe src="http://www.slideshare.net/slideshow/embed_code/436358" width="425" height="355" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe> <div style="padding:5px 0 12px"> View more <a href="http://www.slideshare.net/">presentations</a> from <a href="http://www.slideshare.net/obrajesse">obrajesse</a> </div> </div>
 
 You can watch
 [a video of Jesse's
@@ -35,32 +19,4 @@ Prophet at YAPC::Asia 2008
 Jesse introduced Prophet at
 [YAPC::Asia in May 2008](http://conferences.yapcasia.org/ya2008/talk/985).
 
-<script type="text/javascript"
-src="http://www.nicovideo.jp/thumb_watch/sm3327042"></script><embed
-type="application/x-shockwave-flash" id="external_nico_0"
-name="external_nico_0"
-src="http://ext.nicovideo.jp/swf/thumbwatch.swf?ts=1213857307"
-allowscriptaccess="always" bgcolor="#000000" quality="high"
-flashvars="thumbWatch=1&amp;playerTimestamp=1216370172&amp;v=sm3327042&amp;thumbTitle=Step3%3A%20Prophet%20-%20Jesse%20Vincent&amp;thumbDescription=yapcasia2008%20day%3A1%20track%3A2%20(2008-05-15)%20Jesse%20Vincent%20%20%20next...&amp;thumbImage=http%3A%2F%2Ftn-skr1.smilevideo.jp%2Fsmile%3Fi%3D3327042&amp;thumbWidth=485&amp;thumbHeight=385&amp;mylist_counter=1&amp;movie_type=mp4&amp;wv_id=sm3327042&amp;thumbPlayKey=1216884494.aND4dSfYFWmAwx7WuKIeSLghWhE"
-height="385" width="485"> </p>
-<p>
-<div style="width:425px;text-align:left" id="__ss_409645"><a
-style="font:14px Helvetica,Arial,Sans-serif;display:block;margin:12px 0
-3px 0;text-decoration:underline;"
-href="http://www.slideshare.net/obrajesse/prophet-a-peer-to-peer-replicated-disconnected-database?src=embed"
-title="Prophet - A peer to peer replicated disconnected
-database">Prophet - A peer to peer replicated disconnected
-database</a><object style="margin:0px" width="425" height="355"><param
-name="movie"
-value="http://static.slideshare.net/swf/ssplayer2.swf?doc=yapcasia08prophet-1210922212891548-9"/><param
-name="allowFullScreen" value="true"/><param name="allowScriptAccess"
-value="always"/><embed
-src="http://static.slideshare.net/swf/ssplayer2.swf?doc=yapcasia08prophet-1210922212891548-9"
-type="application/x-shockwave-flash" allowscriptaccess="always"
-allowfullscreen="true" width="425" height="355"></embed></object><div
-style="font-size:11px;font-family:tahoma,arial;height:26px;padding-top:2px;">view
-<a
-href="http://www.slideshare.net/obrajesse/prophet-a-peer-to-peer-replicated-disconnected-database?src=embed"
-title="View Prophet - A peer to peer replicated disconnected database on
-SlideShare">presentation</a>
- </div></div>
+<div style="width:425px" id="__ss_409645"> <strong style="display:block;margin:12px 0 4px"><a href="http://www.slideshare.net/obrajesse/prophet-a-peer-to-peer-replicated-disconnected-database" title="Prophet - A peer to peer replicated disconnected database">Prophet - A peer to peer replicated disconnected database</a></strong> <iframe src="http://www.slideshare.net/slideshow/embed_code/409645" width="425" height="355" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe> <div style="padding:5px 0 12px"> View more <a href="http://www.slideshare.net/">presentations</a> from <a href="http://www.slideshare.net/obrajesse">obrajesse</a> </div> </div>

diff --git a/talks.mdwn b/talks.mdwn
new file mode 100644
index 0000000..94b51e0
--- /dev/null
+++ b/talks.mdwn
@@ -0,0 +1,66 @@
+[[!meta title="Talks about Prophet and Sharecropping"]]
+
+Web 2.0 is Sharecropping (Ignite Boston)
+========================================
+
+Jesse presented this 55 slide rant as a 5 minute talk at [Ignite
+Boston in May
+2008](http://ignite.oreilly.com/2008/06/ignite-boston-3-files-uploaded.html").
+
+<div style="width:425px;text-align:left" id="__ss_436358"><a
+style="font:14px Helvetica,Arial,Sans-serif;display:block;margin:12px 0
+3px 0;text-decoration:underline;"
+href="http://www.slideshare.net/obrajesse/web-20-is-sharecropping?src=embed"
+title="Web 2.0 is Sharecropping">Web 2.0 is Sharecropping</a><object
+style="margin:0px" width="425" height="355"><param name="movie"
+value="http://static.slideshare.net/swf/ssplayer2.swf?doc=igniteboston-1212114248086547-9"/><param
+name="allowFullScreen" value="true"/><param name="allowScriptAccess"
+value="always"/><embed
+src="http://static.slideshare.net/swf/ssplayer2.swf?doc=igniteboston-1212114248086547-9"
+type="application/x-shockwave-flash" allowscriptaccess="always"
+allowfullscreen="true" width="425" height="355"></embed></object><div
+style="font-size:11px;font-family:tahoma,arial;height:26px;padding-top:2px;">view
+<a
+href="http://www.slideshare.net/obrajesse/web-20-is-sharecropping?src=embed"
+title="View Web 2.0 is Sharecropping on
+SlideShare">presentation</a></div></div>
+
+You can watch
+[a video of Jesse's
+talk](http://cachefly.oreilly.com/ignite/boston3/IgniteTranscripts/12\_Jesse\_Vincent.m4v).
+
+Prophet at YAPC::Asia 2008
+==========================
+
+Jesse introduced Prophet at
+[YAPC::Asia in May 2008](http://conferences.yapcasia.org/ya2008/talk/985).
+
+<script type="text/javascript"
+src="http://www.nicovideo.jp/thumb_watch/sm3327042"></script><embed
+type="application/x-shockwave-flash" id="external_nico_0"
+name="external_nico_0"
+src="http://ext.nicovideo.jp/swf/thumbwatch.swf?ts=1213857307"
+allowscriptaccess="always" bgcolor="#000000" quality="high"
+flashvars="thumbWatch=1&amp;playerTimestamp=1216370172&amp;v=sm3327042&amp;thumbTitle=Step3%3A%20Prophet%20-%20Jesse%20Vincent&amp;thumbDescription=yapcasia2008%20day%3A1%20track%3A2%20(2008-05-15)%20Jesse%20Vincent%20%20%20next...&amp;thumbImage=http%3A%2F%2Ftn-skr1.smilevideo.jp%2Fsmile%3Fi%3D3327042&amp;thumbWidth=485&amp;thumbHeight=385&amp;mylist_counter=1&amp;movie_type=mp4&amp;wv_id=sm3327042&amp;thumbPlayKey=1216884494.aND4dSfYFWmAwx7WuKIeSLghWhE"
+height="385" width="485"> </p>
+<p>
+<div style="width:425px;text-align:left" id="__ss_409645"><a
+style="font:14px Helvetica,Arial,Sans-serif;display:block;margin:12px 0
+3px 0;text-decoration:underline;"
+href="http://www.slideshare.net/obrajesse/prophet-a-peer-to-peer-replicated-disconnected-database?src=embed"
+title="Prophet - A peer to peer replicated disconnected
+database">Prophet - A peer to peer replicated disconnected
+database</a><object style="margin:0px" width="425" height="355"><param
+name="movie"
+value="http://static.slideshare.net/swf/ssplayer2.swf?doc=yapcasia08prophet-1210922212891548-9"/><param
+name="allowFullScreen" value="true"/><param name="allowScriptAccess"
+value="always"/><embed
+src="http://static.slideshare.net/swf/ssplayer2.swf?doc=yapcasia08prophet-1210922212891548-9"
+type="application/x-shockwave-flash" allowscriptaccess="always"
+allowfullscreen="true" width="425" height="355"></embed></object><div
+style="font-size:11px;font-family:tahoma,arial;height:26px;padding-top:2px;">view
+<a
+href="http://www.slideshare.net/obrajesse/prophet-a-peer-to-peer-replicated-disconnected-database?src=embed"
+title="View Prophet - A peer to peer replicated disconnected database on
+SlideShare">presentation</a>
+ </div></div>

diff --git a/sd/contributing.mdwn b/sd/contributing.mdwn
index 3fc4250..a79cadd 100644
--- a/sd/contributing.mdwn
+++ b/sd/contributing.mdwn
@@ -1,3 +1,5 @@
+[[!meta title="Contributing to SD"]]
+
 Want to help out with SD? Great! We're always interested in new contributors,
 and have plenty of tasks that new people can help out with. Help make SD work
 better for you.

diff --git a/sd/contributing.mdwn b/sd/contributing.mdwn
new file mode 100644
index 0000000..3fc4250
--- /dev/null
+++ b/sd/contributing.mdwn
@@ -0,0 +1,72 @@
+Want to help out with SD? Great! We're always interested in new contributors,
+and have plenty of tasks that new people can help out with. Help make SD work
+better for you.
+
+Making the website better
+=========================
+
+This website is a wiki! Please edit liberally—if you think something
+could be better, chances are it could.
+
+You can also edit the website [using git](/ikiwiki.cgi?do=branchable). [Drop us
+a line](/contact/) if you want to get a commit bit! (Really, just ask. We'd
+love to give you one.)
+
+Increasing test coverage
+========================
+
+We currently have pretty good test coverage, but it can always be better. We're
+publishing coverage analysis reports for [Prophet
+here](http://web.mit.edu/spang/Public/prophet/prophet-coverage/) and [SD
+here](http://web.mit.edu/spang/Public/prophet/sd-coverage/). New tests that
+increase our coverage are gratefully accepted.
+
+Squashing bugs
+==============
+
+If there's anything from [the bug list](/sd/bugs/) that catches your interest,
+or if you find a new bug, feel free to fix it and submit a patch. If it's a
+feature-wishlist bug that requires design alterations, however, you may wish to
+talk to us first to make sure your ideas and ours are in line.
+
+Documentation
+=============
+
+We're currently lacking a good tutorial, screenshots, and other bling to show
+people and help them use SD. Some ideas for things we're looking for here can
+be found by searching for tickets assigned to the "docs" component (from a
+checked out copy of SD's git repository, with the SD bug replica cloned:
+
+> git sd ticket search -- component=docs 'status=~new|open'
+
+Writing foreign replica syncs
+=============================
+
+If you want to write a foreign replica module for an issue tracker that SD
+doesn't support yet, we'd love to hear from you.
+
+Submitting patches
+==================
+
+So, you've written a patch. Rock on! Now you just need to get it applied.
+
+Our preferred way of receiving patches is by email.
+
+From your checkout of Prophet or SD:
+
+> git format-patch origin/master
+
+And then [email us](/contact/) the generated patch(es). Try to send it to the
+right list for whatever you're patching, but most of us are subscribed to both
+lists and we're not too picky about it.
+
+When submitting patches, try to have good commit messages and separate your
+patches into logical units. But don't worry about being perfect—the worst
+that can happen is that we ask for an amended patch with changes.
+
+Getting commit access
+---------------------
+
+After you've sent us a patch that looks good, you're eligible to get commit
+access to the repository, if you want it. [Ask us](/contact/) if we forget to
+ask you.

diff --git a/contact.mdwn b/contact.mdwn
index c91302e..17cfd1c 100644
--- a/contact.mdwn
+++ b/contact.mdwn
@@ -1,6 +1,8 @@
 [[!meta title="Get in touch"]]
 
-Despite Prophet being designed for "offline" replication, Prophet's developers are nearly constantly online. You can usually find us on IRC and can always contact us by email.
+Despite Prophet being designed for "offline" replication, Prophet's (and
+SD's) developers are nearly constantly online. You can usually find us
+on IRC and can always contact us by email.
 
 IRC
 ===
@@ -10,4 +12,10 @@ Prophet's developers hang out on #prophet on irc.freenode.net.
 Electronic Mail
 ===========
 
-If you're looking for something a little more asynchronous than IRC, electronic mail is always a reasonable option. You can [sign up for the Prophet mailing list or browse the list archives](http://lists.bestpractical.com/mailman/listinfo/prophet) over at Best Practical's mailing list server.
+If you're looking for something a little more asynchronous than IRC,
+electronic mail is always a reasonable option. You can
+[sign up for the Prophet mailing list or browse the list
+archives](http://lists.bestpractical.com/mailman/listinfo/prophet) over
+at Best Practical's mailing list server. There's also an [SD
+list](http://lists.bestpractical.com/mailman/listinfo/sd) for
+SD-specific discussion.

diff --git a/get_prophet.mdwn b/get_prophet.mdwn
deleted file mode 100644
index afa9907..0000000
--- a/get_prophet.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-Released versions of Prophet are available on CPAN. Prophet is currently undergoing rapid development however, so we recommend installing directly from Git if you can. Prophet's public mirror is currently hosted on GitHub.
-
-The following command will get you a copy of the source tree you can install:
-
->git clone git://github.com/bestpractical/prophet.git
-
-Once you've downloaded Prophet, you can install it:
-
->cd prophet
-
->PERL_MM_USE_DEFAULT=1 perl Makefile.PL
-
->make test
-
->make install
-
-
-In the hopefully unlikely event that Prophet doesn't pass its tests, please tell the developers about it so we can improve things.
diff --git a/get_sd.mdwn b/get_sd.mdwn
deleted file mode 100644
index cb6e2d6..0000000
--- a/get_sd.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-Released versions of SD are available on CPAN. SD is currently undergoing rapid development however, so we recommend installing directly from Git if you can. SD's public mirror is currently hosted on GitHub.
-
-Before you install SD, you'll need to install Prophet.
-
-The following command will get you a copy of the source tree you can install:
-
->git clone git://github.com/bestpractical/sd.git
-
-Once you've downloaded SD, you can install it:
-
->cd sd
-
->PERL_MM_USE_DEFAULT=1 perl Makefile.PL
-
->make test
-
->make install
-
-In the hopefully unlikely event that SD doesn't pass its tests, please tell the developers about it so we can improve things.
diff --git a/index.mdwn b/index.mdwn
index e56fa4d..a2576da 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,32 +6,47 @@ News
 2009-08-28
 ----------------
 
-We've just released Prophet and SD 0.7 (Cavil) You can download them from [CPAN](http://search.cpan.org/dist/App-SD/) or [Gitorious](https://gitorious.org/prophet). For more information, have a look at the [blog post](http://blog.bestpractical.com/2009/08/prophet-and-sd-07-cavil-are-now-available.html).
+We've just released Prophet and SD 0.7 (Cavil) You can download them
+from [CPAN](http://search.cpan.org/dist/App-SD/) or
+[Gitorious](https://gitorious.org/prophet). For more information, have a
+look at the [blog post](http://blog.bestpractical.com/2009/08/prophet-and-sd-07-cavil-are-now-available.html).
 
 Prophet
 ======
 
-Prophet is a new kind of database designed for the post Web-2.0 world. It's made to let you collaborate with your friends and coworkers without needing any kind of special server or internet provider.
+Prophet is a new kind of database designed for the post Web-2.0 world.
+It's made to let you collaborate with your friends and coworkers without
+needing any kind of special server or internet provider.
 
 Prophet's buzzword-laden pitch reads something like this:
 
-> A grounded, semirelational, peer to peer replicated, disconnected, versioned, property database with self-healing conflict resolution.
+> A grounded, semirelational, peer to peer replicated, disconnected,
+> versioned, property database with self-healing conflict resolution.
 
-The best place to start learning about Prophet is [a few recent slides decks and videos](http://syncwith.us/talks).
+The best place to start learning about Prophet is
+[a few recent slides decks and videos](/talks/).
 
-[[Get Prophet]]
+[Get Prophet](/prophet/download/)
 
 [[SD]] (Simple Defects)
 ===============
 
-Prophet is flexible enough to be used for all sorts of applications, but we've started with something near and dear to the hearts of most software developers: bug tracking.
+Prophet is flexible enough to be used for all sorts of applications, but
+we've started with something near and dear to the hearts of most
+software developers: bug tracking.
 
-SD is a peer to peer bug tracking system which we've built to share with just about anything. Contributors have helped us write adaptors for RT, Hiveminder, Trac, GitHub, Google Code, and Redmine. You can extend SD to sync to other bug tracking tools by writing a small bit of code. If you can help make SD work better with your bug tracker, [drop us a line](/contact/).
+SD is a peer to peer bug tracking system which we've built to share with
+just about anything. Contributors have helped us write adaptors for RT,
+Hiveminder, Trac, GitHub, Google Code, and Redmine. You can extend SD to
+sync to other bug tracking tools by writing a small bit of code. If you
+can help make SD work better with your bug tracker,
+[drop us a line](/contact/).
 
-#Installation
+Installation
 ================
 
-Follow the installations on the [[Installation]] page to install Prophet and SD.
+Follow the installations on the [[Installation]] page to install Prophet
+and SD.
 
 *header photo original:
 [dotcompals @ Flickr](http://www.flickr.com/photos/dotcompals/3449854626/)*
diff --git a/prophet/download.mdwn b/prophet/download.mdwn
new file mode 100644
index 0000000..afa9907
--- /dev/null
+++ b/prophet/download.mdwn
@@ -0,0 +1,18 @@
+Released versions of Prophet are available on CPAN. Prophet is currently undergoing rapid development however, so we recommend installing directly from Git if you can. Prophet's public mirror is currently hosted on GitHub.
+
+The following command will get you a copy of the source tree you can install:
+
+>git clone git://github.com/bestpractical/prophet.git
+
+Once you've downloaded Prophet, you can install it:
+
+>cd prophet
+
+>PERL_MM_USE_DEFAULT=1 perl Makefile.PL
+
+>make test
+
+>make install
+
+
+In the hopefully unlikely event that Prophet doesn't pass its tests, please tell the developers about it so we can improve things.
diff --git a/sd/download.mdwn b/sd/download.mdwn
new file mode 100644
index 0000000..cb6e2d6
--- /dev/null
+++ b/sd/download.mdwn
@@ -0,0 +1,19 @@
+Released versions of SD are available on CPAN. SD is currently undergoing rapid development however, so we recommend installing directly from Git if you can. SD's public mirror is currently hosted on GitHub.
+
+Before you install SD, you'll need to install Prophet.
+
+The following command will get you a copy of the source tree you can install:
+
+>git clone git://github.com/bestpractical/sd.git
+
+Once you've downloaded SD, you can install it:
+
+>cd sd
+
+>PERL_MM_USE_DEFAULT=1 perl Makefile.PL
+
+>make test
+
+>make install
+
+In the hopefully unlikely event that SD doesn't pass its tests, please tell the developers about it so we can improve things.

diff --git a/sidebar.mdwn b/sidebar.mdwn
new file mode 100644
index 0000000..b58d1ab
--- /dev/null
+++ b/sidebar.mdwn
@@ -0,0 +1,12 @@
+* [Home](/)
+* [Why?](/sharecropping/)
+* [Presentations](/talks/)
+* Prophet
+  * [Get Prophet](/prophet/download/)
+* [SD](/sd/)
+  * [Get SD](/sd/download/)
+  * [Using SD](/sd/using/)
+  * [SD for SD (Bugs)](/sd/bugs/)
+  * [Contributing](/sd/contributing/)
+* [Mailing lists](/contact)
+* [Contact us](/contact/)

diff --git a/installation.mdwn b/installation.mdwn
index 14ba875..4c709e7 100644
--- a/installation.mdwn
+++ b/installation.mdwn
@@ -3,7 +3,7 @@ This page outlines the installation process for Prophet and SD.
 * Install Prophet.
 The following command will get you a copy of the source tree you can install:
 
->git clone git://github.com/bestpractical/prophet.git
+>git clone git://gitorious.org/prophet/prophet.git
 
 Once you've downloaded Prophet, you can install it:
 
@@ -19,7 +19,7 @@ Once you've downloaded Prophet, you can install it:
 
 The following command will get you a copy of the source tree you can install:
 
-> git clone git://github.com/bestpractical/sd.git
+> git clone git://gitorious.org/prophet/sd.git
 
 Once you've downloaded SD, you can install it:
 

diff --git a/installation.mdwn b/installation.mdwn
new file mode 100644
index 0000000..14ba875
--- /dev/null
+++ b/installation.mdwn
@@ -0,0 +1,33 @@
+This page outlines the installation process for Prophet and SD.
+
+* Install Prophet.
+The following command will get you a copy of the source tree you can install:
+
+>git clone git://github.com/bestpractical/prophet.git
+
+Once you've downloaded Prophet, you can install it:
+
+>cd prophet
+
+>PERL_MM_USE_DEFAULT=1 perl Makefile.PL
+
+>make test
+
+>make install
+
+*  Install SD.
+
+The following command will get you a copy of the source tree you can install:
+
+> git clone git://github.com/bestpractical/sd.git
+
+Once you've downloaded SD, you can install it:
+
+>cd sd
+
+>PERL_MM_USE_DEFAULT=1 perl Makefile.PL
+
+>make test
+
+>make install
+

diff --git a/index.mdwn b/index.mdwn
index 2df62ac..e56fa4d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -28,5 +28,10 @@ Prophet is flexible enough to be used for all sorts of applications, but we've s
 
 SD is a peer to peer bug tracking system which we've built to share with just about anything. Contributors have helped us write adaptors for RT, Hiveminder, Trac, GitHub, Google Code, and Redmine. You can extend SD to sync to other bug tracking tools by writing a small bit of code. If you can help make SD work better with your bug tracker, [drop us a line](/contact/).
 
+#Installation
+================
+
+Follow the installations on the [[Installation]] page to install Prophet and SD.
+
 *header photo original:
 [dotcompals @ Flickr](http://www.flickr.com/photos/dotcompals/3449854626/)*

diff --git a/get_sd.mdwn b/get_sd.mdwn
index f6f4542..cb6e2d6 100644
--- a/get_sd.mdwn
+++ b/get_sd.mdwn
@@ -1,12 +1,14 @@
-Released versions of Prophet are available on CPAN. Prophet is currently undergoing rapid development however, so we recommend installing directly from Git if you can. Prophet's public mirror is currently hosted on GitHub.
+Released versions of SD are available on CPAN. SD is currently undergoing rapid development however, so we recommend installing directly from Git if you can. SD's public mirror is currently hosted on GitHub.
+
+Before you install SD, you'll need to install Prophet.
 
 The following command will get you a copy of the source tree you can install:
 
->git clone git://github.com/bestpractical/prophet.git
+>git clone git://github.com/bestpractical/sd.git
 
-Once you've downloaded Prophet, you can install it:
+Once you've downloaded SD, you can install it:
 
->cd prophet
+>cd sd
 
 >PERL_MM_USE_DEFAULT=1 perl Makefile.PL
 
@@ -14,4 +16,4 @@ Once you've downloaded Prophet, you can install it:
 
 >make install
 
-In the hopefully unlikely event that Prophet doesn't pass its tests, please tell the developers about it so we can improve things.
+In the hopefully unlikely event that SD doesn't pass its tests, please tell the developers about it so we can improve things.

diff --git a/get_sd.mdwn b/get_sd.mdwn
new file mode 100644
index 0000000..f6f4542
--- /dev/null
+++ b/get_sd.mdwn
@@ -0,0 +1,17 @@
+Released versions of Prophet are available on CPAN. Prophet is currently undergoing rapid development however, so we recommend installing directly from Git if you can. Prophet's public mirror is currently hosted on GitHub.
+
+The following command will get you a copy of the source tree you can install:
+
+>git clone git://github.com/bestpractical/prophet.git
+
+Once you've downloaded Prophet, you can install it:
+
+>cd prophet
+
+>PERL_MM_USE_DEFAULT=1 perl Makefile.PL
+
+>make test
+
+>make install
+
+In the hopefully unlikely event that Prophet doesn't pass its tests, please tell the developers about it so we can improve things.

diff --git a/sd.mdwn b/sd.mdwn
index c704ebb..03ba422 100644
--- a/sd.mdwn
+++ b/sd.mdwn
@@ -20,7 +20,7 @@ SD is a peer-to-peer bug tracker that’s built for sharing and use both online
 
 # Getting SD
 
-You can get SD here.
+Visit the [[Get SD]] page to learn how to get and install SD.
 
 #Support
 

diff --git a/sd.mdwn b/sd.mdwn
new file mode 100644
index 0000000..c704ebb
--- /dev/null
+++ b/sd.mdwn
@@ -0,0 +1,27 @@
+SD is a peer-to-peer bug tracker that’s built for sharing and use both online and offline. With SD, you can sync your bugs back and forth between other instances of SD, and even between SD and other bug trackers that SD supports.
+
+# Features
+
+* Peer-to-peer syncing between instances
+* Syncing with other bug trackers
+ * [RT](http://bestpractical.com/rt)
+ * [Hiveminder](http://hiveminder.com/)
+ * [Trac](http://trac.edgewall.com/)
+ * [GitHub](http://github.com/)
+ * [Google Code](http://code.google.com/)
+ * [Redmine](http://redmine.org/)
+* Command-line interface, including an interactive shell
+* Git and Darcs VCS integration
+* Local, single-user web UI
+* "Hackathon mode": local net sync via Bonjour
+* SQLite and filesystem backends
+* Synchronization via sneakernet
+* Completely free and open source, released under the MIT license
+
+# Getting SD
+
+You can get SD here.
+
+#Support
+
+If you have a problem using SD, submit a bug report or ask for help on *#prophet* on *irc.freenode.net* or SD’s mailing list.

diff --git a/index.mdwn b/index.mdwn
index 037c120..2df62ac 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -21,7 +21,7 @@ The best place to start learning about Prophet is [a few recent slides decks and
 
 [[Get Prophet]]
 
-SD (Simple Defects)
+[[SD]] (Simple Defects)
 ===============
 
 Prophet is flexible enough to be used for all sorts of applications, but we've started with something near and dear to the hearts of most software developers: bug tracking.

diff --git a/get_prophet.mdwn b/get_prophet.mdwn
new file mode 100644
index 0000000..afa9907
--- /dev/null
+++ b/get_prophet.mdwn
@@ -0,0 +1,18 @@
+Released versions of Prophet are available on CPAN. Prophet is currently undergoing rapid development however, so we recommend installing directly from Git if you can. Prophet's public mirror is currently hosted on GitHub.
+
+The following command will get you a copy of the source tree you can install:
+
+>git clone git://github.com/bestpractical/prophet.git
+
+Once you've downloaded Prophet, you can install it:
+
+>cd prophet
+
+>PERL_MM_USE_DEFAULT=1 perl Makefile.PL
+
+>make test
+
+>make install
+
+
+In the hopefully unlikely event that Prophet doesn't pass its tests, please tell the developers about it so we can improve things.

diff --git a/index.mdwn b/index.mdwn
index dfcef30..037c120 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -19,7 +19,7 @@ Prophet's buzzword-laden pitch reads something like this:
 
 The best place to start learning about Prophet is [a few recent slides decks and videos](http://syncwith.us/talks).
 
-[Get Prophet]
+[[Get Prophet]]
 
 SD (Simple Defects)
 ===============

diff --git a/index.mdwn b/index.mdwn
index ea2c19f..dfcef30 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -19,6 +19,8 @@ Prophet's buzzword-laden pitch reads something like this:
 
 The best place to start learning about Prophet is [a few recent slides decks and videos](http://syncwith.us/talks).
 
+[Get Prophet]
+
 SD (Simple Defects)
 ===============
 

diff --git a/local.css b/local.css
index 9094141..d942069 100644
--- a/local.css
+++ b/local.css
@@ -13,7 +13,6 @@ div#content blockquote {
 	-webkit-border-radius: 0.5em;
 }
 
-div#content blockquote.p {
+blockquote p {
 	margin-bottom: 0;
-	padding-bottom: 0;
 }

diff --git a/local.css b/local.css
index eba9753..9094141 100644
--- a/local.css
+++ b/local.css
@@ -12,3 +12,8 @@ div#content blockquote {
 	-moz-border-radius: 0.5em;
 	-webkit-border-radius: 0.5em;
 }
+
+div#content blockquote.p {
+	margin-bottom: 0;
+	padding-bottom: 0;
+}

diff --git a/local.css b/local.css
index 2f84162..eba9753 100644
--- a/local.css
+++ b/local.css
@@ -2,7 +2,7 @@
 	background-image: url('clouds_header.jpg');
 }
 
-div.content blockquote {
+div#content blockquote {
 	font-style: italic;
 	background: #ffc;
 	padding: 1em;

diff --git a/local.css b/local.css
index e4e935c..2f84162 100644
--- a/local.css
+++ b/local.css
@@ -1,3 +1,14 @@
 .pageheader {
 	background-image: url('clouds_header.jpg');
 }
+
+div.content blockquote {
+	font-style: italic;
+	background: #ffc;
+	padding: 1em;
+	margin-left: 4em;
+	margin-right: 4em;
+	border: 1px solid #eeb;
+	-moz-border-radius: 0.5em;
+	-webkit-border-radius: 0.5em;
+}

diff --git a/contact.mdwn b/contact.mdwn
index 58176c3..c91302e 100644
--- a/contact.mdwn
+++ b/contact.mdwn
@@ -1,3 +1,5 @@
+[[!meta title="Get in touch"]]
+
 Despite Prophet being designed for "offline" replication, Prophet's developers are nearly constantly online. You can usually find us on IRC and can always contact us by email.
 
 IRC

diff --git a/contact.mdwn b/contact.mdwn
new file mode 100644
index 0000000..58176c3
--- /dev/null
+++ b/contact.mdwn
@@ -0,0 +1,11 @@
+Despite Prophet being designed for "offline" replication, Prophet's developers are nearly constantly online. You can usually find us on IRC and can always contact us by email.
+
+IRC
+===
+
+Prophet's developers hang out on #prophet on irc.freenode.net.
+
+Electronic Mail
+===========
+
+If you're looking for something a little more asynchronous than IRC, electronic mail is always a reasonable option. You can [sign up for the Prophet mailing list or browse the list archives](http://lists.bestpractical.com/mailman/listinfo/prophet) over at Best Practical's mailing list server.

diff --git a/index.mdwn b/index.mdwn
index 796e5d0..ea2c19f 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,3 +25,6 @@ SD (Simple Defects)
 Prophet is flexible enough to be used for all sorts of applications, but we've started with something near and dear to the hearts of most software developers: bug tracking.
 
 SD is a peer to peer bug tracking system which we've built to share with just about anything. Contributors have helped us write adaptors for RT, Hiveminder, Trac, GitHub, Google Code, and Redmine. You can extend SD to sync to other bug tracking tools by writing a small bit of code. If you can help make SD work better with your bug tracker, [drop us a line](/contact/).
+
+*header photo original:
+[dotcompals @ Flickr](http://www.flickr.com/photos/dotcompals/3449854626/)*

diff --git a/index.mdwn b/index.mdwn
index 971b57f..796e5d0 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,3 +1,5 @@
+[[!meta title="Syncable tools for the offline web"]]
+
 News
 ====
 

diff --git a/clouds_header.jpg b/clouds_header.jpg
new file mode 100644
index 0000000..9cc76bc
Binary files /dev/null and b/clouds_header.jpg differ
diff --git a/local.css b/local.css
new file mode 100644
index 0000000..e4e935c
--- /dev/null
+++ b/local.css
@@ -0,0 +1,3 @@
+.pageheader {
+	background-image: url('clouds_header.jpg');
+}

diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..971b57f
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,25 @@
+News
+====
+
+2009-08-28
+----------------
+
+We've just released Prophet and SD 0.7 (Cavil) You can download them from [CPAN](http://search.cpan.org/dist/App-SD/) or [Gitorious](https://gitorious.org/prophet). For more information, have a look at the [blog post](http://blog.bestpractical.com/2009/08/prophet-and-sd-07-cavil-are-now-available.html).
+
+Prophet
+======
+
+Prophet is a new kind of database designed for the post Web-2.0 world. It's made to let you collaborate with your friends and coworkers without needing any kind of special server or internet provider.
+
+Prophet's buzzword-laden pitch reads something like this:
+
+> A grounded, semirelational, peer to peer replicated, disconnected, versioned, property database with self-healing conflict resolution.
+
+The best place to start learning about Prophet is [a few recent slides decks and videos](http://syncwith.us/talks).
+
+SD (Simple Defects)
+===============
+
+Prophet is flexible enough to be used for all sorts of applications, but we've started with something near and dear to the hearts of most software developers: bug tracking.
+
+SD is a peer to peer bug tracking system which we've built to share with just about anything. Contributors have helped us write adaptors for RT, Hiveminder, Trac, GitHub, Google Code, and Redmine. You can extend SD to sync to other bug tracking tools by writing a small bit of code. If you can help make SD work better with your bug tracker, [drop us a line](/contact/).

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b84c806
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.ikiwiki
+/recentchanges