<newsletter:website> Merge branch 'master' of git+ssh://git.geany.org/git/newsletter

[Russell Dickenson]

Updating branch refs/heads/website
         to dd7f81305e8af69e42e4e6c67093e9ee5f865e68 (commit)
       from bb544b18569d1654e0742a9fe92937a404f7804f (commit)

commit dd7f81305e8af69e42e4e6c67093e9ee5f865e68
Merge: bb544b1 805ebaa
Author: Russell Dickenson <russelldickenson at gmail.com>
Date:   Sun Apr 10 22:58:46 2011 +1000

    Merge branch 'master' of git+ssh://git.geany.org/git/newsletter

commit 805ebaaa43be37d38e5f2c8ff0976523892e4b3f
Merge: b8c78ce b58b39f
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Fri Apr 8 19:11:14 2011 +0200

    Merge branch 'website'

commit b58b39fd170eb68b6d36d07c3ea999b8a78397d2
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Fri Apr 8 19:08:29 2011 +0200

    Level heading one level down at About page

commit b8c78cee7928fb8ac4191ba35417d008497682d0
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Fri Apr 8 19:08:29 2011 +0200

    Level heading one level down at About page

commit 89b9d38da660f4310d82e873ebf2afad627e7e71
Merge: d1067d8 b20d37c
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Fri Apr 8 18:23:28 2011 +0200

    Merge website branch into master

commit b20d37c9c586b46a7397dc43fddea392f1070730
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Fri Apr 8 18:21:24 2011 +0200

    Add some content to about page

commit 37a3d895e331b2e9d3678d830feedc06f20243a6
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Fri Apr 8 18:12:21 2011 +0200

    Change link on footer to link to authors section of geany.org

commit 402253a8cbfa82f38014b0db196f8ad06541a3d5
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Mon Mar 21 20:43:01 2011 +0100

    fix deprecated warning, use explode instead of split

commit 8b167456604cf82dd4ace6a507b242dfbf9a4b23
Author: Enrico Tröger <enrico.troeger at uvena.de>
Date:   Sun Mar 13 17:15:14 2011 +0100

    Offer HTML, PDF and plain Text variants of the newsletter(s)

commit 9420cb9a5c12d75e82307afee7e129f43fd701ba
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Mar 13 15:28:25 2011 +0100

    add rudimentary about page

commit 4175180e5a7ba400b62373d4a719b5f1218f00d1
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Mar 13 15:25:52 2011 +0100

    correct the page title

commit eb141a0bb8ea7638e0e0beef1c101830ad58b485
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Mar 13 14:28:36 2011 +0100

    add file newsletters.php

commit 090287c0679ab08f6637b4d200e75bbbbd9e8bb8
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Mar 13 14:13:44 2011 +0100

    allow including php files from content/ directory
    make newsletters.php the default landing page

commit b385882425bc5cb3d182b90eeeb0a39f1062ae24
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Mar 13 14:09:57 2011 +0100

    add index.php

commit fdbfb385a81ddcf7905691afcd2b0a1a755e397d
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Mar 13 14:09:17 2011 +0100

    add content/404.html

commit b66b08fef8e720b0b6a2f23a8c9a70d19a196cd7
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Mar 13 13:23:44 2011 +0100

    add images and stylesheets for the website

 content/about.html |   23 +++++++++++++++++++++--
 index.php          |    2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/content/about.html b/content/about.html
index 1b03ab1..7641b28 100644
--- a/content/about.html
+++ b/content/about.html
@@ -1,2 +1,21 @@
-<h1>About Geany Newsletter</h1>
-<p>Sorry, this page has to be filled with content first.</p>
+<h2>About Geany Newsletter</h2>
+
+<h3>Goal and intention of the newsletter</h3>
+
+<p>The Geany newsletter is a cooperate work of people around Geany
+— Developers, translators or just users and fans of Geany.</p>
+
+<p>On a regular basis its trying to give a short update on what is
+going on inside development of Geany, its plugins and all the
+environment around Geany. Beside giving the updates its also a goal
+of the newsletter to tell users about intersting features of Geany
+itself or of one of its plugins.</p>
+
+<h3>Authors</h3>
+<p>Everybody is free to contribute to the newsletter.</p>
+
+<p>If you like to contribute to the newsletter, make a request or
+complaint about content please contact
+<a href="mailto:frank at geany.org">frank at geany.org</a> via email or
+<a href="xmpp://fralan@jabber.org">fralan at jabber.org</a> on Jabber/XMPP.
+</p>
diff --git a/index.php b/index.php
index da32ca1..2674075 100644
--- a/index.php
+++ b/index.php
@@ -77,7 +77,7 @@ print '<?xml version="1.0"?>';
 	<div id="footer">
 		<p>© Dominic Hopf<br />
 		Contact <a href="http://dominichopf.de/">Dominic Hopf</a> or the
-		<a href="http://www.geany.org/Support/MailingList">Geany Team</a>
+		<a href="http://www.geany.org/Main/Authors">Geany Team</a>
 		for questions.</p>
 	</div>
 </body>