diff --git a/doc/source/index.rst b/doc/source/index.rst
index dfa1b46a668a854764fade058c54a491b1261192..ba7ddd2796c16b7df58d35bf23ae82d7569cab04 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -9,9 +9,7 @@ What makes PyOpenCL special?
   often called 
   `RAII <http://en.wikipedia.org/wiki/Resource_Acquisition_Is_Initialization>`_
   in C++, makes it much easier to write correct, leak- and
-  crash-free code. PyOpenCL knows about dependencies, too, so (for example)
-  it won't detach from a context before all memory allocated in it is also
-  freed.
+  crash-free code.
 
 * Completeness. PyOpenCL puts the full power of OpenCL's API at your
   disposal, if you wish. Every obscure `get_info()` query and 
@@ -76,7 +74,8 @@ Contents
     reference
 
 Note that this guide does not explain OpenCL programming and technology. Please 
-refer to generic OpenCL tutorials for that.
+refer to the official `Khronos OpenCL documentation <http://khronos.org/opencl>`_
+for that.
 
 PyOpenCL also has its own `web site <http://mathema.tician.de/software/pyopencl>`_,
 where you can find updates, new versions, documentation, and support.
diff --git a/setup.py b/setup.py
index 877767d7875a0ad99b267a1df4a2765ea2415642..1967108533350fd52ff1f63b325e1abacc4af396 100644
--- a/setup.py
+++ b/setup.py
@@ -71,9 +71,7 @@ def main():
               called
               `RAII <http://en.wikipedia.org/wiki/Resource_Acquisition_Is_Initialization>`_
               in C++, makes it much easier to write correct, leak- and
-              crash-free code. PyOpenCL knows about dependencies, too, so (for
-              example) it won't detach from a context before all memory
-              allocated in it is also freed.
+              crash-free code.
 
             * Completeness. PyOpenCL puts the full power of OpenCL's API at
               your disposal, if you wish.  Every obscure `get_info()` query and