Merged revisions 718557,718570,718591 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r718557 | vhennebert | 2008-11-18 11:10:19 +0000 (Tue, 18 Nov 2008) | 2 lines
  
  Improved the FAQ by creating a separate entry for the problem about keep-together on table-cell, and the added support for inline keeps in 0.95
........
  r718570 | jeremias | 2008-11-18 13:16:32 +0000 (Tue, 18 Nov 2008) | 1 line
  
  Update conference ads.
........
  r718591 | acumiskey | 2008-11-18 13:56:52 +0000 (Tue, 18 Nov 2008) | 2 lines
  
  TextHandler interface changes, the Graphics2D implementation is now passed to drawString().
........


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@718594 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 24 insertions, 16 deletions

diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
index f05f07126..1838a416a 100644
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -639,15 +639,25 @@ Check the following:</p>
           <link href="http://www.mulberrytech.com/xsl/xsl-list/">XSL list
           archive</link> for how to perform these tasks.
         </p>
-        <p>
-          If your text is not hyphenated at all and overflows the cell, please check
-          if you've specified <code>keep-together="always"</code> on the table-cell
-          or one of its parent elements. <code>keep-together="always"</code> implicitely
-          also sets <code>keep-together.within-line="always"</code> which forbids FOP
-          to break the text into multiple lines. This is important as FOP supports inline-level
-          keeps since version 0.94. It's a good idea not to use the shorthand
-          <code>keep-together="always"</code> at all!
-        </p>
+      </answer>
+    </faq>
+    <faq id="table-cell-wrap">
+      <question>The contents of table cells don’t wrap</question>
+      <answer>
+        <p>You probably have <code>keep-together="always"</code> set on the table cell. See <link 
+            href="#keep-together">next question</link>.</p>
+      </answer>
+    </faq>
+    <faq id="keep-together">
+      <question>FOP 0.95 and FOP 0.94 behave differently when <code>keep-together="always"</code> 
+        is set on table cells</question>
+      <answer>
+        <p>Support for inline-level keeps has been added in FOP 0.95, and setting 
+          <code>keep-together="always"</code> also implicitly sets 
+          <code>keep-together.within-line="always"</code>, which forbids FOP
+          to break the text into multiple lines. Set 
+          <code>keep-together.within-column="always"</code> on table-cell instead. It’s a good idea 
+          not to use the shorthand <code>keep-together="always"</code> at all!</p>
       </answer>
     </faq>
     <faq id="row-height-constraint">
diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml
index 20b12808e..a6a5ac65f 100644
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@@ -369,19 +369,17 @@ which will be used to configure the chosen Forrest skin.
       <width>88</width>
       <height>31</height>
     </credit>
-    <!--
     <credit box-location="alt2">
-      <name>ApacheCon Europe 2008</name>
+      <name>ApacheCon Europe 2009</name>
       <url>http://eu.apachecon.com/</url>
-      <image>http://apache.org/ads/ApacheCon/2008-europe-125x125.png</image>
+      <image>http://apache.org/ads/ApacheCon/2009-europe-125x125.png</image>
       <width>125</width>
       <height>125</height>
     </credit>
-    -->
     <credit box-location="alt2">
-      <name>ApacheCon US 2008</name>
+      <name>ApacheCon US 2009</name>
       <url>http://us.apachecon.com/</url>
-      <image>http://apache.org/ads/ApacheCon/2008-usa-125x125.png</image>
+      <image>http://apache.org/ads/ApacheCon/2009-usa-125x125.png</image>
       <width>125</width>
       <height>125</height>
     </credit>

path: root/src/documentation