Update documentation etc. to point at the new home page.

--HG--
extra : transplant_source : %8D9%B3J%8E%DE%A1%81t%7E%A0%08%13%A4%AE%9C%EA.%C3%10

8 files changed, 23 insertions, 19 deletions

diff --git a/README b/README
index 349fdd2b1..ce6e85d0d 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ Individual frontends (e.g. xine-ui, gxine, totem, ...) may provide
 additional documentation in their packages.
 
 For more information on xine features (supported multimedia formats etc.)
-see the xine homepage, located at http://xinehq.de/
+see the xine homepage, located at http://www.xine-project.org/
 
 The xine-lib XML parser (src/xine-utils/xmlparser.[ch] and
 src/xine-utils/xmllexer.[ch]) is released under the GNU LGPL, see COPYING.LIB
diff --git a/debian/watch b/debian/watch
index c82dbbc10..d3a4d7702 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-http://xinehq.de/index.php/releases \
+http://www.xine-project.org/releases \
 	(?:.*/)?xine/xine-lib-([\d\.]*).tar.gz \
 	debian uupdate
diff --git a/doc/faq/faq.sgml b/doc/faq/faq.sgml
index 5dbd1c6a4..48f9b2416 100644
--- a/doc/faq/faq.sgml
+++ b/doc/faq/faq.sgml
@@ -199,7 +199,7 @@
      tools for further info.
      You can also find links to third parties providing xine RPMs on
      the xine homepage at
-     <ulink url="http://xinehq.de/index.php/releases">http://xinehq.de/index.php/releases</ulink>.
+     <ulink url="http://www.xine-project.org/releases">http://www.xine-project.org/releases</ulink>.
     </para>
     <para>
      See the next section of this FAQ for instructions on how to build xine
diff --git a/doc/hackersguide/intro.sgml b/doc/hackersguide/intro.sgml
index c7dce6254..4e96d2de1 100644
--- a/doc/hackersguide/intro.sgml
+++ b/doc/hackersguide/intro.sgml
@@ -6,7 +6,7 @@
   <para>
    You are currently looking at a piece of documentation for xine. 
    xine is a free video player. It lives on
-   <ulink url="http://xinehq.de/">http://xinehq.de/</ulink>. Specifically
+   <ulink url="http://www.xine-project.org/">http://www.xine-project.org/</ulink>. Specifically
    this document goes under the moniker of the "xine Hackers' Guide".
   </para>
  </sect1>
@@ -36,7 +36,7 @@
   </para>
   <para>
    New versions of this document can also be obtained from the xine web site:
-   <ulink url="http://xinehq.de/">http://xinehq.de/</ulink>.
+   <ulink url="http://www.xine-project.org/">http://www.xine-project.org/</ulink>.
   </para>
  </sect1>
 
diff --git a/doc/internal/HOWTO.release b/doc/internal/HOWTO.release
index 2128ca391..38532aac0 100644
--- a/doc/internal/HOWTO.release
+++ b/doc/internal/HOWTO.release
@@ -127,15 +127,19 @@ hands.
     (also make sure it gets immediately approved by the xine-announce
      moderator!)
 
-12) write the announcement for xinehq:
-    You need to login on xinehq and use your admin privileges to create a
-    news article in the "New Releases" section. Include a link to the
-    SourceForge Release notes/Changelog page and one to the download page.
-
-    Warning: triple-check that you get the HTML correct! If you have
-             unmatched quotes, you might break the whole website so that it
-             can only be repaired by manually fiddling with mysql to get the
-             HTML right!
+12) write the announcement for xine-project.org:
+    You need to have an account on alioth.debian.org and a checked-out copy
+    of ssh://hg.debian.org//hg/xine-lib/xine-project-www/ (using Mercurial). 
+    Add the new news item near the top of pages/news/items.xml (use the
+    provided template), run update.sh (requires xsltproc; if this fails,
+    re-edit), check that it looks fine in a convenient browser, then commit
+    and push the change. At present, you will need to request a web site
+    update via #xine on irc.oftc.net or by contacting a site admin.
+
+    You should include a link to the SourceForge Release notes/Changelog
+    page and one to the download page.
+
+    Warning: triple-check that you get the XML correct!
 
 13) write the Freshmeat announcement:
     use your freshmeat account to log into their website, if you aren't
diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5
index 0524dee6d..eba55aef5 100644
--- a/doc/man/en/xine.5
+++ b/doc/man/en/xine.5
@@ -346,8 +346,8 @@ stream.
 
 .br
 The programs are documented fully on the xine home page:
-.UR http://xinehq.de/
-.IR "http://xinehq.de/"
+.UR http://www.xine-project.org/
+.IR "http://www.xine-project.org/"
 .UE
 .SH AUTHOR
 This text was extracted from the xine man page by Darren Salt
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index 453ffa306..952c5e0d2 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -79,8 +79,8 @@ Version:        %{version}
 Release:        %{release}
 License:        GPL
 Group:          Development/Libraries
-URL:            http://xinehq.de
-Source:         http://xinehq.de/files/@PACKAGE@-@VERSION@.tar.bz2
+URL:            http://www.xine-project.org
+Source:         http://prdownloads.sourceforge.net/xine/@PACKAGE@-@VERSION@.tar.bz2
 Packager:       Manfred Tremmel <Manfred.Tremmel@iiv.de>
 Obsoletes:      xine
 Obsoletes:      xine-lib
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 55b7f9b84..50382ee7e 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -20,7 +20,7 @@
 /* 
   These are plugin routines called by the xine engine. See
   Chapter 4. Extending xine's input
-  http://xinehq.de/index.php/hackersguide/index.php?resource=5.3&action=default#INPUT
+  http://www.xine-project.org/hackersguide#INPUT
   and the comments in input_plugin.h
 
   This is what is referred to below a "the xine plugin spec"