H2 Update, added notes and additional info about ACL, groups, options

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

@@ -1,5 +1,5 @@
 ---
-title: 'Plumble: Android'
+title: 'Plumble: Mumble Android App'
 updated:
 page-toc:
     active: true
@@ -15,3 +15,182 @@ taxonomy:
         - talking
         - plumble
 ---
+
+![Plumble](en/icon.png)
+
+# Download and install
+
+You can download and install **Plumble**, the movile app for **Mumble** from [**F-Droid**](https://f-droid.org/en/packages/com.morlunk.mumbleclient).
+
+Please check for the latest version of **Plumble** (Version 3.3.0-rc1) since it has an **Import/Export Certificate** feature -which is very important- and better languages support.
+
+# Previous Notes
+
+**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).
+
+----
+
+
+# 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.
+
+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.
+
+
+![Welcome](en/01.png)
+
+To learn more about Certificates on Mumble, please check [here](https://wiki.mumble.info/wiki/Mumble_Certificates)
+
+![Certificate](en/02.png)
+
+Once the certificate has been generated, you will see the screen to add servers with the instructions to do it.
+
+
+![Adding servers](en/03.png)
+
+Fill in the fields with the following information:
+
+1. **Label**: the name you want to use to identify the server in Pumble.
+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
+
+![Adding servers](en/04.png)
+
+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**.
+
+Tap on the server you want to join.
+
+![Joining](en/06.png)
+
+# Basic Settings and Usage
+
+Now you are in. By tapping on the menu icon you can access some information about the servers and the applications settings.
+
+![Menu](en/07.png)
+
+![Info](en/08.png)
+
+## Settings
+In the **Settings** section you will find the following adjustments:
+
+![Settings](en/09.png)
+
+### 1. **General**
+Here you can set and configure notifications and connections settings
+  - Chat notifications
+  - Text-to-Speach
+  - Load External Images
+  - Auto Reconnect
+  - Force TCP
+  - Connect via Tor
+
+### 2. **Authentication**
+Certificates related and default username settings
+  - Generate Certificate
+  - Certificate
+  - Import Certificate
+  - Export Certificate
+  - Clear Server Certificates
+  - Default Username
+
+### 3. **Audio**
+Here is where you can configure and adjust the audio quality and settings
+  - Transmit Mode (*we suggest you to use **Push to Talk** option*)
+  - Handset Mode
+  - Microphone Volume
+  - Detection Threshold  
+  - Push to Talk settings
+    - Push to Talk key
+    - Push to Talk Hot Corner
+    - Push to Talk Sound
+    - Hide Push to Talk Button
+    - Toggle Push to Talk
+  - Half Duplex Mode
+  - Advanced and detailed audio settings
+    - Input Sample Rate
+    - Input Quality
+    - Audio per packet
+    - Enable Input Preprocessor
+    - Disable Opus Codec
+
+### 4. **Appearance**
+You can choose Light or Dark themes for the app
+
+### 5. **About**
+**Pumble** information (Version, Contributors and Licenses)
+
+
+## Other options
+You can also set the way you prefer to handle the audio output, i.e. the behaviour of the microphone, among other options.
+
+Tap the three dot icon menu in the right corner next to the microphone icon (1). The options are:
+- **Transmit Mode**(2):
+    - a. **Voice activity** - the microphone is activated when it detects the sound of the voice (3)
+    - b. **Push to Talk** - the microphone is activated by pressing the Push to Talk button (3)
+    - c. **Continuous** - the microphone remains activated whether you speak or not (3)
+- **Deafen** - disable the listening
+- **Search** - help find a channel
+- **Bluetooth** - activates the Bluetooth connection
+- **Disconnect** - disconnects you from the server
+
+![Options](en/options.png)
+
+## 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.
+
+![Channel](en/10.png)
+
+### Joining a Channel or a room
+
+1. **Root**<br>
+This is the server main space, where Channels and rooms 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.
+
+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)
+
+![Joining](en/11.png)
+
+### What if the room 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.
+
+Remember that **you cannot be connected to more than one server, channel or room at the same time**
+
+### Creating a Channel or a room
+
+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.
+
+1. Tap the channel where the room will be created (1) and the the three dots menu icon on the top bar (2)
+
+![Creating](en/12.png)
+
+2. Tap on **Add**
+
+![Adding](en/13.png)
+
+3. Fill in with the necessary information about the room
+
+![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.

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

@@ -1,159 +0,0 @@
----
-title: 'Plumble: Mumble Android App'
-updated:
-page-toc:
-    active: true
-published: true
-visible: true
-indexed: true
-taxonomy:
-    category:
-        - docs
-    tags:
-        - audio
-        - conference
-        - talking
-        - plumble
----
-
-# Download and install
-
-You can download and install **Plumble**, the movile app for **Mumble** from [**F-Droid**](https://f-droid.org/en/packages/com.morlunk.mumbleclient).
-
-# 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 a user.
-
-![Welcome](en/01.png)
-
-To learn more about Certificates on Mumble, please check [here](https://wiki.mumble.info/wiki/Mumble_Certificates)
-
-![Certificate](en/02.png)
-
-Once the certificate has been generated, you will see the screen to add servers with the instructions to do it.
-
-![Adding servers](en/03.png)
-
-Fill in the fields with the following information:
-
-1. **Label**: the name you want to use to identify the server in Pumble.
-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
-
-![Adding servers](en/04.png)
-
-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**.
-
-Tap on the server you want to join.
-
-![Joining](en/06.png)
-
-# Basic Settings and Usage
-
-Now you are in. By tapping on the menu icon you can access some information about the servers and the applications settings.
-
-![Menu](en/07.png)
-
-![Info](en/08.png)
-
-## Settings
-In the **Settings** section you will find the following adjustments:
-
-![Settings](en/09.png)
-
-### 1. **General**
-Here you can set and configure notifications and connections settings
-  - Chat notifications
-  - Text-to-Speach
-  - Load External Images
-  - Auto Reconnect
-  - Force TCP
-  - Connect via Tor
-
-### 2. **Authentication**
-Certificates related and default username settings
-  - Generate Certificate
-  - Certificate file
-  - Default Username
-  - Clear Server Certificates
-
-### 3. **Audio**
-Here is where you can configure and adjust the audio quality and settings
-  - Transmit Mode (*we suggest you to use **Push to Talk** option*)
-  - Handset Mode
-  - Microphone Volume
-  - Detection Threshold  
-  - Push to Talk settings
-    - Push to Talk key
-    - Push to Talk Hot Corner
-    - Push to Talk Sound
-    - Hide Push to Talk Button
-    - Toggle Push to Talk
-  - Half Duplex Mode
-  - Advanced and detailed audio settings
-    - Input Sample Rate
-    - Input Quality
-    - Audio per packet
-    - Enable Input Preprocessor
-    - Disable Opus Codec
-
-### 4. **Appearance**
-You can choose Light or Dark themes for the app
-
-### 5. **About**
-**Pumble** information (Version, Contributors and Licenses)
-
-**NOTE**<br>
-The Pumble application lacks of some administrative and features settings - like the **Access Control List** - that are only available through the desktop app.
-
-To learn about **Mumble** desktop app and its settings, please, check [here](../1.Mumble)
-
-## 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.
-
-![Channel](en/10.png)
-
-### Joining a Channel or a room
-
-1. **Root**<br>
-This is the server main space, where Channels and rooms 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.
-
-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)
-
-![Joining](en/11.png)
-
-Remember that **you cannot be connected to more than one server, channel or room at the same time**
-
-### Creating a Channel or a room
-
-Creating a channel or a room is similar to joining in one. By default, the channel/rooms you create will be temporary unless you register your user (this is to avoid SPAM).
-
-To **Register** a user on the server, you will only need to make a long tap on your username and select the option. This will allow you to create permanent rooms.
-
-1. Tap the channel where the room will be created (1) and the the three dots menu icon on the top bar (2)
-
-![Creating](en/12.png)
-
-2. Tap on **Add**
-
-![Adding](en/13.png)
-
-3. Fill in with the necessary information about the room
-
-![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.