Rev 2479: HACKING rest fixes from jam in http://sourcefrog.net/bzr/doc

[Martin Pool]

At http://sourcefrog.net/bzr/doc

------------------------------------------------------------
revno: 2479
revision-id: mbp at sourcefrog.net-20070503062149-mkf0na5ce8j3rpzm
parent: mbp at sourcefrog.net-20070503061911-1mmho1eh1pz7y950
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-05-03 16:21:49 +1000
message:
  HACKING rest fixes from jam
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  doc/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
=== modified file 'HACKING'
--- a/HACKING	2007-05-03 06:19:11 +0000
+++ b/HACKING	2007-05-03 06:21:49 +0000
@@ -106,14 +106,14 @@
 changes visible to users or plugin developers. Please include a diff
 against mainline if you're giving a link to a branch.
 
-You can generate a bundle like this:
+You can generate a bundle like this::
 
   bzr bundle > mybundle.patch
   
 A .patch extension is recommended instead of .bundle as many mail clients
 will send the latter as a binary file. If a bundle would be too long or your
 mailer mangles whitespace (e.g. implicitly converts Unix newlines to DOS
-newlines), use the merge-directive command instead like this:
+newlines), use the merge-directive command instead like this::
 
   bzr merge-directive http://bazaar-vcs.org http://example.org/my_branch > my_directive.patch
 
@@ -183,7 +183,9 @@
 As a starting suggestion though:
 
 * create a local copy of the main development branch (bzr.dev) by using
-  this command: bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ bzr.dev
+  this command::
+  
+    bzr branch http://bazaar-vcs.org/bzr/bzr.dev/ bzr.dev
    
 * keep your copy of bzr.dev prestine (by not developing in it) and keep
   it up to date (by using bzr pull)
@@ -702,16 +704,16 @@
 
     0. OK.
     1. Conflicts in merge-like operations, or changes are present in
-        diff-like operations. 
+       diff-like operations. 
     2. Unrepresentable diff changes (i.e. binary files that we cannot show 
-        a diff of).
+       a diff of).
     3. An error or exception has occurred.
 
 Errors are handled through Python exceptions. Exceptions should be defined
 inside bzrlib.errors, so that we can see the whole tree at a glance.
 
 We broadly classify errors as either being either internal or not,
-depending on whether ``user_error`` is set or not.  If we think it's our
+depending on whether ``internal_error`` is set or not.  If we think it's our
 fault, we show a backtrace, an invitation to report the bug, and possibly
 other details.  This is the default for errors that aren't specifically
 recognized as being caused by a user error.  Otherwise we show a briefer
@@ -993,4 +995,5 @@
 http://bazaar-vcs.org/BzrWin32Installer
 
 
-:: vim: ft=rst tw=74 ai
+..
+   vim: ft=rst tw=74 ai

=== modified file 'doc/default.css'
--- a/doc/default.css	2006-08-29 03:21:56 +0000
+++ b/doc/default.css	2007-05-03 06:21:49 +0000
@@ -9,7 +9,7 @@
   margin-bottom: 70px;
   font-family: Verdana, Geneva, Arial, sans-serif;
   font-size: small;
-  line-height: 180%
+  line-height: 140%
   }
 
 /* p {
@@ -111,6 +111,7 @@
 
 tt, .literal-block {
   font-family: monospace;
+  line-height: 100%
   }
 
 tt {
@@ -120,6 +121,7 @@
 
 .literal-block {
   margin-left: 5em;
+  margin-right: 5em;
   color: #000000;
   font-weight: normal;
   background-color: #c1d1ff;