merge with 0.6

doc/markup/inline.rst

@@ -4,16 +4,13 @@ Inline markup
 =============
 
 Sphinx uses interpreted text roles to insert semantic markup into documents.
-
+They are written as ``:rolename:`content```.
-Variable names are an exception, they should be marked simply with ``*var*``.
-
-For all other roles, you have to write ``: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
+   free to use it for anything you like, e.g. variable names; use the
-   value to set it to a known role.
+   :confval:`default_role` config value to set it to a known role.
 
 
 .. _xref-syntax:

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