From 3efee046d2962b90474e9d9240ee364fcade9a3c Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sat, 20 Jan 2018 11:58:07 +0100 Subject: [PATCH 1/2] docs: Don't duplicate option list in FAQ It is already in config.example.yml. --- resources/FAQ.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/resources/FAQ.md b/resources/FAQ.md index 4aa3a35..5770b72 100644 --- a/resources/FAQ.md +++ b/resources/FAQ.md @@ -11,16 +11,9 @@ You can ususally download the video by doing *File > Save to* or *ctrl + S*. ## How do I change config parameters? You need to create a YAML file called `config.yml` in the `config/` folder. -Here are the parameters that you can set: -* `youtubedl`: path to your youtube-dl binary -* `python`: path to your python binary -* `params`: an array of parameters to pass to youtube-dl -* `convert`: true to enable audio conversion -* `avconv`: path to your avconv or ffmpeg binary -* `remux`: enable remux mode (experimental) - -See [`config.example.yml`](../config/config.example.yml) for default values. +See [`config.example.yml`](../config/config.example.yml) +for a list of parameters you can set and their default value. ## How do I enable audio conversion? From bebcbf53645e62011033036ad3ca60e521fa842d Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sat, 20 Jan 2018 12:00:52 +0100 Subject: [PATCH 2/2] build(composer): Fix license "GPL-3.0" is a deprecated SPDX license identifier. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a0cefd0..e773526 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "rudloff/alltube", "description": "HTML GUI for youtube-dl", - "license": "GPL-3.0", + "license": "GPL-3.0-only", "homepage": "http://alltubedownload.net/", "type": "project", "require": {