#
#
# patch "wiki/InterfacesFrontendsAndTools.mdwn"
#  from [0018bae0d8565deaaa432605be45150f64223cad]
#    to [d3f4d6beb8a0f756af48d6b2bee7a0ea7b68ec6a]
#
============================================================
--- wiki/InterfacesFrontendsAndTools.mdwn	0018bae0d8565deaaa432605be45150f64223cad
+++ wiki/InterfacesFrontendsAndTools.mdwn	d3f4d6beb8a0f756af48d6b2bee7a0ea7b68ec6a
@@ -13,11 +13,12 @@
    * **[DVC](http://download.gna.org/dvc/)** (see also [DVC](http://gna.org/projects/dvc)) is a project to create a generic library for fancy Emacs interfaces to modern version control systems.  DVC includes monotone support.
  * **[ViewMTN](http://grahame.angrygoats.net/viewmtn.shtml)**: a web interface to a monotone repository.
  * **[TracMonotone](http://tracmtn.1erlei.de/)**: As noted below, development of a trac plugin is ongoing.
+ * **[guitone](http://guitone.thomaskeller.biz)**: A Qt-based, cross-platform frontend for monotone. [Latest version](http://viewmtn.angrygoats.net/branch/head/browse/net.venge.monotone.guitone) (via viewmtn).
  * **[mtsh](http://mtn-host.prjek.net/projects/mtsh/)**: GTK+ wrapper for monotone focusing on working copy operations -- add, drop, revert, rename, commit, update, diff, and browsing.  Has a mechanism for per-file commit comments. *(This is a bit old and very much unmaintained.)*
  * **Usher**: A server manager that can be used to serve several projects on the same IP/port, starting and stopping servers as needed. In branch `net.venge.monotone.contrib.usher`.
  * **[meld](http://meld.sf.net)**: a general diff, merge, and history browsing tool written in [Python](http://python.org) for [Gnome](http://gnome.org). Has monotone support since 1.1.3.
  * **shell completion**: monotone ships with completion scripts for both bash and zsh, in the `contrib/` directory of monotone's source tree. Latest versions for [bash](http://viewmtn.angrygoats.net/fileinbranch.psp?branch=net.venge.monotone&path=contrib/monotone.bash_completion) and [zsh](http://viewmtn.angrygoats.net/fileinbranch.psp?branch=net.venge.monotone&path=contrib/monotone.zsh_completion) (via viewmtn).
- * "**dumb server**" support, for publishing repositories via ordinary ftp/http/sftp/local filesystem: in branch [net.venge.monotone.dumb](http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone.dumb). 
+ * "**dumb server**" support, for publishing repositories via ordinary ftp/http/sftp/local filesystem: in branch [net.venge.monotone.dumb](http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone.dumb).
  * **[m7](http://www.midwinter.com/~lch/programming/m7/)**: Experimental drop-in command-line wrapper for monotone. Adds simple local version numbers (no longer using certs) and an enhanced annotate front-end.
  * **monotree**: Java app for browsing and visualizing history; more portable than monotone-viz. In branch `net.venge.monotone.contrib.monotree`.
  * **[RSCM::Monotone](http://rscm.rubyforge.org/classes/RSCM/Monotone.html)**: a [Ruby](http://www.ruby-lang.org/) interface to monotone.
@@ -26,9 +27,8 @@
  * **ciabot_monotone.py**: A notification script for [CIA](http://cia.navi.cx).  In `contrib/` directory of monotone's source tree. [Latest version](http://viewmtn.angrygoats.net/fileinbranch.psp?branch=net.venge.monotone&path=contrib/ciabot_monotone.py) (via viewmtn).
  * Script for **importing maildir-format mailboxes** to monotone, for offline reading and syncing: [on the list](http://lists.gnu.org/archive/html/monotone-devel/2005-09/msg00234.html).
  * **[Wireshark](http://www.wireshark.org)**: a fantastic network traffic analyzer, that has support for decoding monotone's 'netsync' protocol.
- * **[guitone](http://guitone.thomaskeller.biz)**: A Qt-based, cross-platform frontend for monotone, in early stage. [Latest version](http://viewmtn.angrygoats.net/branch/head/browse/net.venge.monotone.guitone) (via viewmtn).
  * **[Apso](http://aleph0.info/apso/)**: A system for encrypting version control system repositories/databases (currently a prototype; the first version control system supported is Monotone).
- * **[Monotree](http://www.highscore.de/monotree/)**: A .NET based viewer for monotone's database (does not require to have monotone installed as it loads monotone's database directly and creates a report). 
+ * **[Monotree](http://www.highscore.de/monotree/)**: A .NET based viewer for monotone's database (does not require to have monotone installed as it loads monotone's database directly and creates a report).
  * **[Ikiwiki](http://ikiwiki.info/)** is a wiki that can use a revision control system, and in particular [monotone](http://ikiwiki.info/rcs/monotone/), as a backend.  As Monotone is distributed, Ikiwiki becomes distributed.  Ikiwiki also has a bug tracking plugin that then allows distributed bug tracking.  This website is generated with ikiwiki, edited by the distributed monotone developers.
 
 ## converting to monotone from other systems
@@ -40,7 +40,7 @@
 
 # Integrated development environments
 
- * **[PIDA]([http://pida.berlios.de/)**: Integrated development environment supporting Monotone (among others)
+ * **[PIDA](http://pida.berlios.de/)**: Integrated development environment supporting Monotone (among others)
 
 ## merge tools
 
@@ -72,9 +72,8 @@ out of the box.
 
  * tools to manage code reviews, integration workflows, and such things
    * one possibly relevant thing: vim plugin for doing code reviews: <http://www.vim.org/scripts/script.php?script_id=1563>
- * a cross-platform GUI monotone interface (probably using Qt, since that seems to be the best way to make sane cross-platform interfaces these days?) (GTKmm is really nice IMO, would be worth a look if someone went ahead on this) (both Qt and GTKmm add several megabtytes of bloat on OS X; try wxWindows or FLTK instead)
-   * The work on a cross-platform GUI has already started, see <http://guitone.thomaskeller.biz> or <mtn://monotone.ca/net.venge.monotone.guitone>
  * "Tortoise Monotone" -- a windows interface to monotone, integrated with the file explorer.  This approach works *very* well for subversion...
+   * the work on TortoiseMtn has been [started on the last summit](http://viewmtn.angrygoats.net/branch/head/browse/net.venge.monotone.tortoise) - based on [TortoiseHg](http://tortoisehg.sf.net) and [guitone](http://guitone.thomaskeller.biz)
  * `mtnpatch`, a small, standalone, slightly smarter version/wrapper of `patch(1)` that understands and can apply the additional cset operations (eg, `drop` and `rename`) listed in `mtn diff` comments.  Useful for end-users tracking monotone sources without actually using monotone or a db.  Bonus points for a `mtnfollow` that combines this patch tool with a web client to fetch diffs as needed from ViewMTN, and keeps a `_MTN` directory up to date so its easy for a user to switch to using full monotone once they need it (eg, for local changes).
  * A Visual Studio plugin for Monotone.
  * *your wished-for tool here*