summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Schaller <christian.schaller@collabora.co.uk>2010-05-03 13:52:10 +0100
committerChristian Schaller <christian.schaller@collabora.co.uk>2010-05-03 13:52:10 +0100
commit4bf33ea0856e6eb71be5f7ea83e532e37c7e577b (patch)
tree6cf359737632857c3beded98436ce6532b77b7a2
parent9818736c8c7f6c677787da4533762a4f86462033 (diff)
Layout fixes and typo fixes
-rw-r--r--src/htdocs/conference/index.xml10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/htdocs/conference/index.xml b/src/htdocs/conference/index.xml
index 9a88203f..8119812b 100644
--- a/src/htdocs/conference/index.xml
+++ b/src/htdocs/conference/index.xml
@@ -9,6 +9,7 @@
<page>
<title>GStreamer Conference 2010</title>
<body>
+<h1>GStreamer Conference 2010</h1>
<h2>Cambridge, United Kingdom 26th of October 2010</h2>
<p>
In conjuction with the <a href="http://www.embeddedlinuxconference.com/elc_europe10/">
@@ -35,7 +36,7 @@ with an actual agenda soon.
<li>GStreamer 1.0</li>
<li>DLNA support</li>
<li>Cross platform development with GStreamer</li>
-<li>Telepathey VOIP and videoconferencing</li>
+<li>Telepathy VOIP and videoconferencing</li>
<li>GStreamer and Android</li>
<li>GStreamer and MeeGo</li>
<li>GStreamer, Webkit and HTML5</li>
@@ -60,11 +61,14 @@ please check back there for updates on when you can register.
Anyone interested in open source multimedia are encouraged to join us at the GStreamer Conference 2010.
If you are a hobbyist or a student interested in the field of multimedia or working for a company
using or looking to GStreamer on their products then this is the perfect event for you to network
-and learn more about what is happening. The talks should be interested for both developers and
+and learn more about what is happening. The talks should be target both developers and
managers alike.
</p>
<p>
-<img src="http://farm2.static.flickr.com/1361/1330772310_39512c9610.jpg"/>
+<table>
+<tr><td><img src="http://farm2.static.flickr.com/1361/1330772310_39512c9610.jpg" width="500" height="375"/>
+</td></tr>
+<tr><td><b>Photo of Cambridge Arms Hotel</b></td></tr>
</p>
</body>