[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ae04d306fe65a55e36a2df237da16633e93daf71
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 9 06:05:58 2009 +0000

    2009-10-08  Alex Milowski  <alex at milowski.com>
    
            Reviewed by Darin Adler.
    
            Added a basic description of the layout and rendering project and added links to the blog entries on rendering.
    
            * projects/layout/index.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49382 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index fcb01b6..6bd7f55 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-08  Alex Milowski  <alex at milowski.com>
+
+        Reviewed by Darin Adler.
+
+        Added a basic description of the layout and rendering project and added links to the blog entries on rendering.
+
+        * projects/layout/index.html:
+
 2009-10-07  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKitSite/projects/layout/index.html b/WebKitSite/projects/layout/index.html
index c24e0f0..927087d 100644
--- a/WebKitSite/projects/layout/index.html
+++ b/WebKitSite/projects/layout/index.html
@@ -1,13 +1,17 @@
 <?php
-	$title = "Layout and Rendering";
-	include("../../header.inc");
+    $title = "Layout and Rendering";
+    include("../../header.inc");
 ?>
 <h2>Layout and Rendering</h2>
+<p>Layout and rendering provides the core functionality to display a markup language such as HTML, SVG, or MathML.  A render object tree is generated from the markup and those tree object instances are responsible for the layout and subsequent rendering of the content.</p>
 
-<p>
-Needs to be written.
-</p>
+<h3>Related Blog Entries</h3>
+<p> <a href="http://webkit.org/blog/114/webcore-rendering-i-the-basics/">WebCore Rendering I – The Basics</a> </p>
+<p> <a href="http://webkit.org/blog/115/webcore-rendering-ii-blocks-and-inlines/">WebCore Rendering II – Blocks and Inlines</a> </p>
+<p> <a href="http://webkit.org/blog/116/webcore-rendering-iii-layout-basics/">WebCore Rendering III – Layout Basics</a> </p>
+<p> <a href="http://webkit.org/blog/117/webcore-rendering-iv-absolutefixed-and-relative-positioning/">WebCore Rendering IV – Absolute/Fixed and Relative Positioning</a> </p>
+<p> <a href="http://webkit.org/blog/118/webcore-rendering-v-floats/">WebCore Rendering V – Floats</a> </p>
 
 <?php
-	include("../../footer.inc");
+    include("../../footer.inc");
 ?>

-- 
WebKit Debian packaging