From: Gord Thompson <gord@gordthompson.com>
Date: Fri, 15 May 2020 12:07:57 +0000 (-0600)
Subject: Adjust documentation wording for firebird and sybase
X-Git-Tag: rel_1_4_0b1~330^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f08d54d30b139b5925772b40778746b94cc4f76;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Adjust documentation wording for firebird and sybase

Change-Id: Ied2cdab1c2dbdee681a5500285a5bcdd4d589afa
---

diff --git a/lib/sqlalchemy/dialects/firebird/base.py b/lib/sqlalchemy/dialects/firebird/base.py
index f6d50023b8..680968b9ed 100644
--- a/lib/sqlalchemy/dialects/firebird/base.py
+++ b/lib/sqlalchemy/dialects/firebird/base.py
@@ -12,13 +12,14 @@ r"""
 
 .. note::
 
-    The Firebird dialect within SQLAlchemy **is not currently supported**. The
-    dialect is not tested within continuous integration and is likely to have
-    many issues and caveats not currently handled.
+    The Firebird dialect within SQLAlchemy **is not currently supported**.
+    It is not tested within continuous integration and is likely to have
+    many issues and caveats not currently handled. Consider using the
+    `external dialect <https://github.com/pauldex/sqlalchemy-firebird>`_
+    instead.
 
-.. deprecated:: 1.4 This dialect is deprecated and will be removed
-    in a future version. This dialect is superseded by the external
-    version available at external-dialect_.
+.. deprecated:: 1.4 The internal Firebird dialect is deprecated and will be
+   removed in a future version. Use the external dialect.
 
 Firebird Dialects
 -----------------
@@ -77,7 +78,6 @@ the SQLAlchemy ``returning()`` method, such as::
 
 
 .. _dialects: http://mc-computing.com/Databases/Firebird/SQL_Dialect.html
-.. _external-dialect: https://github.com/pauldex/sqlalchemy-firebird
 """
 
 import datetime
diff --git a/lib/sqlalchemy/dialects/sybase/base.py b/lib/sqlalchemy/dialects/sybase/base.py
index 634cf0da4e..77ebfac938 100644
--- a/lib/sqlalchemy/dialects/sybase/base.py
+++ b/lib/sqlalchemy/dialects/sybase/base.py
@@ -16,12 +16,14 @@
 
 .. note::
 
-    The Sybase dialect within SQLAlchemy **is not currently supported**.   The
-    dialect is not tested within continuous integration and is likely to have
-    many issues and caveats not currently handled.
+    The Sybase dialect within SQLAlchemy **is not currently supported**.
+    It is not tested within continuous integration and is likely to have
+    many issues and caveats not currently handled. Consider using the
+    `external dialect <https://github.com/gordthompson/sqlalchemy-sybase>`_
+    instead.
 
-.. deprecated:: 1.4 The Sybase dialect is deprecated and will be removed
-   in a future version.
+.. deprecated:: 1.4 The internal Sybase dialect is deprecated and will be
+   removed in a future version. Use the external dialect.
 
 """
 
@@ -654,7 +656,8 @@ class SybaseDialect(default.DefaultDialect):
     def __init__(self, *args, **kwargs):
         util.warn_deprecated(
             "The Sybase dialect is deprecated and will be removed "
-            "in a future version.",
+            "in a future version. This dialect is superseded by the external "
+            "dialect https://github.com/gordthompson/sqlalchemy-sybase.",
             version="1.4",
         )
         super(SybaseDialect, self).__init__(*args, **kwargs)