Merge branch 'master' of github.com:bigbluebutton/bigbluebutton.github.io

Author: ffdixon

_data/create.yml

@@ -77,7 +77,7 @@
   required: "Optional(Breakout Room)"
   type: "Boolean"
   default: "true"
-  description: "If set to false, breakout rooms will be disabled."
+  description: "<b>[DEPRECATED]</b> Removed in 2.5, temporarily still handled, please transition to disabledFeatures.<br><br>If set to false, breakout rooms will be disabled."
 
 - name: "breakoutRoomsPrivateChatEnabled"
   required: "Optional(Breakout Room)"
@@ -182,7 +182,13 @@
   required: false
   type: "Boolean"
   default: "false"
-  description: "Setting to <code class=\"language-plaintext highlighter-rouge\">lockSettingsLockOnJoinConfigurable=true` will allow applying of `lockSettingsLockOnJoin</code>."
+  description: "Setting to <code class=\"language-plaintext highlighter-rouge\">true</code> will allow applying of <code class=\"language-plaintext highlighter-rouge\">lockSettingsLockOnJoin</code>."
+
+- name: "lockSettingsHideViewersCursor"
+  required: false
+  type: "Boolean"
+  default: "false"
+  description: "Setting to <code class=\"language-plaintext highlighter-rouge\">true</code> will prevent viewers to see other viewers cursor when multi-user whiteboard is on. (added 2.5)"
 
 - name: "guestPolicy"
   required: false
@@ -218,7 +224,7 @@
 - name: "learningDashboardEnabled"
   type: "Boolean"
   default: "true"
-  description: "Default <code class=\"language-plaintext highlighter-rouge\">learningDashboardEnabled=true</code>. When this option is enabled BigBlueButton generates a Dashboard where moderators can view a summary of the activities of the meeting. (added 2.4)"
+  description: "<b>[DEPRECATED]</b> Removed in 2.5, temporarily still handled, please transition to disabledFeatures.<br><br>Default <code class=\"language-plaintext highlighter-rouge\">learningDashboardEnabled=true</code>. When this option is enabled BigBlueButton generates a Dashboard where moderators can view a summary of the activities of the meeting. (added 2.4)"
 
 - name: "learningDashboardCleanupDelayInMinutes"
   type: "Number"
@@ -241,4 +247,26 @@
   required: false
   type: "Boolean"
   default: "false"
-  description: "Setting to <code class=\"language-plaintext highlighter-rouge\">true</code> will disable Virtual Backgrounds for all users in the meeting. (added 2.4.3)"
+  description: "<b>[DEPRECATED]</b> Removed in 2.5, temporarily still handled, please transition to disabledFeatures.<br><br>Setting to <code class=\"language-plaintext highlighter-rouge\">true</code> will disable Virtual Backgrounds for all users in the meeting. (added 2.4.3)"
+
+- name: "userCameraCap"
+  required: false
+  type: "Number"
+  default: "3"
+  description: "Setting to <code class=\"language-plaintext highlighter-rouge\">0</code> will disable this threshold. Defines the max number of webcams a single user can share simultaneously. (added 2.4.5)"
+
+- name: "meetingCameraCap"
+  required: false
+  type: "Number"
+  default: "0"
+  description: "Setting to <code class=\"language-plaintext highlighter-rouge\">0</code> will disable this threshold. Defines the max number of webcams a meeting can have simultaneously. (added 2.5.0)"
+
+- name: "groups"
+  required: false
+  type: "String"
+  description: "Pre-defined groups to automatically assign the students to a given breakout room. (added 2.5)<br><br><b>Expected value:</b> Json with Array of groups.<br><b>Group properties:</b><br><ul><li><code class=\"language-plaintext highlighter-rouge\">id</code> - String with group unique id.</li><li><code class=\"language-plaintext highlighter-rouge\">name</code> - String with name of the group <i>(optional)</i>.</li><li><code class=\"language-plaintext highlighter-rouge\">roster</code> - Array with IDs of the users.</li></ul><br>E.g:<br><code class=\"language-json highlighter-rouge\">[<br>{id:'1',name:'GroupA',roster:['1235']},<br>{id:'2',name:'GroupB',roster:['2333','2335']},<br>{id:'3',roster:[]}<br>]</code>"
+
+- name: "disabledFeatures"
+  required: false
+  type: "String"
+  description: "List (comma-separated) of features to disable in a particular meeting. (added 2.5)<br><br>Available options to disable:<br><ul><li><code class=\"language-plaintext highlighter-rouge\">breakoutRooms</code>- <b>Breakout Rooms</b> </li><li><code class=\"language-plaintext highlighter-rouge\">captions</code>- <b>Closed Caption</b> </li><li><code class=\"language-plaintext highlighter-rouge\">chat</code>- <b>Chat</b></li><li><code class=\"language-plaintext highlighter-rouge\">externalVideos</code>- <b>Share an external video</b> </li><li><code class=\"language-plaintext highlighter-rouge\">layouts</code>- <b>Layouts</b> (allow only default layout)</li><li><code class=\"language-plaintext highlighter-rouge\">learningDashboard</code>- <b>Learning Analytics Dashboard</b></li><li><code class=\"language-plaintext highlighter-rouge\">polls</code>- <b>Polls</b> </li><li><code class=\"language-plaintext highlighter-rouge\">screenshare</code>- <b>Screen Sharing</b></li><li><code class=\"language-plaintext highlighter-rouge\">sharedNotes</code>- <b>Shared Notes</b></li><li><code class=\"language-plaintext highlighter-rouge\">virtualBackgrounds</code>- <b>Virtual Backgrounds</b></li></ul>"

