fix formatting markdown README

Merge pull request #5 from linuxserver/3.5
Rebase to alpine 3.5
2017-03-15 16:13:43 +00:00 · 2017-02-09 20:38:37 +00:00 · 2017-02-09 20:07:57 +01:00 · 2016-10-18 03:04:41 +01:00 · 2016-10-17 23:53:39 +01:00
2 changed files with 15 additions and 8 deletions
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:3.5
 MAINTAINER saarg

 # set version label
@ -23,7 +23,7 @@ RUN \
 	libusb-dev \
 	linux-headers \
 	make \
-	openssl-dev \
+	libressl-dev \
 	pcsc-lite-dev \
 	subversion \
 	tar && \
--- a/README.md
+++ b/README.md
@ -2,6 +2,8 @@
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
 [podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: http://www.streamboard.tv/oscam/
+[hub]: https://hub.docker.com/r/linuxserver/oscam/

 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]

@ -12,12 +14,10 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f

 # linuxserver/oscam
 [![](https://images.microbadger.com/badges/version/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/oscam.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/oscam.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-oscam)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-oscam/)
-[hub]: https://hub.docker.com/r/linuxserver/oscam/

-[Oscam][oscamurl] is an Open Source Conditional Access Module software used for descrambling DVB transmissions using smart cards. It's both a server and a client.
+[Oscam][appurl] is an Open Source Conditional Access Module software used for descrambling DVB transmissions using smart cards. It's both a server and a client.

-[![oscam](http://download.oscam.cc/images/Logo.png)][oscamurl]
-[oscamurl]: http://www.streamboard.tv/oscam/
+[![oscam](http://download.oscam.cc/images/Logo.png)][appurl]

 ## Usage

@ -31,7 +31,13 @@ docker create \
  linuxserver/oscam
 ```

-**Parameters**
+## Parameters
+
+`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. 
+For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
+So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
+http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.`
+

 * `-p 8888` - the port(s)
 * `-v /config` - where oscam should store config files and logs
@ -94,6 +100,7 @@ The web interface is at port 8888.

 ## Versions

-+ **14-10-16:** Add version layer information.
+ **09.02.2017:** Rebase to alpine 3.5.
+ **14.10.2016:** Add version layer information.
 + **02.10.2016:** Add info on passing through devices to README.
 + **25.09.2016:** Initial release.
Author	SHA1	Message	Date
sparklyballs	68f2d36e67	fix formatting markdown README	2017-03-15 16:13:43 +00:00
sparklyballs	f889c01563	Merge pull request #5 from linuxserver/3.5 Rebase to alpine 3.5	2017-02-09 20:38:37 +00:00
tobbenb	a5f359c7f8	Rebase to alpine 3.5	2017-02-09 20:07:57 +01:00
sparklyballs	ed6c6bbb98	fix date separator	2016-10-18 03:04:41 +01:00
sparklyballs	023a7599b9	add extra parameters info	2016-10-17 23:53:39 +01:00