aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2011-05-10 09:49:43 +0200
committerLars Thorsen <[email protected]>2011-05-10 09:49:43 +0200
commit67be6297d72dc10d13bdf6fa8e6892cedf68ee15 (patch)
treece2070bb8f4e25ccb459d2fa36b87a6546057608 /lib
parent6f7310e3a06af45f2635b0451874445b7f51b7ff (diff)
parent241b15f667a69929847c6f6b4f710f0a718d1b53 (diff)
downloadotp-67be6297d72dc10d13bdf6fa8e6892cedf68ee15.tar.gz
otp-67be6297d72dc10d13bdf6fa8e6892cedf68ee15.tar.bz2
otp-67be6297d72dc10d13bdf6fa8e6892cedf68ee15.zip
Merge branch 'lars/docbuilder/fop-10-crash/OTP-9143' into dev
* lars/docbuilder/fop-10-crash/OTP-9143: Changed copyright year. Removed an overflow warning. Fix fop 1.0 crash when building pdf
Diffstat (limited to 'lib')
-rw-r--r--lib/docbuilder/doc/src/character_entities.xml4
-rw-r--r--lib/docbuilder/doc/src/inline_tags.xml7
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/docbuilder/doc/src/character_entities.xml b/lib/docbuilder/doc/src/character_entities.xml
index e78cf0ebec..0a4ae17fb5 100644
--- a/lib/docbuilder/doc/src/character_entities.xml
+++ b/lib/docbuilder/doc/src/character_entities.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1997</year><year>2009</year>
+ <year>1997</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -125,7 +125,7 @@
<cell align="left" valign="middle">not sign</cell>
</row>
<row>
- <cell align="left" valign="middle">&shy;</cell>
+ <cell align="left" valign="middle"></cell> <!-- a space is used instead of &shy; due to bug in fop 1.0 -->
<cell align="left" valign="middle">&amp;shy;</cell>
<cell align="left" valign="middle">soft hyphen</cell>
</row>
diff --git a/lib/docbuilder/doc/src/inline_tags.xml b/lib/docbuilder/doc/src/inline_tags.xml
index 10afbf143f..5bcca54c05 100644
--- a/lib/docbuilder/doc/src/inline_tags.xml
+++ b/lib/docbuilder/doc/src/inline_tags.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1997</year><year>2010</year>
+ <year>1997</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -246,7 +246,10 @@
bibliography file. Example:</p>
<pre>
[...,
- {"erlbook","Concurrent Programming in ERLANG","J. Armstrong, R. Virding, C. Wikstr&ouml;m, M. Williams, Concurrent Programming in ERLANG, Prentice Hall, 1996, ISBN 0-13-508301-X","jocke"},
+ {"erlbook",
+ "Concurrent Programming in ERLANG","J. Armstrong, R. Virding, C. Wikstr&ouml;m, "
+ "M. Williams, Concurrent Programming in ERLANG, Prentice Hall, 1996, ISBN 0-13-508301-X",
+ "jocke"},
...].
</pre>
</section>