http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml 
b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
index e38dcd4..82e53bc 100644
--- a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
+++ b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-               xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>How to restrict access to your Openmeetings 
server</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-       
-               <section name="Server Side">
-       
-                       <p>You can protect your OpenMeetings instance from 
beeing accessed
-                               from 3th party by using the file:
-                       </p>
-                       
<p>$RED5_HOME/webapps/openmeetings/WEB-INF/red5-web.properties </p>
-                       <p>Content: </p>
-                       <source>webapp.virtualHosts=*,localhost, 
127.0.0.1</source>
-                       Sample file:
-                       <a
-                               
href="https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties;hb=HEAD";
-                               
rel="nofollow">https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties;hb=HEAD
-                       </a>
-               </section>
-
-               <section name="Client Side">
-
-                       <p>And you can restrict the access also for the client 
side: Every
-                               Flash Plugin will check a file called 
"crossdomain.xml" before it
-                               tries to access the server using rtmp/RPC. This 
file is located: </p>
-                       <p>$RED5_HOME/webapps/root/crossdomain.xml </p>
-                       <p>Content: </p>
-                       <source>
-<![CDATA[
-<?xml version="1.0"?>
-<cross-domain-policy>
-    <site-control permitted-cross-domain-policies="all"/>
-    <allow-access-from domain="localhost" to-ports="20-65535"/>
-    <allow-access-from domain="*.local" to-ports="20-65535"/>
-</cross-domain-policy>
-]]>
-                       </source>
-                       
-                       <p>
-                               If you accessing your application behind an 
Apache Webservre (using
-                               mod_proxy or mod_jk2) be careful to make the 
crossdomain.xml
-                               accessible. Flash will always search for this 
file in the www-root
-                               directory of every URL you connect to. You 
might use
-                               <a 
href="https://addons.mozilla.org/de/firefox/addon/firebug/"; 
rel="nofollow">FireBug
-                               </a>
-                               for example to lookup requests.
-                       </p>
-
-               </section>
-
-       </body>
-
-</document>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+               xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>How to restrict access to your Openmeetings 
server</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+       
+               <section name="Server Side">
+       
+                       <p>You can protect your OpenMeetings instance from 
beeing accessed
+                               from 3th party by using the file:
+                       </p>
+                       
<p>$RED5_HOME/webapps/openmeetings/WEB-INF/red5-web.properties </p>
+                       <p>Content: </p>
+                       <source>webapp.virtualHosts=*,localhost, 
127.0.0.1</source>
+                       Sample file:
+                       <a
+                               
href="https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties;hb=HEAD";
+                               
rel="nofollow">https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties;hb=HEAD
+                       </a>
+               </section>
+
+               <section name="Client Side">
+
+                       <p>And you can restrict the access also for the client 
side: Every
+                               Flash Plugin will check a file called 
"crossdomain.xml" before it
+                               tries to access the server using rtmp/RPC. This 
file is located: </p>
+                       <p>$RED5_HOME/webapps/root/crossdomain.xml </p>
+                       <p>Content: </p>
+                       <source>
+<![CDATA[
+<?xml version="1.0"?>
+<cross-domain-policy>
+    <site-control permitted-cross-domain-policies="all"/>
+    <allow-access-from domain="localhost" to-ports="20-65535"/>
+    <allow-access-from domain="*.local" to-ports="20-65535"/>
+</cross-domain-policy>
+]]>
+                       </source>
+                       
+                       <p>
+                               If you accessing your application behind an 
Apache Webservre (using
+                               mod_proxy or mod_jk2) be careful to make the 
crossdomain.xml
+                               accessible. Flash will always search for this 
file in the www-root
+                               directory of every URL you connect to. You 
might use
+                               <a 
href="https://addons.mozilla.org/de/firefox/addon/firebug/"; 
rel="nofollow">FireBug
+                               </a>
+                               for example to lookup requests.
+                       </p>
+
+               </section>
+
+       </body>
+
+</document>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/SakaiPlugin.xml 
b/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
index 30f6be4..64b9d0a 100644
--- a/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
+++ b/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
@@ -1,111 +1,111 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>Sakai Plugin</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-
-               <section name="Introduction">
-                       <p>
-                               In 2010,
-                               <a rel="nofollow" href="http://www.samoo.es"; 
target="_blank">Samoo company
-                               </a>
-                               has developed a plugin that integrates Sakai 
LMS and OpenMeetings
-                               .
-                       </p>
-                       <p>
-                               The plugin was developed for some Spanish 
Universities that use
-                               Sakai and belongs to
-                               <a rel="nofollow" target="_blank" 
-                                       
href="https://confluence.sakaiproject.org/display/SPANISH/S2G+-+Spanish+Sakai+Group";>"Spanish
 Sakai Universities"</a>
-                               group:
-                       </p>
-                       <ul>
-                               <li>
-                                       <a rel="nofollow" 
href="http://www.udl.es/"; target="_blank">Universitat de Lleida </a>
-                               </li>
-                               <li>
-                                       <a rel="nofollow" 
href="http://www.upv.es/"; target="_blank">Universidad Polit&#233;cnica de 
Valencia </a>
-                               </li>
-                               <li>
-                                       <a rel="nofollow" 
href="http://www.um.es/"; target="_blank">Universidad de Murcia</a>
-                               </li>
-                               <li>
-                                       <a rel="nofollow" 
href="http://www.unavarra.es/"; target="_blank">Universidad P&#250;blica de 
Navarra</a>
-                               </li>
-                               <li>
-                                       <a rel="nofollow" 
href="http://www.ucam.edu/"; target="_blank">Universidad Cat&#243;lica San 
Antonio de Murcia
-                                       </a>
-                               </li>
-                       </ul>
-               </section>
-
-               <section name="Features">
-                       <p>The plugin contains the following features: </p>
-                       <ul>
-                               <li>Create videoconference rooms through Sakai: 
</li>
-                               <li>
-                                       <ol>
-                                               <li>Integrated with calendar 
</li>
-                                               <li>Integrated with 
announcements </li>
-                                               <li>Sends an email to all site 
participants </li>
-                                               <li>Rooms restricted to site 
groups </li>
-                                               <li>Configurable room type </li>
-                                       </ol>
-                               </li>
-                       </ul>
-                       <p />
-                       <ul>
-                               <li>Future requirements </li>
-                               <li>
-                                       <ol>
-                                               <li>Publish room recordings to 
students </li>
-                                               <li>Room reservation </li>
-                                       </ol>
-                               </li>
-                       </ul>
-               </section>
-
-               <section name="Source">
-                       <p>
-                               You can download and build the source code
-                               <a rel="nofollow" target="_blank" 
-                                       
href="https://source.sakaiproject.org/contrib/samoo/adobeconnectpro-openmeetings-integration/trunk/";>here</a>
-                       </p>
-               </section>
-
-               <section name="Installation and documentation">
-                       <p>
-                               The documentation resides in the
-                               <a rel="nofollow" target="_blank" 
href="https://confluence.sakaiproject.org/display/OPENMTG/Home";>Sakai 
confluence space</a>
-                       </p>
-                       <p>
-                               Please contact the mailing list for further 
information. For
-                               commercial support you can also contact
-                               <a rel="nofollow" href="http://www.samoo.es"; 
target="_blank">Samoo company</a>
-                               or other companies from the list of
-                               <a href="commercial-support.html">commercial 
support</a>
-                               .
-                       </p>
-               </section>
-
-       </body>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>Sakai Plugin</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+
+               <section name="Introduction">
+                       <p>
+                               In 2010,
+                               <a rel="nofollow" href="http://www.samoo.es"; 
target="_blank">Samoo company
+                               </a>
+                               has developed a plugin that integrates Sakai 
LMS and OpenMeetings
+                               .
+                       </p>
+                       <p>
+                               The plugin was developed for some Spanish 
Universities that use
+                               Sakai and belongs to
+                               <a rel="nofollow" target="_blank" 
+                                       
href="https://confluence.sakaiproject.org/display/SPANISH/S2G+-+Spanish+Sakai+Group";>"Spanish
 Sakai Universities"</a>
