Permalink
Browse files

Merging from release-2.3.0 branch to master.

  • Loading branch information...
garnaat committed Mar 20, 2012
2 parents 94c7391 + c4f3744 commit 2d882029846a00b5216876e1c1e07ad1ccc4c60a
Showing with 10 additions and 9 deletions.
  1. +7 −7 README.markdown
  2. +3 −2 boto/__init__.py
View
@@ -1,6 +1,6 @@
# boto
-boto 2.2.2
-14-Feb-2012
+boto 2.3.0
+18-Mar-2012
## Introduction
@@ -27,6 +27,7 @@ At the moment, boto supports:
* Flexible Payment Service (FPS)
* CloudFormation
* Amazon DynamoDB
+ * Amazon SimpleWorkflow
The goal of boto is to support the full breadth and depth of Amazon
Web Services. In addition, boto provides support for other public
@@ -44,13 +45,11 @@ to keep boto compatible with Python 2.5.x but no guarantees are made.
The main source code repository for boto can be found on
[github.com](http://github.com/boto/boto)
-[Online documentation](http://readthedocs.org/docs/boto/) is also
+[Online documentation](http://docs.pythonboto.org/) is also
available. The online documentation includes full API documentation
as well as Getting Started Guides for many of the boto modules.
-Boto releases can be found on the [Google Project
-page](http://code.google.com/p/boto/downloads/list) or on the [Python
-Cheese Shop](http://pypi.python.org/).
+Boto releases can be found on the [Python Cheese Shop](http://pypi.python.org/).
Join our `IRC channel`_ (#boto on FreeNode).
IRC channel: http://webchat.freenode.net/?channels=boto
@@ -68,6 +67,7 @@ Credentials and other boto-related settings can also be stored in a
boto config file. See
[this](http://code.google.com/p/boto/wiki/BotoConfig) for details.
-Copyright (c) 2006-2011 Mitch Garnaat <mitch@garnaat.com>
+Copyright (c) 2006-2012 Mitch Garnaat <mitch@garnaat.com>
Copyright (c) 2010-2011, Eucalyptus Systems, Inc.
+Copyright (c) 2012 Amazon.com, Inc. or its affiliates.
All rights reserved.
View
@@ -1,6 +1,7 @@
-# Copyright (c) 2006-2011 Mitch Garnaat http://garnaat.org/
+# Copyright (c) 2006-2012 Mitch Garnaat http://garnaat.org/
# Copyright (c) 2010-2011, Eucalyptus Systems, Inc.
# Copyright (c) 2011, Nexenta Systems Inc.
+# Copyright (c) 2012 Amazon.com, Inc. or its affiliates.
# All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -31,7 +32,7 @@
import urlparse
from boto.exception import InvalidUriError
-__version__ = '2.3.0-dev'
+__version__ = '2.3.0'
Version = __version__ # for backware compatibility
UserAgent = 'Boto/%s (%s)' % (__version__, sys.platform)

0 comments on commit 2d88202

Please sign in to comment.