版本 269 和 Downloads 的 版本 270 之間的變動

時間撮記:

2010-12-22 下午05:33:47 (14 年 前)

作者:

Klaus Espenlaub

註解:

first go at correctly separating GPL/PUEL with 4.0.0

Downloads

@@ -4 +4 @@
 == !VirtualBox binaries == 
 
-The binaries in this section are all released under the [wiki:"VirtualBox_PUEL" VirtualBox Personal Use and Evaluation License (PUEL)]. By downloading, you agree to the terms and conditions of that license.
+The binaries in this section are all released under the terms of the GPL. By downloading, you agree to the terms and conditions of that license.
 
  * '''!VirtualBox 4.0 for Windows hosts''' [http://download.virtualbox.org/virtualbox/4.0.0/VirtualBox-4.0.0-69151-Win.exe x86/amd64]
@@ -14 +14 @@
  * '''!VirtualBox 4.0 for Solaris hosts''' [http://download.virtualbox.org/virtualbox/4.0.0/VirtualBox-4.0.0-69151-SunOS.tar.gz x86/amd64]
 
- * '''!VirtualBox 4.0 Oracle VM !VirtualBox Extension Pack''' [http://download.virtualbox.org/virtualbox/4.0.0/Oracle_VM_VirtualBox_Extension_Pack-4.0.0-69151.vbox-extpack All platforms]
-
  * '''!VirtualBox 4.0 Software Developer Kit (SDK)''' [http://download.virtualbox.org/virtualbox/4.0.0/VirtualBoxSDK-4.0.0-69151.zip All platforms]
 
- * '''[wiki:Download_Old_Builds VirtualBox older builds]'''
+Please consider downloading the Oracle VM !VirtualBox Extension Pack below. It con
 
 See the [wiki:Changelog changelog] for what has changed.[[BR]]
@@ -28 +26 @@
 '''Note:''' After upgrading !VirtualBox it is recommended to upgrade the guest additions as well.
 
+== !VirtualBox Extension Pack binaries == 
+
+The binaries in this section are all released under the [wiki:"VirtualBox_PUEL" VirtualBox Personal Use and Evaluation License (PUEL)]. By downloading, you agree to the terms and conditions of that license.
+
+ * '''!VirtualBox 4.0 Oracle VM !VirtualBox Extension Pack''' [http://download.virtualbox.org/virtualbox/4.0.0/Oracle_VM_VirtualBox_Extension_Pack-4.0.0-69151.vbox-extpack All platforms]
+
 == User Manual == #manual
 
@@ -36 +40 @@
 You may also like to take a look at our [wiki:User_FAQ frequently asked questions list].
 
-== !VirtualBox Open Source Edition (OSE) == #ose
+== !VirtualBox older builds == 
 
-For a detailed explanation about the differences between '''!VirtualBox''' and '''!VirtualBox OSE''', please take a look at the [wiki:"Editions"] page. The '''!VirtualBox OSE''' sources are available free of charge under the terms and conditions of the [wiki:"GPL" GNU General Public License, Version 2]. By downloading from the below links, you agree to these terms and conditions.
+The binaries in this section are all released under the [wiki:"VirtualBox_PUEL" VirtualBox Personal Use and Evaluation License (PUEL)]. By downloading, you agree to the terms and conditions of that license.
+
+ * '''[wiki:Download_Old_Builds VirtualBox older builds]'''
+
+== !VirtualBox Sources == #ose
+
+The '''!VirtualBox''' sources are available free of charge under the terms and conditions of the [wiki:"GPL" GNU General Public License, Version 2]. By downloading from the below links, you agree to these terms and conditions.
 
  * '''[http://download.virtualbox.org/virtualbox/4.0.0/VirtualBox-4.0.0.tar.bz2 Source code]'''
@@ -64 +74 @@
 After getting the sources in one of the ways listed above, you should have a look at the [wiki:"Build_instructions" build instructions].
 
-Please note that the Open Source Edition does not include an installer or setup utilities, as it is mainly aimed at developers and Linux distributors.  We do request that anyone intending to redistribute the Open Source Edition [http://www.sun.com/virtualbox contact] us first.  Please also take a look at our [wiki:"Licensing_FAQ" licensing FAQ], in particular regarding the use of the name !VirtualBox.
+Please also take a look at our [wiki:"Licensing_FAQ" licensing FAQ], in particular regarding the use of the name !VirtualBox.