+                               group:
+                       </p>
+                       <ul>
+                               <li>
+                                       <a rel="nofollow" 
href="http://www.udl.es/"; target="_blank">Universitat de Lleida </a>
+                               </li>
+                               <li>
+                                       <a rel="nofollow" 
href="http://www.upv.es/"; target="_blank">Universidad Polit&#233;cnica de 
Valencia </a>
+                               </li>
+                               <li>
+                                       <a rel="nofollow" 
href="http://www.um.es/"; target="_blank">Universidad de Murcia</a>
+                               </li>
+                               <li>
+                                       <a rel="nofollow" 
href="http://www.unavarra.es/"; target="_blank">Universidad P&#250;blica de 
Navarra</a>
+                               </li>
+                               <li>
+                                       <a rel="nofollow" 
href="http://www.ucam.edu/"; target="_blank">Universidad Cat&#243;lica San 
Antonio de Murcia
+                                       </a>
+                               </li>
+                       </ul>
+               </section>
+
+               <section name="Features">
+                       <p>The plugin contains the following features: </p>
+                       <ul>
+                               <li>Create videoconference rooms through Sakai: 
</li>
+                               <li>
+                                       <ol>
+                                               <li>Integrated with calendar 
</li>
+                                               <li>Integrated with 
announcements </li>
+                                               <li>Sends an email to all site 
participants </li>
+                                               <li>Rooms restricted to site 
groups </li>
+                                               <li>Configurable room type </li>
+                                       </ol>
+                               </li>
+                       </ul>
+                       <p />
+                       <ul>
+                               <li>Future requirements </li>
+                               <li>
+                                       <ol>
+                                               <li>Publish room recordings to 
students </li>
+                                               <li>Room reservation </li>
+                                       </ol>
+                               </li>
+                       </ul>
+               </section>
+
+               <section name="Source">
+                       <p>
+                               You can download and build the source code
+                               <a rel="nofollow" target="_blank" 
+                                       
href="https://source.sakaiproject.org/contrib/samoo/adobeconnectpro-openmeetings-integration/trunk/";>here</a>
+                       </p>
+               </section>
+
+               <section name="Installation and documentation">
+                       <p>
+                               The documentation resides in the
+                               <a rel="nofollow" target="_blank" 
href="https://confluence.sakaiproject.org/display/OPENMTG/Home";>Sakai 
confluence space</a>
+                       </p>
+                       <p>
+                               Please contact the mailing list for further 
information. For
+                               commercial support you can also contact
+                               <a rel="nofollow" href="http://www.samoo.es"; 
target="_blank">Samoo company</a>
+                               or other companies from the list of
+                               <a href="commercial-support.html">commercial 
support</a>
+                               .
+                       </p>
+               </section>
+
+       </body>
+
 </document>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml 
b/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml
index 3c7645e..f02bde3 100644
--- a/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml
+++ b/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>SugarCRM Plugin</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-
-               <section name="SugarCRM Plugin for OpenMeetings">
-                       <p>
-                               You can get the latest Version of the Plugin 
for SugarCRM from the
-                               <a href="downloads.html">downloads</a>
-                               .
-                       </p>
-                       <p>
-                               You can find the OpenMeetings Plugin also in the
-                               <a 
href="http://www.sugarforge.org/projects/openmeetings/"; target="_blank" 
rel="nofollow">SugarCRM Plugin database</a>
-                               .
-                       </p>
-               </section>
-
-               <section name="Features">
-                       <p>The plugin contains the following features: </p>
-                       <ul>
-                               <li>Create videoconference rooms through 
SugarCRM: </li>
-                               <li>
-                                       <ol>
-                                               <li>Integrated with calendar 
</li>
-                                               <li>Integrated with SugarCRM 
meetings </li>
-                                               <li>Sends invetations emails to 
meeting participants </li>
-                                               <li>Configurable room type </li>
-                                       </ol>
-                               </li>
-                       </ul>
-               </section>
-
-               <section name="Installation the SugarCRM Plugin for 
OpenMeetings">
-                       <p>In SugarCRM's administration web-interface you will 
find the
-                               module loader.
-                       </p>
-                       <a class="fancybox-buttons" 
href="images/SugarCRM_Installation.png">
-                               <img src="images/SugarCRM_Installation.png" 
alt="" width="640" height="320" />
-                       </a>
-                       <ol>
-                               <li>Upload the module with module loader in 
administration area. </li>
-                               <li>Configure OpenMeetings settings. </li>
-                               <li>Create OpenMeetings rooms. </li>
-                       </ol>
-               </section>
-
-               <section name="Demo video">
-                       <p>The demo video of SugarCRM plugin show you the 
plugin in action </p>
-                       <iframe width="640" height="390" 
src="http://www.youtube.com/embed/xrDbcXqxDq8"; frameborder="0" 
allowfullscreen=""></iframe>
-               </section>
-
-       </body>
-
-</document>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>SugarCRM Plugin</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+
+               <section name="SugarCRM Plugin for OpenMeetings">
+                       <p>
+                               You can get the latest Version of the Plugin 
for SugarCRM from the
+                               <a href="downloads.html">downloads</a>
+                               .
+                       </p>
+                       <p>
+                               You can find the OpenMeetings Plugin also in the
+                               <a 
href="http://www.sugarforge.org/projects/openmeetings/"; target="_blank" 
rel="nofollow">SugarCRM Plugin database</a>
+                               .
+                       </p>
+               </section>
+
+               <section name="Features">
+                       <p>The plugin contains the following features: </p>
+                       <ul>
+                               <li>Create videoconference rooms through 
SugarCRM: </li>
+                               <li>
+                                       <ol>
+                                               <li>Integrated with calendar 
</li>
+                                               <li>Integrated with SugarCRM 
meetings </li>
+                                               <li>Sends invetations emails to 
meeting participants </li>
+                                               <li>Configurable room type </li>
+                                       </ol>
+                               </li>
+                       </ul>
+               </section>
+
+               <section name="Installation the SugarCRM Plugin for 
OpenMeetings">
+                       <p>In SugarCRM's administration web-interface you will 
find the
+                               module loader.
+                       </p>
+                       <a class="fancybox-buttons" 
href="images/SugarCRM_Installation.png">
+                               <img src="images/SugarCRM_Installation.png" 
alt="" width="640" height="320" />
+                       </a>
+                       <ol>
+                               <li>Upload the module with module loader in 
administration area. </li>
+                               <li>Configure OpenMeetings settings. </li>
+                               <li>Create OpenMeetings rooms. </li>
+                       </ol>
+               </section>
+
+               <section name="Demo video">
+                       <p>The demo video of SugarCRM plugin show you the 
plugin in action </p>
+                       <iframe width="640" height="390" 
src="http://www.youtube.com/embed/xrDbcXqxDq8"; frameborder="0" 
allowfullscreen=""></iframe>
+               </section>
+
+       </body>
+
+</document>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml 
b/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
index 134ad20..8f0a83c 100644
--- a/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
+++ b/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>Timezones</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-               <section name="Introduction">
-                       <p>
-                               Time zones are being taken from JDK, so please 
keep it up to date :)
-                       </p>
-                       <p>
-                               You can set a Flag
-                               <strong>forceTimeZoneCheck</strong>
-                               for each user that gives him a Pop-Up 
notification to change his
-                               time zone. The Flag can be changed in the user 
administration of
-                               OpenMeetings. This can be handy if you update 
from a previous
-                               version of OpenMeetings to make sure users see 
the new feature and
-                               update their settings.
-                       </p>
-               </section>
-       </body>
-</document>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>Timezones</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+               <section name="Introduction">
+                       <p>
+                               Time zones are being taken from JDK, so please 
keep it up to date :)
+                       </p>
+                       <p>
+                               You can set a Flag
+                               <strong>forceTimeZoneCheck</strong>
+                               for each user that gives him a Pop-Up 
notification to change his
+                               time zone. The Flag can be changed in the user 
administration of
+                               OpenMeetings. This can be handy if you update 
from a previous
+                               version of OpenMeetings to make sure users see 
the new feature and
+                               update their settings.
+                       </p>
+               </section>
+       </body>
+</document>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/Upgrade.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/Upgrade.xml 
b/openmeetings-server/src/site/xdoc/Upgrade.xml
index ebdd7b8..b224c75 100644
--- a/openmeetings-server/src/site/xdoc/Upgrade.xml
+++ b/openmeetings-server/src/site/xdoc/Upgrade.xml
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>Upgrade</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-               <section name="Upgrading OpenMeetings via the Web-Interface">
-                       <ol>
-                               <li>
-                                       <p>There is a System Backup and Import 
tool. Login as Administrator and Administration &gt; Backup</p>
-                                       <a class="fancybox-buttons" 
href="images/backup.png"><img src="images/backup.png" alt="" width="600" /></a>
-                                       <p>
-                                               The Text in the Administration 
&gt; Backup section actually just says
-                                               it all. The backup contains 
users, rooms, groups and
-                                               appointments (Invitations and 
Reminders are NOT included in the
-                                               Backup and Reminders will not 
be send again!). The Backup contains
-                                               also all uploaded Files and 
Documents and will re-import them again.
-               
-                                               Max Upload Size is 1000 MB.
-                                       </p>
-                               </li>
-                               <li>Stop Openmeetings</li>
-                               <li>(*) Backup folder with existing 
installation</li>
-                               <li>(*) Perform DB backup using tools available 
for your database</li>
-                               <li>Delete/move folder with existing 
installation of OM</li>
-                               <li>Drop existing OM database</li>
-                               <li>Create empty Database with same name and 
UTF-8 support</li>
-                               <li>Unzip new version of OM into the same 
folder</li>
-                               <li>(*) Modify DB settings</li>
-                               <li>Start Openmeetings</li>
-                               <li>go to 
http://localhost:5080/openmeetings</li>
-                               <li>Install OM using Web installer</li>
-                               <li>Login as Administrator and Administration 
&gt; Backup</li>
-                               <li>Perform system import</li>
-                       </ol>
-                       <p>(*) Optional step</p>
-               </section>
-
-               <section name="Upgrading OpenMeetings from command line">
-                       <p>
-                               <i>You need OpenMeetings 2.x or later to have 
the command line interface (CLI) 
-                                       feature available
-                               </i>
-                       </p>
-                       <p>
-                               Alternatively to the Web-Installer you can also 
export and import via the command line. <br/>
-                               <b>You should shutdown the Red5-Service while 
doing CLI export or import operations</b><br />
-                               Cd to your red5-home directory, type 
"./admin.sh" and hit enter. You will get options available.<br />
-                               <br />
-                               A typical export would be:<br />
-                               <tt>./admin.sh -b -file 
backup_today.zip</tt><br />
-                               <br />
-                               A typical import would be:<br />
-                               <tt>./admin.sh -r -file 
backup_yesterday.zip</tt><br />
-                               <br />
-                               You can also combine the installation with a 
backup, that way you will create exactly the user table 
-                               that existed in the backup.<br />
-                               A typical install from backup would be:<br />
-                               <tt>./admin.sh -i -file 
backup_yesterday.zip</tt><br/>
-                               please see <a href="CommandLineAdmin.html" 
target="_blank" rel="nofollow">Command Line Admin</a> for more options
-                       </p>
-                       <p><b>Detailed steps</b></p>
-                       <ol>
-                               <li>Stop Openmeetings</li>
-                               <li>(*) Backup folder with existing 
installation</li>
-                               <li>(*) Perform DB backup using tools available 
for your database</li>
-                               <li><tt>./admin.sh -v -b -file 
../backup_today.zip</tt></li>
-                               <li>Delete/move folder with existing 
installation of OM</li>
-                               <li>Unzip new version of OM into the same 
folder</li>
-                               <li><tt>./admin.sh -v -i -file 
../backup_today.zip --drop --skip-default-rooms</tt> (Optionally you can specify
-                                       additional parameters like DB 
host/user/pass/instance etc.)</li>
-                               <li>Start Openmeetings</li>
-                               <li>go to 
http://localhost:5080/openmeetings</li>
-                       </ol>
-                       <p>(*) Optional step</p>
-               </section>
-
-       </body>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>Upgrade</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+               <section name="Upgrading OpenMeetings via the Web-Interface">
+                       <ol>
+                               <li>
+                                       <p>There is a System Backup and Import 
tool. Login as Administrator and Administration &gt; Backup</p>
+                                       <a class="fancybox-buttons" 
href="images/backup.png"><img src="images/backup.png" alt="" width="600" /></a>
+                                       <p>
+                                               The Text in the Administration 
&gt; Backup section actually just says
+                                               it all. The backup contains 
users, rooms, groups and
+                                               appointments (Invitations and 
Reminders are NOT included in the
+                                               Backup and Reminders will not 
be send again!). The Backup contains
+                                               also all uploaded Files and 
Documents and will re-import them again.
+               
+                                               Max Upload Size is 1000 MB.
+                                       </p>
+                               </li>
+                               <li>Stop Openmeetings</li>
+                               <li>(*) Backup folder with existing 
installation</li>
+                               <li>(*) Perform DB backup using tools available 
for your database</li>
+                               <li>Delete/move folder with existing 
installation of OM</li>
+                               <li>Drop existing OM database</li>
+                               <li>Create empty Database with same name and 
UTF-8 support</li>
+                               <li>Unzip new version of OM into the same 
folder</li>
+                               <li>(*) Modify DB settings</li>
+                               <li>Start Openmeetings</li>
+                               <li>go to 
http://localhost:5080/openmeetings</li>
+                               <li>Install OM using Web installer</li>
+                               <li>Login as Administrator and Administration 
&gt; Backup</li>
+                               <li>Perform system import</li>
+                       </ol>
+                       <p>(*) Optional step</p>
+               </section>
+
+               <section name="Upgrading OpenMeetings from command line">
+                       <p>
+                               <i>You need OpenMeetings 2.x or later to have 
the command line interface (CLI) 
+                                       feature available
+                               </i>
+                       </p>
+                       <p>
+                               Alternatively to the Web-Installer you can also 
export and import via the command line. <br/>
+                               <b>You should shutdown the Red5-Service while 
doing CLI export or import operations</b><br />
+                               Cd to your red5-home directory, type 
"./admin.sh" and hit enter. You will get options available.<br />
+                               <br />
+                               A typical export would be:<br />
+                               <tt>./admin.sh -b -file 
backup_today.zip</tt><br />
+                               <br />
+                               A typical import would be:<br />
+                               <tt>./admin.sh -r -file 
backup_yesterday.zip</tt><br />
+                               <br />
+                               You can also combine the installation with a 
backup, that way you will create exactly the user table 
+                               that existed in the backup.<br />
+                               A typical install from backup would be:<br />
+                               <tt>./admin.sh -i -file 
backup_yesterday.zip</tt><br/>
+                               please see <a href="CommandLineAdmin.html" 
target="_blank" rel="nofollow">Command Line Admin</a> for more options
+                       </p>
+                       <p><b>Detailed steps</b></p>
+                       <ol>
+                               <li>Stop Openmeetings</li>
+                               <li>(*) Backup folder with existing 
installation</li>
+                               <li>(*) Perform DB backup using tools available 
for your database</li>
+                               <li><tt>./admin.sh -v -b -file 
../backup_today.zip</tt></li>
+                               <li>Delete/move folder with existing 
installation of OM</li>
+                               <li>Unzip new version of OM into the same 
folder</li>
+                               <li><tt>./admin.sh -v -i -file 
../backup_today.zip --drop --skip-default-rooms</tt> (Optionally you can specify
+                                       additional parameters like DB 
host/user/pass/instance etc.)</li>
+                               <li>Start Openmeetings</li>
+                               <li>go to 
http://localhost:5080/openmeetings</li>
+                       </ol>
+                       <p>(*) Optional step</p>
+               </section>
+
+       </body>
+
 </document>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/WebappNamePath.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/WebappNamePath.xml 
