X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=in%2Ftinyos.md;h=03414bb36823d485e0f0cc272ead1b496f5dcfc2;hb=d848b801a6fa1fad501fb8b58a7ed8dd3dc5e359;hp=104609565ace27f37df5d7a7d80ae4c778a28bb7;hpb=9c78235aa6cc9fa205a3aa75a2c8f6590e449333;p=oss-web.git

diff --git a/in/tinyos.md b/in/tinyos.md
index 1046095..03414bb 100644
--- a/in/tinyos.md
+++ b/in/tinyos.md
@@ -6,17 +6,16 @@ ctime: 2009-12-07
 Repositories: [tinyos](http://repo/gitweb/?p=tmi/tinyos-2.x.git;a=summary),
 [[aptrepo]].
 
-TMI uses [TinyOS](http://www.tinyos.net) for various data acquisition
-applications, and we maintain a modified tree that supports certain features
-not available in the official tree.  We maintain a
-[repository](http://repo/gitweb/?p=tmi/tinyos-2.x.git;a=summary) containing
-our TinyOS tree, in which we also maintain a cogent patchset against the
-official tree.
+TMI maintains a [TinyOS](http://www.tinyos.net) branch containing certain
+features not available in the official tree.  The TMI repository contains
+code imported from CVS upstream, our internal working branches, and tags
+marking a series commits that are a clean patch series of the TMI enhancements
+against an official upstream release.
 
 * Current patchset tag: patchset/2.1.0-3
-* Build from official release tag: tinyos/2.1.0
-* View the patchset [here](http://repo/gitweb/?p=tmi/tinyos-2.x.git;a=shortlog;h=refs/tags/patchset/2.1.0-3).
+* Derived from official release tag: tinyos/2.1.0
+* View the latest patchset [here](http://repo/gitweb/?p=tmi/tinyos-2.x.git;a=shortlog;h=refs/tags/patchset/2.1.0-3).
 
-Our TinyOS requires a newer [[msp430]] toolchain.  A complete TinyOS
+The TMI TinyOS code requires a newer [[msp430]] toolchain.  A complete TinyOS
 development environment including a newer toolchain is available for
 installation from our [[APT repository|aptrepo]].