Merge branch 'dev' of github.com:microsoft/mssql-django into dev

Author: Smart-Dev00214

README.md

@@ -26,23 +26,16 @@ We hope you enjoy using the MSSQL-Django 3rd party backend.
 
 ## Installation
 
-1. Install pyodbc and Django
+1. Install pyodbc 3.0 (or newer) and Django 2.2 (or newer)
 
-2. Install django-mssql-backend ::
+2. Install mssql-django ::
 
-    pip install django-mssql-backend
+    pip install mssql-django
 
-3. Now you can point the ``ENGINE`` setting in the settings file used by
-   your Django application or project to the ``'mssql'``
-   module path ::
+3. Set the ``ENGINE`` setting in the settings.py file used by
+   your Django application or project to ``'mssql'``
 
-    'ENGINE': 'mssql'
-
-## Regex Support
-
-django-mssql-backend supports regex using a CLR .dll file. To install it, run ::
-
-    python manage.py install_regex_clr {database_name}
+    ``'ENGINE': 'mssql'``
 
 ## Configuration
 
@@ -223,9 +216,14 @@ Here is an example of the database settings:
 ## Limitations
 
 The following features are currently not supported:
-
+- mssql-django does not support SQL-based regex commands
 - Altering a model field from or to AutoField at migration
 
+## Future Plans
+
+The following features and additions are planned:
+- install instructions for CLR .dll file to add SQL-based regex command support to SQL Server or Azure SQL DB
+
 ## Contributing
 
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
@@ -250,4 +248,4 @@ This project may contain trademarks or logos for projects, products, or services
 trademarks or logos is subject to and must follow 
 [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general).
 Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
-Any use of third-party trademarks or logos are subject to those third-party's policies.
+Any use of third-party trademarks or logos are subject to those third-party's policies.

setup.py

@@ -19,7 +19,7 @@
 
 setup(
     name='mssql-django',
-    version='2.8.1',
+    version='1.0.a1',
     description='Django backend for Microsoft SQL Server',
     long_description=open('README.md').read(),
     author='Microsoft',