From 75a1e126b53d1caa9a3aa4bacf6f1da3ea05f724 Mon Sep 17 00:00:00 2001
From: "http://joeyh.name/" <joey@web>
Date: Sat, 4 May 2013 16:39:26 +0000
Subject: [PATCH 1/2] Added a comment

---
 ...comment_4_f6bf82c263fefe38701709d9dbd974cc._comment | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment

diff --git a/doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment b/doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment
new file mode 100644
index 0000000000..6a9637481d
--- /dev/null
+++ b/doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 4"
+ date="2013-05-04T16:39:23Z"
+ content="""
+Local pairing uses UDP port 55556. This is sent to multicast address 224.0.0.251 (same used by Avahi).
+
+(You also need TCP port 22 open for ssh.)
+"""]]

From 7979d386df17419ce6942e5e0011336a8b21829f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c"
 <Justin@web>
Date: Sat, 4 May 2013 18:57:13 +0000
Subject: [PATCH 2/2] Adding section explaining annex-rsync-transport

---
 doc/special_remotes/rsync.mdwn | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/special_remotes/rsync.mdwn b/doc/special_remotes/rsync.mdwn
index 641faf4747..581ac6b96e 100644
--- a/doc/special_remotes/rsync.mdwn
+++ b/doc/special_remotes/rsync.mdwn
@@ -36,3 +36,25 @@ These parameters can be passed to `git annex initremote` to configure rsync:
 
 The `annex-rsync-options` git configuration setting can be used to pass
 parameters to rsync.
+
+## annex-rsync-transport
+
+You can use the `annex-rsync-transport` git configuration setting to choose
+whether we run rsync over ssh or rsh.  This setting is also used to specify
+parameters that git annex will pass to ssh/rsh.
+
+ssh is the default transport; if you'd like to run rsync over rsh, modify your
+.git/config to include
+
+        annex-rsync-transport = rsh
+
+under the appropriate remote.
+
+To pass parameters to ssh/rsh, include the parameters after "rsh" or
+"ssh".  For example, to configure ssh to use the private key at
+`/path/to/private/key`, specify
+
+         annex-rsync-transport = ssh -i /path/to/private/key
+
+Note that environment variables aren't expanded here, so for example, you
+cannot specify `-i $HOME/.ssh/private_key`.