diff --git a/README.md b/README.md index 63cd097c7..1a5b7879a 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,8 @@ Caravel's main goal is to make it easy to slice, dice and visualize data. It empowers users to perform **analytics at the speed of thought**. Caravel provides: -* A quick way to intuitively visualize datasets by allowing users to create and share interactive dashboards +* A quick way to intuitively visualize datasets by allowing users to create + and share interactive dashboards * A rich set of visualizations to analyze your data, as well as a flexible way to extend the capabilities * An extensible, high granularity security model allowing intricate rules @@ -39,9 +40,9 @@ Caravel provides: authentication providers (database, OpenID, LDAP, OAuth & REMOTE_USER through Flask AppBuiler) * A simple semantic layer, allowing to control how data sources are - displayed in the UI, - by defining which fields should show up in which dropdown and which - aggregation and function (metrics) are made available to the user + displayed in the UI, by defining which fields should show up in + which dropdown and which aggregation and function (metrics) are + made available to the user * Deep integration with Druid allows for Caravel to stay blazing fast while slicing and dicing large, realtime datasets @@ -50,7 +51,7 @@ Database Support ---------------- Caravel was originally designed on top of Druid.io, but quickly broadened -its scope to support other databases through the use of SqlAlchemy, a Python +its scope to support other databases through the use of SQLAlchemy, a Python ORM that is compatible with [most common databases](http://docs.sqlalchemy.org/en/rel_1_0/core/engines.html). diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 46c6153c3..66efa1ec1 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -14,11 +14,11 @@ Now click on the ``+`` button to add a new entry .. image:: _static/img/tutorial/db_plus.png :scale: 30 % -Fill in an arbitrary reference name for the database, and you SqlAlchemy +Fill in an arbitrary reference name for the database, and you SQLAlchemy URI. To figure out how to construct your URI, check out the -`SqlAlchemy documentation `_. +`SQLAlchemy documentation `_. Then you can test your connection. If it works, you'll see a positive popup -and list of the tables that SqlAlchemy has found for that URI. +and list of the tables that SQLAlchemy has found for that URI. .. image:: _static/img/tutorial/db_added.png :scale: 30 %