[Pkg-jed-commit] r1105 - www

[Rafael Laboissiere]

Author: rafael
Date: 2008-04-22 13:29:44 +0000 (Tue, 22 Apr 2008)
New Revision: 1105

Modified:
   www/DJG-Guidelines.txt
Log:
Add double-colons before verbatim material

Modified: www/DJG-Guidelines.txt
===================================================================
--- www/DJG-Guidelines.txt	2008-04-20 11:53:35 UTC (rev 1104)
+++ www/DJG-Guidelines.txt	2008-04-22 13:29:44 UTC (rev 1105)
@@ -208,7 +208,7 @@
 Additionaly to the master branch, the repository should contain a branch
 “upstream” that contains the upstream source. You should add a branch
 “merged” which is the upstream branch with the master branch. Upon this
-branch you should start a branch “work” where you commit new changes.
+branch you should start a branch “work” where you commit new changes::
 
       o---o---o---o---M                     master
        \               \
@@ -221,9 +221,10 @@
 This looks difficult, it has some advantages:
 • The master and upstream branches contain nothing else.
 • It's possible to publish the work branch and discuss the changes.
-  Later, when these changes are accepted they can be moved to the master
-  branch with rebase and you get a clean master branch.
 
+Later, when these changes are accepted they can be moved to the master
+branch with rebase and you get a clean master branch::
+
       o---o---o---o---M---W1---W2---W3      master
        \               \             \
     o---o-------o-------o-------------o     merged
@@ -233,7 +234,7 @@
 The master branch should never be rebased. Git can't handle this.
 
 You might also create feature branches additionally to the work branch,
-e.g a branch to migrate to or from cdbs.
+e.g a branch to migrate to or from cdbs::
 
       o---o---o---o---M                     master
        \               \