浏览代码

Merge pull request #23 from sparklyballs/stable-4.0.9

edit README
sparklyballs 10 年之前
父节点
当前提交
067da7b48c
共有 1 个文件被更改,包括 23 次插入 和 14 次删除
  1. 23 14
      README.md

+ 23 - 14
README.md

@@ -1,16 +1,25 @@
-![https://linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)
+[linuxserverurl]: https://linuxserver.io
+[forumurl]: https://forum.linuxserver.io
+[ircurl]: https://www.linuxserver.io/index.php/irc/
+[podcasturl]: https://www.linuxserver.io/index.php/category/podcast/
 
-The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring easy user mapping and community support. Find us for support at:
-* [forum.linuxserver.io](https://forum.linuxserver.io)
-* [IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io`
-* [Podcast](https://www.linuxserver.io/index.php/category/podcast/) covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
+[![linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)][linuxserverurl]
+
+The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at:
+* [forum.linuxserver.io][forumurl]
+* [IRC][ircurl] on freenode at `#linuxserver.io`
+* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
 # linuxserver/tvheadend
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/tvheadend.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/tvheadend.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-tvheadend)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-tvheadend/)
+[hub]: https://hub.docker.com/r/linuxserver/tvheadend/
 
-[Tvheadend] (https://www.tvheadend.org/) is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.
+[Tvheadend](https://www.tvheadend.org/) is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT>IP and HDHomeRun as input sources.
 Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.
 Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).
 
+[![tvheadend](https://s31.postimg.io/8urk8vdu3/logobig.png)][tvheadendurl]
+[tvheadendurl]: https://www.tvheadend.org/
 
 ## Usage
 
@@ -27,13 +36,13 @@ docker create \
 The --device=/dev/dvb is only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out.
 
 
-You can choose between ,using tags, stable or master version of tvheadend.
+You can choose between ,using tags, latest (default, and no tag required or a specific stable version of tvheadend.
 
-Add one of the tags,  if required,  to the linuxserver/tvheadend line of the run/create command in the following format, linuxserver/tvheadend:master
+Add one of the tags, if required, to the linuxserver/tvheadend line of the run/create command in the following format, linuxserver/tvheadend:stable-4.0.9
 
 #### Tags
-+ **master** : latest development from tvheadend git, with updates once a week.
-+ **stable** : latest stable version.
+
++ **stable-4.0.9** : latest stable version.
 
 
 **Parameters**
@@ -44,7 +53,7 @@ Add one of the tags,  if required,  to the linuxserver/tvheadend line of the run
 * `-e PUID` for UserID - see below for explanation
 * `-e TZ` - for timezone information *eg Europe/London, etc*
 
-It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it tvheadend-unstable /bin/bash`.
+It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it tvheadend /bin/bash`.
 
 ### User / Group Identifiers
 
@@ -59,7 +68,7 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel
 
 ## Setting up the application
 
-The setup depends if you run the master or stable tag. Running the master is the easiest as it has a setup wizard.
+The setup depends if you run the one of the stable tags or use latest. Running latest is the easiest as it has a setup wizard.
 
 **Stable**
 
@@ -68,7 +77,7 @@ Go back to the TV adapters tab and add the newly created network under universal
 
 After the scan is done, head to the Services tab and find the services you want as channels, mark them, and press map services. They should now appear under Configuration --> Channel/EPG.
 
-**Master**
+**Latest**
 
 The first thing to do is to run the setup wizard. If it doesn't pop up at first login, you can find it in Configuration --> General --> Base and click Start Wizard. This will guide you to set up the basic parts of tvheadend.
 
@@ -114,4 +123,4 @@ For advanced setup of tvheadend, go to [tvheadend.org] (https://www.tvheadend.or
 
 ## Versions
 
-+ **05.09.2016:** Initial release.
++ **05.09.2016:** Initial release.