Merge pull request #5 from linuxserver/revert-4-iconv

Revert "test iconv as possible fix for file types"
2016-08-16 17:31:35 +01:00 · 2016-08-16 17:30:38 +01:00 · 2016-08-16 17:13:36 +01:00 · 2016-08-16 16:41:14 +01:00 · 2016-08-15 21:11:30 +01:00 · 2016-08-15 21:47:09 +02:00
2 changed files with 4 additions and 7 deletions
--- a/2
+++ b/2
@@ -184,7 +184,7 @@ RUN \
 ./autogen.sh && \
 ./configure \
 	--bindir=/usr/bin \
-	--sysconfdir=/config && \
+	--sysconfdir=/config/comskip && \
 make && \
 make install && \

--- a/READMETEMPLATE.md
+++ b/READMETEMPLATE.md
@@ -1,6 +1,6 @@
 ![https://linuxserver.io](https://www.linuxserver.io/wp-content/uploads/2015/06/linuxserver_medium.png)

-The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring auto-update on startup, easy user mapping and community support. Find us for support at:
+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!
@@ -48,10 +48,7 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel

 ## Setting up the application

-The first thing to do is to create your admin user as by default everyone is allowed to access tvheadend. Go to Configuration --> Users --> Access Entries and click Add and fill in all the required fields.
-Then go to the password tab and click Add and fill in the user name you created in the previous step and enter your password.
-Click the (login) button in the top of the webgui and check that your user is configured properly. After you have logged in, deleteor disable the * user.
-Then you can start configuring tvheadend with the wizard foun in Configuration --> General --> Base and click Start Wizard.
+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.

 **Configuring XMLTV grabber**

@@ -68,7 +65,7 @@ If you allready have a configuration file, you can add it in the .xmltv folder w

 **Comskip**
 This container comes with Comskip for commercial flagging of recordings. This you have to add in the recording config of tvheadend.
-Go to Configuration --> Recording and add the below in the Post-processor command field.
+Go to Configuration --> Recording. Change the view level to advanced in the top right corner, and add the below in the Post-processor command field.

 ```
 comskip "%f"
Author	SHA1	Message	Date
sparklyballs	54d63a5e00	Merge pull request #5 from linuxserver/revert-4-iconv Revert "test iconv as possible fix for file types"	2016-08-16 17:31:35 +01:00
sparklyballs	a14f66db00	Revert "test iconv as possible fix for file types"	2016-08-16 17:30:38 +01:00
sparklyballs	e1ee820917	Merge pull request #4 from sparklyballs/iconv test iconv as possible fix for file types	2016-08-16 17:13:36 +01:00
sparklyballs	644788414b	test iconv as possible fix for file types	2016-08-16 16:41:14 +01:00
sparklyballs	8bf78cda30	Merge pull request #3 from tobbenb/master Fix comskip ini path	2016-08-15 21:11:30 +01:00
tobbenb	72d025a041	Fix comskip ini path	2016-08-15 21:47:09 +02:00
sparklyballs	6786c84726	Merge pull request #2 from tobbenb/master Added info about view level	2016-08-14 18:23:32 +01:00
tobbenb	a51be70d70	Removed info about configuring users.	2016-08-14 19:19:38 +02:00
tobbenb	3344f9793d	Added info about view level	2016-08-14 18:07:32 +02:00