summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-25 21:26:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-25 21:26:13 -0400
commit32d3cffc4cf075d7c20fee8addc556f402e94cd2 (patch)
tree4640fa6618d6c14b652dada4d0423e56ea3a3f95 /doc
parent03979d4d54e7b0ce76fa296e57b9b5e1820ce7b1 (diff)
run yesod, and launch webapp on startup
Diffstat (limited to 'doc')
-rw-r--r--doc/design/assistant/webapp.mdwn2
-rw-r--r--doc/git-annex.mdwn6
-rw-r--r--doc/install.mdwn2
3 files changed, 9 insertions, 1 deletions
diff --git a/doc/design/assistant/webapp.mdwn b/doc/design/assistant/webapp.mdwn
index 598c1ff3a..cec766c57 100644
--- a/doc/design/assistant/webapp.mdwn
+++ b/doc/design/assistant/webapp.mdwn
@@ -2,7 +2,7 @@ The webapp is a web server that displays a shiny interface.
## security
-* Listen only to localhost.
+* Listen only to localhost. **done**
* Instruct the user's web browser to open an url that contains a secret
token. This guards against other users on the same system.
* I would like to avoid passwords or other authentication methods,
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 85a5a18f0..282b1fda5 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -188,6 +188,12 @@ subdirectories).
* assistant
Like watch, but also automatically syncs changes to other remotes.
+ Typically started at boot, or when you log in.
+
+* webapp
+
+ Opens a web browser, viewing the git-annex assistant's web app.
+ (If the assistant is not already running, it will be automatically started.)
# REPOSITORY SETUP COMMANDS
diff --git a/doc/install.mdwn b/doc/install.mdwn
index 54d6ecb6b..058c3cf6e 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -48,6 +48,8 @@ To build and use git-annex, you will need:
(optional; Linux only)
* [dbus](http://hackage.haskell.org/package/dbus)
(optional)
+ * [yesod](http://hackage.haskell.org/package/yesod)
+ (optional; for webapp)
* Shell commands
* [git](http://git-scm.com/)
* [uuid](http://www.ossp.org/pkg/lib/uuid/)