diff options
| author | Kaare Olsen <kaare-guest> | 2010-12-29 03:19:46 +0000 |
|---|---|---|
| committer | Kaare Olsen <kaare-guest> | 2010-12-29 03:19:46 +0000 |
| commit | 6c625e058f4ed0c1fd8f89c6b2e1d5d901622053 (patch) | |
| tree | 18f8bd22946970ce745c15af0d77286dab112f09 /english/trademark.wml | |
| parent | 96d9117dcaf300a729d4aa24539ea30802b7d83d (diff) | |
Fixing URLs which were broken when SPI got a new website
CVS version numbers
danish/trademark.wml: 1.1 -> 1.2
english/trademark.wml: 1.8 -> 1.9
finnish/trademark.wml: 1.4 -> 1.5
french/trademark.wml: 1.6 -> 1.7
german/trademark.wml: 1.4 -> 1.5
russian/trademark.wml: 1.1 -> 1.2
Diffstat (limited to 'english/trademark.wml')
| -rw-r--r-- | english/trademark.wml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/english/trademark.wml b/english/trademark.wml index 04dad9cba2b..19eb92c8f9e 100644 --- a/english/trademark.wml +++ b/english/trademark.wml @@ -2,7 +2,7 @@ <h2>Trademark Licensing Policy</h2> <p><em>Debian</em> is registered trademark of <a -href="http://www.spi-inc.org/about-spi/trademarks">Software in the Public +href="http://www.spi-inc.org/corporate/trademarks/">Software in the Public Interest, Inc.</a> and managed by the Debian project.</p> <p>The trademark was <a @@ -28,7 +28,7 @@ should ask us <strong>first</strong>.</q></p> <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-06-03-bmh.1">2003-06-03-bmh.1</a>), a Trademark Committee was started +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. This committee can be contacted at <a href="http://lists.spi-inc.org/listinfo/spi-trademark">\ spi-trademark@lists.spi-inc.org</a>.</p> @@ -57,11 +57,11 @@ the Debian trademark through a License Agreement:</p> <ul> <li>Stiftelsen SLX Debian Labs, per SPI's resolution -<a href="http://www.spi-inc.org/corporate/resolutions/2004-01-05-bmh.1">\ +<a href="http://www.spi-inc.org/corporate/resolutions/2004/2004-01-05.bmh.1/">\ 2004-01-05.bmh.1</a>.</li> <li>Vincent Renardias and <q>Les logiciels du soleil</q>, per SPI's resolution -<a href="http://www.spi-inc.org/corporate/resolutions/1999-08-06.mgs">\ +<a href="http://www.spi-inc.org/corporate/resolutions/1999/1999-08-06.mgs/">\ 1999-08-06.mgs</a>.</li> <li>The Debian UK Society, <a |