b/openmeetings-server/src/site/xdoc/WebappNamePath.xml
index 53658a8..97cb7b1 100644
--- a/openmeetings-server/src/site/xdoc/WebappNamePath.xml
+++ b/openmeetings-server/src/site/xdoc/WebappNamePath.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>Webapp Name / Path</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-
-               <section name="Customize Openmeetings logo">
-                       <p>If you want to set up your logo in Openmeetings 
header you can do the following:</p>
-                       <ol>
-                               <li>create your logo image as PNG 40px 
height</li>
-                               <li>replace 
<tt>/opt/red5/webapps/openmeetings/css/images/logo.png</tt> with your logo 
file</li>
-                       </ol>
-               </section>
-               <section name="Renaming /openmeetings context">
-                       <p>
-                               If you want to have
-                               <tt>http://yourcorp.com:5080/yourmeetings</tt>
-                               instead of
-                               <tt>http://yourcorp.com:5080/openmeetings</tt>
-                               you need to do the following
-                       </p>
-                       <ol>
-                               <li>stop openmmetings if it is running </li>
-                               <li>
-                                       go to openmeetings install dir (for ex. 
<tt>/opt/red5</tt>)
-                               </li>
-                               <li>
-                                       rename 
<tt>/opt/red5/webapps/openmeetings</tt> to 
<tt>/opt/red5/webapps/yourmeetings</tt>
-                                       (for ex. <tt>mv 
/opt/red5/webapps/openmeetings /opt/red5/webapps/yourmeetings</tt>)
-                               </li>
-                               <li>
-                                       open 
<tt>/opt/red5/webapps/yourmeetings/public/config.xml</tt>
-                                       using your favorite text editor (for 
ex. <tt>vim /opt/red5/webapps/yourmeetings/public/config.xml</tt>)
-                                       <ul>
-                                               <li>
-                                                       find and modify 
<tt>&lt;webAppRootKey&gt;openmeetings&lt;/webAppRootKey&gt;</tt>
-                                                       to be 
<tt>&lt;webAppRootKey&gt;<strong>yourmeetings</strong>&lt;/webAppRootKey&gt;</tt>
-                                               </li>
-                                               <li>
-                                                       find and modify 
<tt>&lt;httpRootKey&gt;/openmeetings/&lt;/httpRootKey&gt;</tt>
-                                                       to be 
<tt>&lt;httpRootKey&gt;<strong>/yourmeetings/</strong>&lt;/httpRootKey&gt;</tt>
-                                               </li>
-                                       </ul>
-                               </li>
-                               <li>
-                                       open 
<tt>/opt/red5/webapps/root/index.html</tt>
-                                       using your favorite text editor (for 
ex. <tt>vim /opt/red5/webapps/root/index.html</tt>)
-                                       <ul>
-                                               <li>
-                                                       find and modify 
<tt>&lt;meta http-equiv="REFRESH" content="0;url=openmeetings/"&gt;</tt>
-                                                       to be <tt>&lt;meta 
http-equiv="REFRESH" content="0;url=<strong>yourmeetings/</strong>"&gt;</tt>
-                                               </li>
-                                       </ul>
-                               </li>
-                       </ol>
-                       <p>That's it</p>
-               </section>
-
-               <section name="Changing hard-coded application name in string 
labels">
-                       <p>
-                               To have
-                               <i>Your Application Name</i>
-                               instead of
-                               <i>Openmeetings</i>
-                               in
-                               <strong>all</strong>
-                               text labels you need to do the following
-                       </p>
-                       <ol>
-                               <li>
-                                       ensure
-                                       <strong>
-                                               <tt>{0}</tt>
-                                       </strong>
-                                       placeholder is used in
-                                       <i>all</i>
-                                       strings you have added and/or modified 
(all strings bundled into
-                                       Openmeetings already have this 
placeholder)
-                               </li>
-                               <li>login to Openmeetings as user with 
administrator privileges </li>
-                               <li>
-                                       go to
-                                       <tt>Administration -&gt; 
Configuration</tt>
-                               </li>
-                               <li>
-                                       find and edit configuration with name
-                                       <strong>
-                                               <tt>application.name</tt>
-                                       </strong>
-                               </li>
-                               <li>
-                                       Set its value to be
-                                       <i>
-                                               <tt>Your Application Name</tt>
-                                       </i>
-                               </li>
-                               <li>
-                                       <tt>Save</tt>
-                               </li>
-                               <li>reload page or relogin </li>
-                       </ol>
-                       <p>
-                       All string will display
-                       <i>
-                               <tt>Your Application Name</tt>
-                       </i>
-                       in place of
-                       <i>
-                               <tt>Openmeetings</tt>
-                       </i>
-                       </p>
-               </section>
-
-               <section name="Running multiple Openmeetings instances on the 
same server">
-                       <p>
-                               If you want to run multiple Openmeetings 
instances on the same server i.e. to have<br/>  
-                               
<tt>http://yourcorp.com:5080/openmeetings1</tt><br/> 
-                               
<tt>http://yourcorp.com:5080/openmeetings2</tt><br/> etc.<br/> you need to do 
the following:
-                       </p>
-                       <ol>
-                               <li>edit 
<tt>webapps/openmeetings1/WEB-INF/red5-web.properties</tt> for 
<strong>every</strong> Openmeetings 
-                               instance and add the following line 
<tt>webapp.contextPath=/openmeetings1</tt>  to it (context of 
-                               <strong>every</strong> instance 
<strong>should</strong> match the folder name in webapps dir)
-                               </li>
-                               <li>in case of java memory problems modify 
<tt>red5.sh</tt> add following line:<br/>
-                                       <source>export 
JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled 
-XX:MaxPermSize=128M"</source>
-                                       or <tt>red5.bat</tt>:<br/>
-                                       <source>set 
JAVA_OPTS=-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled 
-XX:MaxPermSize=128M</source>
-                               </li>
-                       </ol>
-               </section>
-       </body>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>Webapp Name / Path</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+
+               <section name="Customize Openmeetings logo">
+                       <p>If you want to set up your logo in Openmeetings 
header you can do the following:</p>
+                       <ol>
+                               <li>create your logo image as PNG 40px 
height</li>
+                               <li>replace 
<tt>/opt/red5/webapps/openmeetings/css/images/logo.png</tt> with your logo 
file</li>
+                       </ol>
+               </section>
+               <section name="Renaming /openmeetings context">
+                       <p>
+                               If you want to have
+                               <tt>http://yourcorp.com:5080/yourmeetings</tt>
+                               instead of
+                               <tt>http://yourcorp.com:5080/openmeetings</tt>
+                               you need to do the following
+                       </p>
+                       <ol>
+                               <li>stop openmmetings if it is running </li>
+                               <li>
+                                       go to openmeetings install dir (for ex. 
<tt>/opt/red5</tt>)
+                               </li>
+                               <li>
+                                       rename 
<tt>/opt/red5/webapps/openmeetings</tt> to 
<tt>/opt/red5/webapps/yourmeetings</tt>
+                                       (for ex. <tt>mv 
/opt/red5/webapps/openmeetings /opt/red5/webapps/yourmeetings</tt>)
+                               </li>
+                               <li>
+                                       open 
<tt>/opt/red5/webapps/yourmeetings/public/config.xml</tt>
+                                       using your favorite text editor (for 
ex. <tt>vim /opt/red5/webapps/yourmeetings/public/config.xml</tt>)
+                                       <ul>
+                                               <li>
+                                                       find and modify 
<tt>&lt;webAppRootKey&gt;openmeetings&lt;/webAppRootKey&gt;</tt>
+                                                       to be 
<tt>&lt;webAppRootKey&gt;<strong>yourmeetings</strong>&lt;/webAppRootKey&gt;</tt>
+                                               </li>
+                                               <li>
+                                                       find and modify 
<tt>&lt;httpRootKey&gt;/openmeetings/&lt;/httpRootKey&gt;</tt>
+                                                       to be 
<tt>&lt;httpRootKey&gt;<strong>/yourmeetings/</strong>&lt;/httpRootKey&gt;</tt>
+                                               </li>
+                                       </ul>
+                               </li>
+                               <li>
+                                       open 
<tt>/opt/red5/webapps/root/index.html</tt>
+                                       using your favorite text editor (for 
ex. <tt>vim /opt/red5/webapps/root/index.html</tt>)
+                                       <ul>
+                                               <li>
+                                                       find and modify 
<tt>&lt;meta http-equiv="REFRESH" content="0;url=openmeetings/"&gt;</tt>
+                                                       to be <tt>&lt;meta 
http-equiv="REFRESH" content="0;url=<strong>yourmeetings/</strong>"&gt;</tt>
+                                               </li>
+                                       </ul>
+                               </li>
+                       </ol>
+                       <p>That's it</p>
+               </section>
+
+               <section name="Changing hard-coded application name in string 
labels">
+                       <p>
+                               To have
+                               <i>Your Application Name</i>
+                               instead of
+                               <i>Openmeetings</i>
+                               in
+                               <strong>all</strong>
+                               text labels you need to do the following
+                       </p>
+                       <ol>
+                               <li>
+                                       ensure
+                                       <strong>
+                                               <tt>{0}</tt>
+                                       </strong>
+                                       placeholder is used in
+                                       <i>all</i>
+                                       strings you have added and/or modified 
(all strings bundled into
+                                       Openmeetings already have this 
placeholder)
+                               </li>
+                               <li>login to Openmeetings as user with 
administrator privileges </li>
+                               <li>
+                                       go to
+                                       <tt>Administration -&gt; 
Configuration</tt>
+                               </li>
+                               <li>
+                                       find and edit configuration with name
+                                       <strong>
+                                               <tt>application.name</tt>
+                                       </strong>
+                               </li>
+                               <li>
+                                       Set its value to be
+                                       <i>
+                                               <tt>Your Application Name</tt>
+                                       </i>
+                               </li>
+                               <li>
+                                       <tt>Save</tt>
+                               </li>
+                               <li>reload page or relogin </li>
+                       </ol>
+                       <p>
+                       All string will display
+                       <i>
+                               <tt>Your Application Name</tt>
+                       </i>
+                       in place of
+                       <i>
+                               <tt>Openmeetings</tt>
+                       </i>
+                       </p>
+               </section>
+
+               <section name="Running multiple Openmeetings instances on the 
same server">
+                       <p>
+                               If you want to run multiple Openmeetings 
instances on the same server i.e. to have<br/>  
+                               
<tt>http://yourcorp.com:5080/openmeetings1</tt><br/> 
+                               
<tt>http://yourcorp.com:5080/openmeetings2</tt><br/> etc.<br/> you need to do 
the following:
+                       </p>
+                       <ol>
+                               <li>edit 
<tt>webapps/openmeetings1/WEB-INF/red5-web.properties</tt> for 
<strong>every</strong> Openmeetings 
+                               instance and add the following line 
<tt>webapp.contextPath=/openmeetings1</tt>  to it (context of 
+                               <strong>every</strong> instance 
<strong>should</strong> match the folder name in webapps dir)
+                               </li>
+                               <li>in case of java memory problems modify 
<tt>red5.sh</tt> add following line:<br/>
+                                       <source>export 
JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled 
-XX:MaxPermSize=128M"</source>
+                                       or <tt>red5.bat</tt>:<br/>
+                                       <source>set 
JAVA_OPTS=-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled 
-XX:MaxPermSize=128M</source>
+                               </li>
+                       </ol>
+               </section>
+       </body>
+
 </document>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/WebcamResolutions.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/WebcamResolutions.xml 
