3 files changed, 30 insertions, 8 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 18043c456..2c3e26f2e 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -23,6 +23,18 @@
     on compatibility concerns, see :doc:`/changelog/migration_10`.
 
     .. change::
+        :tags: feature, postgresql, pypy
+        :tickets: 3052
+        :pullreq: bitbucket:34
+
+        Added support for the psycopg2cffi DBAPI on pypy.   Pull request
+        courtesy shauns.
+
+        .. seealso::
+
+            :mod:`sqlalchemy.dialects.postgresql.psycopg2cffi`
+
+    .. change::
         :tags: feature, orm
         :tickets: 3262
         :pullreq: bitbucket:38
diff --git a/doc/build/changelog/migration_10.rst b/doc/build/changelog/migration_10.rst
index c0369d8b8..23ee6f466 100644
--- a/doc/build/changelog/migration_10.rst
+++ b/doc/build/changelog/migration_10.rst
@@ -1769,6 +1769,14 @@ by Postgresql as of 9.4.  SQLAlchemy allows this using
 
     :class:`.FunctionFilter`
 
+Support for psycopg2cffi Dialect on Pypy
+----------------------------------------
+
+Support for the pypy psycopg2cffi dialect is added.
+
+.. seealso::
+
+    :mod:`sqlalchemy.dialects.postgresql.psycopg2cffi`
 
 Dialect Improvements and Changes - MySQL
 =============================================
diff --git a/doc/build/dialects/postgresql.rst b/doc/build/dialects/postgresql.rst
index 11bbe2cf9..e5d8d51bc 100644
--- a/doc/build/dialects/postgresql.rst
+++ b/doc/build/dialects/postgresql.rst
@@ -188,22 +188,24 @@ psycopg2
 
 .. automodule:: sqlalchemy.dialects.postgresql.psycopg2
 
+pg8000
+--------------
+
+.. automodule:: sqlalchemy.dialects.postgresql.pg8000
+
+psycopg2cffi
+--------------
+
+.. automodule:: sqlalchemy.dialects.postgresql.psycopg2cffi
+
 py-postgresql
 --------------------
 
 .. automodule:: sqlalchemy.dialects.postgresql.pypostgresql
 
-pg8000
---------------
-
-.. automodule:: sqlalchemy.dialects.postgresql.pg8000
 
 zxjdbc
 --------------
 
 .. automodule:: sqlalchemy.dialects.postgresql.zxjdbc
 
-psycopg2cffi
---------------
-
-.. automodule:: sqlalchemy.dialects.postgresql.psycopg2cffi