From 063d2f9c6e6dc5a23a16d1f2bb4506349e904b47 Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Thu, 29 Jul 2010 09:05:13 +0530 Subject: [PATCH] (minor) don't assume "ssh gitolite" applicable always in docs [thanks to hal-eisen on github for catching this, although I could not directly use his patches.] --- doc/3-faq-tips-etc.mkd | 3 +++ doc/4-wildcard-repositories.mkd | 3 +++ doc/6-ssh-troubleshooting.mkd | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/doc/3-faq-tips-etc.mkd b/doc/3-faq-tips-etc.mkd index 935e4b3..345ac77 100644 --- a/doc/3-faq-tips-etc.mkd +++ b/doc/3-faq-tips-etc.mkd @@ -458,7 +458,10 @@ Easy! Just use ssh to give the "info" command to the gitolite server: To understand what these symbols mean, please see doc/report-output.mkd. The administrator can also say things like: + # if you installed using the "from-client" method ssh gitolite info u1 u2 u3 + # for the other 3 install methods + ssh git@server info u1 u2 u3 to get this info for other user(s). diff --git a/doc/4-wildcard-repositories.mkd b/doc/4-wildcard-repositories.mkd index f5a66f0..5addbfa 100644 --- a/doc/4-wildcard-repositories.mkd +++ b/doc/4-wildcard-repositories.mkd @@ -213,7 +213,10 @@ file: Push the config, then try + # if you installed using the "from-client" method ssh gitolite expand + # for the other 3 install methods + ssh git@server expand diff --git a/doc/6-ssh-troubleshooting.mkd b/doc/6-ssh-troubleshooting.mkd index 39ba275..636907c 100644 --- a/doc/6-ssh-troubleshooting.mkd +++ b/doc/6-ssh-troubleshooting.mkd @@ -33,6 +33,11 @@ In addition to both these documents, there's now a program called `sshkeys-lint` that you can run on your client. Run it without arguments to get help on how to run it and what inputs it needs. +**IMPORTANT NOTE: A lot of this document applies only if you installed using +the [from-client method][fc] . If you used one of the [other 3 methods][o3] , +some of it may or may not apply. At the very least, any mention of `ssh +gitolite` below will change to `ssh git@server`; see [this][urls] for why.** + ### the most common problems that an admin will see @@ -455,3 +460,6 @@ bigger problems than gitolite install not working!)] [doc0]: http://github.com/sitaramc/gitolite/blob/pu/doc/0-INSTALL.mkd [doc9gas]: http://github.com/sitaramc/gitolite/blob/pu/doc/9-gitolite-and-ssh.mkd [install]: http://github.com/sitaramc/gitolite/blob/pu/doc/0-INSTALL.mkd +[o3]: http://github.com/sitaramc/gitolite/blob/pu/doc/0-INSTALL.mkd#installation_and_setup +[fc]: http://github.com/sitaramc/gitolite/blob/pu/doc/0-INSTALL.mkd#from_client_method_install_from_the_client_to_the_server +[urls]: http://github.com/sitaramc/gitolite/blob/pu/doc/0-INSTALL.mkd#URLs_for_gitolite_managed_repos