Merge branch 'master' of github.com:tiyn/wiki

wiki/tvheadend.md

@@ -1,6 +1,6 @@
 # TVHeadend
 
-[TVHeadend](https://tvheadend.org/) is a server application that forwards video
+[TVHeadend](https://tvheadend.org/) is a server application that forwards [video](/wiki/video.md)
 streams to internet streams.
 It supports multiple dvb tuners and tuner sticks aswell as Sat>IP tuners.
 It also has the ability to record programs like a digital video recorder.

wiki/video.md

@@ -11,6 +11,16 @@ your needs.
 In general you need to consider if you want the video directly on your pc or
 access a server for it.
 
+## Television 
+
+The following is a list of programs that can be used to watch, record and/or download television
+series or movies.
+
+- [MediathekView](https://github.com/mediathekview/mediathekview) is an open-source, cross-platform 
+  software to view and download media from the mediathek of german, austrian and swiss television.
+- [TVHeadend](/wiki/tvheadend.md) is a server-software that makes it possible to stream and record
+  tv shows and movies via a web interface.
+
 ## Video Editing
 
 There are various programs that can be used to edit videos.

wiki/windows.md

@@ -26,3 +26,14 @@ reg add "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\TimeZoneInformation
 ```
 
 Disabling of UTC time is done with the same command with a `0` instead of a `1`.
+
+## Installation
+
+This section focusses on topics that are related to the installation of Windows.
+
+### Bypass Network Setup During Installation 
+
+To bypass the setup of a network during the installation process `Shift` and `F10` need to be
+pressed.
+By putting in `oobe/bypassnro` into the command line and pressing `Enter` the computer will restart
+and will display an option to bypass the network setup during the corresponding step.