From: Mark Clarkstone Date: Thu, 8 Nov 2018 18:20:49 +0000 (+0000) Subject: cosmetic: TVHeadend|tvheadend -> Tvheadend, where needed for consistency X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ae0d14ededf94f0a4af9037a38b9a4f0aa5eeab;p=thirdparty%2Ftvheadend.git cosmetic: TVHeadend|tvheadend -> Tvheadend, where needed for consistency --- diff --git a/debian/tvheadend.default b/debian/tvheadend.default index 57ce013ea..042a61231 100644 --- a/debian/tvheadend.default +++ b/debian/tvheadend.default @@ -1,5 +1,5 @@ # -# Default configuration for tvheadend +# Default configuration for Tvheadend. # systemd # See tvheadend --help for more - default "-u hts -g video" diff --git a/docs/class/debugging.md b/docs/class/debugging.md index 7711fcc07..09877ec49 100644 --- a/docs/class/debugging.md +++ b/docs/class/debugging.md @@ -8,7 +8,7 @@ Contents | Description ## Overview -This tab is used to configure various debugging options in tvheadend. +This tab is used to configure various debugging options in Tvheadend. !['Debugging tab'](static/img/doc/debugging/tab.png) @@ -37,7 +37,7 @@ command-line parameters. ## Subsystems -The following options can be passed to tvheadend to provide detailed debugging +The following options can be passed to Tvheadend to provide detailed debugging information while the application is running. diff --git a/docs/class/satip_server.md b/docs/class/satip_server.md index dc8547327..cd6b9a7a5 100644 --- a/docs/class/satip_server.md +++ b/docs/class/satip_server.md @@ -8,7 +8,7 @@ inc/config_notes -* You can put a custom M3U playlist (which will be advertised to clients) in your tvheadend configuration directory - filename *satip.m3u*. +* You can put a custom M3U playlist (which will be advertised to clients) in your Tvheadend configuration directory - filename *satip.m3u*. --- diff --git a/docs/markdown/doc_update.md b/docs/markdown/doc_update.md index e9530ef1c..cc1682e39 100644 --- a/docs/markdown/doc_update.md +++ b/docs/markdown/doc_update.md @@ -2,7 +2,7 @@ The documentation is written in markdown, and then converted for direct inclusion to tvheadend binary. The markdown processor in -tvheadend binary adds other information from the internal +Tvheadend binary adds other information from the internal class system. The User Guide diff --git a/docs/markdown/dvbinputs.md b/docs/markdown/dvbinputs.md index 07459e1ea..b85ee6c86 100644 --- a/docs/markdown/dvbinputs.md +++ b/docs/markdown/dvbinputs.md @@ -8,13 +8,13 @@ Contents | Description [Networks](class/mpegts_network) | Where you configure networks [Muxes](class/mpegts_mux) | Where you configure multiplexes [Services](class/mpegts_service) | Discovered service(s) management -[Mux Schedulers](class/mpegts_mux_sched) | Where you configure mux schedulers - schedule tvheadend to tune to a specific mux to receive different types of data, EMMs, EIT etc +[Mux Schedulers](class/mpegts_mux_sched) | Where you configure mux schedulers - schedule Tvheadend to tune to a specific mux to receive different types of data, EMMs, EIT etc --- ## Overview -This tab is where you configure how tvheadend manages your adapters/input, +This tab is where you configure/manage your adapters/input, networks, muxes and services. @@ -36,16 +36,16 @@ networks, muxes and services. ## TV Adapters -The adapter tree lists the available frontends, LNB configuration and -so on related to your device(s) in sections. Clicking on these sections -will display available parameters and device information. Bold sections -and a green dot indicate that it's enabled. A red dot indicates that it's -disabled. Please see the [Introduction](introduction) (Using the Interface) for +The adapter tree lists the available frontends, LNB configuration and +so on related to your device(s) in sections. Clicking on these sections +will display available parameters and device information. Bold sections +and a green dot indicate that it's enabled. A red dot indicates that it's +disabled. Please see the [Introduction](introduction) (Using the Interface) for details on how to use the tree/split panel. ### An Example TV Adapter Tree -Here is an example of a device tree - yours will follow the same layout, +Here is an example of a device tree - yours will follow the same layout, but this is just to give you an idea as to what all the bits mean. !['DVB Input tree explained' Tab](static/img/doc/dvbinputs/the_tree_explained.png) diff --git a/docs/markdown/introduction.md b/docs/markdown/introduction.md index bd79c1975..2cdfe5b79 100644 --- a/docs/markdown/introduction.md +++ b/docs/markdown/introduction.md @@ -444,7 +444,7 @@ check-box so that the changes are applied to all (selected) entries. This guide is intended to give you a high-level overview of how to set up and use Tvheadend. It does not aim to provide a complete description of every step or answer every question: more details are available on the -tvheadend [wiki](https://tvheadend.org/projects/tvheadend/wiki). +Tvheadend [wiki](https://tvheadend.org/projects/tvheadend/wiki). Tvheadend includes copies of many of these pages in the application, which is easier to find when you're wondering what to do next. diff --git a/docs/markdown/status_connections.md b/docs/markdown/status_connections.md index 2a356870f..8785d88b5 100644 --- a/docs/markdown/status_connections.md +++ b/docs/markdown/status_connections.md @@ -38,7 +38,7 @@ This is a read-only tab; nothing is configurable. : The data port(s) used by the client device. **Username** -: The username used to access tvheadend (a blank cell indicates no username was supplied). +: The username used to access Tvheadend (a blank cell indicates no username was supplied). **Started** : Date the connection started - YYYY-MM-DD HH:MM:SS. diff --git a/docs/markdown/todo.md b/docs/markdown/todo.md index 3730fede4..44a4cad80 100644 --- a/docs/markdown/todo.md +++ b/docs/markdown/todo.md @@ -11,7 +11,7 @@ They're just some of the areas I'm aware of that we need to close off before rel 3. Obviously, fill in the minor gaps as highlighted in the document: buttons, descriptions, etc. -4. Generate new webUI help pages and push them to the tvheadend repo +4. Generate new webUI help pages and push them to the Tvheadend repo 5. Check all link from tvh (e.g. there are no help buttons on the 'Stream' tabs) diff --git a/man/tvheadend.1 b/man/tvheadend.1 index edd79024a..9dbb3347f 100644 --- a/man/tvheadend.1 +++ b/man/tvheadend.1 @@ -158,7 +158,7 @@ Specify number of tsfile tuners. Use ts file (mux file) as input. .TP .SH "LOGGING" -All activity inside tvheadend is logged to syslog using log facility +All activity inside Tvheadend is logged to syslog using log facility \fBLOG_DAEMON\fR. .SH "SETUP" .SS "Access to video adapters" @@ -196,7 +196,7 @@ is run as a system daemon a dedicated user needs to be created and Tvheadend should be launched with the '-u' argument. Also notice that XMLTV will read/ store cache and configuration from the same user home directory. .PP -If daemonizing, tvheadend will writes its pid in /var/run/tvheadend.pid +If daemonizing, Tvheadend will writes its pid in /var/run/tvheadend.pid .SH "AUTHOR" .B Tvheadend and this man page is maintained by the Tvheadend team. Please see the diff --git a/src/config.c b/src/config.c index 127acc91b..8aaf58ac9 100644 --- a/src/config.c +++ b/src/config.c @@ -1539,7 +1539,7 @@ dobackup(const char *oldver) tvherror(LS_CONFIG, "executed in directory '%s'", root); tvherror(LS_CONFIG, "please DON'T report this as an error, you may use --nobackup to skip"); tvherror(LS_CONFIG, "... or run the above command in the printed directory"); - tvherror(LS_CONFIG, "... using the same user/group as for the tvheadend executable"); + tvherror(LS_CONFIG, "... using the same user/group as for the Tvheadend executable"); tvherror(LS_CONFIG, "... to check the reason for the unfinished backup"); free(s); htsbuf_queue_flush(&q); diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c index b73800fd1..2d07b282d 100644 --- a/src/input/mpegts/iptv/iptv.c +++ b/src/input/mpegts/iptv/iptv.c @@ -785,7 +785,7 @@ const idclass_t iptv_network_class = { .name = N_("Use A/V library"), .desc = N_("The input stream is remuxed with A/V library (libav or" " or ffmpeg) to the MPEG-TS format which is accepted by" - " tvheadend."), + " Tvheadend."), .off = offsetof(iptv_network_t, in_libav), .opts = PO_ADVANCED }, diff --git a/src/input/mpegts/iptv/iptv_mux.c b/src/input/mpegts/iptv/iptv_mux.c index 6fe3cddd4..ca1d56f69 100644 --- a/src/input/mpegts/iptv/iptv_mux.c +++ b/src/input/mpegts/iptv/iptv_mux.c @@ -145,7 +145,7 @@ const idclass_t iptv_mux_class = .name = N_("Use A/V library"), .desc = N_("The input stream is remuxed with A/V library (libav or" " or ffmpeg) to the MPEG-TS format which is accepted by" - " tvheadend."), + " Tvheadend."), .list = iptv_mux_libav_enum, .off = offsetof(iptv_mux_t, mm_iptv_libav), }, diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c index 9f7278f53..f6fc20ce4 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c @@ -381,7 +381,7 @@ const idclass_t linuxdvb_frontend_dvbs_slave_class = "case, the position, the polarization and low-high " "band settings must be equal. If you set another " "tuner as master, then this tuner will act as " - "a slave and tvheadend will assure that this tuner " + "a slave and Tvheadend will assure that this tuner " "will not use incompatible parameters (position, " "polarization, lo-hi)."), .list = linuxdvb_frontend_dvbs_class_master_enum, diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c index 84bb31185..ca7447fe6 100644 --- a/src/input/mpegts/satip/satip.c +++ b/src/input/mpegts/satip/satip.c @@ -1249,7 +1249,7 @@ ST: urn:ses-com:device:SatIPServer:1\r\n" htsbuf_queue_init(&q, 0); htsbuf_append(&q, MSG, sizeof(MSG)-1); - htsbuf_qprintf(&q, "USER-AGENT: unix/1.0 UPnP/1.1 TVHeadend/%s\r\n", tvheadend_version); + htsbuf_qprintf(&q, "USER-AGENT: unix/1.0 UPnP/1.1 tvheadend/%s\r\n", tvheadend_version); htsbuf_append(&q, "\r\n", 2); upnp_send(&q, NULL, 0, 0); htsbuf_queue_flush(&q); diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c index c9ae7911c..1ab245c4c 100644 --- a/src/input/mpegts/satip/satip_frontend.c +++ b/src/input/mpegts/satip/satip_frontend.c @@ -499,7 +499,7 @@ const idclass_t satip_frontend_dvbs_class = "case, the position, the polarization and low-high " "band settings must be equal." "if you set other tuner as master, then this tuner " - "will act like a slave one and tvheadend will " + "will act like a slave one and Tvheadend will " "assure that this tuner will not use incompatible " "parameters (position, polarization, lo-hi)."), .set = satip_frontend_dvbs_class_master_set, @@ -540,7 +540,7 @@ const idclass_t satip_frontend_dvbs_slave_class = "case, the position, the polarization and low-high " "band settings must be equal." "if you set other tuner as master, then this tuner " - "will act like a slave one and tvheadend will " + "will act like a slave one and Tvheadend will " "assure that this tuner will not use incompatible " "parameters (position, polarization, lo-hi)."), .set = satip_frontend_dvbs_class_master_set, diff --git a/src/satip/server.c b/src/satip/server.c index 6168279ec..4ded46e2d 100644 --- a/src/satip/server.c +++ b/src/satip/server.c @@ -69,7 +69,7 @@ satip_server_http_xml(http_connection_t *hc) %s%s\n\ TVHeadend Team\n\ http://tvheadend.org\n\ -TVHeadend %s\n\ +Tvheadend %s\n\ TVHeadend SAT>IP\n\ 1.1\n\ \n\ diff --git a/support/eitscrape_test.py b/support/eitscrape_test.py index dec785b6d..d90f04157 100755 --- a/support/eitscrape_test.py +++ b/support/eitscrape_test.py @@ -23,7 +23,7 @@ another person. So this program allow you to pass two command line arguments. -The first argument is the name of the EIT scraper file (read by tvheadend) that +The first argument is the name of the EIT scraper file (read by Tvheadend) that is typically in the epggrab/eit/conf directory. The second argument is a test input file which is in JSON format and lives diff --git a/support/sat_xml_scan.py b/support/sat_xml_scan.py index cbfc48259..7dc82ba02 100755 --- a/support/sat_xml_scan.py +++ b/support/sat_xml_scan.py @@ -68,7 +68,7 @@ def parse_sat(node): filename = DIR + '/' + asciize(filename) fp = open(filename, "w+") - fp.write('# Generated by tvheadend from satellites.xml\n') + fp.write('# Generated by Tvheadend from satellites.xml\n') for child in node: if child.tag == 'transponder':