about summary refs log tree commit diff
path: root/src/etc/htmldocck.py
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-30 08:13:08 -0700
committerbors <bors@rust-lang.org>2016-05-30 08:13:08 -0700
commitf3bfa313ecf557b9684568f6a2acd42cd67cc1bc (patch)
tree4d000fa349659239a36d57c9215b400e5cdc9ef4 /src/etc/htmldocck.py
parent5da602bda3f30a8943dd4d10383bae6d8a77575c (diff)
parent26c209897f4ae230828898551725cceced59e329 (diff)
downloadrust-f3bfa313ecf557b9684568f6a2acd42cd67cc1bc.tar.gz
rust-f3bfa313ecf557b9684568f6a2acd42cd67cc1bc.zip
Auto merge of #33965 - Manishearth:rollup, r=Manishearth
Rollup of 5 pull requests

- Successful merges: #33867, #33926, #33942, #33958, #33964
- Failed merges:
Diffstat (limited to 'src/etc/htmldocck.py')
-rw-r--r--src/etc/htmldocck.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/etc/htmldocck.py b/src/etc/htmldocck.py
index a930a0d0833..a5449b748dd 100644
--- a/src/etc/htmldocck.py
+++ b/src/etc/htmldocck.py
@@ -117,6 +117,7 @@ from xml.etree import cElementTree as ET
 from htmlentitydefs import entitydefs
 entitydefs['larrb'] = u'\u21e4'
 entitydefs['rarrb'] = u'\u21e5'
+entitydefs['nbsp'] = ' '
 
 # "void elements" (no closing tag) from the HTML Standard section 12.1.2
 VOID_ELEMENTS = set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',