summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-19 14:39:36 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-19 14:39:36 -0400
commit1de3cbbef101e1499c27aa3c600946a2c8472b05 (patch)
tree9d8f1d5b5ea77c0b379bb12ac1430547de49724f
parent5022a69e45a073046a2b14b6a4e798910c920ee9 (diff)
parent942480c47f69e13cf053b8f50c98c2ce4eaa256e (diff)
Merge remote-tracking branch 'branchable/master'
-rw-r--r--doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set.mdwn2
-rw-r--r--doc/forum/OSX__39__s_haskell-platform_statically_links_things.mdwn2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set.mdwn b/doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set.mdwn
index 99b7092c7..5e417b14c 100644
--- a/doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set.mdwn
+++ b/doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set.mdwn
@@ -9,4 +9,4 @@ One solution is to enable *PermitUserEnvironment yes* in `/etc/sshd_config` and
PATH=/Users/jtang/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin:/usr/X11/bin:/Users/jtang/.cabal/bin:/opt/local/libexec/gnubin
-If the above is not done, cloning from the OSX host will fail if git is not installed isn't /usr/bin (which it probably won't be).
+If the above is not done, cloning from the OSX host will fail if git is not installed in /usr/bin (which it probably won't be).
diff --git a/doc/forum/OSX__39__s_haskell-platform_statically_links_things.mdwn b/doc/forum/OSX__39__s_haskell-platform_statically_links_things.mdwn
index f65642758..537c85d01 100644
--- a/doc/forum/OSX__39__s_haskell-platform_statically_links_things.mdwn
+++ b/doc/forum/OSX__39__s_haskell-platform_statically_links_things.mdwn
@@ -9,7 +9,7 @@ dyld: could not load inserted library: /opt/local/lib/libtsocks.dylib
error: git-annex died of signal 5
</pre>
-The side effect of this means that users who are behind restrictive firewalls that allow only ssh via a socks proxy, they will need to configure ssh to use something like "http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html".
+The side effect of this means that users who are behind restrictive firewalls that allow only ssh via a socks proxy, they will need to configure ssh to use something like <http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html>.
<pre>
host remotemyhost