update for rename of users/smcv/approved.mdwn to users/smcv/yesplease.mdwn

[git.ikiwiki.info.git] / doc / tips / untrusted_git_push.mdwn

diff --git a/doc/tips/untrusted_git_push.mdwn b/doc/tips/untrusted_git_push.mdwn
index 3573a0ddf9be1f23455a112a482132f57db9256c..948a5506371b8030919743667c275c117a8542f8 100644 (file)
--- a/doc/tips/untrusted_git_push.mdwn
+++ b/doc/tips/untrusted_git_push.mdwn
@@ -68,7 +68,7 @@ untrusted changes. It should *not* include the user that ikiwiki normally runs
 as.
 
 Once you're done modifying the setup file, don't forget to run
 as.
 
 Once you're done modifying the setup file, don't forget to run

-`ikiwiki -setup --refresh --wrappers` on it.
+`ikiwiki --setup ikiwiki.setup --refresh --wrappers` on it.

 
 ## git setup
 
 
 ## git setup
 


@@ -112,11 +112,3 @@ abort the push before refs are updated. However, the changeset will still
 be present in your repository, wasting space. Since nothing refers to it,
 it will be expired eventually. You can speed up the expiry by running `git
 prune`.
 be present in your repository, wasting space. Since nothing refers to it,
 it will be expired eventually. You can speed up the expiry by running `git
 prune`.

-
-When aborting a push, ikiwiki displays an error message about why it didn't
-accept it. If using git over ssh, the user will see this error message,
-which is probably useful to them. But `git-daemon` is buggy, and hides this
-message from the user. This can make it hard for users to figure out why
-their push was rejected. (If this happens to you, look at "'git log --stat
-origin/master..`" and think about whether your changes would be accepted
-over the web interface.)