_data/join.yml

@@ -11,8 +11,13 @@
 - name: "password"
   required: true
   type: "String"
-  description: "The password that this attendee is using. If the moderator password is supplied, he will be given moderator status (and the same for attendee password, etc)"
+  description: "This password value is used to determine the role of the user based on whether it matches the moderator or attendee password.  Note: This parameter is *not* required when the role parameter is passed."
 
+- name: "role"
+  required: true
+  type: "String"
+  description: "Define user role for the meeting.  Valid values are MODERATOR or VIEWER (case insensitive). If the role parameter is present and valid, it overrides the password parameter.  You must specify either password parameter or role parameter in the join request."
+  
 - name: "createTime"
   required: false
   type: "String"
@@ -64,11 +69,6 @@
   type: "String"
   description: "Set to “true” to indicate that the user is a guest, otherwise do NOT send this parameter."
 
-- name: "role"
-  required: false
-  type: "String"
-  description: "Define user role for the meeting. Accept the values(case insensitive) MODERATOR or VIEWER. If the role parameter is present and it's a valid option, it will take over of any password parameter provided. Added in BBB 2.4"
-  
 - name: "excludeFromDashboard"
   required: false
   type: "String"

_includes/footer.html

@@ -1,2 +1,2 @@
 <!-- Documentation for <a href="{% if site.codeurl %}{{ site.codeurl }}{% else %}{{ site.baseurl }}{% endif %}">{{ site.title }}</a> -->
-&copy; 2021 <a href="http://bigbluebutton.org/">BigBlueButton Inc.</a> &middot; <a href="http://bigbluebutton.org/trademark/">Trademark</a> &middot; <a href="http://bigbluebutton.org/open-source-license/">License<a/>
+&copy; 2022 <a href="http://bigbluebutton.org/">BigBlueButton Inc.</a> &middot; <a href="http://bigbluebutton.org/trademark/">Trademark</a> &middot; <a href="http://bigbluebutton.org/open-source-license/">License<a/>

_posts/2.4/2021-05-01-architecture.md

@@ -3,6 +3,8 @@ layout: page
 title: 'Architecture'
 category: 2.4
 date: 2021-05-01 17:34:41
+redirect_from:
+  - /overview/architecture.html
 order: 4
 ---
 
