[Pkg-jed-commit] r1106 - www

[Rafael Laboissiere]

Author: rafael
Date: 2008-04-22 13:43:13 +0000 (Tue, 22 Apr 2008)
New Revision: 1106

Modified:
   www/DJG-Guidelines.txt
Log:
Fix verbatim blocks in numbered lists

Modified: www/DJG-Guidelines.txt
===================================================================
--- www/DJG-Guidelines.txt	2008-04-22 13:29:44 UTC (rev 1105)
+++ www/DJG-Guidelines.txt	2008-04-22 13:43:13 UTC (rev 1106)
@@ -206,9 +206,9 @@
   you can see clearly what's the Debian part is.
 
 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::
+"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::
 
       o---o---o---o---M                     master
        \               \
@@ -219,8 +219,8 @@
                           W1---W2---W3      work
 
 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.
+* 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::
@@ -290,12 +290,12 @@
 reverting easier.
 
 Before you can commit your changes you must add them to the index with
-“git add <file>” or you use “git commit -a” to include all changed files
-into the commit. With “git add -i” you can select only parts of a file
+"git add <file>" or you use "git commit -a" to include all changed files
+into the commit. With "git add -i" you can select only parts of a file
 for the commit. This is very handy when you do multiple changes to get a
 fully working system and dispense them later on different commits.
 
-To do a commit use “git commit” and give in the first line a short
+To do a commit use "git commit" and give in the first line a short
 summary of the change, leave the second line blank and after this you can
 describe the change more in detail.
 
@@ -310,7 +310,7 @@
 * Fix the last commit
 
 Simply edit the file, add it to the index (git add FILE) and run
-“git commit --amend”
+"git commit --amend"
 
 * Fix a patch before the last
 
@@ -318,29 +318,29 @@
 uses rebase.(`git rebase problems`_) You should never do this on the
 master branch without telling all other project members before.
 
-1. Checkout the bad commit. This creates a detatched head.
+1. Checkout the bad commit. This creates a detatched head::
 
-  git checkout COMMIT
+    git checkout COMMIT
 
-2. Edit the file.
+2. Edit the file::
 
-  jed FILE
+    jed FILE
 
-3. Add the file to the index and replace the last commit.
+3. Add the file to the index and replace the last commit::
 
-  git add FILE
-  git commit --amend
+    git add FILE
+    git commit --amend
 
 4. Apply all other changes made in the work branch starting at the
-   current commit.
+   current commit::
 
-  git rebase --onto HEAD HEAD@{1} work
+    git rebase --onto HEAD HEAD@{1} work
 
 Publish the changes
 -------------------
 
 When you finished your work and start the discussion about it you can
-publish your work branch with
+publish your work branch with::
 
   git push origin work:work-YOUR-SIGN
 
@@ -349,7 +349,7 @@
 what he does.
 
 When the changes are accepted, you should include your work in the master
-branch and publish this:
+branch and publish this::
 
   git rebase --onto master upstream work
   git checkout master