diff --git a/clang/www/features.html b/clang/www/features.html index 715c9d18dcab2f..d0b4a7f30fd342 100755 --- a/clang/www/features.html +++ b/clang/www/features.html @@ -269,19 +269,18 @@

Integration with IDEs

-

Use the LLVM 'BSD' License

+

Use the LLVM 'Apache 2' License

We actively intend for clang (and LLVM as a whole) to be used for commercial projects, not only as a stand-alone compiler but also as a library -embedded inside a proprietary application. The BSD license is the simplest way -to allow this. We feel that the license encourages contributors to pick up the -source and work with it, and believe that those individuals and organizations -will contribute back their work if they do not want to have to maintain a fork -forever (which is time consuming and expensive when merges are involved). -Further, nobody makes money on compilers these days, but many people need them -to get bigger goals accomplished: it makes sense for everyone to work -together.

+embedded inside a proprietary application. We feel that the license encourages +contributors to pick up the source and work with it, and believe that those +individuals and organizations will contribute back their work if they do not +want to have to maintain a fork forever (which is time consuming and expensive +when merges are involved). Further, nobody makes money on compilers these days, +but many people need them to get bigger goals accomplished: it makes sense for +everyone to work together.

For more information about the LLVM/clang license, please see the LLVM License diff --git a/clang/www/index.html b/clang/www/index.html index ed826b8ebbdf6a..ce400d6153d317 100755 --- a/clang/www/index.html +++ b/clang/www/index.html @@ -44,7 +44,7 @@

Features and Goals

  • Support diverse clients (refactoring, static analysis, code generation, etc.)
  • Allow tight integration with IDEs
  • -
  • Use the LLVM 'BSD' License
  • +
  • Use the LLVM 'Apache 2' License
  • Internal Design and