From 19b1ca3a135918d95667af0ddebe315e2c4582ae Mon Sep 17 00:00:00 2001
From: Daniel Berteaud
Date: Sat, 14 Mar 2015 13:54:19 +0100
Subject: [PATCH] Doc cleanups
---
templates/default/documentation.html.ep | 35 +++++++++++++++++----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/templates/default/documentation.html.ep b/templates/default/documentation.html.ep
index bb69f8c..3e1f878 100644
--- a/templates/default/documentation.html.ep
+++ b/templates/default/documentation.html.ep
@@ -39,7 +39,7 @@
Text chat (and you can save history)
Screen sharing
Email invitations
- Email notification when someone joins one of your rooms
+ Email notifications when someone joins one of your rooms
Persistent/reserved rooms
Chairman functionnalities (mute/pause/kick other peers)
Grant chairman role to other peers
@@ -49,7 +49,7 @@
- VROOM is translated in French and English. You're welcome to submit patches or pull requests to enhance localization, or add new ones.
+ VROOM is available in French and English. You're welcome to submit patches or pull requests to enhance localization, or add new ones.
@@ -57,20 +57,20 @@
How it works
- WebRTC allows browsers to browsers direct connections. This allows the best latency as it avoids round trip through a server,
+ WebRTC allows browsers to browsers direct connections. This provides the best latency as it avoids round trip through a server,
which is important with real time communications. But it also ensures the privacy of your communications. VROOM takes advantage of those
new WebRTC technologies, and does the following:
- When a client joins a room, it establishes a Websocket link to VROOM. This is called the signaling channel. With this, all peers are able
to exchange small messages between them. But messages sent through this channels is routed through VROOM server, so it's not yet peer to peer
- - When a second peer joins the same room, he get through this signaling channel informations about how to connedct directly to the other one
*
+ - When a second peer joins the same room, he gets through this signaling channel informations about how to connect directly to the other one(s)
- Now, both peer exchange their video and audio stream directly
- The signaling channel stays open and is used to transmit non sensitive informations (peer colors synchronization, notification of muting/kicking etc...)
- Everything else (audio/video/text chat) is sent through data channels
- As long as possible, data channels are established directly between peers, but in some situations, this is not possible. In those case
+ As long as possible, data channels are established directly between peers, but in some situations, this is not possible (NAT, firewalls etc...). In those case
data streams are relayed through a TURN server
@@ -109,7 +109,7 @@
For the same reason, I recommend running Apache as webserver (others like Nginx probably work too, but I provide configuration sample only for Apache)
- VROOM can probably with other DB engine (like PostgreSQL) with minor modifications.
+ VROOM can probably work with other DB engine (like PostgreSQL) with minor modifications.
If you're interrested in adding support for other engines, you're welcome to help
@@ -210,7 +210,7 @@ mysql -uroot vroom < /opt/vroom/docs/database/schema.mysql
Two sample apache configurations are provided in the
conf directory
- httpd_alias.conf should work out of the box, VROOM will be available at https://yourservername/vroom
- - httpd_vhost.conf is an alternative which you can use if you prefer working with named virtualhost
+
- httpd_vhost.conf is an alternative which you can use if you prefer working with named virtualhosts
(but will require additional config adjustments, especially in ssl.conf, which is out of scope for this guide)
Copy the config you want in /etc/httpd/conf.d/
@@ -219,8 +219,8 @@ mysql -uroot vroom < /opt/vroom/docs/database/schema.mysql
In either case, you might want to adjust the apache configuration
- The admin interface of VROOM will be available on /vroom/admin (alias) or /admin (vhost) must be protected by your web server.
- VROOM provides no authentication at all. In the sample configuration, the access is restriucted to localhost,
+ The admin interface of VROOM will be available on /vroom/admin (alias) or /admin (vhost) and must be protected by your web server.
+ VROOM provides no authentication at all. In the sample configuration, the access is restricted to localhost,
but you can change this to anything you want
@@ -286,7 +286,7 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
TURN servers
will be used by the ICE process.
If you plan to use VROOM only on a local network, where each peer can connect to each others, you can just omit this part. But if you want
- VROOM to work from anywhere, you'll need use STUN and most likely TURN too.
+ VROOM to work from anywhere, you'll need use STUN and most likely TURN too.
- stun_server: The STUN server to use. For example stun_server = 'stun:stun.l.google.com:19302'.
This must be a full STUN URI as defined by rfc7064
@@ -321,7 +321,7 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
- from: The address used in the From field of emails sent by VROOM.
- contact: The email address which will get feedback form submissions.
- - sendmail: The path to the sendmail compatible binary to use (default is /usr/bin/sendmail and will probably won'd need to be changed)
+ - sendmail: The path to the sendmail compatible binary to use (default is /usr/bin/sendmail and will probably won't need to be changed)
@@ -332,11 +332,11 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
This section controls the web interface. The available settings are
- powered_by: will be displayed in the footer. You can put HTML code here.
- - template: The name of the template to use. Must be a directory under template. The default,
- and only tempalte provided is called default. But you can copy it and customize it to your taste
+ - template: The name of the template to use. Must be a directory under templates. The default,
+ and only template provided is called default. But you can copy it and customize it to your needs
- chrome_extension_id: This is the ID of the Chrome extension proposed to clients when trying to share screen for the first time
(obviously, only for Chrome users). The reason this is configurable is because the extension requires the allowed websites to be listed.
- Two extensions are provided, the default (ecicdpoejfllflombfanbhfpgcimjddn) will work everywhere but allow to capture screen on any website,
+ Two extensions are provided, the default (ecicdpoejfllflombfanbhfpgcimjddn) will work everywhere but allows screen capture on any website,
which can be a security risk. The other extension (lfkdfilifapafomlhaaihfdglamkmdme) only works on https://vroom.im.
You can create your own extension which will only work for your site, and submit it to Google Chrome Store if you want.
- demo: If enabled, a few more pages and elements will be displayed, like the documentation you're reading right now.
@@ -366,7 +366,7 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
You can set it to 0 if you do not want reserved room to expire
- common_names: a comma separated list of names you don't want anyone to be able to reserve. Rooms with
those names can be created, but not reserved. This is to prevent cybersquatting
- - max_members: This is the maximum number of peer able to be in a room at the same time. You can define a limit
+
- max_members: This is the maximum number of peers able to be in a room at the same time. You can define a limit
per room if you want. But the limit set here cannot be exceeded.
@@ -377,7 +377,8 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
This section controls logging of the VROOM daemon. The following settings are available
- - level: Set the logging level. Can be one of debug, info, warn, error or fatal
+ - level: Set the logging level. Can be one of debug, info, warn,
+ error or fatal
@@ -387,7 +388,7 @@ cp /opt/vroom/conf/settings.ini.dist /opt/vroom/conf/settings.ini
Controls Etherpad-Lite integration. The following settings are available
- - uri: The URI to reach your Etherpad Lite instance. This instance must share the same base domaine as VROOM because
+
- uri: The URI to reach your Etherpad Lite instance. This instance must share the same base domain as VROOM because
of the way sessions are created (Etherpad Lite sessions are created by VROOM directly and sent as a cookie to the clients)
- api_key: The API key of your Etherpad-Lite instance. You can find it in the file APIKEY.txt at the root
of your Etherpad Lite installation