Commit Graph

543 Commits

Author SHA1 Message Date
Torkel Ödegaard
917fabbc9b docs(): updated links again 2016-04-12 09:52:12 -04:00
Torkel Ödegaard
782c484cad docs(): updated release links 2016-04-12 09:20:27 -04:00
Torkel Ödegaard
f93b039e42 change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases 2016-04-11 18:05:28 -04:00
utkarshcmu
41dcefb174 Fixed typos, lang 2016-04-06 07:26:22 -07:00
Daniel Lee
b39aa02b52 fix(plugins): Fix broken link in plugins readme
Another link to setup instructions that it is broken.
2016-04-05 12:05:14 +02:00
Daniel Lee
860e771493 fix(plugins): Fix broken link in plugins readme
Can't find the DEVELOPMENT.md file so linked to 
http://docs.grafana.org/project/building_from_source/ instead.
2016-04-05 12:01:13 +02:00
Torkel Ödegaard
e027770213 docs(): updated links to beta2 2016-04-04 17:49:33 -04:00
Torkel Ödegaard
601e90f5fe docs(): updated install instructions 2016-03-31 06:23:52 -07:00
Torkel Ödegaard
32bed83a17 docs(): updated 2016-03-30 08:01:54 -07:00
Torkel Ödegaard
545d3208c8 docs(): updated plugin docs 2016-03-30 16:56:22 +02:00
Peter Tripp
2cb3505dce Examples for listing CloudWatch resources in templates. 2016-03-27 17:20:33 -07:00
utkarshcmu
4ced5bbbc0 Fixed some minor typos in docs 2016-03-26 20:15:36 -07:00
bergquist
a531a1709e docs(plugin): add apps page 2016-03-24 11:55:36 +01:00
bergquist
f85a3ad44d docs(plugins): minor improvesments to plugin dev guide 2016-03-24 11:29:11 +01:00
bergquist
7f8643efde feat(cli): make all plugin commands subcommands 2016-03-21 10:01:07 +01:00
bergquist
35e53ee511 docs(plugin): add info about enabling apps 2016-03-18 09:48:26 +01:00
bergquist
b1881e5f54 docs(plugins): update links to new examples 2016-03-18 09:48:26 +01:00
bergquist
3c39a935f8 docs(plugins): docs for app plugins 2016-03-18 09:48:26 +01:00
bergquist
2b0499c968 docs(plugin): update link to datasource docs 2016-03-18 09:48:26 +01:00
Matt Toback
5af54c57ba Update admin.md 2016-03-17 14:31:55 -04:00
Bruno Binet
3486bf92eb [docs] typos 2016-03-16 11:56:19 +01:00
Mitsuhiro Tanda
01788e86e5 (cloudwatch) add document for new query 2016-03-11 18:18:14 +09:00
bergquist
0b6fee138a docs(configuration): add redis as session storage 2016-03-10 14:49:37 +01:00
utkarshcmu
4fbff99186 Implemented GetDataSourceIdByName API 2016-03-10 01:31:10 -08:00
Paul Mestemaker
d6ecf74db4 Update ldap.md
Added clearer language on which versions offer LDAP support.
2016-03-09 11:25:42 -08:00
utkarshcmu
4fae1958fa Fixed some typos 2016-03-08 07:28:25 -08:00
Utkarsh Bhatnagar
e5d400ebb9 Update data_source.md 2016-03-08 02:19:52 -08:00
bergquist
2a18430a45 docs(plugin): add table reponse format for queries 2016-03-08 09:26:31 +01:00
Utkarsh Bhatnagar
aef8dab4d9 Fixing language plus typos 2016-03-07 03:49:49 -08:00
bergquist
bcb7eff6fa docs(plugins): basic overview text 2016-03-07 12:16:52 +01:00
Torkel Ödegaard
08a45e9a3b docs(): docs update 2016-03-07 08:52:16 +01:00
bergquist
ad6837ee47 docs(plugins): small guide for developing plugins 2016-03-04 14:28:31 +01:00
bergquist
01d5bc73cc docs(plugins): add css to panel example 2016-03-04 13:11:05 +01:00
bergquist
73a49c463d docs(plugins): add placeholders for plugin docs 2016-03-04 13:11:05 +01:00
bergquist
09c29cdda5 docs(plugins): json formating 2016-03-04 13:11:05 +01:00
bergquist
67dec6a665 docs(plugins): json formating 2016-03-04 13:11:05 +01:00
bergquist
c6a1076e3a docs(plugins): json formating 2016-03-04 09:14:25 +01:00
bergquist
d318c84434 docs(plugins): add json formating 2016-03-04 08:47:22 +01:00
bergquist
c21a210198 docs(datasource): add request objects to docs 2016-03-04 08:45:46 +01:00
bergquist
01d3282838 docs(plugins): add initial documentation for datasource plugins 2016-03-03 13:22:09 +01:00
Utkarsh Bhatnagar
f2dabd0731 Updated Opentsdb docs for 2.2 support 2016-03-03 01:13:30 -08:00
Toby Brain
737896695c Fix IAM role documentation link 2016-03-03 15:33:52 +11:00
bergquist
8b64b2113e docs(plugins): improve install docs for plugins 2016-03-02 08:39:46 +01:00
bergquist
f78f7d6b37 docs(plugins): basic instructions for installing plugins 2016-03-01 10:42:49 +01:00
bergquist
2647f59df1 docs(plugins): add skeleton pages for plugins 2016-03-01 09:39:10 +01:00
bergquist
df8e56ddf8 docs(plugins): move plugins into seperate folder 2016-02-29 16:53:47 +01:00
utkarshcmu
936dd2eaaa Added relevant docs and changes 2016-02-28 01:50:10 -08:00
Andrew MacDonald
ce6c67f9bc Fix the path to grafana-webserver in the Debian install docs. 2016-02-23 16:06:56 -08:00
bergquist
653d4b1d6a chore(docs): remove old http api docs 2016-02-18 12:53:43 +01:00
utkarshcmu
c3fc340c09 Merge branch 'master' of https://github.com/utkarshcmu/grafana into docs-refac 2016-02-10 23:12:41 -08:00
Mitsuhiro Tanda
2cce057df1 (prometheus) add query result template query 2016-02-09 01:37:43 +09:00
Carl Bergquist
d03ae3bfe5 Merge pull request #3944 from doubledutch/github-api-url
Add github api_url to github auth docs
2016-02-05 14:13:17 +01:00
utkarshcmu
0201b9769c Merged with grafana/master 2016-02-05 01:50:47 -08:00
utkarshcmu
4ff6748eb4 Linked docs from main nav 2016-02-05 01:47:34 -08:00
bergquist
8ff997594f fix(tablepanel): change to using two thresholds
fixes #3878
2016-02-05 10:30:46 +01:00
utkarshcmu
616a6bec38 Added api heading in the main menu 2016-02-05 01:15:09 -08:00
Kevin Pike
15fb56e607 Add github api_url to github auth docs 2016-02-04 13:46:02 -08:00
utkarshcmu
59a384b453 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-04 13:34:32 -08:00
Masafumi Yokoyama
c90619c665 doc: fix a broken link 2016-02-03 23:10:48 +09:00
utkarshcmu
952e4dab3e Arranged http_api docs in a better way 2016-02-02 22:59:22 -08:00
utkarshcmu
8952c7c9d1 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-02 11:56:17 -08:00
Prayag Verma
7c61ed99ae Fix typo in docs
Remove extra `of`
2016-02-02 17:47:06 +05:30
utkarshcmu
338afc80d5 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-01 10:32:36 -08:00
bergquist
a2c00f1cc5 docs(playlist): add docs about tags in playlist 2016-01-29 19:44:02 +01:00
utkarshcmu
972ac99b7c Added more metadata 2016-01-28 09:53:19 -08:00
utkarshcmu
58121d89fc Updated http_api docs 2016-01-27 22:02:33 -08:00
Carl Bergquist
251bf7a2b4 Merge pull request #3840 from utkarshcmu/stats
Grafana stats view as mentioned in #3812
2016-01-27 19:41:10 +01:00
Daniel Lee
98982b7a74 docs(singlestat) updates threshold explanation
The implementation of thresholds changed after fixing #3248. Docs
updated to reflect and explain the change.
2016-01-26 21:00:13 +01:00
utkarshcmu
2190392e05 Added grafana_admins count 2016-01-25 00:39:31 -08:00
utkarshcmu
a621c0d273 Added docs for stats api 2016-01-25 00:02:05 -08:00
Mitsuhiro Tanda
d0074b25db (prometheus) add explanation about incompatibility of metric find query 2016-01-20 18:30:17 +09:00
Michael Sambol
3418db1dcd Fix grammatical error in graphite datasource doc
Replace "you" with "your".
2016-01-18 10:41:14 -06:00
utkarshcmu
caa26f594e Added Orgs API 2016-01-14 14:40:12 -08:00
Torkel Ödegaard
6c6c3a5081 feat(plugins): more work on how plugins expose directives 2016-01-14 12:35:31 +01:00
Carl Bergquist
f7fecdc6de Merge pull request #3655 from grafana/playlist
Persistable playlists

