[epiphany] Update project urls

[William Jon McCann <mccann src gnome org>]

commit b28f61e52ed548788dbf04771f273b505d05a8fa
Author: William Jon McCann <william jon mccann gmail com>
Date:   Wed Dec 11 12:21:25 2013 +0100

    Update project urls

 data/default-bookmarks.rdf.in         |    2 +-
 data/epiphany.appdata.xml.in          |    2 +-
 epiphany.doap                         |    4 ++--
 help/C/introduction.page              |    4 +---
 src/bookmarks/ephy-bookmarks-export.c |    2 +-
 src/window-commands.c                 |    6 +-----
 6 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/data/default-bookmarks.rdf.in b/data/default-bookmarks.rdf.in
index 0fb77ec..3d983f0 100644
--- a/data/default-bookmarks.rdf.in
+++ b/data/default-bookmarks.rdf.in
@@ -2,7 +2,7 @@
 <rdf:RDF xmlns="http://purl.org/rss/1.0/"; xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:ephy="http://gnome.org/ns/epiphany#"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
   <channel rdf:about="file://@pkgdatadir@/default-bookmarks.rdf">
     <title>Web bookmarks</title>
-    <link>http://www.gnome.org/projects/epiphany/</link>
+    <link>https://wiki.gnome.org/Apps/Web</link>
     <items>
       <rdf:Seq>
         <rdf:li rdf:resource="http://duckduckgo.com"/>
diff --git a/data/epiphany.appdata.xml.in b/data/epiphany.appdata.xml.in
index 3f56f4e..ad6168b 100644
--- a/data/epiphany.appdata.xml.in
+++ b/data/epiphany.appdata.xml.in
@@ -12,6 +12,6 @@
   <screenshots>
     <screenshot type="default" 
> http://projects.gnome.org/epiphany/images/epiphany-screenshot.png</screenshot>
   </screenshots>
-  <url type="homepage">http://projects.gnome.org/epiphany/</url>
+  <url type="homepage">https://wiki.gnome.org/Apps/Web</url>
   <updatecontact>epiphany-list gnome org</updatecontact>
 </application>
diff --git a/epiphany.doap b/epiphany.doap
index 67be001..56379fa 100644
--- a/epiphany.doap
+++ b/epiphany.doap
@@ -5,10 +5,10 @@
          xmlns:gnome="http://api.gnome.org/doap-extensions#";
          xmlns="http://usefulinc.com/ns/doap#";>
   <name xml:lang="en">Epiphany</name>
-  <shortdesc xml:lang="en">View web pages and find information on the Internet</shortdesc>
+  <shortdesc xml:lang="en">A simple, clean, beautiful view of the Web.</shortdesc>
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop"; />
 
-  <homepage rdf:resource="http://live.gnome.org/Epiphany"; />
+  <homepage rdf:resource="https://wiki.gnome.org/Apps/Web"; />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/epiphany-list"; />
 
   <maintainer>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 4cd7e83..8702417 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -33,9 +33,7 @@
   <p>In GNOME 3, <app>Epiphany</app> is also known as <app>Web</app>.</p>
 
   <media type="image" mime="image/png" src="media/epiphany-3-8.png">
-    <p>Fullscreen screenshot of Epiphany with
-    https://projects.gnome.org/epiphany/ open in the first tab and showing
-    https://gnome.org/ in the second tab.</p>
+    <p>Screenshot of Web with two tabs open.</p>
   </media>
 
 </page>
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index faad186..d7f8b78 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -188,7 +188,7 @@ write_rdf (EphyBookmarks *bookmarks,
        ret = xmlTextWriterWriteElement
                (writer,
                 (xmlChar *) "link",
-                (xmlChar *) "http://www.gnome.org/projects/epiphany/";);
+                (xmlChar *) "https://wiki.gnome.org/Apps/Web";);
        if (ret < 0) goto out;
 
        ret = xmlTextWriterStartElement (writer, (xmlChar *) "items");
diff --git a/src/window-commands.c b/src/window-commands.c
index 0918656..690ab26 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1561,10 +1561,6 @@ window_cmd_help_about (GtkAction *action,
        artists = g_new (char *, (list ? n_artists : 0) + 4 + 1);
        i = 0;
        APPEND_STRV_AND_FREE (artists, list);
-       APPEND (artists, "");
-       APPEND (artists, _("Contact us at:"));
-       APPEND (artists, "<gnome-art-list gnome org>");
-       APPEND (artists, "<gnome-themes-list gnome org>");
        artists[i++] = NULL;
        
        list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, NULL);
@@ -1613,7 +1609,7 @@ window_cmd_help_about (GtkAction *action,
                                */
                               "translator-credits", _("translator-credits"),
                               "logo-icon-name", "web-browser",
-                              "website", "http://www.gnome.org/projects/epiphany";,
+                              "website", "https://wiki.gnome.org/Apps/Web";,
                               "website-label", _("Web Website"),
                               "license", licence,
                               "wrap-license", TRUE,