Merge pull request JuliaLang#17939 from MichaelHatherly/mh/whitespace…

…-literals Fix trailing whitespace in code literal
pwl · Aug 11, 2016 · 8cc4a9b · 8cc4a9b
2 parents fa529ac + 1fe9bf9
commit 8cc4a9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -5,8 +5,8 @@ New language features
 ---------------------
 
  * The REPL now supports something called *prompt pasting*.
- This activates when pasting text that starts with `julia> ` into the REPL.
- In that case, only expressions starting with `julia> ` are parsed, the rest are removed.
+ This activates when pasting text that starts with `julia> ` into the REPL.
+ In that case, only expressions starting with `julia> ` are parsed, the rest are removed.
  This makes it possible to paste a chunk of code that has been copied from a REPL session
  without having to scrub away prompts and outputs.
  This can be disabled or enabled at will with `Base.REPL.enable_promptpaste(::Bool)`.

diff --git a/doc/manual/interacting-with-julia.rst b/doc/manual/interacting-with-julia.rst
@@ -42,8 +42,8 @@ There are a number useful features unique to interactive work. In addition to sh
  julia> ans
  "12"
 
-In Julia mode, the REPL supports something called *prompt pasting*. This activates when pasting text that starts with ``julia> `` into the REPL.
-In that case, only expressions starting with ``julia> `` are parsed, others are removed.
+In Julia mode, the REPL supports something called *prompt pasting*. This activates when pasting text that starts with ``julia> `` into the REPL.
+In that case, only expressions starting with ``julia> `` are parsed, others are removed.
 This makes it is possible to paste a chunk of code that has been copied from a REPL session without having to scrub away prompts and outputs.
 This feature is enabled by default but can be disabled or enabled at will with ``Base.REPL.enable_promptpaste(::Bool)``.
 If it is enabled, you can try it out by pasting the code block above this paragraph straight into the REPL.