b/openmeetings-server/src/site/xdoc/WebcamResolutions.xml
index 118716a..f574c8a 100644
--- a/openmeetings-server/src/site/xdoc/WebcamResolutions.xml
+++ b/openmeetings-server/src/site/xdoc/WebcamResolutions.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>How to configure Camera default resolutions </title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-
-               <section name="How to configure Camera default resolutions">
-
-                       <p>When you choose the webcam you have different 
resolutions
-                               available the user can choose from. </p>
-                       <p>You can add/remove resolutions and also change the 
default
-                               selection. In the public/config.xml there is a 
section: </p>
-                       <source>
-<![CDATA[
-<availableCameraResolutions>
-    <resolution type="4:3 (~6 KByte/sec)" width="40" height="30" 
isDefault="false" />
-    <resolution type="4:3 (~12 KByte/sec)" width="80" height="60" 
isDefault="false" />
-    <resolution type="4:3 (~20 KByte/sec)" width="120" height="90" 
isDefault="true" />
-    <resolution type="QQVGA 4:3 (~36 KByte/sec)" width="160" height="120" 
isDefault="false" />
-    <resolution type="4:3 (~40 KByte/sec)" width="240" height="180" 
isDefault="false" />
-    <resolution type="HVGA 4:3 (~56 KByte/sec)" width="320" height="240" 
isDefault="false" />
-    <resolution type="4:3  (~60 KByte/sec)" width="480" height="360" 
isDefault="false" />
-    <resolution type="4:3 (~68 KByte/sec)" width="640" height="480" 
isDefault="false" />
-    <resolution type="XGA 4:3" width="1024" height="768" isDefault="false" />
-    <resolution type="16:9" width="256" height="150" isDefault="false" />
-    <resolution type="WQVGA 9:5" width="432" height="240" isDefault="false" />
-    <resolution type="pseudo 16:9" width="480" height="234" isDefault="false" 
/>
-    <resolution type="16:9" width="512" height="300" isDefault="false" />
-    <resolution type="nHD 16:9" width="640" height="360" isDefault="false" />
-    <resolution type="16:9" width="1024" height="600" isDefault="false" />
-</availableCameraResolutions>
-]]>
-                       </source>
-                     
-                   <p>Tip: You might edit the public/config.xml with an XML 
aware editor that correctly 
-                   handles the XSD defintion to avoid misconfiguration. The 
openmeetings-config.xsd 
-                   is in the same folder like the public/config.xml. </p>
-               </section>
-
-       </body>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>How to configure Camera default resolutions </title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+
+               <section name="How to configure Camera default resolutions">
+
+                       <p>When you choose the webcam you have different 
resolutions
+                               available the user can choose from. </p>
+                       <p>You can add/remove resolutions and also change the 
default
+                               selection. In the public/config.xml there is a 
section: </p>
+                       <source>
+<![CDATA[
+<availableCameraResolutions>
+    <resolution type="4:3 (~6 KByte/sec)" width="40" height="30" 
isDefault="false" />
+    <resolution type="4:3 (~12 KByte/sec)" width="80" height="60" 
isDefault="false" />
+    <resolution type="4:3 (~20 KByte/sec)" width="120" height="90" 
isDefault="true" />
+    <resolution type="QQVGA 4:3 (~36 KByte/sec)" width="160" height="120" 
isDefault="false" />
+    <resolution type="4:3 (~40 KByte/sec)" width="240" height="180" 
isDefault="false" />
+    <resolution type="HVGA 4:3 (~56 KByte/sec)" width="320" height="240" 
isDefault="false" />
+    <resolution type="4:3  (~60 KByte/sec)" width="480" height="360" 
isDefault="false" />
+    <resolution type="4:3 (~68 KByte/sec)" width="640" height="480" 
isDefault="false" />
+    <resolution type="XGA 4:3" width="1024" height="768" isDefault="false" />
+    <resolution type="16:9" width="256" height="150" isDefault="false" />
+    <resolution type="WQVGA 9:5" width="432" height="240" isDefault="false" />
+    <resolution type="pseudo 16:9" width="480" height="234" isDefault="false" 
/>
+    <resolution type="16:9" width="512" height="300" isDefault="false" />
+    <resolution type="nHD 16:9" width="640" height="360" isDefault="false" />
+    <resolution type="16:9" width="1024" height="600" isDefault="false" />
+</availableCameraResolutions>
+]]>
+                       </source>
+                     
+                   <p>Tip: You might edit the public/config.xml with an XML 
aware editor that correctly 
+                   handles the XSD defintion to avoid misconfiguration. The 
openmeetings-config.xsd 
+                   is in the same folder like the public/config.xml. </p>
+               </section>
+
+       </body>
+
 </document>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml 
