docs: update documentation with new domain name and paypal link

(cherry picked from commit 89b18c05ca4a351db0f4ba8c423e9ec29759cd94)

Conflicts:

	docs/html/overview.html
	docs/html/sysreq.html
	support/changelog

diff --git a/README b/README
index 8899c76a423040be104c1936d15476b06364b5a6..5f2c067540177989b9225abb4367f00179c3e25c 100644 (file)
--- a/README
+++ b/README
@@ -28,6 +28,6 @@ Further information
 -------------------
 
 For more information about building, including generating packages please visit:
-> https://www.lonelycoder.com/redmine/projects/tvheadend/wiki/Building
-> https://www.lonelycoder.com/redmine/projects/tvheadend/wiki/Packaging
-> https://www.lonelycoder.com/redmine/projects/tvheadend/wiki/Git
+> https://tvheadend.org/projects/tvheadend/wiki/Building
+> https://tvheadend.org/projects/tvheadend/wiki/Packaging
+> https://tvheadend.org/projects/tvheadend/wiki/Git

diff --git a/README.md b/README.md
index 8899c76a423040be104c1936d15476b06364b5a6..5f2c067540177989b9225abb4367f00179c3e25c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -28,6 +28,6 @@ Further information
 -------------------
 
 For more information about building, including generating packages please visit:
-> https://www.lonelycoder.com/redmine/projects/tvheadend/wiki/Building
-> https://www.lonelycoder.com/redmine/projects/tvheadend/wiki/Packaging
-> https://www.lonelycoder.com/redmine/projects/tvheadend/wiki/Git
+> https://tvheadend.org/projects/tvheadend/wiki/Building
+> https://tvheadend.org/projects/tvheadend/wiki/Packaging
+> https://tvheadend.org/projects/tvheadend/wiki/Git

diff --git a/debian/control b/debian/control
index 7c0de44ae619417e5e44700b6638895e79fe91a9..29435c2a8373509fdfd0a8cc6aaa501e5e02158d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: tvheadend
 Section: video
 Priority: extra
-Maintainer: Andreas Öman <andreas@lonelycoder.com>
+Maintainer: Andreas Öman <andreas@tvheadend.org>
 Build-Depends: debhelper (>= 7.0.50), pkg-config, libavahi-client-dev, libssl-dev, zlib1g-dev, wget, bzip2, libcurl4-gnutls-dev, git-core
 Standards-Version: 3.7.3
 
@@ -11,7 +11,7 @@ Depends: ${shlibs:Depends}, libavahi-client3, zlib1g
 Recommends: xmltv-util
 Enhances: showtime
 Replaces: hts-tvheadend
-Homepage: http://www.lonelycoder.com/tvheadend
+Homepage: https://tvheadend.org
 Description: Tvheadend
  Tvheadend is a TV streaming server for Linux supporting DVB, ATSC, IPTV, and Analog video (V4L) as input sources.
  Can be used as a backend to Showtime, XBMC and various other clients.

diff --git a/docs/html/overview.html b/docs/html/overview.html
index 437dab8cc059f1cb38200cf70206a4a131aceb49..36de92be8e793f229ccecc231b9ed5c4e569b081 100644 (file)
--- a/docs/html/overview.html
+++ b/docs/html/overview.html
@@ -1,16 +1,8 @@
 <div class="hts-doc-text">
 <p>
-
-
 <center>
-<h1>HTS Tvheadend 3.2</h1>
-&copy; 2006 - 2012, Andreas Öman, et al.<br><br>
+<h1>Tvheadend</h1>
+&copy; 2006 - 2013, Andreas Öman, et al.<br><br>
 <img style="padding: 0px" src="docresources/tvheadendlogo.png">
 </center>
-
-Tvheadend is part of the <b>HTS</b> project hosted at
-<a href="http://www.lonelycoder.com/hts">http://www.lonelycoder.com/hts</a>
-<p>
-It functions primarily as a TV streaming back end for the Showtime Mediaplayer but
-can be used standalone for other purposes, such as a Digital Video Recorder.
 </div>

diff --git a/docs/html/sysreq.html b/docs/html/sysreq.html
index 0f908e07f988aa8c311cba4c83ed2243d348683e..6aab85795d6402319e888f8f4fd612713227002b 100644 (file)
--- a/docs/html/sysreq.html
+++ b/docs/html/sysreq.html
@@ -1,16 +1,9 @@
 <div class="hts-doc-text">
 <p>
-If you want to build tvheadend from source, please visit 
-<a href="http://trac.lonelycoder.com/hts/wiki/howtobuildhts">this</a> page.
-Please notice that wiki development site only reflects the work
-in HEAD (-current). It should not deviate much should you want to
+If you want to build Tvheadend from source, please visit
+<a href="https://tvheadend.org/projects/tvheadend/wiki/Building">this</a> page.
+Please note: that wiki development site only reflects the work
+in master. It should not deviate much should you want to
 build a released version from source, but you never know.
 <p>
-
-Tvheadend is part of the <b>HTS</b> project hosted at
-<a href="http://hts.lonelycoder.com/">http://hts.lonelycoder.com/</a>.
-
-<p>
-It functions primarily as a TV backend for the Showtime Media player but
-can be used standalone for other purposes.
 </div>

