update Debian Trademark page to match status quo (english only)

main changes:
- add a short introductory rationale
- mention current registration (US-only) as well as extension to other
  countries via Madrid Protocol
- get rid of info about registration in other countries; rationale: 1) they
  were out of date and not detailed enough to be useful, 2) they have been
  subsumed by Madrid Protocol action
- update information about the current draft, referring to recent info from
  the DPL (yours truly)

CVS version numbers

english/trademark.wml: 1.12 -> 1.13

1 files changed, 31 insertions, 32 deletions

diff --git a/english/trademark.wml b/english/trademark.wml
index 0060a276f7a..fb920f9e9da 100644
--- a/english/trademark.wml
+++ b/english/trademark.wml
@@ -1,50 +1,49 @@
 #use wml::debian::template title="Debian's Trademark"
 
 <h2>Trademark Licensing Policy</h2>
-<p><em>Debian</em> is registered trademark of <a
+
+<p>Debian is committed to protect and ensure consistent usage of its trademark,
+logos, and styles and also make it easier for every <em>bonafide</em> user to
+use. As a part of this process, the Debian trademark is a registed United
+States trademark of <a
 href="http://www.spi-inc.org/corporate/trademarks/">Software in the Public
-Interest, Inc.</a> and managed by the Debian project.</p>
+Interest, Inc.</a>, managed by the Debian project. For <em>registration outside
+the United States</em>, we have filed a <a
+href="http://en.wikipedia.org/wiki/Madrid_system">Madrid Protocol</a>
+application to extend the protection in the European Union, China and
+Japan.</p>
 
-<p>The trademark was <a
+<p>The Debian trademark was first <a
 href="http://tarr.uspto.gov/servlet/tarr?regser=serial&amp;entry=75386376">registered</a>
-the 21st of December of 1999 but has been in use since August 1993. It is
-registered under the Nice Class 009: <q>Computer Utility and Operating
-System Software</q>.
-</p>
+the 21st of December of 1999, but has been in use since August 1993. It is
+registered under the Nice Class 009: <q>Computer Utility and Operating System
+Software</q>.</p>
 
-<p>The current policy was <a
-href="http://lists.debian.org/debian-announce/debian-announce-1998/msg00006.html">announced</a> by
-Bruce Perens, Debian Project Leader, in 1998:</p>
+<p>The current policy governing usage of the Debian trademark was <a
+href="http://lists.debian.org/debian-announce/debian-announce-1998/msg00006.html">announced</a>
+by Bruce Perens, Debian Project Leader, in 1998:</p>
 
 <p><q>We allow all businesses to make reasonable use of the <q>Debian</q> trademark.
 For example, if you make a CD of our Debian GNU/Linux distribution, you can
 call that product <q>Debian</q>. If you want to use the name in some other way, you
-should ask us <strong>first</strong>.</q></p>
-
-<p><q>To be fair to all businesses, we insist that no business use the name
+should ask us <strong>first</strong>.</q><br />
+<q>To be fair to all businesses, we insist that no business use the name
 <q>Debian</q> in the name of the business, or a domain name of the business.</q></p>
 
+
 <h3>Work in Progress</h3>
 
-<p>As <a href="http://lists.debian.org/debian-devel-announce/2003/10/msg00003.html">announced</a>
-by Martin Michlmayr, Debian Project Leader, in 2003 (also available
-as SPI resolution <a href="http://www.spi-inc.org/corporate/resolutions/2003/2003-06-03.bmh.1/">2003-06-03-bmh.1</a>), a Trademark Committee was started
-to review SPI's trademark policy.</p>
-
-<p>Currently there are two drafts for the trademark policy, one drafted by <a
-href="http://wiki.mako.cc/TrademarkFreedom">Benjamin Mako Hill</a> and a
-different one drafted by 
-<a href="http://wiki.debian.org/ProposedTrademarkPolicy">Branden Robinson</a>.</p>
-
-<h2>Registration outside the US</h2>
-
-<p>A similar trademark has been registered by some other associations related to the
-Debian Project over the world, this includes <a
-href="http://www.debian.or.jp">debian JP</a> in Japan (<a
-href="http://lists.debian.org/debian-legal/2002/09/msg00161.html">registered</a>
-in 2002), as well as Stiftelsen SLX Debian Labs in Norway, 
-<a href="http://debian-es.org">Debian Spain Association</a> in Spain
-(registered in 2007) and Vincent Renardias in France.</p>
+<p>As <a
+href="http://lists.debian.org/debian-devel-announce/2011/08/msg00003.html">announced</a>
+by Stefano Zacchiroli, Debian Project Leader, in August 2011, the current
+Debian Trademark Policy is being reviewed, in collaboration with SPI and <a
+href="http://www.softwarefreedom.org">SFLC</a>.</p>
+
+<p>Previous drafts of a new trademark policy, by <a
+href="http://wiki.mako.cc/TrademarkFreedom">Benjamin Mako Hill</a> and <a
+href="http://wiki.debian.org/ProposedTrademarkPolicy">Branden Robinson</a> are
+available and are being used as basis for the forthcoming policy.</p>
+
 
 <h2>Organisations licensed to use the trademark</h2>