Small doc changes

docs/contributing.rst

@@ -291,7 +291,7 @@ The versions we currently maintain is:
 
 * 2.1
 
-  This is the last version to use the ``carrot`` AMQP framework.
+  This is the last version to use the ``carrot`` AMQP library.
   Recent versions use ``kombu``.
 
 Archived branches
@@ -860,7 +860,7 @@ celery
 kombu
 -----
 
-Messaging framework.
+Messaging library.
 
 :git: https://github.com/celery/kombu
 :CI: http://travis-ci.org/#!/celery/kombu
@@ -904,7 +904,7 @@ Django <-> Celery Integration.
 cl
 --
 
-Actor framework.
+Actor library.
 
 :git: https://github.com/celery/cl
 :PyPI: http://pypi.python.org/pypi/cl

docs/history/changelog-2.2.rst

@@ -449,7 +449,7 @@ Important Notes
 
 * Carrot has been replaced with `Kombu`_
 
-    Kombu is the next generation messaging framework for Python,
+    Kombu is the next generation messaging library for Python,
     fixing several flaws present in Carrot that was hard to fix
     without breaking backwards compatibility.
 

docs/includes/introduction.txt

@@ -23,8 +23,8 @@ message on the queue, the broker then delivers the message to a worker.
 A Celery system can consist of multiple workers and brokers, giving way
 to high availability and horizontal scaling.
 
-Celery is written in Python, but the protocol can be implemented in any
-language.  So far there's RCelery_ for the Ruby programming language, and a
+Celery is a library written in Python, but the protocol can be implemented in
+any language.  So far there's RCelery_ for the Ruby programming language, and a
 `PHP client`, but language interoperability can also be achieved
 by using webhooks.