diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index b7fd1b5217..e0f0d78703 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -220,8 +220,9 @@ subdirectories).
 
   Automatically merges remote tracking branches */git-annex into
   the git-annex branch. While git-annex mostly handles keeping the
-  git-annex branch merged automatically, if you find you are unable
-  to push the git-annex branch due non-fast-forward, this will fix it.
+  git-annex branch merged automatically, via the tweak-fetch hook and other
+  means, if you find you are unable to push the git-annex branch due
+  non-fast-forward, this will fix it.
 
 * fix [path ...]
 
diff --git a/doc/tips/centralised_repository:_starting_from_nothing.mdwn b/doc/tips/centralised_repository:_starting_from_nothing.mdwn
index b12246d368..899068485f 100644
--- a/doc/tips/centralised_repository:_starting_from_nothing.mdwn
+++ b/doc/tips/centralised_repository:_starting_from_nothing.mdwn
@@ -28,14 +28,6 @@ Clone that to the laptop:
 	init laptop ok
         laptop$ 
 
-Merge the `git-annex` repository (this is the bit that is often
-overlooked!):
-
-	laptop$ git annex merge	
-	merge . (merging "origin/git-annex" into git-annex...)
-	ok
-	laptop$ 
-
 Add some content:
 
 	laptop$ git annex addurl http://kitenet.net/~joey/screencasts/git-annex_coding_in_haskell.ogg