Merge branch 'apache_usergrid/putting-docs-on-git' into apache_usergrid/master


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/464d10a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/464d10a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/464d10a4

Branch: refs/heads/master
Commit: 464d10a4cc8964984033f5306e0ddf6980917b77
Parents: ae96778 fa23ab7
Author: Rod Simpson <[email protected]>
Authored: Wed Nov 12 14:55:34 2014 -0700
Committer: Rod Simpson <[email protected]>
Committed: Wed Nov 12 14:55:34 2014 -0700

----------------------------------------------------------------------
 docs/.gitignore                                 |    2 +
 docs/Makefile                                   |  177 +++
 docs/README                                     |   31 +
 docs/_theme/sphinx_rtd_theme/__init__.py        |   17 +
 docs/_theme/sphinx_rtd_theme/breadcrumbs.html   |   19 +
 docs/_theme/sphinx_rtd_theme/footer.html        |   33 +
 docs/_theme/sphinx_rtd_theme/layout.html        |  162 +++
 docs/_theme/sphinx_rtd_theme/layout_old.html    |  205 ++++
 docs/_theme/sphinx_rtd_theme/search.html        |   50 +
 docs/_theme/sphinx_rtd_theme/searchbox.html     |    7 +
 .../sphinx_rtd_theme/static/css/badge_only.css  |    2 +
 .../sphinx_rtd_theme/static/css/theme.css       |    5 +
 .../static/fonts/FontAwesome.otf                |  Bin 0 -> 62856 bytes
 .../static/fonts/fontawesome-webfont.eot        |  Bin 0 -> 38205 bytes
 .../static/fonts/fontawesome-webfont.svg        |  414 +++++++
 .../static/fonts/fontawesome-webfont.ttf        |  Bin 0 -> 80652 bytes
 .../static/fonts/fontawesome-webfont.woff       |  Bin 0 -> 44432 bytes
 docs/_theme/sphinx_rtd_theme/static/js/theme.js |   47 +
 docs/_theme/sphinx_rtd_theme/theme.conf         |    8 +
 docs/_theme/sphinx_rtd_theme/versions.html      |   37 +
 docs/concepts/activity.md                       | 1121 ++++++++++++++++++
 docs/concepts/applications.md                   |   78 ++
 docs/concepts/assets.md                         |   20 +
 docs/concepts/collections.md                    |   21 +
 docs/concepts/events-and-counters.md            |  268 +++++
 docs/concepts/groups.md                         |   38 +
 docs/concepts/query-language.md                 |  427 +++++++
 docs/concepts/relationships.md                  |  100 ++
 docs/concepts/roles-and-permissions.md          |   18 +
 docs/concepts/users-devices.md                  |  108 ++
 docs/conf.py                                    |  273 +++++
 docs/contribute-code.md                         |   24 +
 docs/deploy-local.md                            |  175 +++
 docs/getting-up-and-running-locally.md          |   72 ++
 docs/index.md                                   |   12 +
 docs/lib/sphinxcontrib_markdown.py              |   58 +
 docs/make.bat                                   |  242 ++++
 docs/organizations-admins.md                    |   55 +
 docs/presentations-and-videos.md                |    7 +
 docs/presentations-and-videos/presentations.md  |   21 +
 docs/presentations-and-videos/videos.md         |   11 +
 docs/upgrading.md                               |    3 +
 docs/usage.md                                   |   15 +
 43 files changed, 4383 insertions(+)
----------------------------------------------------------------------


Reply via email to