Bug 1515507 - Update SM Web Site to include references to SM EV (Legal)
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 19 Jan 2019 12:23:32 +0000
changeset 1311 7a862dc6e548
parent 1310 ad9d5860188d
child 1312 cf9bf1c324eb
push id86
push useriann_cvs@blueyonder.co.uk
push dateSat, 19 Jan 2019 12:25:32 +0000
bugs1515507
Bug 1515507 - Update SM Web Site to include references to SM EV (Legal)
src/dev/artwork.en.html
src/dev/index.en.html
src/doc/index.en.html
src/index.en.html
src/legal/index.en.html
--- a/src/dev/artwork.en.html
+++ b/src/dev/artwork.en.html
@@ -63,18 +63,18 @@ dynamic the internet suite application h
 <img src="/images/seamonkey32.png" width="32" height="32" alt="">
 <img src="/images/seamonkey16.png" width="16" height="16" alt="">
 </p>
 
 <p>
 Above images show the SeaMonkey logo in different sizes, from 96px down to
 16px. The SeaMonkey word and logo are registered as US trademarks by the
 Mozilla Foundation, and these logo images are also owned by the Mozilla
-Foundation (the SeaMonkey project at mozilla.org is legally represented by the
-Mozilla Foundation), but they are free to use for promotion of our project and
+Foundation (the SeaMonkey project is legally represented by the SeaMonkey
+Association), but they are free to use for promotion of our project and
 application. Some versions of the logo and derived artwork are used in the
-mozilla.org CVS code repository and the final SeaMonkey application, and
-provided under the <a href="http://www.mozilla.org/MPL/">MPL/LGPL/GPL
-tri-license</a> for that purpose.
+project code repository and the final SeaMonkey application, and provided under
+the <a href="http://www.mozilla.org/MPL/">MPL/LGPL/GPL tri-license</a> for that
+purpose.
 </p>
 
 </body>
 </html>
--- a/src/dev/index.en.html
+++ b/src/dev/index.en.html
@@ -33,18 +33,19 @@ page is another good entry point to help
 Mozilla wiki</a> - and the
 <a href="https://blog.seamonkey-project.org/">SeaMonkey blog</a> features
 development news every now and then.
 </p>
 
 <h2 id="development">Code Development</h2>
 
 <p>
-As we're part of the
-<a href="http://www.mozilla.org/">Mozilla</a> project, most of the
+Even though we are independent from
+<a href="http://www.mozilla.org/">Mozilla</a>, as we're based on the same
+framework as Firefox, most of the
 <a href="https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide">mozilla.org developer pages</a>
 also apply to SeaMonkey, there's also content there that explains
 <a href="https://developer.mozilla.org/En/Developer_Guide/Source_Code/Getting_comm-central">how
 to get the comm-central source code</a>, which includes the current SeaMonkey
 development code.
 </p>
 
 <p>
--- a/src/doc/index.en.html
+++ b/src/doc/index.en.html
@@ -77,22 +77,22 @@ Documentation for older releases is stil
 </p>
 
 <ul>
   <li><a href="2.0">SeaMonkey 2.0 Documentation</a></li>
   <li><a href="1.1">SeaMonkey 1.1 Documentation</a></li>
 </ul>
 
 <p>
-As SeaMonkey is a project hosted by the Mozilla Foundation,
+As SeaMonkey is a project based on the same Mozilla framework as Firefox,
 <a href="http://www.mozilla.org/support/">Mozilla.org Support</a> also applies
 to our software to a certain part. The older
 <a href="http://www.mozilla.org/docs/end-user/">Mozilla.org Documentation</a>
 resources are still often of help, even though they were written for the
 Mozilla 1.x application suite, which later was taken over by our team under the
-new "Seamonkey" name. Another leftover from the same era, the
+new "SeaMonkey" name. Another leftover from the same era, the
 <a href="http://www-archive.mozilla.org/start/1.5/faq/"
    title="frequently asked questions">Mozilla Suite FAQ</a>, is also still
 helpful in many regards.
 </p>
 
 </body>
 </html>
--- a/src/index.en.html
+++ b/src/index.en.html
@@ -72,18 +72,17 @@ corporate users.
 
 <p>
 <a href="http://www.mozilla.org/" class="mozillapower"><img
  src="/images/powered_by_mozilla_small.png" height="31" width="122"
  alt="powered by Mozilla"></a>
 Under the hood, SeaMonkey uses much of the same
 <a href="http://www.mozilla.org/">Mozilla</a> source code which powers such
 successful siblings as Firefox and Thunderbird.
-Legal backing is provided by the
-<a href="http://www.mozilla.org/foundation/">Mozilla Foundation</a>.
+Legal backing is provided by the SeaMonkey Association (SeaMonkey e.V.).
 </p>
 
 <h2><div class="feedlink"><a href="news-atom"
  title="SeaMonkey News - Atom 1.0 feed"><img src="/images/feed.png"
  height="16" width="16" alt=""></a></div><a href="news">Project News</a></h2>
 
 [%- USE date(format = '%B %e, %Y', locale = 'en_US') -%]
 [% USE newsfeed = XML::Simple(
--- a/src/legal/index.en.html
+++ b/src/legal/index.en.html
@@ -10,54 +10,52 @@
 <link rel="top" href="../" title="SeaMonkey Project">
 <link rel="up" href="../" title="Home">
 
 <title>Legal Resources</title>
 </head>
 <body>
 <h1>SeaMonkey Legal Resources</h1>
 <p>
-The SeaMonkey Project is an open source project hosted by and und the legal
-protection of the <a href="http://www.mozilla.org/foundation/">Mozilla
-Foundation</a>.
+The SeaMonkey Project is an independent, open source project hosted by and
+under the legal protection of the SeaMonkey Association (SeaMonkey e.V.).
 </p>
 
 <ul class="toc">
 <li><a href="#license">Licenses</a></li>
 <li><a href="#trademark">Trademarks</a></li>
 <li><a href="#privacy">Privacy</a></li>
 </ul>
 
 <h2 id="license">Licenses</h2>
 
 <p>
 As a project that believes in open source and software freedom, our licenses are
 very important to us as they ensure open collaboration with and wthin our
-project. As a Mozilla project, we generally follow the
+project. As a project based on the Mozilla framework, we generally follow the
 <a href="http://www.mozilla.org/foundation/licensing.html">Mozilla Licensing
 Policies</a>
 <p>
 
 <p>
 Our <a href="https://developer.mozilla.org/en/comm-central">source code</a> is
 licensed under a <a href="http://www.mozilla.org/MPL/">MPL/GPL/LGPL tri-licsense</a>,
 allowing our code to be easily reused in different environments.
 </p>
 
 <p>
 Our release packages and other binaries are released under the
 <a href="http://www.mozilla.org/legal/eula/seamonkey-en.html">SeaMonkey End-User
-License Agreement</a> as provided by the Mozilla Foundation.
+License Agreement</a>.
 </p>
 
 <p>
 Content on the SeaMonkey website is published under a
 <a href="http://www.mozilla.org/foundation/licensing/website-content.html">Creative
-Commons Attribution Share-alike license</a>, just like other Mozilla website
-content.
+Commons Attribution Share-alike license</a>.
 </p>
 
 <h2 id="trademark">Trademarks</h2>
 
 <p>
 The SeaMonkey logo and word are registered trademarks in the USA, Europe and
 Japan, and their use is governed by the <a href="trademark">SeaMonkey
 trademark policy</a>.