Merge pull request 'mumble_fix' (#39) from mumble_fix into master

pages/02.tutorials/08.Office/07.Mumble/01.Mumble/docs.en.md

@@ -6,6 +6,10 @@ page-toc:
 published: true
 visible: true
 indexed: true
+updated:
+    last_modified: "March 2020"
+    app: Mumble
+    app_version: 1.3.0
 taxonomy:
     category:
         - docs

pages/02.tutorials/08.Office/07.Mumble/02.Plumble/docs.en.md

@@ -6,6 +6,10 @@ page-toc:
 published: true
 visible: true
 indexed: true
+updated:
+    last_modified: "March 2020"
+    app: Plumble
+    app_version: 3.3.0
 taxonomy:
     category:
         - docs
@@ -28,14 +32,14 @@ Please check for the latest version of **Plumble** (Version 3.3.0-rc1) since it
 
 **Mumble** software has some important Administration and Permissions features that can only be configured from the desktop application. **Access Control Lists** and **Groups** are examples of these missing features in **Plumble**.
 
-To learn more about **ACL**, **Groups** and other **Mumble** settings, please check our [**Mumble** howto](../1.Mumble).
+To learn more about **ACL**, **Groups** and other **Mumble** settings, please check our [**Mumble** howto](../mumble).
 
 ----
 
 
 # Configuration
 
-When you first launch **Pumble**, a welcome message appears and you are required to generate a cerficate, which is what **Mumble** uses to identify you as user and avoid asking for username and password every time you log in.
+When you first launch **Plumble**, a welcome message appears and you are required to generate a cerficate, which is what **Mumble** uses to identify you as user and avoid asking for username and password every time you log in.
 
 If you already have a Certificate generated on another device (for example, the laptop via the desktop app) you can **import** it. You can also do it the other way around by **exporting** the Certificate generated on the mobile, for example, to a Mumble file that you can then import from another device or computer.
 
@@ -53,11 +57,11 @@ Once the certificate has been generated, you will see the screen to add servers
 
 Fill in the fields with the following information:
 
-1. **Label**: the name you want to use to identify the server in Pumble.
+1. **Label**: the name you want to use to identify the server in Plumble.
 2. **Address**: the server address. For **Disroot**, it is *mumble.disroot.org*
 3. **Port**: make sure the port number is **64738**.
 4. **Username**: the username you want to use.
-5. **Password**: a password for this user
+5. **Password**: a password for this user (not mandatory)
 
 ![Adding servers](en/04.png)
 
@@ -65,7 +69,7 @@ Tap on **ADD** to finish. Now you should see the server info.
 
 ![Adding servers](en/05.png)
 
-You can add as many servers as you want. But **you cannot be connected to more than one server, channel or room at the same time**.
+You can add as many servers as you want. But **you cannot be connected to more than one server or channel at the same time**.
 
 Tap on the server you want to join.
 
@@ -126,7 +130,7 @@ Here is where you can configure and adjust the audio quality and settings
 You can choose Light or Dark themes for the app
 
 ### 5. **About**
-**Pumble** information (Version, Contributors and Licenses)
+**Plumble** information (Version, Contributors and Licenses)
 
 
 ## Other options
@@ -146,43 +150,41 @@ Tap the three dot icon menu in the right corner next to the microphone icon (1).
 
 ## Basic Usage
 
-Once you have taken a look around and set the adjustments, you can join or create a room to talk and/or chat.
+Once you have taken a look around and set the adjustments, you can join or create a channel to talk and/or chat.
 
 ![Channel](en/10.png)
 
-### Joining a Channel or a room
+### Joining a Channel
 
 1. **Root**<br>
-This is the server main space, where Channels and rooms lives.
+This is the server main space, where Channels lives.
 2. **Channel**<br>
-A channel is like a category and can contain several rooms. In our example the server (Root) contains two channels: **Disroot** and **Quarantine hangout**
-3. **Room**<br>
-This is the place where the communication takes place.
+A channel is like a category and can contain several channels. In our example the server (Root) contains two channels: **Disroot** and **Quarantine hangout**. This is the place where the communication takes place.
 
-Now, to joining a channel or a room is simple as tapping the name (1) and then the arrow icon on the top bar (2)
+Now, to joining a channel is simple as tapping the name (1) and then the arrow icon on the top bar (2)
 
 ![Joining](en/11.png)
 
-### What if the room is password protected?
+### What if the channel is password protected?
 If a channel is password protected you will need to create an **Access Token**.
 
 Tap on the menu, up to the left (1), then tap **Access Token** (2) and finally write the password (3) and tap the plus icon (+) to add it.
 
 ![Access Token](en/acc_tok.png)
 
-You can now access to the password protected room.
+You can now access to the password protected channel.
 
-Remember that **you cannot be connected to more than one server, channel or room at the same time**
+Remember that **you cannot be connected to more than one server or channel at the same time**
 
-### Creating a Channel or a room
+### Creating a Channel
 
-Creating a channel or a room is similar to joining one. By default, the channel/rooms you create will be temporary unless you register your user. Although you do not need to register to participate in a public channel, doing so allows you not only to keep the username you choose, but also to create permanent rooms.
+Creating a channel is similar to joining one. By default, the channel you create will be temporary unless you register your user. Although you do not need to register to participate in a public channel, doing so allows you not only to keep the username you choose, but also to create permanent channels.
 
 To register your user is really simple. Just long tap on your username and select **Register** when the options pop up. Remember that you already set the username and the password when you first launched **Plumble**.
 
-Now, to create a channel or a room:
+Now, to create a channel:
 
-1. Tap the channel where the room will be created (1) and the the three dots menu icon on the top bar (2)
+1. Tap the channel where the new channel will be created (1) and the the three dots menu icon on the top bar (2)
 
 ![Creating](en/12.png)
 
@@ -190,11 +192,11 @@ Now, to create a channel or a room:
 
 ![Adding](en/13.png)
 
-3. Fill in with the necessary information about the room
+3. Fill in with the necessary information about the channel
 
 ![Adding](en/14.png)
 
-- **Name**: the name of the room you are creating
-- **Description**: a brief description about the room topic
-- **Position**: the position in which the room will appear on your room list
-- **Temporary**: When allowed by the server admins, you can select whether the room will be permanent or temporary, that is, it will be deleted when the last user leaves it.
+- **Name**: the name of the channel you are creating
+- **Description**: a brief description about the channel topic
+- **Position**: the position in which the channel will appear on your channels list
+- **Temporary**: When allowed by the server admins, you can select whether the channel will be permanent or temporary, that is, it will be deleted when the last user leaves it.

pages/02.tutorials/08.Office/07.Mumble/docs.en.md

@@ -11,15 +11,12 @@ taxonomy:
         - Plumble
         - audioconference
         - audio
-updated:
-    last_modified: "March 2020"
-    app: Mumble
-    app_version: 1.3.0
 page-toc:
   active: false
 ---
 
 ![](/home/icons/mumble.png)
+
 **Mumble** is an open source, low-latency, high quality voice chat software primarily intended for use while gaming, but that you can use for any audioconference / chatting.
 <br>No user account is needed to use it.