Skip to content
Browse files

Merge pull request #2 from artur-gajewski/master

Changed Soprano Brain Alliance names to Soprano Digital
  • Loading branch information...
2 parents dc4088a + c0a38a8 commit 6ae55852770c21c7fa2f0e326ef198c37aae0c07 @Ezku Ezku committed Oct 9, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 index.html
View
8 index.html
@@ -44,7 +44,7 @@ <h2 id="section-introduction">Introduction</h2>
<li><strong>Based on Github</strong>: easy to use, fork and contribute to.</li>
<li><strong>New BSD license</strong>: use the code freely, no strings attached.</li>
<li><strong>Clean copyright</strong>: we require contributors to sign a license agreement (don't worry, it's easy and effortless).</li>
- <li><strong>Corporate backing</strong>: sponsored by <a href="http://brainalliance.com/">Soprano Brain Alliance</a> and <a href="http://fraktio.fi/">Fraktio</a>, we aren't going down tomorrow.</li>
+ <li><strong>Corporate backing</strong>: sponsored by <a href="http://www.soprano.fi/">Soprano Digital</a> and <a href="http://fraktio.fi/">Fraktio</a>, we aren't going down tomorrow.</li>
</ul>
</div>
<div class="one-third column">
@@ -173,14 +173,14 @@ <h4 class="subheader">How we avoid legal hassle</h4>
</header>
<div class="two-thirds column">
<h3 id="section-licensing-cla">Contributor License Agreement</h3>
- <p>Due to corporate issues and a resulting requirement for copyright cleanliness, we have to require contributors to sign a license agreement. The agreement basically states that you allow us the use of code contributed by you, guaranteeing the project's legal safety. If you work for <em>Soprano Brain Alliance</em>, we've already got you covered. For everyone else, we'll be featuring an electronic form for you to sign the agreement in short order.</p>
+ <p>Due to corporate issues and a resulting requirement for copyright cleanliness, we have to require contributors to sign a license agreement. The agreement basically states that you allow us the use of code contributed by you, guaranteeing the project's legal safety. If you work for <em>Soprano Digital</em>, we've already got you covered. For everyone else, we'll be featuring an electronic form for you to sign the agreement in short order.</p>
<h3 id="section-licensing-new-bsd">New BSD license</h3>
<p>The <a href="http://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22New_BSD_License.22_or_.22Modified_BSD_License.22.29">New BSD license</a> allows pretty much everything except the use of the contributors' names in forks without explicit permission. We chose it to guarantee that all code contributions can be salvaged should anything happen to the project, and to guarantee that the code is safe to use in proprietary, third-party projects.</p>
<p><a href="LICENSE">This is how your LICENSE file should look.</a></p>
<h3 id="section-licensing-who">Wait, what? Who are these guys?</h3>
- <p>The Xi project is not a legal entity, but the license's copyright statement has to reference at least one. We'd like Xi to be a community driven effort and not rest on corporate entities, so we used our actual names. The license states: <em><q>"Copyright (c) 2011, Mikko Forsström, Mikko Hirvonen, Eevert Saukkokoski"</q></em>. These are the names of three guys currently or formerly of <em>Soprano Brain Alliance</em> with intent to improve the state of PHP.</p>
+ <p>The Xi project is not a legal entity, but the license's copyright statement has to reference at least one. We'd like Xi to be a community driven effort and not rest on corporate entities, so we used our actual names. The license states: <em><q>"Copyright (c) 2011, Mikko Forsström, Mikko Hirvonen, Eevert Saukkokoski"</q></em>. These are the names of three guys currently or formerly of <em>Soprano Digital</em> with intent to improve the state of PHP.</p>
<p>The notation is merely symbolic; we represent the Xi project, and you aren't signing away anything you wouldn't expect to with a New BSD license.</p>
<p>That said, software licensing is not a simple beast, and none of us are legal experts. If you think there's something wrong with out licensing terms, contact us so we can sort it out.</p>
</div>
@@ -197,7 +197,7 @@ <h3 id="section-licensing-who">Wait, what? Who are these guys?</h3>
</div>
<div class="one-third column sponsor">
<h4>Sponsor</h4>
- <p>The Xi Project is sponsored by <a href="http://brainalliance.com/">Soprano Brain Alliance</a> and <a href="http://fraktio.fi/">Fraktio</a>, Finland. The companies relinquish any copyright claims to work done on Xi by company employees.</p>
+ <p>The Xi Project is sponsored by <a href="http://www.soprano.fi/">Soprano Digital</a> and <a href="http://fraktio.fi/">Fraktio</a>, Finland. The companies relinquish any copyright claims to work done on Xi by company employees.</p>
</div>
<div class="one-third column colophon">
<h4>Colophon</h4>

0 comments on commit 6ae5585

Please sign in to comment.
Something went wrong with that request. Please try again.