cosmetic: TVHeadend|tvheadend -> Tvheadend, where needed for consistency

diff --git a/debian/tvheadend.default b/debian/tvheadend.default
index 57ce013ea5f71930b0e5594228eb775197204ff8..042a61231f269b1a0e35baca240eeeaf5a912c83 100644 (file)
--- 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 7711fcc0769df9495b56e96e17990cd5053db20f..09877ec496230e27f5524677acc12ab5e49e49d1 100644 (file)
--- 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 dc8547327cae1734394848638b59b562363f5027..cd6b9a7a52700c0c9103d49f5516eb8465faa6d2 100644 (file)
--- a/docs/class/satip_server.md
+++ b/docs/class/satip_server.md
@@ -8,7 +8,7 @@
 
 <tvh_include>inc/config_notes</tvh_include>
 
-* 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 e9530ef1c0528dfe8c1f1666ddb7fb2959978e03..cc1682e39687f1a520252c11956d7622ad4669bd 100644 (file)
--- 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 07459e1ea7cb00771ede1919c72d3f1cc924c6a5..b85ee6c8658aaee0f42f8ba6e6e6d0b261034e0c 100644 (file)
--- 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 bd79c197507a72dc3a12ae7a21872bb9830dec20..2cdfe5b79ed0a06109817f433338242be153edec 100644 (file)
--- 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 2a356870f6a066102b535fff1a26f707d0f3d336..8785d88b5d810c68c889d19c3df30349e8b7f069 100644 (file)
--- 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 3730fede41b891bd2a2bd185b282966943de6fab..44a4cad80f38c20b999de240c92692f64f3341c4 100644 (file)
--- 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 edd79024aae6c7ab890c80acf2cab2af834bf9f2..9dbb3347fc33b0cc88e2541583c6ee4d4351ca58 100644 (file)
--- 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 127acc91b296e19603b56f20449e31b210d0a1c9..8aaf58ac9934a92b8782316dc44cf784e635e9f6 100644 (file)
--- 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 b73800fd1aa5a09fa4532d2d32ff5ac048af2395..2d07b282d9ee8d9b6f0883162fc068fd7b85836d 100644 (file)
--- 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 6fe3cddd41208ef16764fb7ac5889c0c1e2d02cf..ca1d56f699e8291f333468ecdc495ff9a6c37fa2 100644 (file)
--- 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 9f7278f53d578d097e4bc5b2b622c7dcd9253600..f6fc20ce47d7d1f23e4a8ea8a563b40438461e03 100644 (file)
--- 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 84bb3118536995296ccd59958c55255c285b8ded..ca7447fe65b3dc9d3551344cc1c49d4a65fcfa60 100644 (file)
--- 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 c9ae7911cd6b73235449f652b9be8b98a7979629..1ab245c4c200c91b615985c547cbedbacb04d9d2 100644 (file)
--- 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 6168279ec274065dae94f0855c9ae445ae682b23..4ded46e2d0a8479a42c345b63bbe47831942e71d 100644 (file)
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -69,7 +69,7 @@ satip_server_http_xml(http_connection_t *hc)
 <friendlyName>%s%s</friendlyName>\n\
 <manufacturer>TVHeadend Team</manufacturer>\n\
 <manufacturerURL>http://tvheadend.org</manufacturerURL>\n\
-<modelDescription>TVHeadend %s</modelDescription>\n\
+<modelDescription>Tvheadend %s</modelDescription>\n\
 <modelName>TVHeadend SAT>IP</modelName>\n\
 <modelNumber>1.1</modelNumber>\n\
 <modelURL></modelURL>\n\

diff --git a/support/eitscrape_test.py b/support/eitscrape_test.py
index dec785b6db83e0409251ca90164cbc988fba61d9..d90f04157ef1e3eb387f2027041cfabaf29af118 100755 (executable)
--- 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 cbfc482598f33c9083c3cc50d5cad24879988c0a..7dc82ba02e60c29f88b3f09f7fec2d2e5b3be403 100755 (executable)
--- 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':