diff options
Diffstat (limited to 'release/text')
| -rw-r--r-- | release/text/copyright.txt | 33 | ||||
| -rw-r--r-- | release/text/readme.html | 10 |
2 files changed, 12 insertions, 31 deletions
diff --git a/release/text/copyright.txt b/release/text/copyright.txt index 9f49dd4587a..207d6f54ea8 100644 --- a/release/text/copyright.txt +++ b/release/text/copyright.txt @@ -1,6 +1,6 @@ This version of Blender has been originally released at www.blender.org. - It is subject to the GPL license, which is part of this download. + It is subject to the GNU GPL license, which is part of this download. For more information please review the Blender source code distribution, which should be available at the same location as where you obtained this version. @@ -14,14 +14,12 @@ License Agreement accompanies (the "Software"). By installing, copying or otherwise using the Software, You agree to be - bound by the terms of this License Agreement. If You do not agree to the - terms of this License Agreement do not install or use the Software. + bound by the terms of this License Agreement. 1. Grant of License - Subject to the provisions of this License Agreement, BF grants You a - limited, non-exclusive, personal, non-sublicenseable, non-transferable - license to use the Software at any computer You own or use. + Subject to the provisions of the GNU GPL license, BF grants You a + non-exclusive right to use the Software at any computer You own or use. Artwork you create with the Software - whether it is images, movies, scripts, exported 3d files or the .blend files themselves - is your sole property, and can be licensed or sold under any conditions you prefer. @@ -76,25 +74,8 @@ out of or in connection with (i) the use of the Software by You and (ii) the use of any Works created with the Software by You or any third parties. - - 6. Term and Termination - - This License Agreement and the license granted hereunder is effective - until terminated. This License Agreement shall terminate automatically - and forthwith if You fail to comply with the terms of this License - Agreement. Upon termination, You shall cease the use of the Software, - remove the Software from (the memory of) your computer and destroy all - copies of the Software. - - 7. Entire Agreement - - This License Agreement is the entire agreement between BF and You in - respect of the subject matter of the License Agreement. This License - Agreement supersedes all prior written or oral agreements, proposals or - understandings, and any other communications between BF and You - relating to the subject matter of this License Agreement. - - 8. Enforceability + + 6. Enforceability If any provision of this License Agreement is held to be unenforceable by a court of competent jurisdiction for any reason, such provision @@ -102,7 +83,7 @@ enforceable, and the remainder of the License Agreement shall remain in effect. - 9. Governing law and disputes + 7. Governing law and disputes This License Agreement and all disputes arising from it will be governed by the laws of The Netherlands. All disputes arising in connection with diff --git a/release/text/readme.html b/release/text/readme.html index 1da4b62a73e..1b14c63e14a 100644 --- a/release/text/readme.html +++ b/release/text/readme.html @@ -12,23 +12,23 @@ </style> </head> <body> -<p class="title"><b>Blender 2.5 Alpha 2</b></p> +<p class="title"><b>Blender 2.5 Beta</b></p> <p><br></p> <p class="header"><b>About</b></p> <p class="body">Welcome to Blender, the free, open source 3D application for modeling, animation, rendering, compositing, video editing and game creation. Blender is available for Linux, Mac OS X, Windows, Solaris and Irix and has a large world-wide community.</p> <p class="body">Blender can be used freely for any purpose, including commercial use and distribution. It's free and open-source software, released under the GNU GPL licence. The entire source code is available on our website.</p> <p class="body">For more information, visit <a href="http://www.blender.org">blender.org</a>.</p> <p><br></p> -<p class="header"><b>2.5 Alpha 2</b></p> -<p class="body">The Blender Foundation and online developer community is proud to present Blender 2.5 Alpha 2. This release is the third official testing release of the Blender 2.5 series, and represents the culmination of many years of redesign and development work. <a href="http://www.blender.org/development/release-logs/blender-250/">More information about this release</a>.</p> +<p class="header"><b>2.5 Beta</b></p> +<p class="body">The Blender Foundation and online developer community is proud to present Blender 2.5 Beta. This release is the third official testing release of the Blender 2.5 series, and represents the culmination of many years of redesign and development work. <a href="http://www.blender.org/development/release-logs/blender-250/">More information about this release</a>.</p> <p class="body">What to Expect:</p> <p class="body"> • Big improvements - This is our most exciting version to date, already a significant improvement in many ways over 2.49</p> <p class="body"> • Missing/Incomplete Features - Although most of it is there, not all functionality from pre-2.5 versions has been restored yet. Some functionality may be re-implemented a different way.</p> -<p class="body"> • Bugs - We've fixed a lot lately, but there are still quite a few bugs. This is alpha software, we're still working on it!</p> +<p class="body"> • Bugs - We've fixed a lot lately, but there are still quite a few bugs. This is beta software, we're still working on it!</p> <p class="body"> • Changes - If you're used to the old Blenders, Blender 2.5 may seem quite different at first, but it won't be long before it grows on you even more than before.</p> <p><br></p> <p class="header"><b>Bugs</b></p> -<p class="body">Blender 2.5 Alpha 2 is unfinished software. If you encounter a bug, please help us by posting it in the bug tracker or using Help → Report a Bug from inside Blender 2.5. If it wasn’t reported yet, please log in (or register) and fill in detailed information about the error. Please post detailed instructions on how to reproduce it or post a .blend file showcasing the bug.</p> +<p class="body">Blender 2.5 Beta is unfinished software. If you encounter a bug, please help us by posting it in the bug tracker or using Help → Report a Bug from inside Blender 2.5. If it wasn’t reported yet, please log in (or register) and fill in detailed information about the error. Please post detailed instructions on how to reproduce it or post a .blend file showcasing the bug.</p> <p><br></p> <p class="header"><b>Package Contents</b></p> <p class="body">The downloaded Blender package includes:</p> |