From dfd4b66c48106edfcbdd1b32e733640e2587acbb Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 3 Dec 2009 12:21:55 +0000 Subject: documentation: Fix bugs introduced in the SGML to XML transition In the transition from SGML to XML (several releases ago), bugs were introduced in the documentation, for instance "\n" replaced by newlines. Correct those bugs. Also correct double backslashes. They seem to have been introduced very early in the development of OTP. According to Lars they "solved" a bug in the generation of HTML &c. Now that standard tools are used instead of docbuilder, the bug has become visible. --- lib/tools/doc/src/erlang_mode.xml | 2 +- lib/tools/doc/src/erlang_mode_chapter.xml | 6 +++--- lib/tools/doc/src/notes_history.xml | 30 ++++++++++++++---------------- lib/tools/doc/src/xref.xml | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) (limited to 'lib/tools') diff --git a/lib/tools/doc/src/erlang_mode.xml b/lib/tools/doc/src/erlang_mode.xml index 72770898c2..912c442153 100644 --- a/lib/tools/doc/src/erlang_mode.xml +++ b/lib/tools/doc/src/erlang_mode.xml @@ -51,7 +51,7 @@ TAB (erlang-indent-command) - Indents the current line of code. - M-C-\\ (indent-region) - Indents all + M-C-\ (indent-region) - Indents all lines in the region. M-l (indent-for-comment) - Insert a comment character to the right of the code on the line (if diff --git a/lib/tools/doc/src/erlang_mode_chapter.xml b/lib/tools/doc/src/erlang_mode_chapter.xml index cf043e3302..b22c6b1809 100644 --- a/lib/tools/doc/src/erlang_mode_chapter.xml +++ b/lib/tools/doc/src/erlang_mode_chapter.xml @@ -74,10 +74,10 @@ environment variable is set, Emacs will look for the .emacs file in the directory indicated by the HOME variable. If HOME is not set, Emacs - will look for the .emacs file in C:\\ .

+ will look for the .emacs file in C:\ .

Below is a complete example of what should be added to a user's .emacs provided that OTP is installed in the directory - ]]>:

+ ]]>:

/lib/tools-/emacs" load-path)) @@ -87,7 +87,7 @@ ]]>

In .emacs, the slash character "/" can be used as path - separator. But if you decide to use the backslash character "\\", + separator. But if you decide to use the backslash character "\", please not that you must use double backslashes, since they are treated as escape characters by Emacs.

 diff --git a/lib/tools/doc/src/notes_history.xml b/lib/tools/doc/src/notes_history.xml index ef5ce1c03d..3791d5270a 100644 --- a/lib/tools/doc/src/notes_history.xml +++ b/lib/tools/doc/src/notes_history.xml @@ -4,23 +4,21 @@
- 2006 - 2007 - Ericsson AB, All Rights Reserved + 20062009 + Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - 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. - - The Initial Developer of the Original Code is Ericsson AB. + The contents of this file are subject to the Erlang Public License, + Version 1.1, (the "License"); you may not use this file except in + 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. + Tools Release Notes @@ -63,7 +61,7 @@

Own Id: OTP-5073

-

Previous patch from open source messed up \\M-q so part of +

Previous patch from open source messed up \M-q so part of that patch was backed out.

Own Id: OTP-5074

 diff --git a/lib/tools/doc/src/xref.xml b/lib/tools/doc/src/xref.xml index 6fff68fe9f..407a7392ad 100644 --- a/lib/tools/doc/src/xref.xml +++ b/lib/tools/doc/src/xref.xml @@ -1176,7 +1176,7 @@ Evaluates a predefined analysis.

no_functions. Functions in library modules and the functions module_info/0,1 are not counted by - info. Assuming that "Extra := _:module_info/\\"(0|1)\\" + LM" has been evaluated, the + info. Assuming that "Extra := _:module_info/\"(0|1)\" + LM" has been evaluated, the sum of the number of local and exported functions are:

"# (F - Extra)" (info/1) -- cgit v1.2.3