Fix merge diff.

diff --git a/www/en/index.shtml b/www/en/index.shtml
index 5387ec4d7097a7d3d0fcb24afac362e2f32d226d..b0dcb4cda57bfca1960d41b59d57f932156e8094 100644 (file)
--- a/www/en/index.shtml
+++ b/www/en/index.shtml
@@ -46,7 +46,7 @@
                                        </ul>
 
                                        <p>
-                                               <b>ear Community!</b><br />
+                                               <b>Dear Community!</b><br />
                                                It is almost a year ago, we´ve finalized the 2.1 and started the BETA process for
                                                the final release. After two hard months 2.1 was released in november 2007. Here are
                                                some very interisting numbers to show the growing interest for IPFire and its ongoing

diff --git a/www/en/news.shtml b/www/en/news.shtml
index 0c28882913f5d7787cd28a88013e41976a28dc7e..a013e942c3fe6b4d91df6d4b5bfc98a89e218540 100644 (file)
--- a/www/en/news.shtml
+++ b/www/en/news.shtml
@@ -34,7 +34,7 @@
                                        </ul>
 
                                        <p>
-                                               <b>ear Community!</b><br />
+                                               <b>Dear Community!</b><br />
                                                It is almost a year ago, we´ve finalized the 2.1 and started the BETA process for
                                                the final release. After two hard months 2.1 was released in november 2007. Here are
                                                some very interisting numbers to show the growing interest for IPFire and its ongoing