diff --git a/LICENSE b/LICENSE index f42ddb1aa52..7d19426e7a0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012, Continuum Analytics, Inc. +Copyright (c) 2012, Anaconda, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.rst b/README.rst index 900ee75a79b..9e08ce26b87 100644 --- a/README.rst +++ b/README.rst @@ -35,7 +35,7 @@ Installing ========== The easiest way to install numba and get updates is by using the Anaconda -Distribution: https://www.anaconda.com/downloads +Distribution: https://www.anaconda.com/download :: diff --git a/buildscripts/condarecipe.buildbot/license.txt b/buildscripts/condarecipe.buildbot/license.txt index ead66cf6df9..7d19426e7a0 100644 --- a/buildscripts/condarecipe.buildbot/license.txt +++ b/buildscripts/condarecipe.buildbot/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2017, Anaconda, Inc. +Copyright (c) 2012, Anaconda, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/buildscripts/condarecipe.hsa/license.txt b/buildscripts/condarecipe.hsa/license.txt index ead66cf6df9..7d19426e7a0 100644 --- a/buildscripts/condarecipe.hsa/license.txt +++ b/buildscripts/condarecipe.hsa/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2017, Anaconda, Inc. +Copyright (c) 2012, Anaconda, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/buildscripts/condarecipe.jenkins/license.txt b/buildscripts/condarecipe.jenkins/license.txt index ead66cf6df9..7d19426e7a0 100644 --- a/buildscripts/condarecipe.jenkins/license.txt +++ b/buildscripts/condarecipe.jenkins/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2017, Anaconda, Inc. +Copyright (c) 2012, Anaconda, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/buildscripts/condarecipe.local/license.txt b/buildscripts/condarecipe.local/license.txt index ead66cf6df9..7d19426e7a0 100644 --- a/buildscripts/condarecipe.local/license.txt +++ b/buildscripts/condarecipe.local/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2017, Anaconda, Inc. +Copyright (c) 2012, Anaconda, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/source/developer/contributing.rst b/docs/source/developer/contributing.rst index 73c1ec3f5d1..353cc1744cb 100644 --- a/docs/source/developer/contributing.rst +++ b/docs/source/developer/contributing.rst @@ -191,7 +191,7 @@ You can expect this to take less than 20 minutes. Some platforms (such as Windows) cannot be hosted by Travis-CI, and the Numba team has therefore access to a separate platform provided by -`Anaconda, Inc. `_, our sponsor. We hope parts of that +`Anaconda, Inc. `_, our sponsor. We hope parts of that infrastructure can be made public in the future. diff --git a/docs/source/user/faq.rst b/docs/source/user/faq.rst index 62a1b67fe40..9329b1d0d97 100644 --- a/docs/source/user/faq.rst +++ b/docs/source/user/faq.rst @@ -102,11 +102,12 @@ apply them. Does Numba automatically parallelize code? ------------------------------------------ -In can, in some cases: +It can, in some cases: * Ufuncs and gufuncs with the ``target="parallel"`` option will run on multiple threads. * The experimental ``parallel=True`` option to ``@jit`` will attempt to optimize - array operations and run them in parallel. + array operations and run them in parallel. It also adds support for ``prange()`` to + explicitly parallelize a loop. You can also manually run computations on multiple threads yourself and use the ``nogil=True`` option (see :ref:`releasing the GIL `). Numba diff --git a/docs/source/user/installing.rst b/docs/source/user/installing.rst index 6306b52a365..dc5f2d1addb 100644 --- a/docs/source/user/installing.rst +++ b/docs/source/user/installing.rst @@ -22,7 +22,7 @@ Installing using Conda The easiest way to install numba and get updates is by using Conda, a cross-platform package manager and software distribution maintained by Anaconda, Inc. You can either use `Anaconda -`_ to get the full stack in one download, +`_ to get the full stack in one download, or `Miniconda `_ which will install the minimum packages needed to get started.