summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-15 15:20:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-15 15:20:24 -0400
commit5d98b56adab5933947bc61dc669e07abefd48ebf (patch)
treeebcaf34b797b129060dbcdc690f6664d78ca1b56
parent068ee408f6282564f7e5cc07b37f1f92d7cb03a5 (diff)
update some comments re ssh password entry on Android
-rw-r--r--doc/Android/comment_20_81940ea56ace3dcd5fa84dfccd88ad96._comment2
-rw-r--r--doc/Android/oldcomments/comment_15_77bafc01b47d4cf8f96bde2b6704ed71._comment (renamed from doc/Android/comment_15_77bafc01b47d4cf8f96bde2b6704ed71._comment)0
-rw-r--r--doc/design/assistant/sshpassword.mdwn2
3 files changed, 3 insertions, 1 deletions
diff --git a/doc/Android/comment_20_81940ea56ace3dcd5fa84dfccd88ad96._comment b/doc/Android/comment_20_81940ea56ace3dcd5fa84dfccd88ad96._comment
index ed4d6e0b0..56a4bb632 100644
--- a/doc/Android/comment_20_81940ea56ace3dcd5fa84dfccd88ad96._comment
+++ b/doc/Android/comment_20_81940ea56ace3dcd5fa84dfccd88ad96._comment
@@ -4,7 +4,7 @@
subject="comment 20"
date="2013-07-17T19:06:31Z"
content="""
-@frioux the webapp has a \"ssh server\" option that will set up a ssh key and use it for passwordless data transfer to a ssh server. You have to enter your password twice in the git-annex terminal app, and then it's set up.
+@frioux the webapp has a \"ssh server\" option that will set up a ssh key and use it for passwordless data transfer to a ssh server.
The openssh included in the git-annex app fully supports everything you can usually do with ssh keys, so you can also set this up by hand.
"""]]
diff --git a/doc/Android/comment_15_77bafc01b47d4cf8f96bde2b6704ed71._comment b/doc/Android/oldcomments/comment_15_77bafc01b47d4cf8f96bde2b6704ed71._comment
index 0ecd59fe6..0ecd59fe6 100644
--- a/doc/Android/comment_15_77bafc01b47d4cf8f96bde2b6704ed71._comment
+++ b/doc/Android/oldcomments/comment_15_77bafc01b47d4cf8f96bde2b6704ed71._comment
diff --git a/doc/design/assistant/sshpassword.mdwn b/doc/design/assistant/sshpassword.mdwn
index 7e0dbe795..59f981bb1 100644
--- a/doc/design/assistant/sshpassword.mdwn
+++ b/doc/design/assistant/sshpassword.mdwn
@@ -61,3 +61,5 @@ if the shim cannot requst an arbitrary password prompt.
* test on OSX
* test on Android
+* remove the vestigial terminal on Windows and Android, since this was the
+ last thing actually using it (not easy!)