closes #515
closes #1137
2016-01-12 15:20:43 +01:00
Utkarsh Bhatnagar
39aca0f038 Update playlist.md 2016-01-08 23:52:51 -08:00
bergquist
d0841919ea docs(plugins): fixes typo 2016-01-08 10:55:22 +01:00
bergquist
a23e60ab69 docs(plugins): adds plugin page 2016-01-08 10:53:39 +01:00
Torkel Ödegaard
3362d6bc56 Merge branch 'docs-2.6' 2016-01-08 10:25:20 +01:00
Torkel Ödegaard
19a5e425cf docs: fixed building from source go dependency verison 2016-01-08 10:22:57 +01:00
bergquist
6c8d084664 Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql 2016-01-07 17:08:31 +01:00
Henri DF
5af3fe93f2 Docs: add example with filter in ES template 2016-01-04 21:48:47 -08:00
Daniel Low
ea566fff24 Add TLS for mysql
Use ssl_mode for mysql and add docs
add docs for the new parameters in config

Tolerate ssl_mode without client authentication

Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00:00
Carl Bergquist
333f9101a0 Merge pull request #3458 from improbable-io/use-memcache-for-session
Add memcache as session provider
2015-12-17 15:56:15 +01:00
utkarshcmu
3a6e8a535c Fixed typos 2015-12-16 02:30:53 -08:00
Torkel Ödegaard
f163ceffd0 fix(elasticsearch): fixes spelling of lucene, #3519 2015-12-15 08:29:24 +01:00
Torkel Ödegaard
33395d530d docs(): updated downloads for 2.6 and whats new in 2.6 article 2015-12-14 15:45:00 +01:00
Torkel Ödegaard
e334107c7d docs(): added whats new in 2.6 article 2015-12-14 15:15:56 +01:00
Torkel Ödegaard
56c3dd3652 docs(influxdb): updated influxdb docs 2015-12-14 14:16:22 +01:00
Torkel Ödegaard
6ddd458402 docs(elasticsearch): updated elasticsearch with info about templating and pipeline metrics 2015-12-14 13:55:16 +01:00
Torkel Ödegaard
ee328667d0 docs(table): updated table docs 2015-12-14 13:40:06 +01:00
Matt Toback
62fe5cdbaa New table panel doc 2015-12-11 14:20:21 -05:00
Daniel Low
ed16914715 Add memcache as session provider 2015-12-08 13:35:09 +00:00
Torkel Ödegaard
891d7c134c Merge pull request #3205 from mtanda/cloudwatch_suggest_fix
(cloudwatch) fix dimension value suggestion
2015-12-03 17:17:07 +01:00
Mitsuhiro Tanda
eb5822bc7c update cloudwatch docs 2015-12-04 01:04:50 +09:00
Torkel Ödegaard
8e0bba4f99 fix(templating): minor fix to default property name, fixes #3378 2015-12-01 09:01:44 +01:00
Torkel Ödegaard
4cc61d10ff fix(docs): fixed typo in installing docs fixes #3379 2015-12-01 08:59:30 +01:00
utkarshcmu
ca5d0496ee Validated HTTP responses 2015-11-23 19:19:26 -08:00
Torkel Ödegaard
4a3f50cef7 fix(docs): minor fix to http docs, fixes #3301 2015-11-21 10:07:33 +01:00
Christoph Krybus
b0c01369c5 Fix recommended graphite version for better performance
There is no 0.9.13 graphite release, only 0.9.14.
2015-11-19 13:44:46 +01:00
utkarshcmu
e5931e264b Updated http_api docs 2015-11-16 06:56:46 -08:00
Torkel Ödegaard
ee5ebe2e81 Merge pull request #3224 from mattttt/patch-6
Updating singlestat article to include troubleshooting
2015-11-13 09:32:42 +01:00
Torkel Ödegaard
a71b681e80 fix(docs): minor docs fix 2015-11-13 09:32:16 +01:00
Torkel Ödegaard
cc125f5fd7 change(shortcuts): changed CTRL+F search shortcut to just F 2015-11-13 09:25:31 +01:00
Matt Toback
7888c1c614 Update singlestat.md 2015-11-12 12:35:45 -05:00
Matt Toback
b43315c36d Update singlestat.md 2015-11-12 12:07:09 -05:00
Matt Toback
fbd6417c8a Updating singlestat article to include troubleshooting 2015-11-12 12:03:33 -05:00
Utkarsh Bhatnagar
74b10a42ee Fixed broken links in the doc page 2015-11-02 10:29:42 -08:00
Utkarsh Bhatnagar
f14ef22bb6 Fixed doc links 2015-11-02 10:25:33 -08:00
Utkarsh Bhatnagar
e8c9b0806a Added templating, timepicker, panel docs 2015-11-02 10:15:40 -08:00
Utkarsh Bhatnagar
f54615ed46 Included rows JSON and TODO headers 2015-11-02 00:21:59 -08:00
utkarshcmu
4c1b6f3059 Fixed a typo 2015-11-01 23:55:03 -08:00
Utkarsh Bhatnagar
ada641090f Explained basic JSON fields 2015-11-01 23:53:24 -08:00
utkarshcmu
3a021a87a1 Added JSON of new dashboard 2015-11-01 23:17:23 -08:00
utkarshcmu
5100339604 Initialized dashboard JSON doc. 2015-11-01 22:58:14 -08:00
Vitaliy Fuks
acb5340ffb Fixed typo in OpenTSDB's "metasync" documentation 2015-10-31 18:07:24 -04:00
Torkel Ödegaard
6a01cd56ca Merge pull request #3085 from mtanda/cloudwatch_template_doc
Add templating explanation to CloudWatch docs.
2015-10-31 11:37:01 +01:00
Utkarsh Bhatnagar
03130e1217 Update opentsdb.md
As we merged, changes with auto suggestions in the master branch. Update docs respectively.
2015-10-30 22:11:17 -07:00
Torkel Ödegaard
0a0a0776e4 Merge pull request #3088 from utkarshcmu/suggest-opentsdb
Tag suggestions fixed for v2.1.1 & above by using Suggest Api.
2015-10-30 10:34:44 +01:00
utkarshcmu
8b9d13491f Fixed some more typos in docs 2015-10-30 02:07:08 -07:00
Mitsuhiro Tanda
8a252774ce Update cloudwatch.md, add explanation about templating 2015-10-29 23:51:27 +09:00
Torkel Ödegaard
f8a1c7c8a1 docs(cloudwatch): updated docs with info about #3080 2015-10-29 12:22:01 +01:00
utkarshcmu
2f09ef2970 Fixed typos in 2.5v doc 2015-10-28 04:27:51 -07:00
Torkel Ödegaard
6ea2c08ecb docs(): minor docs fix 2015-10-28 11:50:22 +01:00
Torkel Ödegaard
1685e7cea4 docs(): update to install docs and whats new in 2.5 2015-10-28 11:08:12 +01:00
Torkel Ödegaard
6397b8c1ef docs(): updated version to 2.5.0 2015-10-28 09:31:57 +01:00
ubhatnagar
6af86152e6 Removed typos in cloudwatch docs 2015-10-26 21:02:04 -07:00
Matt
da31fffb16 Update timerange.md 2015-10-26 14:05:44 -04:00
Matt
c97e3ec7ae Updates to timepicker docs for 2.5 release
Updated images to be in separate PR.
2015-10-26 14:03:26 -04:00
Torkel Ödegaard
da3d5375b8 feat(ldap): refactoring of PR #2928 updated docs 2015-10-26 16:21:03 +01:00
Torkel Ödegaard
59bd029e46 docs(cloudwatch): minor cloudwatch fix 2015-10-26 15:51:34 +01:00
Torkel Ödegaard
1dbf0ad976 docs(cloudwatch): initial cloudwatch docs, closes #2900 2015-10-26 15:44:14 +01:00
Torkel Ödegaard
7477667df1 docs(elasticsearch): initial elasticsearch docs, closes #2862 2015-10-26 14:21:38 +01:00
Torkel Ödegaard
a5c742cee5 docs(elasticsearch): began work on elasticsearch docs #2862 2015-10-26 13:36:00 +01:00
Torkel Ödegaard
052c9aca15 Merge branch 'master' of github.com:grafana/grafana 2015-10-26 12:16:13 +01:00
Torkel Ödegaard
b0e975bfce Merge pull request #3025 from utkarshcmu/docs
Added OpenSuse documentation
2015-10-26 08:22:52 +01:00
mlbarrow
21f3f859b9 Update influxdb.md
Typo fix
2015-10-24 20:58:19 -07:00
Utkarsh Bhatnagar
54be4c5e2c Made installation doc consistent 2015-10-23 23:21:00 -07:00
ubhatnagar
45cdbe0a18 Rearranged installation docs for OpenSuse 2015-10-23 23:03:58 -07:00
ubhatnagar
6c76e9728e Added OpenSuse installation command 2015-10-23 22:53:30 -07:00
ubhatnagar
7205cf8ce1 Fixed 3014 2015-10-23 07:29:15 -07:00
ubhatnagar
1e2e4ba3ad Fixed other docs typos 2015-10-21 22:09:07 -07:00
ubhatnagar
aaf4b1a399 Fixed typos in guides. 2015-10-21 21:13:39 -07:00
ubhatnagar
a5e3d7a94b Fixed datasources docs typos 2015-10-21 20:58:04 -07:00
Torkel Ödegaard
1ff3c3be84 Merge pull request #2952 from Krinkle/fixup
docs(): Fix changelog link in whats-new-in-v2-1
2015-10-17 12:44:09 -04:00
Scott M. Likens
bd77fd92bb I'm not sure what a dashboard is ... 2015-10-15 19:45:40 -07:00
Timo Tijhof
267417d6a8 docs(): Fix changelog link in whats-new-in-v2-1
The quotes turn the value into a title attribute rather than href attribute,
thus on http://docs.grafana.org/guides/whats-new-in-v2-1/ this link was
rendered as <a href title="https://github.com/...">CHANGELOG.md</a>
which when clicked goes back to itself (not to GitHub).
2015-10-14 14:00:25 -04:00
anryko
b68987dcde Fixed configuration example for Github OAuth team_ids. 2015-10-09 17:05:46 +02:00
Torkel Ödegaard
9b5a0a54cf minor docs fix 2015-10-09 08:28:33 +02:00
Torkel Ödegaard
f11785001c docs: minor fix 2015-10-06 17:51:22 +02:00
Ivan Babrou
0dc0e03c4c Add suggest_tagk() and suggest_tagv() to OpenTSDB datasource (#2840) 2015-10-04 12:54:43 +01:00
Jimmi Dyson
7cadb9012a Switch to png image 2015-09-30 16:45:38 +01:00
Jimmi Dyson
0c222c4e8c Fix Prometheus test connection 2015-09-30 16:44:24 +01:00
Jimmi Dyson
59dbe45784 Fix typo in docs 2015-09-30 14:20:58 +01:00
Jimmi Dyson
055efa3904 Add prometheus docs 2015-09-30 12:42:48 +01:00
Torkel Ödegaard
3eddfc028e Merge branch 'patch-2' of https://github.com/cagdascirit/grafana 2015-09-21 11:32:36 +02:00
Torkel Ödegaard
8d87db58c6 docs(): added link to external install tutorial / article 2015-09-21 09:04:59 +02:00
Cagdas Cirit
c26209d579 Update debian.md 2015-09-17 18:25:36 +02:00
Torkel Ödegaard
7c25edc7b2 docs(): fixed iframe snapshot links in docs, fixes #2682 2015-09-08 15:24:20 +02:00
Torkel Ödegaard
2725053c82 docs(): fixed iframe snapshot links in docs, fixes #2682 2015-09-08 15:19:59 +02:00
Torkel Ödegaard
f29471521c Merge pull request #2663 from victorhooi/patch-1
Add note about phantomjs binary and PNG rendering.
2015-09-04 08:40:53 +02:00
Julien Danjou
63f9dc826f doc: fix link to basic concepts 2015-09-03 14:01:32 +02:00
Victor Hooi
b80adcc00a Add note about phantomjs libraries. 2015-09-03 16:35:49 +10:00
Victor Hooi
68a7c3fa3b Add note about phantomjs binary and PNG rendering. 2015-09-03 16:29:58 +10:00
Baptiste Fontaine
28474d9340 influxdb doc: typo fixed 2015-09-01 12:47:26 +02:00
Torkel Ödegaard
3e0c66edab docs(): updated download links in docs 2015-08-24 10:05:05 +02:00
Torkel Ödegaard
a4ff1e4f33 docs(): updated version in install docs 2015-08-20 15:20:26 +02:00
Torkel Ödegaard
952a69abca docs(tutorial): updated hubot tutorial 2015-08-19 13:53:15 +02:00
Trent White
2f5115ca45 Update hubot_howto.md 2015-08-18 09:37:51 -04:00
Trent White
66878a9b48 Update hubot_howto.md 2015-08-18 09:34:31 -04:00
Trent White
333952a231 Update hubot_howto.md 2015-08-18 09:34:08 -04:00
Torkel Ödegaard
4f8cea6e2d docs(): added tutorial article on hubot and grafana integration 2015-08-18 14:39:04 +02:00
Torkel Ödegaard
d4432ddd64 feat(mixed datasources): feature ready to merge to master, closes #436 2015-08-18 08:22:00 +02:00
Torkel Ödegaard
2f849be9d8 docs(): minor tweaks to new tutorial 2015-08-14 09:41:07 +02:00
Torkel Ödegaard
f784551e20 docs(): Began work on stack install and config tutorial 2015-08-13 08:52:50 +02:00
Torkel Ödegaard
a3d9169930 docs(): minor update 2015-08-13 08:00:27 +02:00
Torkel Ödegaard
5aee981590 Merge branch 'master' of https://github.com/mattttt/grafana
Conflicts:
	docs/sources/installation/debian.md
	docs/sources/installation/ldap.md
2015-08-12 16:30:48 +02:00
Anton Gilgur
e4baef94bc docs(ldap): Clarify LDAP features and sample config
* Clarify certain features, such as multiple mappings
* Fixup ldap.toml sample config
* Fixup docs README's port number
* Fixup bad link from LDAP docs to Configuration docs
* Fixup some spelling, grammar, and line endings
2015-08-11 19:57:53 -07:00
Trent White
8c05f9cf3e Merge pull request #11 from mattttt/trent-update
add text panel page
2015-08-11 16:52:15 -04:00
Trent White
ebcab0f26e add text panel page 2015-08-11 16:50:33 -04:00
Matt
14996bd08b Update templating.md 2015-08-11 15:57:36 -04:00
Matt
dd9fb9d526 Update templating.md 2015-08-11 15:56:18 -04:00
Matt
f3ffed673b Merge pull request #10 from mattttt/build-patch-1
Reformatted a confusing part of of the running grafana locally section
2015-08-11 15:47:38 -04:00
Matt Toback
5b342dd229 Reformatted a confusing part of of the running grafana locally section 2015-08-11 15:41:12 -04:00
Trent White
04795709a3 formatting tweak, added datasource overview blurb. 2015-08-11 15:30:13 -04:00
Matt Toback
511a592ec8 Added patch from ct 2015-08-11 14:58:30 -04:00
Matt
d132d3abfd Merge pull request #7 from mattttt/mattttt-docs
Mattttt docs
2015-08-11 14:41:21 -04:00
raj dutt
c6798892b8 Update screencasts.md
tweaks
2015-08-11 14:26:04 -04:00
Matt Toback
eea5b026ce Sanity checked and verified for merge 2015-08-11 14:17:56 -04:00
raj dutt
331e858ed3 Update gettingstarted.md 2015-08-11 14:04:14 -04:00
Trent White
3d602a2558 Merge remote-tracking branch 'origin/master' 2015-08-11 14:01:03 -04:00
Trent White
14386a2f62 Merge branch 'trent-docs'
Conflicts:
	docs/sources/reference/templating.md
2015-08-11 13:59:46 -04:00
raj dutt
4e91e05470 Update gettingstarted.md 2015-08-11 13:58:44 -04:00
Trent White
ea0bec8bf2 update content on annotations 2015-08-11 13:51:27 -04:00
raj dutt
c2e8a1d733 Update singlestat.md 2015-08-11 13:49:24 -04:00
raj dutt
c6155723a1 Update playlist.md 2015-08-11 13:43:36 -04:00
Trent White
8c64afc81e update to templating doc 2015-08-11 13:42:40 -04:00
raj dutt
eafd1d8c53 Update templating.md 2015-08-11 13:33:01 -04:00
raj dutt
df0673f907 Update templating.md 2015-08-11 13:31:49 -04:00
raj dutt
ed536f18ee Update basic_concepts.md 2015-08-11 13:07:30 -04:00