From baaa706d34013208d69c48c8ff6bc2edbebe8994 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 18 Apr 2013 13:02:22 +0100 Subject: [PATCH] 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 --- README | 6 +++--- README.md | 6 +++--- debian/control | 4 ++-- docs/html/overview.html | 12 ++---------- docs/html/sysreq.html | 15 ++++----------- man/tvheadend.1 | 4 ++-- src/main.c | 2 +- src/webui/extjs.c | 8 ++++---- support/changelog | 14 +++++++------- 9 files changed, 28 insertions(+), 43 deletions(-) diff --git a/README b/README index 8899c76a..5f2c0675 100644 --- 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 8899c76a..5f2c0675 100644 --- 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 7c0de44a..29435c2a 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: tvheadend Section: video Priority: extra -Maintainer: Andreas Öman +Maintainer: Andreas Öman 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 437dab8c..36de92be 100644 --- a/docs/html/overview.html +++ b/docs/html/overview.html @@ -1,16 +1,8 @@

- -

-

HTS Tvheadend 3.2

-© 2006 - 2012, Andreas Öman, et al.

+

Tvheadend

+© 2006 - 2013, Andreas Öman, et al.

- -Tvheadend is part of the HTS project hosted at -http://www.lonelycoder.com/hts -

-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.

diff --git a/docs/html/sysreq.html b/docs/html/sysreq.html index 0f908e07..6aab8579 100644 --- a/docs/html/sysreq.html +++ b/docs/html/sysreq.html @@ -1,16 +1,9 @@

-If you want to build tvheadend from source, please visit -this 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 +this 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.

- -Tvheadend is part of the HTS project hosted at -http://hts.lonelycoder.com/. - -

-It functions primarily as a TV backend for the Showtime Media player but -can be used standalone for other purposes.

diff --git a/man/tvheadend.1 b/man/tvheadend.1 index 47fb3c5a..3d055c57 100644 --- 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 0ec35a77..9d20edd5 100644 --- 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 45ecfed1..00d157e3 100644 --- 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) "
" "HTS Tvheadend %s" "

" - "© 2006 - 2012 Andreas \303\226man, et al.

" + "© 2006 - 2013 Andreas \303\226man, et al.

" "
" - "" - "http://www.lonelycoder.com/tvheadend

" + "" + "https://tvheadend.org

" "Based on software from " "ExtJS. " "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." "
" - "" + "" "", tvheadend_version, tvheadend_version); diff --git a/support/changelog b/support/changelog index 3bd008c4..dcded20a 100755 --- 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}"