diff --git a/docs/getting-started.md b/docs/getting-started.md
index 1ec48a88269dce3818f2139d6872d907bfc54b56..c3a52a1a512b13db121c9d0c8471f3e09f01335f 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -4,28 +4,41 @@ Metabase lets you ask questions about your data, drill into specific records, an
##Step 1: Installing Metabase
Metabase uses Java to operate, so you'll need at least version 1.6 or later. Not sure what version of Java you're using? No problem. Here's how to check:
-###Mac Users:
-In Terminal, insert the command prompt: "java -version". You will receive a message similar to:
+**Mac Users:**
+
+In Terminal, insert the command prompt: "java -version". You will receive a message similar to:
java version "1.60_65"
Java (TM) SE Runtime Environment (build 1.6.0_65-b14-466.1-11M4716)
Java HotSpot (TM) 64-Bit Server VM (build 20.65-b04-466.1, mixed mode)
-As long as the version is at least 1.6, you're all set to go!
+As long as the version is at least 1.6, you're all set to go!
+
+**Windows Users:**
-###Windows Users:
Under Programs, click on the "Java" icon. Click on "About" and then find the version number listed. If you're using version 1.6 or greater, then you're good to go!
-If you don't have the latest version of Java, download the most recent Java Development Kit (JDK) from [Oracle's Java Downloads page](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+---
+
+If you don't have the latest version of Java, download it at: [https://java.com/en/download/](https://java.com/en/download/)
+
+Once you take care of checking the version of java on your computer, **Download the Metabase file from [www.metabase.com/download](www.metabase.com/download).**
-Once you take care of checking the version of java on your computer, **Download the Metabase file from [www.metabase.com/download](www.metabase.com/download).** Place the Metabase JAR in the directory. Run the command `java -jar metabase.jar` to create a file called "metabase.db.h2.db". **This file contains important application data, so don't delete it!**
+Place the Metabase JAR in the directory.
+
+Run the command `java -jar metabase.jar` to create a file called "metabase.db.h2.db". **This file contains important application data, so don't delete it!**
Now that you have Metabase installed, you can sync it to your database. Go to [http://localhost:3000](http://localhost:3000) to connect your database.
+
+
+
##Step 2: Configuring your Instance
-Create a Metabase account by entering your name, email, and super-secretive password—we don't recommend using password123!
+Create a Metabase account by entering your name and email. Create a super-secretive password!
-Now Metabase needs to find your data. Where does your data live? Depending on where you keep your database, the steps to connect with Metabase vary. Not to worry, though, we outlined the configuration steps for each of the major platforms.
+
+
+Once you have an account, you can now connect Metabase with your data. Where does your data live? Depending on where you keep your database, the steps to connect with Metabase vary. Not to worry, though, we outlined the configuration steps for each platform Metabase supports.
###If you use Heroku:
@@ -84,6 +97,8 @@ Metabase needs this information to finish connecting to your database.
**Now that you have your database information,** use the information to fill out the remainder of the form.
+
+
After you enter your database's information, Metabase will try to connect to your database and validate the credentials. If you get a validation error, no need to panic. Validation errors occur when the wrong credentials are entered. Simply double check the spelling and punctuation of the information you entered and try to connect to the database once more.
Once Metabase successfully connects to your database, it'll run a few queries against your database to build a model of your data. Click the prompt "continue" to see what data Metabase found in your database!
@@ -92,52 +107,44 @@ Once Metabase successfully connects to your database, it'll run a few queries ag
If you look at your homepage, you'll see the different tables that Metabase was able to find in your data source set and pulled for you. Click a table you want to learn more about. Note the number of rows.
-*Figure 1*
-
-
+
-For example, in the sample data set above, the database (data source) is "Bird Impact" (it's a database of the number of collisions between birds and aircrafts). The table is "strikes" and the number of rows is 151,069.
+For example, in the sample data set above, the database (data source) is "Sample Dataset". There are four tables—"Orders," "People," "Products," and "Reviews." They have 17,323; 2500; 200; and 1025 rows each respectively.
##Step 4: Asking your Question
By clicking on an individual table, you enter the interface (pictured below) that allows you to ask Metabase questions based on your data.
-*Figure 2*
+
-
+Your screen will reflect the data source you connected to Metabase and the table you selected. In our example, the data source is "Sample Dataset" and the table is "Orders".
-Your screen will reflect the data source you connected to Metabase and the table you selected. In our example, the data source is "Bird Impact" and the table is "strikes" (exactly what we selected on the previous screen).
+For now, let's start with a basic question using our data set. How many orders placed had a subtotal (before tax) of greater than or equal to $40.00? More precisely, this question translates to "How many records are in the table 'Orders' that meet the stated conditions.
-For now, let's start with a basic question using our data set. How many collisions were there between aircrafts and birds? More precisely, this question translates to "How many records are in the table 'strikes'?" To find the number, we want to _filter_ the data by **the field we are interested in** (which is "Birds Struck" for our example). Our operator is **"is"** because we want to know the value (not whether it is greater or less than a number, etc.). The value is left blank because we don't know the value. We want to view the **Count** because we want to know the number (not a listing of every incident).
+To find the number, we want to _filter_ the data by **the field we are interested in** (which is "Subtotal" for our example). Our operator is **"Greater than or equal to"** because we want to know the value (not whether it is greater or less than a number, etc.). The value is 40 because we are interested in orders with a subtotal greater than or equal to 40. We want to view the **Count** because we want to know the number (not a listing of every incident).
-*Figure 3*
-
-
+
After you select the different components of your question, click **Run query**.
-*Figure 4*
-
-
+
-There were 151,069 collisions between aircraft and birds. Stated in database parlance, there are 151,069 records in the table. Does this number look familiar? When selecting a table on your homepage in Step 3 (See *Figure 1*) 151069 was labeled as "total" and listed next to the table "strikes".
+There were 11,741 orders with a subtotal greater than or equal to $40.00. Stated in database parlance, there are 11,741 records in the table that meet theh paramters we set.
**The total number listed next to each table is the number of records. Each record is an iteration of the event your database records.**
Metabase can present the answers to your questions in a variety of formats. To change the format, select one of the options from the dropdown menu in the top left hand corner of the screen next to **Visualization**.
-*Figure 5*
-
Not every format is the best way to show an answer to a question. If Metabase think that's the case with a specific question and display format, the format choice will appear faded. For example, it wouldn't make sense to show the number of collisions between aircraft and birds as a singular bar graph.
-You can "group" your data into categories. Click **Add a grouping** to select the category to filter your answer by. Metabase will analyze your database to discover valid categories for adding filters to your questions. For example, we can ask Metabase to tell us the number of collisions between aircraft and birds grouped by the weather conditions. The table "strikes" already had a field to record weather conditions labeled "PRECIP" (short for "precipitation").
+You can "group" your data into categories. Click **Add a grouping** to select the category to filter your answer by. Metabase will analyze your database to discover valid categories for adding filters to your questions.
-*Figure 6*
+
-
+Above, Metabase filtered the Product table to show the number of products priced more than $20 grouped by rating.
**When you make any changes to the question (called the "query"), the blue "Run query" button reappears.** Click it to refresh the answer and to find the answer to your new query.
diff --git a/docs/images/AccountSetup.png b/docs/images/AccountSetup.png
new file mode 100644
index 0000000000000000000000000000000000000000..973d10b46f43f2b529dfeccddcb05c7544692e0d
Binary files /dev/null and b/docs/images/AccountSetup.png differ
diff --git a/docs/images/AddDatabase.png b/docs/images/AddDatabase.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ac9a1e09b04433f0fe7351a58c4f3e1615aad78
Binary files /dev/null and b/docs/images/AddDatabase.png differ
diff --git a/docs/images/AddQ.png b/docs/images/AddQ.png
new file mode 100644
index 0000000000000000000000000000000000000000..a340301ce54e25eeed08b254dc4be1696f1f4997
Binary files /dev/null and b/docs/images/AddQ.png differ
diff --git a/docs/images/Addnewdashboard.png b/docs/images/Addnewdashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..c64eb449f0c7ea0629f7fd4778d0f8baa48a24e6
Binary files /dev/null and b/docs/images/Addnewdashboard.png differ
diff --git a/docs/images/Bookicon.png b/docs/images/Bookicon.png
index 9c7e8baf11b5939792ce2537526030af63327c6d..d66303678346a60c269673fa01653cb7a59a9b1d 100644
Binary files a/docs/images/Bookicon.png and b/docs/images/Bookicon.png differ
diff --git a/docs/images/DashboardDropdown.png b/docs/images/DashboardDropdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..307919e232b0bba6fb9f9a161f068abbc0583d10
Binary files /dev/null and b/docs/images/DashboardDropdown.png differ
diff --git a/docs/images/DashboardGridButton.png b/docs/images/DashboardGridButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..82c85303a165e0add72836456c6f234cf8fc960e
Binary files /dev/null and b/docs/images/DashboardGridButton.png differ
diff --git a/docs/images/DashboardSuccess.png b/docs/images/DashboardSuccess.png
new file mode 100644
index 0000000000000000000000000000000000000000..4198b2275938ead05f9c33262c96d1c2c0d45f01
Binary files /dev/null and b/docs/images/DashboardSuccess.png differ
diff --git a/docs/images/DashboardView.png b/docs/images/DashboardView.png
new file mode 100644
index 0000000000000000000000000000000000000000..d39f0023f9baa85353718a3875afc6b67e09a52d
Binary files /dev/null and b/docs/images/DashboardView.png differ
diff --git a/docs/images/DataReference.png b/docs/images/DataReference.png
new file mode 100644
index 0000000000000000000000000000000000000000..61979f878eafea4d6e31ce846b4408fc2f2df85e
Binary files /dev/null and b/docs/images/DataReference.png differ
diff --git a/docs/images/DataReferenceTab.png b/docs/images/DataReferenceTab.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f1836b314897ee0d06c580a7935ab2507e8732
Binary files /dev/null and b/docs/images/DataReferenceTab.png differ
diff --git a/docs/images/DataTableExplore.png b/docs/images/DataTableExplore.png
new file mode 100644
index 0000000000000000000000000000000000000000..290624b27118e8aa3d91797c0fd4c3abb8b7f08d
Binary files /dev/null and b/docs/images/DataTableExplore.png differ
diff --git a/docs/images/DatabaseConnected.png b/docs/images/DatabaseConnected.png
new file mode 100644
index 0000000000000000000000000000000000000000..acd4beb70d2ef1299235cf81e5be64cd1a8d05a3
Binary files /dev/null and b/docs/images/DatabaseConnected.png differ
diff --git a/docs/images/DatabaseView.png b/docs/images/DatabaseView.png
new file mode 100644
index 0000000000000000000000000000000000000000..17bec5a4d4e6b8ebce1661b074e4ae7cc9009194
Binary files /dev/null and b/docs/images/DatabaseView.png differ
diff --git a/docs/images/EditDashboard.png b/docs/images/EditDashboard.png
index aed2b1b88b1db5eba0902d6efa1a609092a51409..428b17f4c3e5539168d866d7d30dee8793ccc26b 100644
Binary files a/docs/images/EditDashboard.png and b/docs/images/EditDashboard.png differ
diff --git a/docs/images/EditDashboardInterface.png b/docs/images/EditDashboardInterface.png
new file mode 100644
index 0000000000000000000000000000000000000000..98a2a7fc6f5c8443217cd5dea3ffe21be0dd8d41
Binary files /dev/null and b/docs/images/EditDashboardInterface.png differ
diff --git a/docs/images/Editmode.png b/docs/images/Editmode.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0caa9907b66164fbb2f5ab682dae5235b7dd2f1
Binary files /dev/null and b/docs/images/Editmode.png differ
diff --git a/docs/images/GroupingFeature.png b/docs/images/GroupingFeature.png
index c0bf6cd8fca187bdb36b2bda9174880dde167e7c..6ba3aa7862b77395f2b11472baecb3f20e9d0849 100644
Binary files a/docs/images/GroupingFeature.png and b/docs/images/GroupingFeature.png differ
diff --git a/docs/images/QueryInterfaceBar.png b/docs/images/QueryInterfaceBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..afa8c57be3eb2ba5528fc510874e866df9b5a17c
Binary files /dev/null and b/docs/images/QueryInterfaceBar.png differ
diff --git a/docs/images/QuestionConditions.png b/docs/images/QuestionConditions.png
new file mode 100644
index 0000000000000000000000000000000000000000..0edebc365992208c0d139823ecaae22918d3879e
Binary files /dev/null and b/docs/images/QuestionConditions.png differ
diff --git a/docs/images/SQLButton.png b/docs/images/SQLButton.png
index c6bc2e2907d485985e4fbf6859439a0ba6af58c7..382b63bacfd12ebd87fb59bbb2e9370c113fd223 100644
Binary files a/docs/images/SQLButton.png and b/docs/images/SQLButton.png differ
diff --git a/docs/images/SQLInterface.png b/docs/images/SQLInterface.png
index 3e7d6e68bfbef5d8bafa92a09dc1a5558812b631..ae1ee771810e1d4c0e025bca3cc712fdbdeb9527 100644
Binary files a/docs/images/SQLInterface.png and b/docs/images/SQLInterface.png differ
diff --git a/docs/images/SampleQuestionAnswer.png b/docs/images/SampleQuestionAnswer.png
new file mode 100644
index 0000000000000000000000000000000000000000..22f495bb777fa665ccd3c75bf1150e864641fcf3
Binary files /dev/null and b/docs/images/SampleQuestionAnswer.png differ
diff --git a/docs/images/SaveButton.png b/docs/images/SaveButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..f21509de2ae6f3c332fb435550aa883924a1ce3b
Binary files /dev/null and b/docs/images/SaveButton.png differ
diff --git a/docs/images/SaveCard.png b/docs/images/SaveCard.png
new file mode 100644
index 0000000000000000000000000000000000000000..2342568c44398b63e4c77ad0d9c748cbc96b249c
Binary files /dev/null and b/docs/images/SaveCard.png differ
diff --git a/docs/images/SavedQuestion.png b/docs/images/SavedQuestion.png
new file mode 100644
index 0000000000000000000000000000000000000000..69ee3ccea866cb85511bb059a02e3821296dc2c0
Binary files /dev/null and b/docs/images/SavedQuestion.png differ
diff --git a/docs/images/TableInterface.png b/docs/images/TableInterface.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3658ccc0f75a3bb95b56c1aa520dbf3d9159e90
Binary files /dev/null and b/docs/images/TableInterface.png differ
diff --git a/docs/images/VisualizeChoices.png b/docs/images/VisualizeChoices.png
new file mode 100644
index 0000000000000000000000000000000000000000..b759000b033ca86569f3255a5c86a31fbec034ec
Binary files /dev/null and b/docs/images/VisualizeChoices.png differ
diff --git a/docs/images/WelcomeScreen.png b/docs/images/WelcomeScreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..d522be07fe358632757a164cb3bd428c69441c3d
Binary files /dev/null and b/docs/images/WelcomeScreen.png differ
diff --git a/docs/users-guide.md b/docs/users-guide.md
index e78e5d8f1c080b1f9096354cd52e3e052753d965..bcf3250e5250e43a164e6443075a97fa8ea109d0 100644
--- a/docs/users-guide.md
+++ b/docs/users-guide.md
@@ -1,4 +1,4 @@
-# User Guide
+#User Guide
## Overview
---
@@ -85,8 +85,7 @@ If we wanted to analyze our hypothetical app's database with Metabase, we could
---
Metabase's two core concepts are questions and their corresponding answers. Everything else is based around this functionality. To ask Metabase a question, use the query interface bar.
-*Figure 1: Sample Query Interface Bar*
-
+
Questions are made up of a number of parts:
@@ -96,7 +95,7 @@ Source data comes from a table in your database. Typically, users use a single
###Filtering your Data
---
-You can filter your data by any field in the table you're working with or any connected tables through foreign keys. Filters narrow down the source data to an interesting subset, like "active users" or bookings after June 15th, 2015."
+You can filter your data by any field in the table you're working with or any connected tables through foreign keys. Filters narrow down the source data to an interesting subset, like "active users" or "bookings after June 15th, 2015."
Different fields can have different filters based on them.
There are four universal operators that can be applied to any field. These operators are:
@@ -175,10 +174,12 @@ Even if you don't understand SQL or how to use it, it's worthwhile to understand
###Using SQL
You can switch a card from GUI mode to SQL mode by clicking on the "**>_**" button in the upper right hand corner.
-
+
+
You can write SQL directly into the text box that appears.
-
+
+
To try it out, type the command `select count(*), date from purchases group by date`. Don't worry if you don't understand this just yet. Click 'run query' and note the table that comes back is the same as if you had graphed "count" broken out by "date".
@@ -203,9 +204,7 @@ Answers to questions can be visualized in a number of ways:
To change how the answer to your query is displayed, click on the visualization button beneath the query interface bar to access the dropdown menu.
-*Figure 2: Visualization Button and Dropdown Menu*
-
-
+
If a particular output format is not sensible for your query, the format option will appear faded on the dropdown menu.
@@ -217,15 +216,16 @@ Once a question is answered, you can save, favorite, or download the answer.
###How to Save a Question
After entering a question, click the blue **Save** Button above the query interface bar to save a question.
-*Figure 3: Save a Question*
+
-
+A pop-up box will appear asking you to input information about the question.
-After you save a question, the query interface bar will change. Instead of the **Save** button, you will have three new options. Clicking the **Star** favorites the question. Click the middle **Double Square** button to delete the saved question. Click the **Dashboard +** icon to add your saved question to a Dashboard.
+
-*Figure 4: Options for Saved Questions*
-
+After you save a question, the query interface bar will change. Instead of the **Save** button, you will have three new options. Clicking the **Star** favorites the question. Click the middle **Double Square** button to delete the saved question. Click the **Dashboard +** icon to add your saved question to a Dashboard.
+
+
##Dashboards
---
@@ -240,31 +240,33 @@ You can make as many dashboards as you want. **Public dashboards** (public only
##How to add a Question to a Dashboard
After saving a question, click the **"Dashboard +"** icon to add a question to a dashboard.
-*Figure 5: Add Question to Dashboard*
-
-
+
##How to Create a Dashboard
Once you have a question saved, you can create a dashboard. Click "Create a new dashboard" (*See Figure 5*). Enter a name and description for your dashboard, as well as configure its privacy settings.
-*Figure 6: Create a Dashboard*
-
+
Once you successfully create your dashboard, the following pop-up will appear.
-*Figure 7: Dashboard Created Successfully*
-
+
+
+You can view your Dashboard by clicking the link or by selecting dashboard from the dropdown menu at the top of the screen.
+
+
+
+After creating your first dashboard and adding your first question, your dashboard will look similar to this:
+
+
##How to Arrange Dashboards
To make changes to a dashboard, clicking the **Dashboard Grid** button will allow you to resize, reorder, or remove individual question cards.
-*Figure 8: Dashboard Grid Button*
-
+
The lines around the card will change from solid to dotted, signifying that you are in edit mode.
-*Figure 9: Dotted Lines Signify Edit Mode*
-
+
* To resize a card, click on its borders. You can also use the handle in the lower right corner, which will let you drag your cursor to resize the card.
* To reorder your cards, click and drag the card to where you want it to be. Other cards will rearrange as you move the card to its new place to make room for it.
@@ -273,10 +275,13 @@ The lines around the card will change from solid to dotted, signifying that you
##How to Delete a Dashboard
Deleting a dashboard does not delete the individual question cards on a dashboard. Deleting a dashboard deletes the grouping of the questions (but not the questions themselves).
-To delete a dashboard, click the **Edit** button next to the title of your dashboard at the top of the screen. A popup screen will appear that will allow you to choose to delete the dashboard, or change its settings.
+To delete a dashboard, click the **Edit** button next to the title of your dashboard at the top of the screen.
+
+
-*Figure 10: Deleting a Dashboard Interface*
-
+A popup screen will appear that will allow you to choose to delete the dashboard, or change its settings.
+
+
Be careful when deleting public dashboards - make sure other users in your organization do not need the dashboard.
@@ -292,28 +297,21 @@ If you have more than 10 cards on a dashboard, consider breaking the dashboard i
---
You can get to the data model reference at any time by clicking on the **Book** icon in the top righthand corner of the screen.
-*Figure 11: Book Icon*
-
-
+
-After clicking the icon, the **Data Reference** tab will open. It lists all the databases you have access to and the tables inside them.
-
-*Figure 12: Data Reference Tab*
-
-
+After clicking the icon, the **Data Reference** tab will open. It lists all the databases you have access to and the tables inside them.
+
+
Click on the table you would like to explore further to see a description of it and a list of all the fields it contains.
-*Figure 13: Select Table to Explore*
-
+
If you click on a field of interest, you will see a description of the field's contents, as well as suggestions for queries based on that field.
-*Figure 14: Field & Suggested Queries*
-
-
-In addition to looking at a table's fields, you can also look at its connections if your table includes any. Click on **Connections** to view them (located next to **Field** button, See Figure 13)
+
+In addition to looking at a table's fields, you can also look at its connections if your table includes any. Click on **Connections** to view them (located next to **Field** button).