allow making encrypted rsync special remotes

wow, that was easy!

3 files changed, 17 insertions, 8 deletions

diff --git a/templates/configurators/addssh.hamlet b/templates/configurators/addssh.hamlet
index 03a99fd96..c2336a169 100644
--- a/templates/configurators/addssh.hamlet
+++ b/templates/configurators/addssh.hamlet
@@ -2,11 +2,6 @@
   <h2>
     Adding a remote server using ssh
   <p>
-    Clone this repository to a ssh server. Your data will be #
-    uploaded to the server. If you set up other devices to use the same #
-    server, they will all be kept in sync, using the server as a central #
-    hub.
-  <p>
     You can use nearly any server that has ssh and rsync. For example, you #
     could use a <a href="http://linode.com/">Linode</a> or another VPS, or #
     an account on a friend's server.
diff --git a/templates/configurators/confirmssh.hamlet b/templates/configurators/confirmssh.hamlet
index 0eb42a048..43d27d032 100644
--- a/templates/configurators/confirmssh.hamlet
+++ b/templates/configurators/confirmssh.hamlet
@@ -5,9 +5,23 @@
     <div .span8>
       <p>
         The server has been verified to be usable.
+      $if not (rsyncOnly sshdata)
+        <p>
+          You have two options for how to use the server.
+        <p>
+          <a .btn .btn-primary href="@{MakeSshGitR sshdata}" onclick="$('#setupmodal').modal('show');">
+            Use a git repository on the server
+          <br>
+          All your data will be uploaded to the server. If you set up other #
+          devices to use the same server, they will all be kept in sync, #
+          using the server as a central hub. #
       <p>
-        <a .btn .btn-primary href="@{MakeSshR sshdata}" onclick="$('#setupmodal').modal('show');">
-          Clone this repository to the remote server
+        <a .btn .btn-primary href="@{MakeSshRsyncR sshdata}" onclick="$('#setupmodal').modal('show');">
+          Use an encrypted rsync repository on the server
+        <br>
+        The contents of your files will be stored, fully encrypted, on the #
+        server. The server will not store other information about your #
+        git repository.
     <div .span4>
       $if haspubkey
         <div .alert .alert-info>
diff --git a/templates/configurators/makessherror.hamlet b/templates/configurators/makessherror.hamlet
index 6422431cc..05d2de412 100644
--- a/templates/configurators/makessherror.hamlet
+++ b/templates/configurators/makessherror.hamlet
@@ -6,5 +6,5 @@
   <p>
     Transcript: #{msg}
   <p>
-    <a .btn .btn-primary href="@{MakeSshR sshdata}">
+    <a .btn .btn-primary href="#">
      Retry