From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Feb 2013 18:03:35 +0000 (-0800)
Subject: Merge branch 'jc/doc-maintainer' into maint
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2173205f5c6e0e87c282cf94c13c8a41935cb1a2;p=git.git

Merge branch 'jc/doc-maintainer' into maint

* jc/doc-maintainer:
  howto/maintain: document "### match next" convention in jch/pu branch
  howto/maintain: mark titles for asciidoc
  Documentation: update "howto maintain git"
---

2173205f5c6e0e87c282cf94c13c8a41935cb1a2
diff --cc Documentation/howto/maintain-git.txt
index ea6e4a52c,e4fc2fa4f..816c79150
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@@ -5,14 -5,13 +5,17 @@@ Abstract: Imagine that git development 
   neighborhood maintainer is struck down by a wayward bus. Out of the
   hordes of suckers (loyal developers), you have been tricked (chosen) to
   step up as the new maintainer. This howto will show you "how to" do it.
 +Content-type: text/asciidoc
 +
 +How to maintain Git
 +===================
  
+ Activities
+ ----------
+ 
  The maintainer's git time is spent on three activities.
  
-  - Communication (60%)
+  - Communication (45%)
  
     Mailing list discussions on general design, fielding user
     questions, diagnosing bug reports; reviewing, commenting on,