diff options
| author | Ask Solem <ask@celeryproject.org> | 2015-07-13 12:22:34 -0700 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2015-07-13 12:22:34 -0700 |
| commit | 1a061fde01cd8436b52d8d22da1b0db6720755c7 (patch) | |
| tree | fb026125f0234abad960abefeb8dacfefad0328d /docs/userguide | |
| parent | 4ef2f10e15a784de56dcd290d60229020ab11090 (diff) | |
| parent | 083e684f033a712569902eebf186d1db13b1659c (diff) | |
| download | kombu-1a061fde01cd8436b52d8d22da1b0db6720755c7.tar.gz | |
Merge branch 'master' of github.com:celery/kombu
Diffstat (limited to 'docs/userguide')
| -rw-r--r-- | docs/userguide/pools.rst | 2 | ||||
| -rw-r--r-- | docs/userguide/serialization.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/userguide/pools.rst b/docs/userguide/pools.rst index a6059b95..69d3acba 100644 --- a/docs/userguide/pools.rst +++ b/docs/userguide/pools.rst @@ -155,7 +155,7 @@ instances: from kombu import pools from kombu import Connection - connections = pools.Connection(limit=100) + connections = pools.Connections(limit=100) producers = pools.Producers(limit=connections.limit) connection = Connection('amqp://guest:guest@localhost:5672//') diff --git a/docs/userguide/serialization.rst b/docs/userguide/serialization.rst index 9f325575..72970489 100644 --- a/docs/userguide/serialization.rst +++ b/docs/userguide/serialization.rst @@ -106,10 +106,10 @@ Sending raw data without Serialization ====================================== In some cases, you don't need your message data to be serialized. If you -pass in a plain string or Unicode object as your message, then `Kombu` will +pass in a plain string or Unicode object as your message and a custom `content_type`, then `Kombu` will not waste cycles serializing/deserializing the data. -You can optionally specify a `content_type` and `content_encoding` +You can optionally specify a `content_encoding` for the raw data:: >>> with open("~/my_picture.jpg", "rb") as fh: |
