summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-02 15:33:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-02 15:37:18 -0400
commit94d75d88ab7ea9d7ce9d84daa42f4d681af525d5 (patch)
tree1d470b578a420f838439da7d8157ba2070c5ad7d
parent9f403113dde2310e2992b70542228085aa195c6c (diff)
layout
-rw-r--r--doc/design/assistant/configurators.mdwn1
-rw-r--r--templates/configurators/confirmssh.hamlet11
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/design/assistant/configurators.mdwn b/doc/design/assistant/configurators.mdwn
index b6aaa1cb6..163e10cf5 100644
--- a/doc/design/assistant/configurators.mdwn
+++ b/doc/design/assistant/configurators.mdwn
@@ -10,6 +10,7 @@ through setting up common use cases.
* Create a repository (run when the web app is started without a configured
repository too).
* Clone this repo to a USB drive or other removable drive. **done**
+* Make a bare repo on a remote ssh server **done**
* Clone this repo to another host. (Needs [[pairing]])
* Set up Amazon S3.
* Set up rsync remote.
diff --git a/templates/configurators/confirmssh.hamlet b/templates/configurators/confirmssh.hamlet
index 60bba8485..0eb42a048 100644
--- a/templates/configurators/confirmssh.hamlet
+++ b/templates/configurators/confirmssh.hamlet
@@ -4,7 +4,7 @@
<div .row-fluid>
<div .span8>
<p>
- The server at #{sshHostName sshdata} has been verified to be usable.
+ The server has been verified to be usable.
<p>
<a .btn .btn-primary href="@{MakeSshR sshdata}" onclick="$('#setupmodal').modal('show');">
Clone this repository to the remote server
@@ -12,9 +12,8 @@
$if haspubkey
<div .alert .alert-info>
<i .icon-info-sign></i> #
- <p>
- A ssh key will be installed on the server, allowing git-annex to #
- access it securely without a password.
+ A ssh key will be installed on the server, allowing git-annex to #
+ access it securely without a password.
<div .modal .fade #setupmodal>
<div .modal-header>
<h3>
@@ -24,6 +23,6 @@
Setting up repository on the remote server. This could take a minute.
$if haspubkey
<p>
- You will be prompted once more for your ssh password. A ssh key
- is being installed on the server, allowing git-annex to access it
+ You will be prompted once more for your ssh password. A ssh key #
+ is being installed on the server, allowing git-annex to access it #
securely without a password.