From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Mon, 9 May 2016 21:57:25 +0000 (+0100)
Subject: mdhelp: fix image paths
X-Git-Tag: v4.2.1~535
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a798a1943e72cb345b1dde5b3eb50960ec61f6db;p=thirdparty%2Ftvheadend.git

mdhelp: fix image paths
---

diff --git a/docs/class/channeltag.md b/docs/class/channeltag.md
index 2a79e6110..dca068579 100644
--- a/docs/class/channeltag.md
+++ b/docs/class/channeltag.md
@@ -1,5 +1,5 @@
 This tab is where you manage your channel tags.
 
-!['Channel tag'](docresources/channeltags.png)
+!['Channel tag'](static/img/doc/channeltags.png)
 
 ---
diff --git a/docs/class/mpegts_mux_sched.md b/docs/class/mpegts_mux_sched.md
index 1465d75fb..c81fa04f4 100644
--- a/docs/class/mpegts_mux_sched.md
+++ b/docs/class/mpegts_mux_sched.md
@@ -13,13 +13,7 @@ useful to get EPG, services or access rights updates.
 
 <tvh_include>inc/add_grid_entry</tvh_include>
 
-<<<<<<< 10ce88504b561738e9b6c8845758490ce74a7f41
-!['Mux Add/Edit Example'](static/img/doc/configdvbmuxsched1.png)
-
-**Tip**: You can also edit entries directly within the grid.
-=======
-!['Add Mux Schedule'](docresources/addmuxsched.png)
->>>>>>> mdhelp: update channel, schedulers, satip help + screenshots
+!['Add Mux Schedule'](static/img/doc/addmuxsched.png)
 
 ---
 
diff --git a/docs/class/satip_client.md b/docs/class/satip_client.md
index b87b835a0..8cfa125d8 100644
--- a/docs/class/satip_client.md
+++ b/docs/class/satip_client.md
@@ -1,6 +1,6 @@
 This panel displays all available SAT>IP client parameters.
 
-!['SAT>IP Panel'](docresources/satipclient.png)
+!['SAT>IP Panel'](static/img/doc/satipclient.png)
 
 ---