From a7ec8726e2f3c5259c2233cc2ab3fc56147febf9 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Mon, 19 Apr 2010 11:40:22 +0000
Subject: OTP-8567 The word 'spec' is no longer reserved.

The function erl_scan:reserved_word/1 no longer returns true when given the
word spec. This bug was introduced in STDLIB-1.15.3 (R12B-3).
---
 lib/stdlib/doc/src/erl_scan.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'lib/stdlib/doc/src')

diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml
index 4175146c3c..1199c34f0f 100644
--- a/lib/stdlib/doc/src/erl_scan.xml
+++ b/lib/stdlib/doc/src/erl_scan.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>erl_scan</title>
@@ -103,7 +103,7 @@ attributes() = line() | list() | tuple()</code>
           Info, atom()}</c>,
           <c>{char, Info, integer()}</c>, <c>{comment, Info,
           string()}</c>, <c>{float, Info, float()}</c>, <c>{integer,
-          Info, integer()}</c>, <c>{var, Info, atom()}</c>, 
+          Info, integer()}</c>, <c>{var, Info, atom()}</c>,
           and <c>{white_space, Info, string()}</c>.</p>
         <p>The valid options are:</p>
         <taglist>
@@ -149,7 +149,8 @@ attributes() = line() | list() | tuple()</code>
         <v>StartLocation = EndLocation = location()</v>
         <v>Options = Option | [Option]</v>
         <v>Option = {reserved_word_fun,reserved_word_fun()}
-                  | return_comments | return_white_spaces | return</v>
+                  | return_comments | return_white_spaces | return
+                  | text</v>
       </type>
       <desc>
         <p>This is the re-entrant scanner which scans characters until
@@ -173,7 +174,7 @@ attributes() = line() | list() | tuple()</code>
               <tag><c>{error, ErrorInfo, EndLocation}</c></tag>
               <item>
                 <p>An error occurred. <c>LeftOverChars</c> is the remaining
-                  characters of the input data, 
+                  characters of the input data,
                   starting from <c>EndLocation</c>.</p>
               </item>
             </taglist>
@@ -278,7 +279,7 @@ attributes() = line() | list() | tuple()</code>
           <item><p>The token's symbol.</p>
           </item>
           <tag><c>{text, string()}</c></tag>
-          <item><p>The token's text..</p>
+          <item><p>The token's text.</p>
           </item>
         </taglist>
       </desc>
@@ -315,7 +316,7 @@ attributes() = line() | list() | tuple()</code>
       <type>
         <v>Attributes = attributes()</v>
         <v>AttributeItemSpec = AttributeItem | [AttributeItem]</v>
-        <v>AttributesInfo = AttributeInfoTuple | undefined 
+        <v>AttributesInfo = AttributeInfoTuple | undefined
                           | [AttributeInfoTuple]</v>
         <v>AttributeInfoTuple = {AttributeItem, Info}</v>
         <v>AttributeItem = atom()</v>
@@ -352,7 +353,7 @@ attributes() = line() | list() | tuple()</code>
             just the line if the column unknown.</p>
           </item>
           <tag><c>{text, string()}</c></tag>
-          <item><p>The token's text..</p>
+          <item><p>The token's text.</p>
           </item>
         </taglist>
       </desc>
-- 
cgit v1.2.3