From 8144af3a1961c9f4efd95ae2914e89c9a259ece0 Mon Sep 17 00:00:00 2001
From: William Enright <william.enright@savoirfairelinux.com>
Date: Wed, 21 Oct 2020 11:42:44 -0400
Subject: [PATCH] Adjusted aspect ratio for documentation images, attempt to
fix truncated pdf command lines
Change-Id: Id101b4518cff6dddaead9236c75d236acd837663
---
userguide/docs/clients.md | 12 +++++-------
userguide/docs/index.md | 17 +++++++----------
userguide/mkdocs.yml | 2 +-
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/userguide/docs/clients.md b/userguide/docs/clients.md
index 23bab1de..5a498420 100644
--- a/userguide/docs/clients.md
+++ b/userguide/docs/clients.md
@@ -15,13 +15,13 @@ For the purposes of this tutorial, we assume that
Open Jami, go to the login page. Click on "Advanced":
<p align="center">
- <img src="./img/client/windows/windows-step1.png" alt="Step 1" style="height:400px;width:500px"/>
+ <img src="./img/client/windows/windows-step1.png" alt="Step 1" style="height:1024;width:768"/>
</p>
Select the option **"Connect to a JAMS server"** which will lead you to the following screen:
<p align="center">
- <img src="./img/client/windows/windows-step2.png" alt="Step 2" style="height:400px;width:500px"/>
+ <img src="./img/client/windows/windows-step2.png" alt="Step 2" style="height:1024;width:768"/>
</p>
The **Jami Account Management Server URL** in this case would be the DNS address of your server and the username and password which correspond to your account. If you have configured the server with an LDAP/AD backend, it would be your LDAP/AD username and password.
@@ -31,16 +31,16 @@ The **Jami Account Management Server URL** in this case would be the DNS address
Open Jami, go to the login page. Click on "Advanced":
<p align="center">
- <img src="./img/client/macos/macos-step1.png" alt="Step 1" style="height:400px;width:500px"/>
+ <img src="./img/client/macos/macos-step1.png" alt="Step 1" style="height:768;width:1024"/>
</p>
Select the option **"Connect to account manager"** which will lead you to the following screen:
<p align="center">
- <img src="./img/client/macos/macos-step2.png" alt="Step 2" style="height:400px;width:500px"/>
+ <img src="./img/client/macos/macos-step2.png" alt="Step 2" style="height:768;width:1024"/>
</p>
-The **Jami Account Management Server URL**```** in this case would be the DNS address of your server and the username and password which correspond to your account. If you have configured the server with an LDAP/AD backend, it would be your LDAP/AD username and password.
+The **Jami Account Management Server URL** in this case would be the DNS address of your server and the username and password which correspond to your account. If you have configured the server with an LDAP/AD backend, it would be your LDAP/AD username and password.
## Connect from an Android device
@@ -59,9 +59,7 @@ Select the option **"Connect to management server"** which will lead you to the
The server in this case would be the DNS address of your server and the username and password which correspond to your account. If you have configured the server with an LDAP/AD backend, it would be your LDAP/AD username and password.
## Connect from an iOS device
-
Open Jami, go to the login page.
-
<p align="center">
<img src="./img/client/ios/ios-step1.png" alt="Step 1" style="height:400px;width:200px"/>
</p>
diff --git a/userguide/docs/index.md b/userguide/docs/index.md
index dc5bc5b8..4bde8d5e 100644
--- a/userguide/docs/index.md
+++ b/userguide/docs/index.md
@@ -4,7 +4,7 @@ JAMS is a server application used to enroll Jami clients into an Enterprise cont
## Obtaining JAMS
-The latest Beta build of JAMS can be downloaded at: **https://git.jami.net/savoirfairelinux/jami-jams**
+The latest Beta build of JAMS can be downloaded at: <https://git.jami.net/savoirfairelinux/jami-jams>
## System Requirements
@@ -37,13 +37,11 @@ The diagram below shows the entire process of how a device enrolls with JAMS:
2. Unpack the .tar file to a directory of your choice.
-3. It is mandatory to run JAMS using a secure SSL connection. To request your SSL certificate files using OpenSSL and generate a pair of PEM and KEY, enter the following command:
-<pre>
-<b>openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout server.key -out server.pem</b></pre>
+3. It is mandatory to run JAMS using a secure SSL connection. To request your SSL certificate files using OpenSSL and generate a pair of PEM and KEY, enter the following command: <pre>
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout server.key -out server.pem</pre>
-4. Launch your JAMS instance. Navigate to the directory where you have extracted the JAMS package and execute the following command:
-<pre>
-<b>java -jar jams-launcher.jar PORT SSL_CERTIFICATE SSL_CERTIFICATE_KEY</b></pre>
+4. Launch your JAMS instance. Navigate to the directory where you have extracted the JAMS package and execute the following command:<pre>
+java -jar jams-launcher.jar PORT SSL_CERTIFICATE SSL_CERTIFICATE_KEY</pre>
| Argument | Details |
| ------------- |------------- |
@@ -54,8 +52,7 @@ The diagram below shows the entire process of how a device enrolls with JAMS:
<br/>
An example of the command would be:
-<pre>
-<b>java -jar jams-launcher 8080 server.pem server.key</b></pre>
+<pre>java -jar jams-launcher 8080 server.pem server.key</pre>
**Current limitations:** JAMS does not support reading encrypted private keys which require a password unlock.
@@ -67,7 +64,7 @@ Please also note that any port above 1024 will safely run JAMS.
This account will have administrative control and the rights to manage your users and group of Jami users.
<p align="center">
- <img src="img/step1.png" alt="Create an admin account" style="height:347px;width:381px" />
+ <img src="img/step1.png" alt="Create an admin account" style="height:768;width:1024" />
</p>
diff --git a/userguide/mkdocs.yml b/userguide/mkdocs.yml
index ff08086e..19d92c13 100644
--- a/userguide/mkdocs.yml
+++ b/userguide/mkdocs.yml
@@ -1,4 +1,4 @@
site_name: Jams User Guide
plugins:
- search
- - mkpdfs
+ - mkpdfs
\ No newline at end of file
--
GitLab