From 61a55f095b403cccb7a184e82b35207946d1f20c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 15 Jun 2009 17:43:32 +0200
Subject: [PATCH 1/2] Remove misguided recommendation to use emphasis for
 variables.

---
 doc/markup/inline.rst | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/markup/inline.rst b/doc/markup/inline.rst
index 69721b321..9b4b26e3a 100644
--- a/doc/markup/inline.rst
+++ b/doc/markup/inline.rst
@@ -4,16 +4,13 @@ Inline markup
 =============
 
 Sphinx uses interpreted text roles to insert semantic markup into documents.
-
-Variable names are an exception, they should be marked simply with ``*var*``.
-
-For all other roles, you have to write ``:rolename:`content```.
+They are written as ``:rolename:`content```.
 
 .. note::
 
    The default role (```content```) has no special meaning by default.  You are
-   free to use it for anything you like; use the :confval:`default_role` config
-   value to set it to a known role.
+   free to use it for anything you like, e.g. variable names; use the
+   :confval:`default_role` config value to set it to a known role.
 
 
 .. _xref-syntax:

From 2c84f0c0db51768e3235eb0a5903edc48c77f377 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 15 Jun 2009 18:27:09 +0200
Subject: [PATCH 2/2] Use parskip package instead of setting \parskip
 ourselves.

---
 sphinx/texinputs/sphinx.sty | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index a2bc3dbff..8d88f0871 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -26,6 +26,8 @@
 \makesavenoteenv{tabulary}
 % For floating figures in the text.
 \RequirePackage{wrapfig}
+% Separate paragraphs by space by default.
+\RequirePackage{parskip}
 
 % Redefine these colors to your liking in the preamble.
 \definecolor{TitleColor}{rgb}{0.126,0.263,0.361}
@@ -89,8 +91,6 @@
 % Style parameters and macros used by most documents here
 \raggedbottom
 \sloppy
-\parindent = 0mm
-\parskip = 2mm
 \hbadness = 5000                % don't print trivial gripes
 
 \pagestyle{empty}               % start this way; change for