diff --git a/man/tvheadend.1 b/man/tvheadend.1
index 47fb3c5aabaca51ec6e17be342a6dca370ad53bc..3d055c5725511f812ebaa23780c6388d3f9ea7a6 100644 (file)
--- a/man/tvheadend.1
+++ b/man/tvheadend.1
@@ -71,8 +71,8 @@ If daemonizing, tvheadend will writes it pid in /var/run/tvheadend.pid
 .B Tvheadend
 and this man page is maintained by Andreas Oeman
 .PP
-(andreas a lonelycoder d com)
+(andreas a tvheadend d org)
 .PP
 You may also visit #hts at irc.freenode.net
 .SH "SEE ALSO"
-.BR http://www.lonelycoder.com/hts/
+.BR https://tvheadend.org

diff --git a/src/main.c b/src/main.c
index 0ec35a775edc8491d785c600b42f226cc65f88fc..9d20edd55c9825610351ea1831b82413b1d35ee7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -322,7 +322,7 @@ show_usage
   }
   printf("\n");
   printf("For more information please visit the Tvheadend website:\n");
-  printf("  http://www.lonelycoder.com/tvheadend/\n");
+  printf("  https://tvheadend.org\n");
   printf("\n");
   exit(0);
 }

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 45ecfed10c70334095a3ff67bfcc354be5f2a73b..00d157e376d90b9c38469ce03724ed547e23a6da 100644 (file)
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -197,10 +197,10 @@ page_about(http_connection_t *hc, const char *remain, void *opaque)
                 "<div class=\"about-title\">"
                 "HTS Tvheadend %s"
                 "</div><br>"
-                "&copy; 2006 - 2012 Andreas \303\226man, et al.<br><br>"
+                "&copy; 2006 - 2013 Andreas \303\226man, et al.<br><br>"
                 "<img src=\"docresources/tvheadendlogo.png\"><br>"
-                "<a href=\"http://www.lonelycoder.com/tvheadend\">"
-                "http://www.lonelycoder.com/tvheadend</a><br><br>"
+                "<a href=\"https://tvheadend.org\">"
+                "https://tvheadend.org</a><br><br>"
                 "Based on software from "
                 "<a target=\"_blank\" href=\"http://www.extjs.com/\">ExtJS</a>. "
                 "Icons from "
@@ -214,7 +214,7 @@ page_about(http_connection_t *hc, const char *remain, void *opaque)
      "All proceeds are used to support server infrastructure and buy test "
      "equipment."
      "<br/>"
-     "<a href='https://www.paypal.com/cgi-bin/webscr?cmd=_donations&#38;business=andreas%%40lonelycoder%%2ecom&#38;item_name=Donation%%20to%%20the%%20Tvheadend%%20project&#38;currency_code=USD'><img src='https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif' alt='' /></a>"
+     "<a href='https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3Z87UEHP3WZK2'><img src='https://www.paypalobjects.com/en_US/GB/i/btn/btn_donateCC_LG.gif' alt='' /></a>"
                 "</center>",
                 tvheadend_version,
                 tvheadend_version);

diff --git a/support/changelog b/support/changelog
index 3bd008c4678ba778e9b5ee306790e3eec7205ad3..dcded20ad9da3b6cae93d2a62399120107c86f3e 100755 (executable)
--- a/support/changelog
+++ b/support/changelog
@@ -10,7 +10,7 @@ VER=$3
 
 # Defaults
 [ -z "$CHANGELOG"     ] && CHANGELOG=$(dirname $0)/../debian/changelog
-[ -z "$DEBEMAIL"      ] && DEBEMAIL="andreas@lonelycoder.com"
+[ -z "$DEBEMAIL"      ] && DEBEMAIL="andreas@tvheadend.org"
 [ -z "$DEBFULLNAME"   ] && DEBFULLNAME="Andreas Öman"
 [ -z "$VER"           ] && VER=$($(dirname $0)/version)
 [ ! -z "$DIST"        ] && VER=${VER}~${DIST}
@@ -18,9 +18,9 @@ VER=$3
 
 # Output
 NOW=$(date -R)
-echo >${CHANGELOG} "tvheadend (${VER}) ${DIST}; urgency=low"
-echo >>${CHANGELOG}
-echo >>${CHANGELOG} "  * The full changelog can be found at "
-echo >>${CHANGELOG} "    http://www.lonelycoder.com/tvheadend/download"
-echo >>${CHANGELOG}
-echo >>${CHANGELOG} " -- ${DEBFULLNAME} <${DEBEMAIL}>  ${NOW}"
+echo >"${CHANGELOG}"  "tvheadend (${VER}) ${DIST}; urgency=low"
+echo >>"${CHANGELOG}"
+echo >>"${CHANGELOG}" "  * The full changelog can be found at "
+echo >>"${CHANGELOG}" "    https://tvheadend.org/projects/tvheadend/wiki/Releases"
+echo >>"${CHANGELOG}"
+echo >>"${CHANGELOG}" " -- ${DEBFULLNAME} <${DEBEMAIL}>  ${NOW}"