autogenerated from git-notes 5a96302 and gitolite-doc 8f0ad53; do not…

… edit
jarv · Jul 3, 2012 · 1432771 · 1432771
1 parent fe9a0c3
commit 1432771
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 11 deletions.
diff --git a/gitolite/emergencies.html b/gitolite/emergencies.html
@@ -163,6 +163,16 @@ <h2><a name="ue"></a> uncommon errors</h2>
 <p>If you think neither of those is the cause, email me.</p></li>
 </ul>
 
+<h2><a name="nonstd"></a> non-standard configs that'll trip you up</h2>
+
+<ul>
+<li><p>having sshd setup to put the authorized_keys file somewhere other than
+the default (which is in .ssh in the hosting user's home directory).</p></li>
+<li><p>having sshd setup to not allow incoming ssh for the hosting user.  Check
+things like 'Allowusers' setting in /etc/ssh/sshd_config etc.</p></li>
+<li><p>having the home directory in a partition that is mounted noexec.</p></li>
+</ul>
+
 <h2><a name="ngp"></a> things that are not gitolite problems</h2>
 
 <p>There are several things that appear to be gitolite problems but are not.  I

diff --git a/gitolite/files.html b/gitolite/files.html
@@ -48,7 +48,8 @@ <h2>install</h2>
 </code></pre>
 
 <p>If we were an existing user, we'd run the migration checker 'check-g2-compat'
-(see <a href="g2migr.html">here</a>).  For now we're only interested in "gitolite/src", so:</p>
+(start <a href="install.html#migr">here</a> for all migration info).  For now we're only interested in
+"gitolite/src", so:</p>
 
 <pre><code>$ ls -aF gitolite/src
 ./  ../  commands/  gitolite*  Gitolite/  gitolite-shell*  syntactic-sugar/  triggers/  VREF/

diff --git a/gitolite/g2incompat.html b/gitolite/g2incompat.html
@@ -26,7 +26,7 @@
 <h1><a name="g2incompat"></a> incompatibility with g2</h1>
 
 <p>This page expands on some incompatibilities that were only briefly mentioned
-in the <a href="g2migr.html">migration</a> page.</p>
+in the <a href="g2migr.html">pre-migration</a> page.</p>
 
 <h2><a name="g2i-name"></a> NAME rules</h2>
 

diff --git a/gitolite/g2migr-example.html b/gitolite/g2migr-example.html
@@ -141,8 +141,9 @@ <h3>run check-g2-compat</h3>
             or that might end up giving *more* access to someone if migrated as-is.
             It does NOT attempt to catch all the differences described in the docs.
 
-INFO        'see docs' usually means doc/g2migr.mkd
-            (online at http://sitaramc.github.com/gitolite/g2migr.html)
+INFO        'see docs' usually means the pre-migration checklist in
+            "g2migr.html"; to get there, start from the main migration
+            page at http://sitaramc.github.com/gitolite/install.html#migr
 
 checking rc file...
 NOTE        GL_ADMINDIR is in the right place; assuming you did not mess with

diff --git a/gitolite/g2migr.html b/gitolite/g2migr.html
@@ -1,6 +1,6 @@
 
 <head>
-    <title>migrating from g2</title>
+    <title>pre-migration checklist</title>
 <style>
     body        { background: #fff; text-color: #000; margin-left:  40px;   font-size:  0.9em;  font-family: sans-serif; max-width: 800px; }
     h1          { background: #ffb; text-color: #000; margin-left: -30px;   border-top:    5px  solid #ccc; }
@@ -23,15 +23,15 @@
 <p style="text-align:center">
 <font color="gray">This is for gitolite "g3"; for older (v2.x) documentation click <a href="http://sitaramc.github.com/gitolite/g2/master-toc.html">here</a></font>
 </p>
-<h1><a name="g2migr"></a> migrating from g2</h1>
+<h1><a name="g2migr"></a> pre-migration checklist</h1>
 
 <p><font color="red"> <strong>This document is a <em>MUST</em> read if you are currently using
 g2 and want to move to g3.</strong> </font></p>
 
 <hr />
 
 <ul>
-<li><a href="g2migr.html">migrating from g2</a>
+<li><a href="g2migr.html">pre-migration checklist</a>
 <ul>
 <li>incompatible features
 <ul>

diff --git a/gitolite/install.html b/gitolite/install.html
@@ -249,7 +249,7 @@ <h3>pre-migration checks</h3>
 <ol>
 <li><p>Check the <a href="dev-status.html">dev-status</a> page to make sure all the features you want have
 been implemented in g3.</p></li>
-<li><p>Read the <a href="g2migr.html">g2 migration</a> page to see what changes affect you and
+<li><p>Read the <a href="g2migr.html">pre-migration</a> page to see what changes affect you and
 your users, and how much time it might take you to migrate.  (The closer
 you were to a default install of the old gitolite, the less time a
 migration will take.)</p>

diff --git a/gitolite/master-toc.html b/gitolite/master-toc.html
@@ -44,6 +44,7 @@ <h2>help for <a href="emergencies.html">emergencies</a></h2>
 <li><a href="emergencies.html#clean">clean</a>ing out a botched install</li>
 <li><a href="emergencies.html#ce">common</a> errors</li>
 <li><a href="emergencies.html#ue">uncommon</a> errors</li>
+<li><a href="emergencies.html#nonstd">non-standard configs</a> that'll trip you up</li>
 <li>things that are <a href="emergencies.html#ngp">not gitolite problems</a></li>
 </ul>
 

diff --git a/gitolite/rc.html b/gitolite/rc.html
@@ -26,9 +26,9 @@
 <h1>the "rc" file (<code>$HOME/.gitolite.rc</code>)</h1>
 
 <p><strong>NOTE</strong>: if you're migrating from g2, there are some settings that MUST be
-dealt with <strong>before</strong> running <code>gitolite setup</code>; please read the <a href="g2migr.html">g2
-migration</a> page and linked pages, and especially the one on
-<a href="g2migr.html#rc-preset">presetting the rc file</a>.</p>
+dealt with <strong>before</strong> running <code>gitolite setup</code>; please read the
+<a href="install.html#migr">migration</a> page and linked pages, and especially the one on "presetting
+the rc file"</p>
 
 <hr />
 

diff --git a/images/flow-CVCS.png b/images/flow-CVCS.png
diff --git a/images/flow-DVCS.png b/images/flow-DVCS.png
diff --git a/images/flow-Git.png b/images/flow-Git.png
diff --git a/images/index-use-review-1.png b/images/index-use-review-1.png
diff --git a/images/index-use-review-2.png b/images/index-use-review-2.png
diff --git a/images/index-use-review-3.png b/images/index-use-review-3.png
diff --git a/images/index-use-review-4.png b/images/index-use-review-4.png