@@ -73,9 +75,9 @@ BigBlueButton web application is a Java-based application written in Scala. It i
 
 The BigBlueButton API provides a third-party integration (such as the [BigBlueButtonBN plugin](https://moodle.org/plugins/mod_bigbluebuttonbn) for Moodle) with an endpoint to control the BigBlueButton server.
 
-Every access to BigBlueButton comes through a front-end portal (we refer to as a third-party application). BigBlueButton integrates Moodle, Wordpress, Canvas, Sakai, and others (see [third-party integrations](http://bigbluebutton.org/integrations/)). BigBlueButton comes with its own front-end called [Greenlight](/install/greenlight-v2.html). When using a learning management system (LMS) such as Moodle, teachers can setup BigBlueButton rooms within their course and students can access the rooms and their recordings.
+Every access to BigBlueButton comes through a front-end portal (we refer to as a third-party application). BigBlueButton integrates Moodle, Wordpress, Canvas, Sakai, MatterMost, and others (see [third-party integrations](http://bigbluebutton.org/integrations/)). BigBlueButton comes with its own front-end called [Greenlight](/greenlight/gl-install.html). When using a learning management system (LMS) such as Moodle, teachers can setup BigBlueButton rooms within their course and students can access the rooms and their recordings.
 
-The BigBlueButton comes with some simple [API demos](http://demo.bigbluebutton.org/demo/demo1.jsp). Regardless of which front-end you use, they all use the [API](/dev/api.html) under the hood.
+The BigBlueButton comes with some simple [API demos](2.4/install.html#install). Regardless of which front-end you use, they all use the [API](/dev/api.html) under the hood.
 
 ## Redis PubSub
 
@@ -106,7 +108,7 @@ FreeSWITCH to easily create their own integration. Communication between apps an
 
 We think FreeSWITCH is an amazing piece of software for handling audio.
 
-FreeSWITCH provides the voice conferencing capability in BigBlueButton. Users are able to join the voice conference through the headset. Users joining through Google Chrome or Mozilla Firefox are able to take advantage of higher quality audio by connecting using WebRTC. FreeSWITCH can also be [integrated with VOIP providers](/install/install.html#add-a-phone-number-to-the-conference-bridge) so that users who are not able to join using the headset will be able to call in using their phone.
+FreeSWITCH provides the voice conferencing capability in BigBlueButton. Users are able to join the voice conference through the headset. Users joining through Google Chrome or Mozilla Firefox are able to take advantage of higher quality audio by connecting using WebRTC. FreeSWITCH can also be [integrated with VOIP providers](/admin/customize.html#add-a-phone-number-to-the-conference-bridge) so that users who are not able to join using the headset will be able to call in using their phone.
 
 ## Kurento and WebRTC-SFU
 

_posts/2.4/2021-05-01-install.md

@@ -4,6 +4,7 @@ title: 'Install'
 category: 2.4
 redirect_from:
   - /install/install.html
+  - /install.html
   - /1.1/install.html
 date: 2021-09-22 22:13:42
 order: 2

_posts/2.4/2021-06-09-new.md

@@ -52,6 +52,8 @@ Under the hood, BigBlueButton 2.4 installs on Ubuntu 18.04 64-bit, and the follo
 
 For full details on what is new in BigBlueButton 2.4, see the release notes. Recent releases:
 
+- [2.4.5](https://github.com/bigbluebutton/bigbluebutton/releases/tag/v2.4.5)
+- [2.4.4](https://github.com/bigbluebutton/bigbluebutton/releases/tag/v2.4.4)
 - [2.4.3](https://github.com/bigbluebutton/bigbluebutton/releases/tag/v2.4.3)
 - [2.4.2](https://github.com/bigbluebutton/bigbluebutton/releases/tag/v2.4.2)
 - [2.4.1](https://github.com/bigbluebutton/bigbluebutton/releases/tag/v2.4.1)

_posts/2.4/2021-09-22-dev.md

@@ -3,6 +3,8 @@ layout: page
 title: 'Development'
 category: 2.4
 date: 2021-09-22 11:42:28
+redirect_from:
+  - /dev/setup.html
 order: 3
 ---
 
@@ -34,7 +36,7 @@ The instructions in this guide are step-by-step so you can understand each step
 
 - First, use Google to search for the error. There is a wealth of information in [bigbluebutton-dev](https://groups.google.com/forum/?fromgroups=#!forum/bigbluebutton-dev) that has been indexed by Google.
 - Try doing the same steps on a different BigBlueButton server.
-- Post a question to bigbluebutton-dev with a description of the problem and the steps to reproduce. Post logs and error messages to [Pastebin](http://pastebin.com) link them in your post.
+- Post a question to bigbluebutton-dev with a description of the problem and the steps to reproduce. Post logs and error messages to [Pastebin](https://pastebin.com/) link them in your post.
 
 ### You Have a Working BigBlueButton Server
 
@@ -239,7 +241,7 @@ Below is an overview of the different components in a production set-up. When de
 
 ## (Optional) Install bbb-demo
 
-Note that at this point we recommend installing and using [GreenLight](/greenlight/install.html) or using API-MATE (link can be found when you run `$ bbb-conf --salt`).
+Note that at this point we recommend installing and using [GreenLight](/greenlight/gl-install.html) or using API-MATE (link can be found when you run `$ bbb-conf --salt`).
 
 If you want to test the installation or to easily start/join meetings while you are developing, you can alternatively install `bbb-demos`:
 
@@ -507,7 +509,7 @@ The `war` application is generated under `build/libs/bigbluebutton-0.10.0.war`.
 Create a new directory and open it.
 
 ```bash
-mkdir exploded && cd exploded
+rm -r exploded && mkdir exploded && cd exploded
 ```
 
 Extract the war content in the newly create directory
@@ -522,7 +524,7 @@ Then copy the `run-prod.sh` after checking all the jar dependencies are listed i
 cp ../run-prod.sh .
 ```
 
-In the next step we will make a copy of the current production directory for `bbb-web`
+In the next step we will make a copy of the current production directory for `bbb-web`. You only need to do this if your current version of bbb-web is worth keeping.
 
 ```bash
 sudo cp -R /usr/share/bbb-web /usr/share/bbb-web-old
@@ -543,8 +545,8 @@ sudo cp -R . /usr/share/bbb-web/
 Make sure the copied files have the right user ownership.
 
 ```bash
-$ sudo chown bigbluebutton:bigbluebutton /usr/share/bbb-web
-$ sudo chown -R bigbluebutton:bigbluebutton /usr/share/bbb-web/assets/ /usr/share/bbb-web/META-INF/ /usr/share/bbb-web/org/ /usr/share/bbb-web/run-prod.sh /usr/share/bbb-web/WEB-INF/
+sudo chown bigbluebutton:bigbluebutton /usr/share/bbb-web
+sudo chown -R bigbluebutton:bigbluebutton /usr/share/bbb-web/assets/ /usr/share/bbb-web/META-INF/ /usr/share/bbb-web/org/ /usr/share/bbb-web/run-prod.sh /usr/share/bbb-web/WEB-INF/
 ```
 
 And finally we run the service.