5 files changed, 7 insertions, 7 deletions
diff --git a/lib/stdlib/doc/src/erl_eval.xml b/lib/stdlib/doc/src/erl_eval.xml
index c95494bf25..d0622594d9 100644
--- a/lib/stdlib/doc/src/erl_eval.xml
+++ b/lib/stdlib/doc/src/erl_eval.xml
@@ -46,7 +46,7 @@
     </datatype>
     <datatype>
       <name name="binding_struct"/>
-      <desc>A binding structure.</desc>
+      <desc><p>A binding structure.</p></desc>
     </datatype>
     <datatype>
       <name name="expression"/>
diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml
index 8c9e08ac3a..18867cfb68 100644
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -94,7 +94,7 @@
       <type>
         <v>Regexp = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
 	<v>Options = [ Option ]</v>
-	<v>Option = unicode | anchored | caseless | dollar_endonly | dotall | extended | firstline | multiline | no_auto_capture | dupnames | ungreedy | {newline, NLSpec}| bsr_anycrlf | bsr_unicode</v>
+	<v>Option = <seealso marker="#type-compile_option">compile_option()</seealso></v>
 	<v>NLSpec = <seealso marker="#type-nl_spec">nl_spec()</seealso></v>
 	<v>MP = <seealso marker="#type-mp">mp()</seealso></v>
 	<v>ErrSpec = {ErrString, Position}</v>
@@ -170,7 +170,7 @@ This option makes it possible to include comments inside complicated patterns. N
       <fsummary>Match a subject against regular expression and capture subpatterns</fsummary>
       <type>
 	<v>Subject = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
-        <v>RE = <seealso marker="#type-mp">mp()</seealso> | iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v>
+        <v>RE = <seealso marker="#type-mp">mp()</seealso> | iodata()</v>
 	<v>Captured = [ CaptureData ]</v>
 	<v>CaptureData = {integer(),integer()}</v>
       </type>
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index 46288cf467..515ea2ebb7 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.erl
@@ -43,7 +43,7 @@
 -type(name() :: term()).
 -type(value() :: term()).
 -type(bindings() :: [{name(), value()}]).
--opaque(binding_struct() :: orddict:orddict()).
+-type(binding_struct() :: orddict:orddict()).
 
 -type(lfun_value_handler() :: fun((Name :: atom(),
                                    Arguments :: [term()]) ->
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index 02dbe60741..e08258a535 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -46,7 +46,7 @@ split(Subject,RE) ->
 
 -spec split(Subject, RE, Options) -> SplitList when
       Subject :: iodata() | unicode:charlist(),
-      RE :: mp() | iodata(),
+      RE :: mp() | iodata() | unicode:charlist(),
       Options :: [ Option ],
       Option :: anchored | global | notbol | noteol | notempty
               | {offset, non_neg_integer()} | {newline, nl_spec()}
@@ -238,7 +238,7 @@ replace(Subject,RE,Replacement) ->
 
 -spec replace(Subject, RE, Replacement, Options) -> iodata() | unicode:charlist() when
       Subject :: iodata() | unicode:charlist(),
-      RE :: mp() | iodata(),
+      RE :: mp() | iodata() | unicode:charlist(),
       Replacement :: iodata() | unicode:charlist(),
       Options :: [Option],
       Option :: anchored | global | notbol | noteol | notempty
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index d79ee676d9..de0179da59 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -72,7 +72,7 @@ start_pseudo(_,_,_) -> ok.  %% It's already there
 
 %% This relay can be used to relay all messages directed to a process.
 
--spec relay(Pid) -> none() when
+-spec relay(Pid) -> no_return() when
       Pid :: pid().
 
 relay({badrpc,Reason}) ->