Merge branch 'maint'

* maint:
  Fix a Unicode filename bug affecting Leex and Yecc

1 files changed, 8 insertions, 6 deletions

diff --git a/lib/parsetools/doc/src/leex.xml b/lib/parsetools/doc/src/leex.xml
index 0fd5a77e37..7ee0633dac 100644
--- a/lib/parsetools/doc/src/leex.xml
+++ b/lib/parsetools/doc/src/leex.xml
@@ -38,19 +38,21 @@ Token = tuple()</code>
   </section>
   <funcs>
     <func>
-      <name>file(FileName) -> ok | error</name>
-      <name>file(FileName, Options) -> ok | error</name>
+      <name>file(FileName, [, Options]) -> LeexRet</name>
       <fsummary>Generate a lexical analyzer</fsummary>
       <type>
         <v>FileName = filename()</v>
         <v>Options = Option | [Option]</v>
         <v>Option =&nbsp;-&nbsp;see below&nbsp;-</v>
-        <v>FileReturn = {ok, Scannerfile} 
-                      | {ok, Scannerfile, Warnings}
-                      | error
-                      | {error, Warnings, Errors}</v>
+        <v>LeexRet = {ok, Scannerfile}
+                   | {ok, Scannerfile, Warnings}
+                   | error
+                   | {error, Warnings, Errors}</v>
         <v>Scannerfile = filename()</v>
         <v>Warnings = Errors = [{filename(), [ErrorInfo]}]</v>
+        <v>ErrorInfo  = {ErrorLine, module(), Reason}</v>
+        <v>ErrorLine = integer()</v>
+        <v>Reason =&nbsp;-&nbsp;formatable by format_error/1&nbsp;-</v>
       </type>
       <desc>
         <p>Generates a lexical analyzer from the definition in the input