From d23f84d2d657c1ca49677ed6c45ddf7ccafe0736 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 22 Dec 2019 19:21:32 +0100 Subject: [PATCH] fixed styling fixed styling --- First-time-installation-configuration.md | 4 --- Home.md | 2 +- Installation-Docker.md | 4 --- Installation-FreeBSD.md | 4 --- Installation-MacOS.md | 4 --- Installation-Running-from-Source.md | 10 +++----- Installation-Synology.md | 4 --- Installation-Windows.md | 4 --- LaunchAgent-on-MacOS.md | 7 +++--- Reverse-proxy-Apache.md | 6 +---- Reverse-proxy-Nginx.md | 30 +++++++++++------------ Upstart-script-for-Debian-Ubuntu.md | 5 ++-- Wizard-General.md | 8 +++--- Wizard-Radarr.md | 6 +++-- Wizard-Sonarr.md | 4 +-- Wizard-Subtitles.md | 8 +++--- _Sidebar.md | 2 +- systemd-service-file-for-Debian-Ubuntu.md | 5 ++-- 18 files changed, 41 insertions(+), 76 deletions(-) diff --git a/First-time-installation-configuration.md b/First-time-installation-configuration.md index 05db017..c99cfda 100644 --- a/First-time-installation-configuration.md +++ b/First-time-installation-configuration.md @@ -1,7 +1,3 @@ -# First time installation/configuration. - ------- - After you installed everything it's best to check all your settings, diff --git a/Home.md b/Home.md index fb1956e..47cd73b 100644 --- a/Home.md +++ b/Home.md @@ -30,7 +30,7 @@ * [General](/morpheus65535/bazarr/wiki/Settings-General) * [Sonarr](/morpheus65535/bazarr/wiki/Settings-Sonarr) * [Radarr](/morpheus65535/bazarr/wiki/Settings-Radarr) - * [Subtitles](/morpheus65535/bazarr/wiki/Settings-Subtitles) + * [Subtitles](/morpheus65535/bazarr/wiki/Settings-Subliminal) * [Notifications](/morpheus65535/bazarr/wiki/Settings-Notifications) * FAQ's & More diff --git a/Installation-Docker.md b/Installation-Docker.md index baf40d5..60b85cf 100644 --- a/Installation-Docker.md +++ b/Installation-Docker.md @@ -1,7 +1,3 @@ -# Installation - Docker - ------- - >NOTE: I no longer support the official bazarr docker image. diff --git a/Installation-FreeBSD.md b/Installation-FreeBSD.md index 247a7cb..d9a0445 100644 --- a/Installation-FreeBSD.md +++ b/Installation-FreeBSD.md @@ -1,7 +1,3 @@ -# Installation - FreeBSD - ------- - Instruction as provided by @Derkades: diff --git a/Installation-MacOS.md b/Installation-MacOS.md index 5b72477..7f6a69e 100644 --- a/Installation-MacOS.md +++ b/Installation-MacOS.md @@ -1,7 +1,3 @@ -# Installation - MacOS (from source) - ------- - bazarr require Python 2.7.13 or greater (**system Python 2.7.10 or version 3.x not supported**) and can be run from source. This will use *git* as updater, so make sure that it's installed. diff --git a/Installation-Running-from-Source.md b/Installation-Running-from-Source.md index 7456cb2..b928bd9 100644 --- a/Installation-Running-from-Source.md +++ b/Installation-Running-from-Source.md @@ -1,12 +1,8 @@ -# Installation - Running from Source - ------- - bazarr require Python 2.7.13 or greater (**version 3.x not yet supported**) and can be run from source. This will use *git* as updater, so make sure that it's installed. -### Windows: +## Windows: * Install [GIT](http://git-scm.com/) * Install Python 2.7.13 or greater (latest is good) from [this link](https://www.python.org/downloads/release/python-2716/) and make sure to check the box to have Python directory added to the system path variable. @@ -17,11 +13,11 @@ bazarr require Python 2.7.13 or greater (**version 3.x not yet supported**) and * You can now start bazarr via `python bazarr.py` to start bazarr. * Open your browser and go to `http://localhost:6767/` -### OS X: +## OS X: * See https://github.com/morpheus65535/bazarr/wiki/Installation-MacOS -### Linux: +## Linux: * (Ubuntu / Debian) Install [GIT](http://git-scm.com/) with `apt-get install git-core python-pip` * (Fedora / CentOS) Install [GIT](http://git-scm.com/) with `yum install git python-pip` diff --git a/Installation-Synology.md b/Installation-Synology.md index 8da934c..9def39b 100644 --- a/Installation-Synology.md +++ b/Installation-Synology.md @@ -1,7 +1,3 @@ -# Installation - Synology - ------- - For now it's only possible to run Bazarr when you are able to run dockers on your Synology. diff --git a/Installation-Windows.md b/Installation-Windows.md index aaee419..13eb109 100644 --- a/Installation-Windows.md +++ b/Installation-Windows.md @@ -1,7 +1,3 @@ -# Installation - Windows - ------- - To install Bazarr on Windows 7 or greater, just use our automated installer: [Bazarr installer](https://github.com/bazarr/bazarr.github.io/releases/latest/download/bazarr.zip) diff --git a/LaunchAgent-on-MacOS.md b/LaunchAgent-on-MacOS.md index 6503f0e..9c930c9 100644 --- a/LaunchAgent-on-MacOS.md +++ b/LaunchAgent-on-MacOS.md @@ -1,6 +1,4 @@ -# LaunchAgent on MacOS ------- As-is, the LaunchAgent expects bazarr to be cloned or installed at `/Applications/bazarr`. If this is counter to other documentation I recommend amending the file contents. @@ -14,7 +12,7 @@ Logs are written to `/usr/local/var/log/bazarr.log`. Here's the file: -``` +```xml @@ -36,4 +34,5 @@ Here's the file: /usr/local/var/log/bazarr.log -``` \ No newline at end of file +``` + diff --git a/Reverse-proxy-Apache.md b/Reverse-proxy-Apache.md index 72df22d..d24c830 100644 --- a/Reverse-proxy-Apache.md +++ b/Reverse-proxy-Apache.md @@ -1,10 +1,6 @@ -# Reverse Proxy - Apache - ------- - -### Using Apache 2.3.12 or greater and /bazarr/ base url: +## Using Apache 2.3.12 or greater and /bazarr/ base url: *Apache 2.3.12 or greater is required to support `AllowEncodedSlashes NoDecode` which is required for Sonarr/Radarr config testing.* diff --git a/Reverse-proxy-Nginx.md b/Reverse-proxy-Nginx.md index a204ce7..d98109b 100644 --- a/Reverse-proxy-Nginx.md +++ b/Reverse-proxy-Nginx.md @@ -1,19 +1,17 @@ -# Reverse Proxy - Nginx - ------- +## Using Nginx and /bazarr/ base url: -### Using Nginx and /bazarr/ base url: - - location /bazarr/ { - proxy_pass http://127.0.0.1:6767/bazarr/; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_redirect off; - } +```php +location /bazarr/ { + proxy_pass http://127.0.0.1:6767/bazarr/; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_redirect off; +} +``` diff --git a/Upstart-script-for-Debian-Ubuntu.md b/Upstart-script-for-Debian-Ubuntu.md index dfefd63..26edd0f 100644 --- a/Upstart-script-for-Debian-Ubuntu.md +++ b/Upstart-script-for-Debian-Ubuntu.md @@ -7,7 +7,7 @@ This is an init upstart file. It assumes you've installed Bazarr in: You have to create a bazarr.conf file in /etc/init/ (sudo nano /etc/init/bazarr.conf) that would contain the following text: -``` +```php description "Upstart Script to run Bazarr as a service on Ubuntu/Debian based systems, as well as others" author "A Bazarr User" @@ -31,4 +31,5 @@ script exec python /opt/bazarr/bazarr.py end script ``` -Tested on linux mint 17.2 XFCE (Ubuntu 14.04) / python 2.7.12 \ No newline at end of file +Tested on linux mint 17.2 XFCE (Ubuntu 14.04) / python 2.7.12 + diff --git a/Wizard-General.md b/Wizard-General.md index bb1e2ec..c1fa03d 100644 --- a/Wizard-General.md +++ b/Wizard-General.md @@ -1,18 +1,16 @@ -# Wizzard - General (General Settings) ------- ## Start-Up ![](images/image-20191221150220886.png) -### 1 - Listening IP address: +#### 1 - Listening IP address: Should be the local IPv4 address of the computer running Bazarr. **Leave it as `0.0.0.0` if you want to listen on every available IP address (recommended). If you are running inside a docker container, that's the recommended value.** -### 2 - Listening port: +#### 2 - Listening port: Should be an available TCP port on the computer running Bazarr. Default is 6767 and is the recommended value. -### 3 - Base URL: +#### 3 - Base URL: This option give your the opportunity to serve Bazarr in a sub-directory. Ex.: `http://127.0.0.1:6767/bazarr/` instead of the default `http://127.0.0.1:6767/` Meanly used when you use a reverse proxy, if you don't use a reverse proxy or don't know what it is leave this empty !!! diff --git a/Wizard-Radarr.md b/Wizard-Radarr.md index 1e77d6f..63a1ff4 100644 --- a/Wizard-Radarr.md +++ b/Wizard-Radarr.md @@ -1,18 +1,20 @@ -# Wizard - Radarr ------- ![image-20191222162338384](images/image-20191222162338384.png) ## Connection settings + ### Settings validation: You have to click the "Test" button after filling in the other fields. You can't go further until the test is successful. ### Use Radarr: + Enable this to use Radarr integration. Required if you want to get subtitles for your movies. ### Hostname or IP address: Enter the hostname or the IP address of the computer running your Radarr instance. **Be aware that when using Bazarr in docker, you cannot reach another container on the same Docker host using the loopback address (ex.: 127.0.0.1). Loopback address refer to the Bazarr Docker container, not the Docker host.** + ### Listening port: + Enter the TCP port of your Radarr instance. Default is 8989. ### Base URL: Mainly used by those who expose Radarr behind a reverse proxy (ex.: /radarr). Don't forget the leading slash. In fact, it should look exactly the same as in Radarr settings. diff --git a/Wizard-Sonarr.md b/Wizard-Sonarr.md index e8205d6..aebddce 100644 --- a/Wizard-Sonarr.md +++ b/Wizard-Sonarr.md @@ -1,6 +1,4 @@ -# Wizard - Sonarr ------- ![image-20191222161617957](images/image-20191222161617957.png) @@ -9,7 +7,9 @@ ### Settings validation: You have to click the "Test" button after filling in the other fields. You can't go further until the test is successful. + ### Use Sonarr: + Enable this to use Sonarr integration. Required if you want to get subtitles for your series. ### Hostname or IP address: Enter the hostname or the IP address of the computer running your Sonarr instance. **Be aware that when using Bazarr in docker, you cannot reach another container on the same Docker host using the loopback address (ex.: 127.0.0.1). Loopback address refer to the Bazarr Docker container, not the Docker host.** diff --git a/Wizard-Subtitles.md b/Wizard-Subtitles.md index ca6b765..844e0b6 100644 --- a/Wizard-Subtitles.md +++ b/Wizard-Subtitles.md @@ -1,16 +1,14 @@ -## Wizzard - Subtitles (Subtitles settings) ------- -### Subtitles options +## Subtitles options ![image-20191221153726487](images/image-20191221153726487.png) -#### Subtitle Folder: +### Subtitle Folder: Choose the location where you want that your subtitles will be stored, `Alongside Media File` is the recommended value. -##### Use Embendded Subtitles: +## Use Embendded Subtitles: Use Embedded Subtitles in media files when determining missing ones. diff --git a/_Sidebar.md b/_Sidebar.md index 48e39af..fbdf481 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -31,7 +31,7 @@ * [General](/morpheus65535/bazarr/wiki/Settings-General) * [Sonarr](/morpheus65535/bazarr/wiki/Settings-Sonarr) * [Radarr](/morpheus65535/bazarr/wiki/Settings-Radarr) - * [Subtitles](/morpheus65535/bazarr/wiki/Settings-Subtitles) + * [Subtitles](/morpheus65535/bazarr/wiki/Settings-Sublimnal) * [Notifications](/morpheus65535/bazarr/wiki/Settings-Notifications) * FAQ's & More diff --git a/systemd-service-file-for-Debian-Ubuntu.md b/systemd-service-file-for-Debian-Ubuntu.md index 4075acf..c2678b7 100644 --- a/systemd-service-file-for-Debian-Ubuntu.md +++ b/systemd-service-file-for-Debian-Ubuntu.md @@ -6,7 +6,7 @@ This is a systemd service file created by users of Bazarr. It assume you've inst You have to create a `bazarr.service` file in `/etc/systemd/system` that would contain the following text: -``` +```php [Unit] Description=Bazarr Daemon After=syslog.target network.target @@ -30,4 +30,5 @@ ExecStartPre=/bin/sleep 30 WantedBy=multi-user.target ``` -Then you need to enable the service using `sudo systemctl enable bazarr` \ No newline at end of file +Then you need to enable the service using `sudo systemctl enable bazarr` +