X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fdocs%2Fhacking.pod;fp=rt%2Fdocs%2Fhacking.pod;h=7c50ee901c9a2003ad81c94d6f2f8188a5671c33;hp=396c5623d40cb2364802b3ae26ce2119c4e9484a;hb=7588a4ac90a9b07c08a3107cd1107d773be1c991;hpb=98d2b25256055abb0dfcb9f586b434474fa97afd

diff --git a/rt/docs/hacking.pod b/rt/docs/hacking.pod
index 396c5623d..7c50ee901 100644
--- a/rt/docs/hacking.pod
+++ b/rt/docs/hacking.pod
@@ -38,7 +38,9 @@ For example, a bugfix branched from C<4.0-trunk> might be named
 C<4.0/fail-taint-mode-early>.  A feature branched from C<master> when
 there exists a C<4.0-trunk> but no C<4.2-trunk> might be named
 C<4.2/rename-LogToScreen>.  For consistency, branches should use dashes,
-not underscores, to separate words.
+not underscores, to separate words.  Branches which are destined for
+4.2, but which are branched from 4.0 (to provide for easy extraction as
+a 4.0 extension) should be named 4.2-on-4.0/branch-name.
 
 Branches should be reviewed by another developer before being merged.
 Reviewers should make sure that the branch accomplishes what it claims