b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
index a8dc062..4c1e622 100644
--- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
+++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-               xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>Website Guide</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-       <body>
-               <section name="How to update Apache OpenMeetings website">
-                       <subsection name="Required tools">
-                               <div>
-                                       <ul>
-                                               <li>Sun JDK7</li>
-                                               <li>Apache Maven (3.3.9 or 
later)</li>
-                                       </ul>
-                               </div>
-                       </subsection>
-                       <subsection name="Introduction">
-                               <div>
-                                       <p>
-                                               The Apache OpenMeetings HTML 
websites are generated from XML files. 
-                                               You edit the XML files, run the 
MAVEN command <source><![CDATA[mvn install -P allModules,unpacked 
-DskipTests=true]]></source> that generates the HTML files 
-                                               and then you copy generated 
HTML files into appropriate place and commit to Git both: XML and HTML files.
-                                       </p>
-                                       <p>
-                                               The website itself uses JQuery 
to generate the menu, the pop images and the image slider at the landing page.
-                                       </p>
-                               </div>
-                       </subsection>
-                       <subsection name="Editing the website">
-                               <div>
-                                       <p>
-                                               OpenMeetings website (<a 
href="http://openmeetings.apache.org/";>http://openmeetings.apache.org/</a>) is 
a copy from the Git repository.<br />
-                                               The files in the Git to be 
synced are at:
-                                               <br />
-                                               <a 
href="https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git";>https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git</a><br/>
-                                       </p>
-                                       <div>
-                                               To update the website you need 
to clone master:<br />
-                                               <a 
href="https://git-wip-us.apache.org/repos/asf/openmeetings-site.git";>https://git-wip-us.apache.org/repos/asf/openmeetings-site.git</a>
 <br/>
-                                               edit the files in the folder 
<tt>openmeetings-server/src/site</tt><br/>
-                                               then you run the command:
-                                               <source><![CDATA[mvn install -P 
allModules,unpacked -DskipTests=true]]></source>
-                                               control the output locally in 
the folder 
<tt>openmeetings-server/target/server/webapps/openmeetings/docs/</tt><br/>
-                                               copy site contents into target 
folder: <source><![CDATA[cp -r 
openmeetings-server/target/server/webapps/openmeetings/docs/* 
../site/]]></source>
-                                               And then commit your changes 
into the Git <i>both</i> the edited xml(s) and generated html files.
-                                       </div>
-                                       <p>
-                                               The public website is 
automatically synced with the Git repository.<br/>
-                                               Changes to the Git should be 
immediately synced to the production website.<br/>
-                                               If not you might login to 
people.apache.org,<br/>
-                                               cd to 
<tt>/www/openmeetings.apache.org/content/</tt><br/>
-                                               and run the linux command 
"touch" on the files that need to be synced
-                                       </p>
-                               </div>
-                       </subsection>
-                       <subsection name="Adding a new menu entry">
-                               <div>
-                                       To add a new menu entry in the left 
side panel you need to modify the file: 
-                                       <br/>
-                                       
<tt>openmeetings-server/src/site/site.xml</tt>
-                               </div>
-                       </subsection>
-               </section>
-       </body>
-</document>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+               xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>Website Guide</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+       <body>
+               <section name="How to update Apache OpenMeetings website">
+                       <subsection name="Required tools">
+                               <div>
+                                       <ul>
+                                               <li>Sun JDK7</li>
+                                               <li>Apache Maven (3.3.9 or 
later)</li>
+                                       </ul>
+                               </div>
+                       </subsection>
+                       <subsection name="Introduction">
+                               <div>
+                                       <p>
+                                               The Apache OpenMeetings HTML 
websites are generated from XML files. 
+                                               You edit the XML files, run the 
MAVEN command <source><![CDATA[mvn install -P allModules,unpacked 
-DskipTests=true]]></source> that generates the HTML files 
+                                               and then you copy generated 
HTML files into appropriate place and commit to Git both: XML and HTML files.
+                                       </p>
+                                       <p>
+                                               The website itself uses JQuery 
to generate the menu, the pop images and the image slider at the landing page.
+                                       </p>
+                               </div>
+                       </subsection>
+                       <subsection name="Editing the website">
+                               <div>
+                                       <p>
+                                               OpenMeetings website (<a 
href="http://openmeetings.apache.org/";>http://openmeetings.apache.org/</a>) is 
a copy from the Git repository.<br />
+                                               The files in the Git to be 
synced are at:
+                                               <br />
+                                               <a 
href="https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git";>https://git-wip-us.apache.org/repos/asf?p=openmeetings-site.git</a><br/>
+                                       </p>
+                                       <div>
+                                               To update the website you need 
to clone master:<br />
+                                               <a 
href="https://git-wip-us.apache.org/repos/asf/openmeetings-site.git";>https://git-wip-us.apache.org/repos/asf/openmeetings-site.git</a>
 <br/>
+                                               edit the files in the folder 
<tt>openmeetings-server/src/site</tt><br/>
+                                               then you run the command:
+                                               <source><![CDATA[mvn install -P 
allModules,unpacked -DskipTests=true]]></source>
+                                               control the output locally in 
the folder 
<tt>openmeetings-server/target/server/webapps/openmeetings/docs/</tt><br/>
+                                               copy site contents into target 
folder: <source><![CDATA[cp -r 
openmeetings-server/target/server/webapps/openmeetings/docs/* 
../site/]]></source>
+                                               And then commit your changes 
into the Git <i>both</i> the edited xml(s) and generated html files.
+                                       </div>
+                                       <p>
+                                               The public website is 
automatically synced with the Git repository.<br/>
+                                               Changes to the Git should be 
immediately synced to the production website.<br/>
+                                               If not you might login to 
people.apache.org,<br/>
+                                               cd to 
<tt>/www/openmeetings.apache.org/content/</tt><br/>
+                                               and run the linux command 
"touch" on the files that need to be synced
+                                       </p>
+                               </div>
+                       </subsection>
+                       <subsection name="Adding a new menu entry">
+                               <div>
+                                       To add a new menu entry in the left 
side panel you need to modify the file: 
+                                       <br/>
+                                       
<tt>openmeetings-server/src/site/site.xml</tt>
+                               </div>
+                       </subsection>
+               </section>
+       </body>
+</document>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/commercial-support.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/commercial-support.xml 
b/openmeetings-server/src/site/xdoc/commercial-support.xml
index c5618d8..fe8a191 100644
--- a/openmeetings-server/src/site/xdoc/commercial-support.xml
+++ b/openmeetings-server/src/site/xdoc/commercial-support.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-
-       <properties>
-               <title>Commercial Support</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-
-               <section name="Commercial Support for OpenMeetings">
-
-                       <p>There are few companies offering complex services 
for OpenMeetings, including code support,
-                       development, integration and bug fixing
-                       </p>
-                       <ul>
-                               <li>
-                                       <a 
href="http://www.unipro.ru/eng/index.html"; target="_blank">unipro.ru</a>
-                                       run by Maxim Solodovnik, Timur 
Tleukenov, Irina Arkhipets, Denis Kandrov, Vasily Degtyarev
-                               </li>
-                               <li>
-                    <a href="http://www.samoo.es"; target="_blank" 
rel="nofollow">samoo.es</a>
-                    provides support for the Sakai Plugin
-                </li>
-                       </ul>
-                       <p>
-                               Please write to <a 
href="mailto:[email protected]";>[email protected]</a> to get UniPro support
-                       </p>
-                       <p>
-                           There are more companies offering installation, 
customization, hosting, conferencing and support services. You can add 
-                               yourself to the <a 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Commercial+Support";>wiki
 page</a>.
-                       </p>
-                       
-                       <p>
-                               Want to get listed here? Become a <a 
href="http://www.apache.org/dev/committers.html";>committer</a>.
-                       </p>
-               </section>
-
-       </body>
-
-</document>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+
+       <properties>
+               <title>Commercial Support</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+
+               <section name="Commercial Support for OpenMeetings">
+
+                       <p>There are few companies offering complex services 
for OpenMeetings, including code support,
+                       development, integration and bug fixing
+                       </p>
+                       <ul>
+                               <li>
+                                       <a 
href="http://www.unipro.ru/eng/index.html"; target="_blank">unipro.ru</a>
+                                       run by Maxim Solodovnik, Timur 
Tleukenov, Irina Arkhipets, Denis Kandrov, Vasily Degtyarev
+                               </li>
+                               <li>
+                    <a href="http://www.samoo.es"; target="_blank" 
rel="nofollow">samoo.es</a>
+                    provides support for the Sakai Plugin
+                </li>
+                       </ul>
+                       <p>
+                               Please write to <a 
href="mailto:[email protected]";>[email protected]</a> to get UniPro support
+                       </p>
+                       <p>
+                           There are more companies offering installation, 
customization, hosting, conferencing and support services. You can add 
+                               yourself to the <a 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Commercial+Support";>wiki
 page</a>.
+                       </p>
+                       
+                       <p>
+                               Want to get listed here? Become a <a 
href="http://www.apache.org/dev/committers.html";>committer</a>.
+                       </p>
+               </section>
+
+       </body>
+
+</document>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/installation.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/installation.xml 
b/openmeetings-server/src/site/xdoc/installation.xml
index f0b191f..173df11 100644
--- a/openmeetings-server/src/site/xdoc/installation.xml
+++ b/openmeetings-server/src/site/xdoc/installation.xml
@@ -1,265 +1,265 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
-       <properties>
-               <title>Installation</title>
-               <author email="[email protected]">Apache 
OpenMeetings Team</author>
-       </properties>
-
-       <body>
-
-               <section name="OpenMeetings Installation">
-
-                       <p>
-                               To update from past versions or migrate see <a 
href="Upgrade.html">Upgrade</a>.<br/>
-                               If you are looking for commercial help have a 
look at
-                               <a href="commercial-support.html" 
target="_blank" rel="nofollow">commercial support</a>.
-                       </p>
-                       <div>
-                               <a href="downloads.html" rel="nofollow">
-                                       <img 
src="images/installation_instructions.png" alt="Installation in 3 simple steps" 
/>
-                               </a>
-                               <p>
-                                       <i>Note: Openmeetings requires JRE 7/8, 
JRE 6 is NOT compatible!</i><br />
-                                       <i>
-                                               Since Version 2.0 you can also 
install OpenMeetings from command line. Just cd to the unpacked 
-                                               archive and type ./admin.sh or 
admin.bat, please see
-                                               <a href="CommandLineAdmin.html" 
target="_blank" rel="nofollow">Command Line Admin</a>
-                                               for more options
-                                       </i>
-                               </p>
-                       </div>
-                       <ol>
-                               <li>
-                                       <b>Recommendation for production 
environment</b>
-                                       <div style="margin-top: 10px; 
margin-bottom:10px">
-                                               By default OpenMeetings uses 
the integrated Apache Derby database.
-                                               For production environment you 
should consider using
-                                               <a 
href="MySQLConfig.html">MySQL</a>
-                                               ,
-                                               <a 
href="PostgresConfig.html">Postgres</a>
-                                               , or for example
-                                               <a href="IBMDB2Config.html">IBM 
DB2</a>
-                                               , or
-                                               <a 
href="OracleConfig.html">Oracle</a>
-                                               , or
-                                               <a 
href="MSSQLConfig.html">MSSQL</a>
-                                       </div>
-                               </li>
-                               <li>
-                                       <b>Enabling Image Upload and import to 
whiteboard</b>
-                                       <div style="margin-top: 10px; 
margin-bottom:10px">
-                                               Install
-                                               <b>ImageMagick</b>
-                                               on the server, you can get more 
information on
-                                               <a 
href="http://www.imagemagick.org"; rel="nofollow" 
target="_blank">http://www.imagemagick.org
-                                               </a>
-                                               regarding installation. The 
instructions
-                                               for installation can be
-                                               found there
-                                               <a 
href="http://www.imagemagick.org/script/binary-releases.php";
-                                                       target="_blank" 
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php
-                                               </a>
-                                               ,
-                                               however on
-                                               most Linux systems you can get 
it via your favorite
-                                               package
-                                               managers (apt-get it)
-                                       </div>
-                               </li>
-                               <li>
-                                       <b>Enabling import of PDFs into 
whiteboard</b>
-                                       <div style="margin-top: 10px; 
margin-bottom:10px">
-                                               <ul>
-                                                       <li>
-                                                               Install
-                                                               
<b>GhostScript</b>
-                                                               on the server, 
you can get more
-                                                               information on
-                                                               <a 
href="http://www.ghostscript.com/download/gsdnld.html"; target="_blank"
-                                                                       
rel="nofollow">
-                                                                       
http://www.ghostscript.com/download/gsdnld.html
-                                                               </a>
-                                                               regarding
-                                                               installation. 
The instructions for installation can be
-                                                               found
-                                                               there, however 
on most Linux systems you can get it via
-                                                               your
-                                                               favorite 
package managers (apt-get it).
-                                                       </li>
-                                               </ul>
-                                       </div>
-                               </li>
-                               <li>
-                                       <b>Enabling import of .doc, .docx, 
.ppt, .pptx, ... all Office
-                                               Documents into whitebaord
-                                       </b>
-                                       <div style="margin-top: 10px; 
margin-bottom:10px">
-                                               <ul>
-                                                       <li>OpenOffice or Libre 
Office Installed</li>
-                                               </ul>
-                                               Since Version 2.x of 
OpenMeetings it is no more required to start
-                                               OpenOffice (or Libreoffice) 
service, see
-                                               <a 
href="OpenOfficeConverter.html">OpenOfficeConverter</a>
-                                               for details
-                                       </div>
-                               </li>
-                               <li>
-                                       <b>Enabling Recording and import of 
.avi, .flv, .mov and .mp4 into
-                                               whiteboard
-                                       </b>
-                                       <div style="margin-top: 10px; 
margin-bottom:10px">
-                                               <ul>
-                                                       <li>
-                                                               Install
-                                                               <b>FFMpeg (with 
-enabled libmp3lame and libx264 options)</b>
-                                                               . You should 
get FFMPEG in an up to date copy! OpenMeetings is
-                                                               tested with 
FFMPEG Version 10.3 and latest build from GIT
-                                                               For Windows you 
can download a Build for example from
-                                                               <a 
href="http://ffmpeg.zeranoe.com/builds/"; target="_blank"
-                                                                       
rel="nofollow">http://ffmpeg.zeranoe.com/builds/ </a>
-                                                               Linux or OSx 
Users should be able to use one of the various
-                                                               Installation 
Instructions on the Web. You need to enable
-                                                               libmp3lame and 
libx264!
-                                                       </li>
-                                                       <li>
-                                                               Install
-                                                               <b>SoX</b>
-                                                               <a 
href="http://sox.sourceforge.net/"; target="_blank" 
rel="nofollow">http://sox.sourceforge.net/
-                                                               </a>
-                                                               . You should 
install SoX in a up
-                                                               to date copy! 
SoX 12.xx will NOT
-                                                               work!
-                                                       </li>
-                                               </ul>
-                                       </div>
-                               </li>
-                       </ol>
-
-               </section>
-
-               <section name="Ports, NAT Settings, Customize">
-
-                       <p>
-                               See
-                               <a href="PortSettings.html">PortSettings</a>
-                       </p>
-               </section>
-
-               <section name="Hardware Requirements">
-                       <ul>
-                               <li>
-                                       Minimalistic requirement (without 
Document Converters, Recorder and
-                                       Upload feature) 1GHz CPU 1 GB RAM (
-                                       <i>server-side</i>
-                                       )
-                               </li>
-                               <li>
-                                       Recommended requirement 2x/4x 2GHz ++ 
CPU (32 or 64Bit) 4GB RAM. If
-                                       you have a 64Bit Operating System check 
if there is a OpenOffice
-                                       64Bit Version
-                                       <a 
href="http://download.openoffice.org/other.html#de"; rel="nofollow">available
-                                               for your OS
-                                       </a>
-                                       (
-                                       <i>server-side</i>
-                                       )
-                               </li>
-                               <li>
-                                       Headset/Microphone recommendation: 
Logitech ClearChat PC Wireless,
-                                       for example from
-                                       <a
-                                               
href="http://www.amazon.de/Logitech-ClearChat-kabelloser-Kopfh%C3%B6rer-Transmitter/dp/B00166WSN4";
-                                               rel="nofollow">Amazon</a>
-                                       or
-                                       <a
-                                               
href="http://shop.ebay.com/i.html?_nkw=Logitech+ClearChat.+Wireless&amp;_sacat=0&amp;_trksid=p3286.m270.l1313&amp;LH_BIN=1&amp;LH_IncludeSIF=1&amp;_odkw=Logitech+ClearChat+PC&amp;_osacat=0";
-                                               rel="nofollow">EBay Auctions</a>
-                                       (
-                                       <i>cient-side</i>
-                                       ).
-                                       <a 
href="RecommendedHardwareList.html">See all recommendations</a>
-                                       for cameras, headsets and speakerphones.
-                               </li>
-                       </ul>
-
-               </section>
-
-               <section name="Debian, Links, Changelog, VoIP">
-                       <ul>
-                               <li>for VoIP and SIP Integration see also <a 
href="voip-sip-integration.html">VoIPAndSIP</a></li>
-                               <li><a 
href="http://meetingslive.sourceforge.net/"; 
rel="nofollow">http://meetingslive.sourceforge.net/</a></li>
-                               <li>
-                                       <a 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools";>Installation
 of OM 2.0 for Windows XP, 7, 2003, 2008</a>
-                               </li>
-                               <li>
-                                       <a 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools";>
-                                               OpenMeetings Installation 
tutorials by Alvaro Bustos for: Ubuntu, Debian, Mint, MacOS X, CentOS, Fedora, 
-                                               PCLinuxOS, openSUSE and Arch 
Linux.</a>
-                               </li>
-                               <li>
-                                       <a 
href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27837303";
-                                               rel="nofollow">Tutoriales en 
español relacionados con OpenMeetings</a>
-                               </li>
-                               <li>
-                                       <a 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools";
-                                               rel="nofollow">Automatic script 
installation for Ubuntu/Debian (beta)</a>
-                               </li>
-                               <li>
-                                       French version of Installation 
Instructions:
-                                       <a 
href="http://flash.54n.free.fr/?/Root/Debian/OpenMeetings-Installation";
-                                               
rel="nofollow">http://flash.54n.free.fr/?/Root/Debian/OpenMeetings-Installation
-                                       </a>
-                               </li>
-                       </ul>
-               </section>
-
-               <section name="Tips and Tricks">
-                       <ul>
-                               <li>
-                                       Use the Debug-Application: open 
<tt>$RED5_HOME/webapps/openmeetings/WEB-INF/web.xml</tt> change
-                                       <source><![CDATA[
-<init-param>
-       <param-name>configuration</param-name>
-       <param-value>DEPLOYMENT</param-value>
-</init-param>
-                                       ]]></source> to be
-                                       <source><![CDATA[
-<init-param>
-       <param-name>configuration</param-name>
-       <param-value>DEVELOPMENT</param-value>
-</init-param>
-                                       ]]></source> 
-                                       then access your OM installation
-                               </li>
-                               <li>If you have Problems with conversion-jobs 
check your openmeetings log
-                                       output (available at 
<tt>$RED5_HOME/log/openmeetings.log</tt>). There will be error Messages which 
help you. You must
-                                       install OpenOffice, ImageMagick and 
GhostScript to run
-                                       all conversion-Jobs correctly.
-                               </li>
-                               <li>
-                                       you can query a Mysql Database to get 
the schema_collection by
-                                       using this query:
-                                       <source><![CDATA[SELECT Table_name, 
TABLE_COLLATION FROM information_schema.tables WHERE table_schema = 
'openmeetings' ORDER BY table_name DESC ]]></source>
-                               </li>
-                       </ul>
-               </section>
-
-       </body>
-
-</document>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+       <properties>
+               <title>Installation</title>
+               <author email="[email protected]">Apache 
OpenMeetings Team</author>
+       </properties>
+
+       <body>
+
+               <section name="OpenMeetings Installation">
+
+                       <p>
+                               To update from past versions or migrate see <a 
href="Upgrade.html">Upgrade</a>.<br/>
+                               If you are looking for commercial help have a 
look at
+                               <a href="commercial-support.html" 
target="_blank" rel="nofollow">commercial support</a>.
+                       </p>
+                       <div>
+                               <a href="downloads.html" rel="nofollow">
+                                       <img 
src="images/installation_instructions.png" alt="Installation in 3 simple steps" 
/>
+                               </a>
+                               <p>
+                                       <i>Note: Openmeetings requires JRE 7/8, 
JRE 6 is NOT compatible!</i><br />
+                                       <i>
+                                               Since Version 2.0 you can also 
install OpenMeetings from command line. Just cd to the unpacked 
+                                               archive and type ./admin.sh or 
admin.bat, please see
+                                               <a href="CommandLineAdmin.html" 
target="_blank" rel="nofollow">Command Line Admin</a>
+                                               for more options
+                                       </i>
+                               </p>
+                       </div>
+                       <ol>
+                               <li>
+                                       <b>Recommendation for production 
environment</b>
+                                       <div style="margin-top: 10px; 
margin-bottom:10px">
+                                               By default OpenMeetings uses 
the integrated Apache Derby database.
+                                               For production environment you 
should consider using
+                                               <a 
href="MySQLConfig.html">MySQL</a>
+                                               ,
+                                               <a 
href="PostgresConfig.html">Postgres</a>
+                                               , or for example
+                                               <a href="IBMDB2Config.html">IBM 
DB2</a>
+                                               , or
+                                               <a 
href="OracleConfig.html">Oracle</a>
+                                               , or
+                                               <a 
href="MSSQLConfig.html">MSSQL</a>
+                                       </div>
+                               </li>
+                               <li>
+                                       <b>Enabling Image Upload and import to 
whiteboard</b>
+                                       <div style="margin-top: 10px; 
margin-bottom:10px">
+                                               Install
+                                               <b>ImageMagick</b>
+                                               on the server, you can get more 
information on
+                                               <a 
href="http://www.imagemagick.org"; rel="nofollow" 
target="_blank">http://www.imagemagick.org
+                                               </a>
+                                               regarding installation. The 
instructions
+                                               for installation can be
+                                               found there
+                                               <a 
href="http://www.imagemagick.org/script/binary-releases.php";
+                                                       target="_blank" 
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php
+                                               </a>
+                                               ,
+                                               however on
+                                               most Linux systems you can get 
it via your favorite
+                                               package
+                                               managers (apt-get it)
+                                       </div>
+                               </li>
+                               <li>
+                                       <b>Enabling import of PDFs into 
whiteboard</b>
+                                       <div style="margin-top: 10px; 
margin-bottom:10px">
+                                               <ul>
+                                                       <li>
+                                                               Install
+                                                               
<b>GhostScript</b>
+                                                               on the server, 
you can get more
+                                                               information on
+                                                               <a 
href="http://www.ghostscript.com/download/gsdnld.html"; target="_blank"
+                                                                       
rel="nofollow">
+                                                                       
http://www.ghostscript.com/download/gsdnld.html
+                                                               </a>
+                                                               regarding
+                                                               installation. 
The instructions for installation can be
+                                                               found
+                                                               there, however 
on most Linux systems you can get it via
+                                                               your
+                                                               favorite 
package managers (apt-get it).
+                                                       </li>
+                                               </ul>
+                                       </div>
+                               </li>
+                               <li>
+                                       <b>Enabling import of .doc, .docx, 
.ppt, .pptx, ... all Office
+                                               Documents into whitebaord
+                                       </b>
+                                       <div style="margin-top: 10px; 
margin-bottom:10px">
+                                               <ul>
+                                                       <li>OpenOffice or Libre 
Office Installed</li>
+                                               </ul>
+                                               Since Version 2.x of 
OpenMeetings it is no more required to start
+                                               OpenOffice (or Libreoffice) 
service, see
+                                               <a 
href="OpenOfficeConverter.html">OpenOfficeConverter</a>
+                                               for details
+                                       </div>
+                               </li>
+                               <li>
+                                       <b>Enabling Recording and import of 
.avi, .flv, .mov and .mp4 into
+                                               whiteboard
+                                       </b>
+                                       <div style="margin-top: 10px; 
margin-bottom:10px">
+                                               <ul>
+                                                       <li>
+                                                               Install
+                                                               <b>FFMpeg (with 
-enabled libmp3lame and libx264 options)</b>
+                                                               . You should 
get FFMPEG in an up to date copy! OpenMeetings is
+                                                               tested with 
FFMPEG Version 10.3 and latest build from GIT
+                                                               For Windows you 
can download a Build for example from
+                                                               <a 
href="http://ffmpeg.zeranoe.com/builds/"; target="_blank"
+                                                                       
rel="nofollow">http://ffmpeg.zeranoe.com/builds/ </a>
+                                                               Linux or OSx 
Users should be able to use one of the various
+                                                               Installation 
Instructions on the Web. You need to enable
+                                                               libmp3lame and 
libx264!
+                                                       </li>
+                                                       <li>
+                                                               Install
+                                                               <b>SoX</b>
+                                                               <a 
href="http://sox.sourceforge.net/"; target="_blank" 
rel="nofollow">http://sox.sourceforge.net/
+                                                               </a>
+                                                               . You should 
install SoX in a up
+                                                               to date copy! 
SoX 12.xx will NOT
+                                                               work!
+                                                       </li>
+                                               </ul>
+                                       </div>
+                               </li>
+                       </ol>
+
+               </section>
+
+               <section name="Ports, NAT Settings, Customize">
+
+                       <p>
+                               See
+                               <a href="PortSettings.html">PortSettings</a>
+                       </p>
+               </section>
+
+               <section name="Hardware Requirements">
+                       <ul>
+                               <li>
+                                       Minimalistic requirement (without 
Document Converters, Recorder and
+                                       Upload feature) 1GHz CPU 1 GB RAM (
+                                       <i>server-side</i>
+                                       )
+                               </li>
+                               <li>
+                                       Recommended requirement 2x/4x 2GHz ++ 
CPU (32 or 64Bit) 4GB RAM. If
+                                       you have a 64Bit Operating System check 
if there is a OpenOffice
+                                       64Bit Version
+                                       <a 
href="http://download.openoffice.org/other.html#de"; rel="nofollow">available
+                                               for your OS
+                                       </a>
+                                       (
+                                       <i>server-side</i>
+                                       )
+                               </li>
+                               <li>
+                                       Headset/Microphone recommendation: 
Logitech ClearChat PC Wireless,
+                                       for example from
+                                       <a
+                                               
href="http://www.amazon.de/Logitech-ClearChat-kabelloser-Kopfh%C3%B6rer-Transmitter/dp/B00166WSN4";
+                                               rel="nofollow">Amazon</a>
+                                       or
+                                       <a
+                                               
href="http://shop.ebay.com/i.html?_nkw=Logitech+ClearChat.+Wireless&amp;_sacat=0&amp;_trksid=p3286.m270.l1313&amp;LH_BIN=1&amp;LH_IncludeSIF=1&amp;_odkw=Logitech+ClearChat+PC&amp;_osacat=0";
+                                               rel="nofollow">EBay Auctions</a>
+                                       (
+                                       <i>cient-side</i>
+                                       ).
+                                       <a 
href="RecommendedHardwareList.html">See all recommendations</a>
+                                       for cameras, headsets and speakerphones.
+                               </li>
+                       </ul>
+
+               </section>
+
+               <section name="Debian, Links, Changelog, VoIP">
+                       <ul>
+                               <li>for VoIP and SIP Integration see also <a 
href="voip-sip-integration.html">VoIPAndSIP</a></li>
+                               <li><a 
href="http://meetingslive.sourceforge.net/"; 
rel="nofollow">http://meetingslive.sourceforge.net/</a></li>
+                               <li>
+                                       <a 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools";>Installation
 of OM 2.0 for Windows XP, 7, 2003, 2008</a>
+                               </li>
+                               <li>
+                                       <a 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools";>
+                                               OpenMeetings Installation 
tutorials by Alvaro Bustos for: Ubuntu, Debian, Mint, MacOS X, CentOS, Fedora, 
+                                               PCLinuxOS, openSUSE and Arch 
Linux.</a>
+                               </li>
+                               <li>
+                                       <a 
href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27837303";
+                                               rel="nofollow">Tutoriales en 
español relacionados con OpenMeetings</a>
+                               </li>
+                               <li>
+                                       <a 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools";
+                                               rel="nofollow">Automatic script 
installation for Ubuntu/Debian (beta)</a>
+                               </li>
+                               <li>
+                                       French version of Installation 
Instructions:
+                                       <a 
href="http://flash.54n.free.fr/?/Root/Debian/OpenMeetings-Installation";
+                                               
rel="nofollow">http://flash.54n.free.fr/?/Root/Debian/OpenMeetings-Installation
+                                       </a>
+                               </li>
+                       </ul>
+               </section>
+
+               <section name="Tips and Tricks">
+                       <ul>
+                               <li>
+                                       Use the Debug-Application: open 
<tt>$RED5_HOME/webapps/openmeetings/WEB-INF/web.xml</tt> change
+                                       <source><![CDATA[
+<init-param>
+       <param-name>configuration</param-name>
+       <param-value>DEPLOYMENT</param-value>
+</init-param>
+                                       ]]></source> to be
+                                       <source><![CDATA[
+<init-param>
+       <param-name>configuration</param-name>
+       <param-value>DEVELOPMENT</param-value>
+</init-param>
+                                       ]]></source> 
+                                       then access your OM installation
+                               </li>
+                               <li>If you have Problems with conversion-jobs 
check your openmeetings log
+                                       output (available at 
<tt>$RED5_HOME/log/openmeetings.log</tt>). There will be error Messages which 
help you. You must
+                                       install OpenOffice, ImageMagick and 
GhostScript to run
+                                       all conversion-Jobs correctly.
+                               </li>
+                               <li>
+                                       you can query a Mysql Database to get 
the schema_collection by
+                                       using this query:
+                                       <source><![CDATA[SELECT Table_name, 
TABLE_COLLATION FROM information_schema.tables WHERE table_schema = 
'openmeetings' ORDER BY table_name DESC ]]></source>
+                               </li>
+                       </ul>
+               </section>
+
+       </body>
+
+</document>
+

Reply via email to