preparing for release 2.0.0

Docu

.github/workflows/buildReporting.yml

@@ -16,92 +16,60 @@ jobs:
   maven-build-reporting:
     runs-on: ubuntu-latest
     steps:
-    -
-      name: Checkout repository
-      uses: actions/checkout@v2
-    -
-      name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-    -
-      name: Cache Maven packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-    -
-      name: Build with Maven
-      run: mvn clean install -e -P let_reporting
-    -
-      name: Reporting
-      uses: codecov/codecov-action@v1
-      with:
-        flags: unittests 
-        name: SEB Server Build 
-        fail_ci_if_error: false 
-        verbose: false
-
-  maven-build-docker:
-    needs: maven-build-reporting
-    # Run only on tagging
-    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    steps:
-    -
-      name: Get short SHA
-      uses: benjlevesque/short-sha@v1.2
+    - name: Get short SHA
+      uses: benjlevesque/short-sha@v3.0
       id: short-sha
-    -
-      name: Store short SHA as environment variable
+    - name: Store short SHA as environment variable
       run: echo $SHA
-      env: 
+      env:
         SHA: ${{ steps.short-sha.outputs.sha }}
-    -
-      name: Set env
+    - name: Set env
       run: echo "TAG_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-    -
-      name: Test tag name
+    - name: Test tag name
       run: |
         echo $TAG_NAME
         echo ${{ env.TAG_NAME }}
     -
       name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     -
-      name: Set up JDK 11
-      uses: actions/setup-java@v2
+      name: Build Test Reporting
+      uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     -
       name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
     -
       name: Build with Maven
-      run: mvn clean install -Dmaven.test.skip=true -Dsebserver-version="${{ env.TAG_NAME }}-${{ env.SHA }}" 
-      env: 
-         sebserver-version: ${{ env.TAG_NAME }}-${{ env.SHA }}
-    -
-      name: Simplify package name
+      run: mvn clean install -e -P let_reporting -Dsebserver-version="${{ env.TAG_NAME }}-${{ env.SHA }}"
+      env:
+        sebserver-version: ${{ env.TAG_NAME }}-${{ env.SHA }}
+
+    - name: Simplify package name
       run: mv target/seb-server-${{ env.TAG_NAME }}-${{ env.SHA }}.jar target/seb-server.jar
-    -
-      uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: Package
         path: target/seb-server.jar
 
   docker-build:
-    needs: maven-build-docker
+    needs: maven-build-reporting
     # Run only on tagging
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+      
     steps:
     -
       name: Set env
@@ -113,31 +81,71 @@ jobs:
         echo ${{ env.TAG_NAME }}
     -
       name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v3
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v3.2.0
     -
       name: Login to DockerHub
-      uses: docker/login-action@v1 
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     -
       name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
+      
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+    -
+      name: Install cosign
+      if: github.event_name != 'pull_request'
+      uses: sigstore/cosign-installer@main
     -
       name: Download a single artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
           name: Package
+    -
+      name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+         images: anhefti/seb-server
+         tags: |
+           type=raw,${{ env.TAG_NAME }}
     -
       name: Build and push
       id: docker_build
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
         file: ./docker/Dockerfile
         push: true
         tags: |
-          anhefti/seb-server:${{ env.TAG_NAME }}
+          anhefti/seb-server:${{ env.TAG_NAME }}
+      # Sign the resulting Docker image digest except on PRs.
+      # This will only write to the public Rekor transparency log when the Docker
+      # repository is public to avoid leaking data.  If you would like to publish
+      # transparency data even for private images, pass --force to cosign below.
+      # https://github.com/sigstore/cosign
+    - name: Sign the published Docker image
+      if: ${{ github.event_name != 'pull_request' }}
+      # This step uses the identity token to provision an ephemeral certificate
+      # against the sigstore community Fulcio instance.
+      run: yes | cosign sign ${TAGS}
+      env:
+        COSIGN_EXPERIMENTAL: true
+        TAGS: ${{ steps.meta.outputs.tags }}
+        
+  cleanup:
+    needs: [maven-build-reporting, docker-build]
+    if: |
+      always()
+    runs-on: ubuntu-latest
+    steps:
+    -
+      name: Delete Artifacts
+      uses: geekyeggo/delete-artifact@v5
+      with:
+          name: Package

.readthedocs.yaml

@@ -0,0 +1,35 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+    # You can also specify other tool versions:
+    # nodejs: "20"
+    # rust: "1.70"
+    # golang: "1.20"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+  # Fail on all warnings to avoid broken references
+  # fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#   - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+   - requirements: docs/requirements.txt

Jenkinsfile

@@ -14,16 +14,16 @@ pipeline {
     stages {
         stage('Maven build') {
             steps {
-                withMaven(maven: 'Maven', options: [findbugsPublisher(disabled: true)]) {
+                withMaven(maven: 'Maven3.9.6') {
                     sh "mvn clean install -e -P let_reporting"
                 }
             }        
         }
-        
+
         stage('Reporting') {
             steps {
-                withMaven(maven: 'Maven', options: [findbugsPublisher(disabled: true)]) {
-                    sh "mvn --batch-mode -V -U -e -P let_reporting pmd:pmd pmd:cpd findbugs:findbugs spotbugs:spotbugs"
+                withMaven(maven: 'Maven3.9.6') {
+                    sh "mvn --batch-mode -V -U -e -P let_reporting pmd:pmd pmd:cpd spotbugs:spotbugs"
                 }
             }
         }
@@ -50,6 +50,6 @@ pipeline {
     }
     triggers {
         pollSCM('H/5 * * * *')
-    }  
+    }
        
 }    

README.rst

@@ -1,40 +1,21 @@
-Master: 
+Safe Exam Browser (SEB) Server
+--------------------------------
 
 .. image:: https://github.com/SafeExamBrowser/seb-server/actions/workflows/buildReporting.yml/badge.svg?branch=master
     :target: https://github.com/SafeExamBrowser/seb-server/actions
 .. image:: https://readthedocs.org/projects/seb-server/badge/?version=latest
     :target: https://seb-server.readthedocs.io/en/latest/?badge=latest
-.. image:: https://codecov.io/gh/SafeExamBrowser/seb-server/branch/master/graph/badge.svg
-    :target: https://codecov.io/gh/SafeExamBrowser/seb-server
 .. image:: https://img.shields.io/github/languages/code-size/SafeExamBrowser/seb-server
     :target: https://github.com/SafeExamBrowser/seb-server
 
-Development:
-
-.. image:: https://github.com/SafeExamBrowser/seb-server/actions/workflows/buildReporting.yml/badge.svg?branch=development
-    :target: https://github.com/SafeExamBrowser/seb-server/actions
-.. image:: https://codecov.io/gh/SafeExamBrowser/seb-server/branch/development/graph/badge.svg
-    :target: https://codecov.io/gh/SafeExamBrowser/seb-server
-.. image:: https://img.shields.io/github/last-commit/SafeExamBrowser/seb-server/development?logo=github
-    :target: https://github.com/SafeExamBrowser/seb-server/tree/development
 
 
----------
-
-**Note regarding to** `CVE-2021-44228 <https://nvd.nist.gov/vuln/detail/CVE-2021-44228>`_: SEB Server is **not affected** by the vulnerability. For more information please read `Log4J2 Vulnerability and Spring Boot <https://spring.io/blog/2021/12/10/log4j2-vulnerability-and-spring-boot>`_
-
-However, to prevent security scanner to alert false-positives we decided to make a patch for the latest version of SEB Server (v1.2.6) including the Log4j 2.16.0 library. If you want to update please make sure your installation refer to version v1.2-stable, v1.2-latest or v1.2.6. Then simply make a update/rebuild of your seb-server docker image.
-
----------
-
-About
------
 The Safe Exam Browser Server web application simplifies and centralizes the configuration of Safe Exam Browser clients for exams. It interacts with a learning management or exam system for setting up and conducting e-assessments with Safe Exam Browser. It also improves security by allowing to monitor connected Safe Exam Browser clients in real time during e-assessments. 
 
 What is Safe Exam Browser (SEB)?
 --------------------------------
 
-`Safe Exam Browser <https://safeexambrowser.org/>`_ (SEB) is an application to carry out e-assessments safely. The freeware application is available for Windows, macOS and iOS. It turns any computer temporarily into a secure workstation. It controls access to resources like system functions, other websites and applications and prevents unauthorized resources being used during an exam. Safe Exam Browser can work with Open edX to control what a student can access during a Open edX quiz attempt. With the SEB Open edX plugin you activate the SEB support in Open edX and now only students using an approved version of SEB and the correct settings will be able to access the quiz in your Open edX course. The Safe Exam Browser is offered under a Mozilla Public License and supported by the `SEB Alliance <https://safeexambrowser.org/alliance/>`_.
+`Safe Exam Browser <https://safeexambrowser.org/>`_ (SEB) is an application to carry out e-assessments safely. The free-ware application is available for Windows, macOS and iOS. It turns any computer temporarily into a secure workstation. It controls access to resources like system functions, other websites and applications and prevents unauthorized resources being used during an exam. Safe Exam Browser can work with Open edX to control what a student can access during a Open edX quiz attempt. With the SEB Open edX plugin you activate the SEB support in Open edX and now only students using an approved version of SEB and the correct settings will be able to access the quiz in your Open edX course. The Safe Exam Browser is offered under a Mozilla Public License and supported by the `SEB Alliance <https://safeexambrowser.org/alliance/>`_.
 
 
 What is Safe Exam Browser Server (SEB Server)?
@@ -42,15 +23,15 @@ What is Safe Exam Browser Server (SEB Server)?
 
 While the interaction with SEB is well known in Learning Management Systems (LMS) like `Open edX <https://open.edx.org/>`_, 
 `Moodle <https://moodle.org/>`_ etc. the SEB Server is an entirely new component to set up secured online exams. 
-It interacts with the assessments system/LMS as well as with SEB on exam clients.It supports exam scenarios on student owned devices (BYOD) 
+It interacts with the assessments system/LMS as well as with SEB on exam clients. It supports exam scenarios on student owned devices (BYOD) 
 and on managed devices.
 
 SEB Server is a modern webservice with a REST API and a GUI service on top of it. SEB Server is written in Java and uses Docker for installation and setup.
 
 SEB Server provides a range of basic functionalities:
 
-- Built-in institutional multitenancy 
-- Linking of multiple Learning Management Systems (LMS). Currently supported: `Open edX <https://open.edx.org/>`_
+- Built-in institutional multitenancy
+- Linking of multiple Learning Management Systems (LMS). Currently supported LMS: `Open edX <https://open.edx.org/>`_, `Moodle <https://moodle.org/>`_, `OLAT <https://www.olat.org/>`_, `ANS <https://ans.app/>`_
 - Accessing the Course/Exam-API of a linked LMS to import a courses or exams for managing with SEB Server
 - Creation and administration of SEB Client Configurations that can be used to startup a SEB and that contains SEB Server connection information for a SEB Client
 - Creation and administration of SEB Exam Configurations that can be bound to an imported Exam to automatically configure a SEB Client that connects to an exam that is managed by SEB Server
@@ -61,77 +42,56 @@ The image below shows a very simplified diagram that locates the SEB Server in a
 Safe Exam Browser (SEB). The SEB Server communicates with the LMS for managing and prepare exams as well as with the SEB Client to ensure 
 a more automated and secure setup for high-stake exams.
 
-.. image:: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/seb-sebserver-lms.png
+.. image:: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-1.5/docs/images/setup_1.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/seb-sebserver-lms.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-1.5/docs/images/setup_1.png
     
-
-SEB Server Version 1.3.0 is out
+SEB Server Version 2.0 is out
 -------------------------------
 
-New features:
+With the new SEB Server release, SEB Server makes a major version change from 1.x to 2.x. This is mainly because of the new
+Screen Proctoring feature for SEB integrated into SEB Server and the removal of live proctoring with Zoom and Jitsi Meet
+that is no longer available for SEB Server version 2.x.
 
-- Table Filter: Enter input on filter input field triggers filter action
-- New: "Exam Templates" to predefine exam configurations that can be applied on exam import
-- Exam Configuration: Copy exam configuration on exam configuration table view
-- Exam Templates: Add an exam configuration template via exam template to automatically create an exam configuration on import
-- Exam Templates: Add indicators for exam template that are automatically applied on exam import
-- Monitoring: Add new filter to filter active connections (without any incidences)
-- Monitoring: Add connection summary for each connection state filter to show how many connections are present per state
-- Monitoring: Improved and extended connection information about user/login change and display client info like SEB version, OS Version...
-- Monitoring: Improved distributed setup with Docker/Kubernetes
-- Monitoring Notifications: Added Raise-Hand Notification and SEB Lock-Screen Notification
+For a migration from a running SEB Server setup with version 1.x to new major version 2.0, please also read the `migration guide <https://seb-server-setup.readthedocs.io/en/latest/major-migration.html>`_.
 
+New Features:
+    - Screen Proctoring with SEB and SEB Server. Can be enabled and configured for an Exam. SEB takes and sends screen shots plus Metadata to SEB Server. With monitoring and search functionality.
+    - Moodle Integration: SEB Server Exam creation from Moodle site with new SEB Server Moodle Plugin 2.0.
+    - Moodle Integration: Auto Login to SEB Server monitoring for Moodle Teacher with dedicated privileges. Comes with Moodle Plugin 2.0
+    - Exam Test Run. There is now the possibility to apply an test run for an Exam that is in coming up status. Exam is then in "Running" like state and SEB clients can connect as well as supporter can monitor the exam.
+
+Improvements:
+    - Improvement of user ID resolution and handshake completion for SEB connecting with SEB-Server. SEB client now sent as much client information as possible and finish up the SEB Server handshake more quickly.
+    - Connection Configuration Improve (or remove) Date Filter.
+    - DB Migration Table charset fix for all tables, set to "utf8mb4_general"
+    - New SEB Settings in SEB Server GUI for version 2.0
+    - Table sort direction selection and table column length selection stick to User Session
 
 Bugfixes:
-
-- Various distributed setup cache issues
-- Fixed Sorting of exam in exam list
-- Fixed LMS Lockup quizzes filter
-- Fixed Exam proctoring settings verification
-- Various proctoring issues for proctoring with Zoom
-
-
-Changes:
-
-- Overall: Extended GUI server session timeout
-- User Roles: Enhanced "Exam Administrator" role to see all running exams and be able to support them as well
-- LMS Lockup/Exam: Show Moodle course name together with the quiz name on LMS lockup as well as on exams
-- Exam Configuration: Streamline "Exam Configuration" settings with the newest SEB versions
-- Monitoring: Improved indicator and monitoring data performance for distributed setups
-- Monitoring: Changed default colors for active connections and indicators (No color if no incidence)
-
-Docker-Image:
-
-    Exact version: docker pull anhefti/seb-server:v1.3.0 (sha256:35692e304ab8f7d198524ff948df472e1eb362f1eb7f0b0fa358d01556011e59)
-    Latest stable minor version with patches: docker pull anhefti/seb-server:v1.3-latest
-
+    - Missing Pending Notification Page Update in Monitoring Detail view
+    - Importing an exam without template throws error
+    - LMS name resolving sometimes gets "null" values for names
+    - New Ready State is not involved within the Filter numbers
+    - Page of ASK Grants in Exam has table selection action problems
+    - Sorting of start and end-date in Assessment Tool Lookup not working as expected
+    - Running Exam without LMS is greyed out without reason
 
 
 SEB - SEB Server Compatibility
 ------------------------------
 
 The table below shows available and upcoming SEB client versions that has SEB Server integration support and are compatible with particular 
-SEB Server version. There is an entry for each platform with a beta or testing release date and a official release date.
+SEB Server versions. There is an entry for each platform with a beta or testing release date and an official release date.
 
-**SEB Server Version 1.0.X**
+**SEB Server Version 2.0.x**
 
 .. csv-table::
-   :header: "Platform / OS", "Beta/RC Version", "Release Version"
+   :header: "Platform / OS", "Release Version"
 
-   "SEB Client for iOS", "22. April 2020 - Version 2.1.50", "Q2 2021 - Version 2.5/3.0"
-   "SEB Client for Mac", "Q2 2021 - Version 3.1", "Q2 2021 - Version 3.1"
-   "SEB Client for Windows", "Q2 2020 - Version 3.1", "Q4 2020 - Version 3.1"
-   
-**SEB Server Version 1.1.X**
-
-.. csv-table::
-   :header: "Platform / OS", "Beta/RC Version", "Release Version"
-
-   "SEB Client for iOS", "22. April 2020 - Version 2.1.50", "Q2 2021 - Version 2.5/3.0"
-   "SEB Client for Mac", "Q2 2021 - Version 3.1", "Q2 2021 - Version 3.1"
-   "SEB Client for Windows", "April 2021 - Version 3.2", "May 2021 - Version 3.2"
-   
+   "SEB Client for iOS", "3.4 (3.3.3 without screen proctoring)"
+   "SEB Client for Mac", "3.4"
+   "SEB Client for Windows", "3.8"
 
 Install SEB Server
 ------------------
@@ -143,8 +103,62 @@ Getting started with SEB Server
 
 For a complete SEB Server user guide please go to `SEB Server User Guide <https://seb-server.readthedocs.io/en/latest/#>`_
 
+
 Project Background
 ------------------
 
-The SEB Server is currently build and maintained by the `Swiss MOOC Service <https://www.swissmooc.ch/>`_ that is founded by leading Swiss universities EPFL, ETH, SUPSI, USI and HES-SO. The Swiss MOOC Service was financially supported from 2018-2020 by the `Swissuniversities´ P5 program <https://www.swissuniversities.ch/themen/digitalisierung/p-5-wissenschaftliche-information>`_.
+The SEB Server is currently build and maintained by `ETH Zürich <https://ethz.ch/en.html>`_ and by the `Swiss MOOC Service <https://www.swissmooc.ch/>`_ that is founded by leading Swiss universities EPFL, ETH, SUPSI, USI and HES-SO. The Swiss MOOC Service was financially supported from 2018-2020 by the `Swissuniversities´ P5 program <https://www.swissuniversities.ch/themen/digitalisierung/p-5-wissenschaftliche-information>`_.
+
+Contributing to SEB Server
+---------------------------
+
+We want to make contributing to this project as easy and transparent as possible, whether it's:
+
+- Give us a star
+- Reporting a bug
+- Submitting a fix
+- Proposing new features
+- Becoming a SEB Alliance member
+
+We use github to host code, to track issues and feature requests, as well as accept pull requests.
+And we use `Github issues <https://github.com/SafeExamBrowser/seb-server/issues>`_ to track public bugs.
+Report a bug by [opening a new issue]();
+
+**Before enter a new bug-report, ensure the bug was not already reported**
+
+Please fill and provide all the information suggested by the bug-report template
+Great Bug Reports tend to have:
+
+- A quick summary and/or background
+- Steps to reproduce
+- Be specific and give sample code if you can. Can also be Pseudocode.
+- What you expected would happen
+- What actually happens
+- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
+
+**We Use Git-Flow for Code Contributions**
+
+Pull requests are the best way to propose changes to the codebase. We use `Github Flow <https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow>`_. We actively welcome your pull requests:
+
+1. Fork the repo and create your branch from `development`. The development branch always has the newest changes.
+2. If you've added code that should be tested, add tests.
+3. If you introduce new API also add clear documentation.
+4. Ensure the test suite passes.
+5. Make sure your code lints.
+6. Issue that pull request!
+
+**Use a Consistent Coding Style**
+
+Have a close look to the existing code stile that is used within SEB Server and adapt to it as close as possible.
+We reserve the right to adapt contributed code to the code style matching SEB Server code style before or after a pull request.
+
+**Any contributions you make will be under the Mozilla Public License Version 2.0**
+
+In short, when you submit code changes, your submissions are understood to be under the same `Mozilla Public License <https://github.com/SafeExamBrowser/seb-server?tab=MPL-2.0-1-ov-file>`_ that covers the project. Feel free to contact the maintainers if that's a concern.
+
+**Becoming a SEB Alliance member**
+
+The `SEB Alliance <https://www.safeexambrowser.org/alliance/members.html>`_ is the body which sustains ongoing funding of the Safe Exam Browser open source project to continue its maintenance, development and support activities. ETH Zurich provides the infrastructure for the management and the software engineering of the SEB project and appoints an alliance manager who will provide administrative support to the SEB Alliance, and ensure the day-to-day running of the SEB Alliance. ETH Zurich leads the Alliance and offers different contribution levels to parties interested in the evolution of the SEB open source project.
+
+More information about `joining <https://www.safeexambrowser.org/alliance/join.html>`_ the Alliance is available in our `benefits <https://www.safeexambrowser.org/alliance/benefits.html>`_ and `documents <https://www.safeexambrowser.org/alliance/documents.html>`_ section.
 

codecov.yml

@@ -1,15 +0,0 @@
-coverage:
-  precision: 2
-  round: down
-  range: "30..70"
-  status:
-    project:
-      default:
-        threshold: 5%
-    patch: off
-  
-github_checks:
-    annotations: false
-    
-fixes:
-  -"::seb-server/"

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-stretch
+FROM eclipse-temurin:17-jre
 
 ENV SERVER_PORT="8080"
 ENV JMX_PORT=
@@ -38,4 +38,4 @@ CMD if [ "x${JMX_PORT}" = "x" ] ; \
         --spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
 fi
 
-EXPOSE $SERVER_PORT $JMX_PORT
+EXPOSE $SERVER_PORT $JMX_PORT

docs/about.rst

@@ -0,0 +1,4 @@
+About SEB Server
+=====================
+
+.. include:: ../README.rst

docs/certificates.rst

@@ -1,66 +1,66 @@
-.. _certificates-label:
-
-Certificates
-====================
-
-Overview
---------
-
-Import and store X.509 certificates within SEB Server is a new feature since SEB Server version 1.2. This allows an institutional administrator
-or an exam administrator to upload and store certificates for further use within SEB Server.
-
-.. note:: 
-    Certificates uploaded to SEB Server are stored in a secured certificate-store that is stored within the data base rather then a 
-    usual file. The certificated store is password secured and only the binary data of the certificate store is places into the 
-    databease for securty reasons.
-    
-Once a certificate has been uploaded to SEB Server it can be used for various other features of SEB Server where a certificate is needed.
-One feature that also comes with the SEB Server version 1.2 is the ability to encrypt a connection configuration with a certificate
-that has the right purpose (Identity) to do so. If you need this feature already, please have a look at: :ref:`connection-configuration-label`
-Other planed features are the import of certificate encrypted exam configurations as well as to embed certificates within a exam configuration
-to allow certificate pinning between SEB and LMS.
-
-There is currently certificate upload support for two version of certificates:
-
-**PEM**
-
-This are usually non password protected certificates in different file-formats. SEB Server currently supports the following PEM file-formats:
-
-- .pem 
-- .crt
-- .cer
-
-**PKCS12**
-
-This are usually password protected certificates in different file-formats. SEB Server currently supports the following PKCS12 file-formats:
-
-- .p12
-- .pfx
-
-.. image:: images/certificates/cert_list.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/certificates/cert_list.png
-
-
-Use Cases
----------
-
-**Upload a certificate**
-
-- To upload and store a certificate of supported file type, please open the "SEB Configuration" section and select the "Certificates" page
-- You will see the list of known certificates from the SEB Server like in the picture above.
-- Choose "Import Certificate" from the right action pane and the upload dialog will open.
-- Within the upload dialog, select the certificate file on your local machine that you want to upload.
-- If the certificate is password protected, you will need to give the password to upload the certificate.
-- Chlick on "OK" to start the import.
-- If the import is successful the imported certificate will show up in the list. Otherwise SEB Server will display an error message with the reason of failure.
-
-**Remove / delete a certificate**
-
-- To permanently delete a stored certificate on SEB Server, please open the "SEB Configuration" section and select the "Certificates" page
-- You will see the list of known certificates from the SEB Server like in the picture above.
-- Please select the certificate you want to remove. 
-- Choose "Remove Selected Certificates" from the right action pane and a configuration dialog will appear.
-- If you are sure to delete the selected certificate(s), click on "OK" to delete.
-- The deleted certificates disappear form the certificates list.
-
+.. _certificates-label:
+
+Certificates
+====================
+
+Overview
+--------
+
+Import and store X.509 certificates within SEB Server is a new feature since SEB Server version 1.2. This allows an institutional administrator
+or an exam administrator to upload and store certificates for further use within SEB Server.
+
+.. note:: 
+    Certificates uploaded to SEB Server are stored in a secured certificate-store that is stored within the data base rather than a 
+    usual file. The certificated store is password secured and only the binary data of the certificate store is placed into the 
+    database for security reasons.
+    
+Once a certificate has been uploaded to SEB Server it can be used for various other features of SEB Server where a certificate is needed.
+One feature that also comes with the SEB Server version 1.2 is the ability to encrypt a connection configuration with a certificate
+that has the right purpose (Identity) to do so. If you need this feature already, please have a look at: :ref:`connection-configuration-label`.
+Other planed features are the import of certificate encrypted exam configurations as well as to embed certificates within an exam configuration
+to allow certificate pinning between SEB and LMS/Assessment Tool.
+
+There is currently certificate upload support for two version of certificates:
+
+**PEM**
+
+This are usually non password protected certificates in different file-formats. SEB Server currently supports the following PEM file-formats:
+
+- .pem 
+- .crt
+- .cer
+
+**PKCS12**
+
+This are usually password protected certificates in different file-formats. SEB Server currently supports the following PKCS12 file-formats:
+
+- .p12
+- .pfx
+
+.. image:: images/certificates/cert_list.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/certificates/cert_list.png
+
+
+Use Cases
+---------
+
+**Upload a certificate**
+
+- To upload and store a certificate of supported file type, please open the "SEB Configuration" section and select the "Certificates" page
+- You will see the list of known certificates from the SEB Server like in the picture above.
+- Choose "Import Certificate" from the right action pane and the upload dialog will open.
+- Within the upload dialog, select the certificate file on your local machine that you want to upload.
+- If the certificate is password protected, you will need to give the password to upload the certificate.
+- Click on "OK" to start the import.
+- If the import is successful, the imported certificate will show up in the list. Otherwise, SEB Server will display an error message with the reason of failure.
+
+**Remove / delete a certificate**
+
+- To permanently delete a stored certificate on SEB Server, please open the "SEB Configuration" section and select the "Certificates" page
+- You will see the list of known certificates from the SEB Server like in the picture above.
+- Please select the certificate you want to remove. 
+- Choose "Remove Selected Certificates" from the right action pane and a configuration dialog will appear.
+- If you are sure to delete the selected certificate(s), click on "OK" to delete.
+- The deleted certificates disappear form the certificates list.
+

docs/conf.py

@@ -43,7 +43,7 @@ extensions = [
     'sphinx.ext.todo',
     'sphinx.ext.imgmath',
     'sphinx.ext.viewcode',
-    'sphinx.ext.githubpages',
+    'sphinx.ext.githubpages'
 ]
 
 # Add any paths that contain templates here, relative to this directory.

docs/config_template.rst

@@ -1,73 +1,73 @@
-.. _config-template-label:
-
-Exam Configuration Templates
-============================
-
-With this feature you can create and manage templates for SEB exam configuration settings. You are able to mainly define default values for each SEB exam 
-settings attribute for an exam config and you are also able to define whether the settings attribute shall be viewed on an exam configuration created from 
-the template or if it shall be hidden.
-
-.. note::
-   The exam configuration template feature is the most experimental feature in SEB Server for now and my change for the upcoming releases.
-   
-To view all available exam configuration templates go to the "SEB Configuration" section and click on the "Configuration Template" menu entry of the 
-left menu pane. SEB Server will then present you a list of all available exam configuration templates. You can filter and sort the list as usual to find
-a specific template by name for example.
-
-.. image:: images/config_templates/list.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/list.png
-
-To create a new exam configuration template use the "Add Configuration Template" action from the right action pane. You will see the creation form
-with a name and description for the new template. At least a unique name is mandatory and the description is optional.
-
-.. image:: images/config_templates/templateEdit.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/templateEdit.png
-    
-To create and save the new exam configuration template use the "Save Configuration Template" action from the right action pane. The template will be
-created with all default settings attribute and views and you will see the configuration template view page. In the view page you will see the information
-of the template within the page header following by a list of all exam configuration setting attributes available for a SEB exam configuration on the 
-SEB Server. The name of an attribute is composed of the internal attribute name followed by the display name of the attribute. 
-
-.. image:: images/config_templates/templateView.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/templateView.png
-
-The type of the attribute defines the input field type and cannot be changed in any way. The view defines the tab on which the settings attribute is placed.
-And the group defines the named group where a settings attribute belongs to. 
-
-.. note::
-    For now the "View" and "Group" properties of an settings attribute cannot be changed, just be set whether the settings attribute shall be shown
-    on its defined view (tab) and within its defined position on the tab or if it shall be hidden at all.
-    In a future version of SEB Server it may possible to also place a settings attribute to another "View" and/or "Group" and also to a certain position
-    of the view grid.
-    
-To attach or detach a particular settings attribute for the template from the view to show or hide it in the configuration settings, select the specific
-settings attribute from the list and use either the "Remove From View" action when you want to remove an attached one, 
-or the "Attach To View" action when you want to attach a hidden settings attribute to the default view.
-
-To define a default value for a specific attribute, select the attribute from the list and use the "Edit Attribute" action from the right action pane to open
-the settings attribute in edit mode. Or just double click on the specific list entry of the settings attribute.
-
-In the settings attribute edit page you see general information about the attribute on the upper part of the page and on the second part you see the
-input field if the settings attribute with the current default value set. To alter the default value just use the input field of the attribute to change
-the value and the change will automatically be set as new default value. If you want to reset the default value of the settings attribute to the original 
-default value, use the "Set Default Values" action from the right action pane to do so. You are also able to attach or detach the settings attribute from 
-the view here by using the "Remove From View" or "Attach To View" actions from the right action pane. To go back to the exam configuration template view
-use the "View Configuration Template" action from the right action pane.
-
-.. image:: images/config_templates/templateAttribute.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/templateAttribute.png
-    
-Back in the exam configuration template view you are able to create a new SEB exam configuration directly from this template by using the "Create Exam Configuration"
-action from the right action pane. The application will present you a creation dialog within a pop-up where you can define a name and description for the
-new SEB exam configuration. At least a unique name is mandatory.
-
- .. image:: images/config_templates/createConfig.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/createConfig.png
-    
-After defines a name and description for the new SEB exam configuration you can click on "OK" to do so an the application will show you the new created 
-SEB exam configuration in the usual place.
+.. _config-template-label:
+
+Exam Configuration Templates
+============================
+
+With this feature you can create and manage templates for SEB exam configuration settings. You are able to mainly define default values for each SEB exam 
+settings attribute for an exam config and you are also able to define whether the settings attribute shall be viewed on an exam configuration created from 
+the template or if it shall be hidden.
+
+.. note::
+   The exam configuration template feature is the most experimental feature in SEB Server for now and might change for the upcoming releases.
+   
+To view all available exam configuration templates, go to the "SEB Configuration" section and click on the "Configuration Template" menu entry of the 
+left menu pane. SEB Server will then present you a list of all available exam configuration templates. You can filter and sort the list as usual to find
+a specific template by name for example.
+
+.. image:: images/config_templates/list.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/config_templates/list.png
+
+To create a new exam configuration template, use the "Add Configuration Template" action from the right action pane. You will see the creation form
+with a name and description for the new template. At least a unique name is mandatory, and the description is optional.
+
+.. image:: images/config_templates/templateEdit.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/templateEdit.png
+    
+To create and save the new exam configuration template use the "Save Configuration Template" action from the right action pane. The template will be
+created with all default settings attribute and views, and you will see the configuration template view page. In the view page you will see the information
+of the template within the page header following by a list of all exam configuration setting attributes available for a SEB exam configuration on the 
+SEB Server. The name of an attribute is composed of the internal attribute name followed by the display name of the attribute. 
+
+.. image:: images/config_templates/templateView.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/config_templates/templateView.png
+
+The type of the attribute defines the input field type and cannot be changed in any way. The view defines the tab on which the settings attribute is placed.
+And the group defines the named group where a settings attribute belongs to. 
+
+.. note::
+    For now, the "View" and "Group" properties of an settings attribute cannot be changed, just be set whether the settings attribute shall be shown
+    on its defined view (tab) and within its defined position on the tab or if it shall be hidden at all.
+    In a future version of SEB Server it might be possible to also place a settings attribute to another "View" and/or "Group" and also to a certain position
+    of the view grid.
+    
+To attach or detach a particular settings attribute for the template from the view to show or hide it in the configuration settings, select the specific
+settings attribute from the list and use either the "Remove From View" action when you want to remove an attached one, 
+or the "Attach To View" action when you want to attach a hidden settings attribute to the default view.
+
+To define a default value for a specific attribute, select the attribute from the list and use the "Edit Attribute" action from the right action pane to open
+the settings attribute in edit mode. Or just double click on the specific list entry of the settings attribute.
+
+In the settings attribute edit page you see general information about the attribute on the upper part of the page and on the second part you see the
+input field if the settings attribute with the current default value set. To alter the default value just use the input field of the attribute to change
+the value and the change will automatically be set as new default value. If you want to reset the default value of the settings attribute to the original 
+default value, use the "Set Default Values" action from the right action pane to do so. You are also able to attach or detach the settings attribute from 
+the view here by using the "Remove From View" or "Attach To View" actions from the right action pane. To go back to the exam configuration template view,
+use the "View Configuration Template" action from the right action pane.
+
+.. image:: images/config_templates/templateAttribute.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/config_templates/templateAttribute.png
+    
+Back in the exam configuration template view you are able to create a new SEB exam configuration directly from this template by using the "Create Exam Configuration"
+action from the right action pane. The application will present you a creation dialog within a pop-up where you can define a name and description for the
+new SEB exam configuration. At least a unique name is mandatory.
+
+ .. image:: images/config_templates/createConfig.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/config_templates/createConfig.png
+    
+After defining a name and description for the new SEB exam configuration you can click on "OK" to do so, and the application will show you the new created 
+SEB exam configuration in the usual place.

docs/configurations.rst

@@ -2,26 +2,26 @@ SEB Configurations
 ==================
 
 There are two different kind of SEB specific configurations that must be defined and be put in place to support e-assessments with
-SEB and SEB Server. The  is used to configure SEB with all needed information to securely connect to SEB Server
-and an Exam Configuration is used to configure SEB to access a running exam with SEB. The  is only needed at least
+SEB and SEB Server. The :ref:`connection-configuration-label` is used to configure SEB with all needed information to securely connect to SEB Server
+and an Exam Configuration is used to configure SEB to access a running exam with SEB. The :ref:`connection-configuration-label` is only needed at least
 once for an institution and must be deployed as start-configuration on a managed SEB setup or can be placed as a download link within
 an internal trusted server, that automatically loads within the SEB application and configures the SEB to connect to the SEB Server.
 
 An exam configuration, as the name implies, is done for an exam and contains most of the known configuration attributes
-from the latest `SEB Configuration Tool <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_
+from the latest `SEB Configuration Tool <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_.
 Currently an exam configuration can only be applied to one Exam but can easily be copied to use with another exam. For detailed
-information about exam configuration see :ref:`exam-configuration-label`
+information about exam configuration see :ref:`exam-configuration-label`.
 
 Within Configuration Templates, it is possible to create templates for exam configuration. Within the current version of SEB Server
 there is the possibility to define different default value(s) for each exam configuration attribute and also to define if the attribute
-is been shown in the exam configuration or not. This allows an Exam Administrator to create a exam configuration template for exams
+is been shown in the exam configuration or not. This allows an Exam Administrator to create an exam configuration template for exams
 with context defines default values and also to be able to only see change the attributes that are relevant for an exam configuration.
 This feature is currently in an experimental state and may be changed and / or expanded within future releases of SEB Server. See 
-:ref:`config-template-label`
+:ref:`config-template-label`.
 
-An new feature since SEB Server version 1.2 is the integrated certificate store where an administator is able to upload and register
-certificates. The certificates can then be used to encrypt and secure a connection configuration for example. Or as planed for another
-SEB Server release, to embed into an exam configuration for SEB to allow certificate pinning on SEB - LMS communication.
+An new feature since SEB Server version 1.2 is the integrated certificate store where an administrator is able to upload and register
+certificates. The certificates can then be used to encrypt and secure a connection configuration for example. Or as planned for another
+SEB Server release, to embed into an exam configuration for SEB to allow certificate pinning on SEB - LMS/Assessment Tool communication.
 
 
 .. toctree::
@@ -30,4 +30,4 @@ SEB Server release, to embed into an exam configuration for SEB to allow certifi
    connection_config
    exam_config
    config_template
-   certificates
+   certificates

docs/connection_config.rst

@@ -1,156 +1,181 @@
-.. _connection-configuration-label:
-
-Connection Configuration
-====================
-
-Overview
---------
-
-A connection configuration is needed to configure a SEB client to securely connect to the SEB Server and present a list of available exams
-for selection. At least one connection configuration is needed for an institution that can be exported and deployed with a SEB on a managed device setup 
-or can be made available within a download link on a internal or trusted server. Another scenario would be to send the connection configuration to
-individual students per mail with instructions on how to install SEB and start it with the configuration to automatically connect to the SEB Server. 
-However, since the connection configuration is security relevant because it contains sensitive data to connect to SEB Server,
-there are different security level one can choose to apply within a internal safe e-assessment strategy.
-
-The lowest level of security is to just have one not encrypted connection configuration for the whole institution and for all e-assessments provided
-at this institution with SEB Server.
-In this case the sensitive data is more exposed to be compromised and misused by others because of the missing password protection and it also takes 
-more effort to deal with such an issue while there is only one connection configuration used by all e-assessments of the institution. If the one client
-configuration has been compromised and a misuse has been detected the concerned connection configuration can be deactivated to prevent further misuse. A
-new one can be created and delivered or updated but since it is only one configuration used for the institution all actual download links have to 
-be updated and all students awaiting a prepared exam has to be informed and supported with the new configuration (link) 
-
-The currently highest level of security is to have encrypted and different connection configuration for different e-assessment.
-In this case the connection configuration is encrypted with a password that can be defined by a institutional- or exam-administrator while
-creating the connection configuration. Once the SEB loads such a connection configuration it will fist prompt the user about the password that must be
-given by the student to proceed and connect to the SEB Server.
-
-Usually a connection configuration can be created or maintained by an institutional administrator or by an exam administrator. Exam supporter role has
-no access to connection configurations and a SEB administrator is able to see connection configurations of other institutions but not to create or modify them.
-
-You can see a list of all available connection configuration for an institution by going to the sub-section "Connection Configuration"
-of the "Configuration" section on the menu on the left hand side.
-
-.. image:: images/connection_config/list.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/connection_config/list.png
-    
-The list shows the name, the date of creation and the status of the connection configurations in a column. With SEB Server administrator role
-also an institution column is shown because a SEB Server administrator is able to see all connection configurations of all institutions.
-As usual, to filter the list use the filter inputs above and click on the lens symbol on the right to apply the filter and to clear the 
-filter use the clear symbol right to the lens symbol. See :ref:`gui-label` for more information about the list navigation. 
-    
-The image below shows the Connection Connection form in the edit mode. To view the fallback related attributes, check the "With Fallback" attribute
-or remove selection to hide all fallback related attributes.
-
-.. image:: images/connection_config/new.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/connection_config/new.png
-
-Short description of all attributes of a connection configuration:
-
-- **Name**: The name of the connection configuration used to maintain connection configurations within the SEB Server application. 
-- **Configuration Purpose**: Defines the configuration purpose as described in `SEB Configuration <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_ section "Use SEB settings file for".
-  **Starting an Exam**; Will cause SEB to use this connection configuration settings on startup but won't change local SEB settings.
-  **Configuring a connection**; Will cause SEB to use this connection configuration settings and also save it as local SEB settings.
-- **Configuration Password**: Used to encrypt the connection configuration with a password. A SEB client will prompt this password while loading a password protected connection configuration.
-- **Encrypt with Certificate**: Since version 1.2. Used to encrypt the connection configuration with a certificate. The same certificate must be known by a SEB client to be able to load the configuration.
-- **With Fallback**: Select this to see and define a fallback strategy for SEB clients using this connection configuration in case of SEB Server service unavailability.
-- **Fallback URL**: Defines a start URL that is loaded by the SEB client in a fallback case.
-- **Connection Attempts**: Defines the number of attempts a SEB client will try to unsuccessfully connect to the SEB Server service until it switches to the fallback case.
-- **Interval**: Time interval (in milliseconds) a SEB client will wait after a unsuccessful connection attempt before starting a next connection attempt.
-- **Connection Timeout**: A overall timeout for SEB Server service connection. After this timeout runs out, starting from fist connection attempt, SEB client will switches to the fallback case no matter if number of attempts has exceeded or not.
-- **Fallback Password**: If set, a SEB client will prompt for this password before switching into the fallback case.
-- **Quit Password**: If set, a SEB client will prompt for this password when a user wants to exit SEB before in fallback case or before the SEB client has loaded an exam.
-
-A connection configuration may also contain and define a fallback strategy that takes place when SEB Server service is not available while 
-a SEB client tries to connect to the SEB Server.
-
-.. note:: 
-    A fallback case only takes place when SEB client is within the connection process (handshake) with the SEB Server and the SEB Server service is unavailable.
-    If a SEB client is already connected to the SEB Server and the user has started an exam, the SEB will just proceed with the exam even 
-    when the SEB Server connection is (temporarily) unavailable.
-    
-The fallback strategy contains some connection attributes that define until when a SEB client considering SEB Server service as unavailable as
-well as attributes that defines how a SEB client has to proceed in the fallback case. How a SEB client reacts to a fallback case differs on the 
-configuration settings in the following ways:
-
-- Connection configuration with "Configuring a Client" setting and no fallback strategy:
-    Show warning message with options "retry" and "quit".
-
-- Connection configuration with "Configuring a Client" setting and fallback strategy:
-    Show warning with options "retry", "fallback" (load Fallback URL) and "quit".
-
-- Connection configuration with "Starting an Exam" setting and no fallback (without local client configuration):
-    Show warning message with options "retry" and "quit".
-
-- Connection configuration with "Starting an Exam" setting and no fallback (with local client configuration):
-    Show warning message with options "retry", "load local settings" and "quit".
-
-- Connection configuration with "Starting an Exam" setting and fallback strategy:
-    Show warning with options "retry", "fallback" (load Fallback URL) and "quit".
-    
-
-Use Cases
----------
-
-**Create Connection Configuration**
-
-As an Institutional Administrator you should create a new secure connection configuration for the upcoming semester. The setup shall operate with
-secure configurations because the configuration file may be exposed to the public Internet. And the setup shall also have a proper fallback
-strategy where SEB clients uses the a given start URL in fallback case.
-
-- Sign in as an Institutional Administrator and select the "Connection Configuration" sub-menu of the "SEB Configuration" main-menu on the left.
-- Use the "Add Connection Configuration" on the right action pane to create a new connection configuration. 
-- Give the new connection configuration a name that not already exists and select "Start an Exam" for "Configuration Purpose".
-  This will ensure that a SEB client that uses this configuration will not override the local configuration that then can be used on fallback. 
-- Give a password to ensure security and to encrypt the connection configuration on export. A SEB client will prompt for the password while loading this configuration.
-- Check "With Fallback" to show all the fallback related attributes.
-- Define a fallback URL that will be used by a SEB client as start URL in the fallback case.
-- Define also fallback case, how many connection attempts on what interval a SEB client shall try before going into fallback mode. You can also define a overall "Connection Timeout" if lapsed a SEB client will also go into the fallback mode. A SEB client will fall-back on either the attempt or the timeout trigger. 
-- When a SEB client goes to fallback mode it will prompt the user as described in the case list above. To prevent further fallback options with a password prompt, give a "Fallback Password" and / or a "Quit Password" that a SEB client will prompt on either the fallback- or the quit-option.
-- After all details are correctly been entered, use the "Save Connection Configuration" action on the right action pane to save the new connection configuration.
-- Now the new connection configuration is created but not active for now and therefore cannot be exported yet. 
-
-**Activate and export Connection Configuration**
-
-A connection configuration for the upcoming semester has been created so far but was not active until now because of security reasons.
-Now we want to activate this connection configuration and export it to make it accessible by a download link on a public server.
-
-- Sign in as an Institutional Administrator and select the "Connection Configuration" sub-menu of the "SEB Configuration" main-menu on the left.
-- Use the list filter and / or the list navigation to find the needed connection configuration.
-- Double-click on the list entry or use the "View Connection Configuration" action on the right for a selected list row, to show the details of a specific Connection configuration.
-- Then either on the list or in the view mode of the form, use the "Activate Connection Configuration" action on the right action pane to activate the connection configuration
-- Now there is a "Export Connection Configuration" action in the detail view of the connection configuration. Use the "Export Connection Configuration" action to start a download dialog. Choose "Save As" and download the file with the name "SEBServerSettings.seb".
-- This file can now be published as download-link within a public server where SEB user can click and start the download and startup of the SEB client automatically. 
-
-**Deactivate a Connection Configuration**
-
-The semester has ended and for security reasons we don't want that SEB clients with a connection configuration for the ended semester
-are able to connect to SEB Server anymore. For this we just have to deactivate the connection configuration for that semester. A SEB client
-that connects with this connection configuration will then receive an HTTP 401 Unauthorized response.
-
-- Sign in as an Institutional Administrator and select the "Connection Configuration" sub-menu of the "SEB Configuration" main-menu on the left.
-- Use the list filter and / or the list navigation to find the needed connection configuration and select the row of this connection configuration.
-- Now use the "Deactivate Connection Configuration" action from the right action pane to deactivate the connection configuration.
-- The connection configuration is now deactivated and SEB client using this connection configuration are not able to connect to SEB Server anymore.
-
-**Encrypt the Connection Configuration by password or certificate**
-
-To secure the used connection configuration you want to encrypt it with either password or certificate encryption. If you encrypt a connection
-configuration by password, SEB will promt the user for the password while loading the configuration whereas by using certificate encryption,
-a SEB client must know the same certificate that is been used for encryption while loading the configuration.
-
-- Sign in as an institutional administrator and select the "Connection Configuration" sub-menu of the "SEB Configuration" main-menu on the left.
-- Create an new connection configuration or use the list filter and / or the list navigation to find the needed connection configuration.
-- Fill in the settings as usual and for password encryption define a password in the "Configuration Password" field and confirm the password in the "Confirm Password" field.
-- For a certificate based encryption select one of the given certificates within the "Encrypt with Certificate" setting.
-- To upload new certificates that can be used for encryption, please refer to: :ref:`certificates-label`
-- "Use asymmetric only encryption" if you use SEB Clients with version before 2.2. For more details on this subject please see: `SEB Configuration <https://safeexambrowser.org/developer/seb-file-format.html>`_
-- Save and activate the connection configuration. The connection configuration will then be encrypted by either password or certificate on export.
-
-.. image:: images/connection_config/encrypt.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/connection_config/encrypt.png
-
+.. _connection-configuration-label:
+
+Connection Configuration
+====================
+
+Overview
+--------
+
+A connection configuration is needed to configure a SEB client to securely connect to the SEB Server and present a list of available exams
+for selection. At least one connection configuration is needed for an institution that can be exported and deployed with a SEB on a managed device setup 
+or can be made available within a download link on an internal or trusted server. Another scenario would be to send the connection configuration to
+individual students per mail with instructions on how to install SEB and start it with the configuration to automatically connect to the SEB Server. 
+However, since the connection configuration is security relevant because it contains sensitive data to connect to SEB Server,
+there are different security level one can choose to apply within an internal safe e-assessment strategy.
+
+The lowest level of security is to just have one not encrypted connection configuration for the whole institution and for all e-assessments provided
+at this institution with SEB Server.
+In this case the sensitive data is more exposed to be compromised and misused by others because of the missing password protection and it also takes 
+more effort to deal with such an issue while there is only one connection configuration used by all e-assessments of the institution. If the one client
+configuration has been compromised and a misuse has been detected, the concerned connection configuration can be deactivated to prevent further misuse. A
+new one can be created and delivered or updated, but since only one configuration is used for the whole institution all actual download links have to 
+be updated and all students awaiting a prepared exam have to be informed and supported with the new :ref:`exam-configuration-label`.
+
+The currently highest level of security is to have encrypted and different connection configurations for different e-assessment.
+In this case the connection configuration is encrypted with a password that can be defined by an institutional- or exam-administrator while
+creating the connection configuration. Once the SEB loads such a connection configuration it will first prompt the user about the password that must be
+given by the student to proceed and connect to the SEB Server.
+
+Usually, a connection configuration can be created or maintained by an institutional administrator or by an exam administrator. Exam supporter role holders have
+no access to connection configurations and a SEB administrator is able to see connection configurations of other institutions but not to create or modify them.
+
+You can see a list of all available connection configuration for an institution by going to the sub-section "Connection Configuration"
+of the "Configuration" section on the menu on the left hand side.
+
+.. image:: images/connection_config/list.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/connection_config/list.png
+
+The list shows the name, the date of creation and the status of the connection configurations in a column. With SEB Server administrator role
+also an institution column is shown because a SEB Server administrator is able to see all connection configurations of all institutions.
+As usual, to filter the list use the filter inputs above and click on the lens symbol on the right to apply the filter and to clear the 
+filter use the clear symbol right to the lens symbol. See :ref:`gui-label` for more information about the list navigation. 
+
+The image below shows the Connection Configuration form in the edit mode. To view the fallback related attributes, check the "With Fallback" attribute
+or remove selection to hide all fallback related attributes.
+
+.. image:: images/connection_config/new.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/connection_config/new.png
+
+Short description of all attributes of a connection configuration:
+
+- **Name**: The name of the connection configuration used to maintain connection configurations within the SEB Server application. 
+- **Configuration Purpose**: Defines the configuration purpose as described in `SEB Configuration <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_ section "Use SEB settings file for".
+  **Starting an Exam**; Will cause SEB to use this connection configuration settings on startup but won't change local SEB settings.
+  **Configuring a connection**; Will cause SEB to use this connection configuration settings and also save it as local SEB settings.
+- **Configuration Password**: Used to encrypt the connection configuration with a password. A SEB client will prompt this password while loading a password protected connection configuration.
+- **Encrypt with Certificate**: Since version 1.2. Used to encrypt the connection configuration with a certificate. The same certificate must be known by a SEB client to be able to load the configuration.
+- **With Fallback**: Select this to see and define a fallback strategy for SEB clients using this connection configuration in case of SEB Server service unavailability.
+- **Fallback URL**: Defines a start URL that is loaded by the SEB client in a fallback case.
+- **Connection Attempts**: Defines the number of attempts a SEB client will try to unsuccessfully connect to the SEB Server service until it switches to the fallback case.
+- **Interval**: Time interval (in milliseconds) a SEB client will wait after a unsuccessful connection attempt before starting a next connection attempt.
+- **Connection Timeout**: A overall timeout for SEB Server service connection. After this timeout runs out, starting from first connection attempt, SEB client will switch to the fallback case no matter if the number of attempts has exceeded or not.
+- **Fallback Password**: If set, a SEB client will prompt for this password before switching into the fallback case.
+- **Quit Password**: If set, a SEB client will prompt for this password when a user wants to exit SEB before in fallback case or before the SEB client has loaded an exam.
+
+A connection configuration may also contain and define a fallback strategy that takes place when SEB Server service is not available while 
+a SEB client tries to connect to the SEB Server.
+
+.. note::
+
+    A fallback case only takes place when SEB client is within the connection process (handshake) with the SEB Server and the SEB Server service is unavailable.
+    If a SEB client is already connected to the SEB Server and the user has started an exam, the SEB will just proceed with the exam even 
+    when the SEB Server connection is (temporarily) unavailable.
+
+The fallback strategy contains some connection attributes that define until when a SEB client considering SEB Server service as unavailable as
+well as attributes that defines how a SEB client has to proceed in the fallback case. How a SEB client reacts to a fallback case differs on the 
+configuration settings in the following ways:
+
+- Connection configuration with "Configuring a Client" setting and no fallback strategy:
+    Show warning message with options "retry" and "quit".
+
+- Connection configuration with "Configuring a Client" setting and fallback strategy:
+    Show warning with options "retry", "fallback" (load Fallback URL) and "quit".
+
+- Connection configuration with "Starting an Exam" setting and no fallback (without local client configuration):
+    Show warning message with options "retry" and "quit".
+
+- Connection configuration with "Starting an Exam" setting and no fallback (with local client configuration):
+    Show warning message with options "retry", "load local settings" and "quit".
+
+- Connection configuration with "Starting an Exam" setting and fallback strategy:
+    Show warning with options "retry", "fallback" (load Fallback URL) and "quit".
+
+**New: Exam Selection for dedicated Client Configurations**
+
+This is a new feature since SEB Server Version 1.6. and allows to select existing exams within a Connection Configuration to reduce the possible
+Exams that SEB presents to a student when a Connection Configuration is loaded by SEB that has no dedicated Exam preselection (downloaded from the Exam view)
+In this case SEB always presented all currently running Exams from the SEB Server to the student for selection. With this
+feature it is now possible to reduce this choice for a specific Client Configuration by selecting the Exams that shall be shown to a student
+when SEB loads the respective Connection Configuration.
+
+.. note::
+
+    Since the Exam selection is stored with SEB Server and not exported to an Connection Configuration it is also possible
+    to change the Exam selection for a certain Connection Configuration after the Connection Configuration was downloaded.
+    SEB will always present the running exams exclusively from actual Exam selection from Connection Configuration on the SEB Server.
+
+If an Connection Configuration has no Exam selection all still running exams are presented to the student as it was before.
+
+To select dedicated Exams for a Connection Configuration you can go to the Connection Configuration edit view and select
+these exams with the multi selector. It is also possible to filter the list by typing in the letters containing in the Exam name of interest.
+
+.. image:: images/connection_config/examSelection.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/connection_config/examSelection.png
+
+
+
+Use Cases
+---------
+
+**Create Connection Configuration**
+
+As an Institutional Administrator you should create a new secure connection configuration for the upcoming semester. The setup shall operate with
+secure configurations because the configuration file may be exposed to the public Internet. And the setup shall also have a proper fallback
+strategy where SEB clients use a given start URL in fallback case.
+
+- Sign in as an Institutional Administrator and select the "Connection Configuration" sub-menu of the "SEB Configuration" main menu on the left.
+- Use the "Add Connection Configuration" on the right action pane to create a new connection configuration. 
+- Give the new connection configuration a name that not already exists and select "Start an Exam" for "Configuration Purpose".
+  This will ensure that a SEB client that uses this configuration will not override the local configuration that then can be used on fallback. 
+- Give a password to ensure security and to encrypt the connection configuration on export. A SEB client will prompt for the password while loading this configuration.
+- Check "With Fallback" to show all the fallback related attributes.
+- Define a fallback URL that will be used by a SEB client as start URL in the fallback case.
+- Define also fallback case, how many connection attempts on what interval a SEB client shall try before going into fallback mode. You can also define an overall "Connection Timeout" if lapsed a SEB client
+will also go into the fallback mode. A SEB client will fall back on either the attempt or the timeout trigger. 
+- When a SEB client goes to fallback mode it will prompt the user as described in the case list above. To prevent further fallback options with a password prompt, give a "Fallback Password" and / or a "Quit Password" that a SEB client will prompt on either the fallback- or the quit-option.
+- After all details have correctly been entered, use the "Save Connection Configuration" action on the right action pane to save the new connection configuration.
+- Now the new connection configuration is created but not active for now and therefore cannot be exported yet. 
+
+**Activate and export Connection Configuration**
+
+A connection configuration for the upcoming semester has been created so far but was not active until now because of security reasons.
+Now we want to activate this connection configuration and export it to make it accessible by a download link on a public server.
+
+- Sign in as an Institutional Administrator and select the "Connection Configuration" sub-menu of the "SEB Configuration" main menu on the left.
+- Use the list filter and / or the list navigation to find the needed connection configuration.
+- Double-click on the list entry or use the "View Connection Configuration" action on the right for a selected list row, to show the details of a specific Connection configuration.
+- Then either on the list or in the view mode of the form, use the "Activate Connection Configuration" action on the right action pane to activate the connection configuration
+- Now there is a "Export Connection Configuration" action in the detail view of the connection configuration. Use the "Export Connection Configuration" action to start a download dialog. Choose "Save As" and download the file with the name "SEBServerSettings.seb".
+- This file can now be published as download link within a public server where SEB user can click and start the download and startup of the SEB client automatically. 
+
+**Deactivate a Connection Configuration**
+
+The semester has ended and for security reasons we don't want that SEB clients with a connection configuration for the ended semester
+are able to connect to SEB Server anymore. For this we just have to deactivate the connection configuration for that semester. A SEB client
+that connects with this connection configuration will then receive an HTTP 401 Unauthorized response.
+
+- Sign in as an Institutional Administrator and select the "Connection Configuration" sub-menu of the "SEB Configuration" main menu on the left.
+- Use the list filter and / or the list navigation to find the needed connection configuration and select the row of this connection configuration.
+- Now use the "Deactivate Connection Configuration" action from the right action pane to deactivate the connection configuration.
+- The connection configuration is now deactivated and SEB client using this connection configuration are not able to connect to SEB Server anymore.
+
+**Encrypt the Connection Configuration by password or certificate**
+
+To secure the used connection configuration you want to encrypt it with either password or certificate encryption. If you encrypt a connection
+configuration by password, SEB will prompt the user for the password while loading the configuration whereas by using certificate encryption,
+a SEB client must know the same certificate that is been used for encryption while loading the configuration.
+
+- Sign in as an institutional administrator and select the "Connection Configuration" sub-menu of the "SEB Configuration" main menu on the left.
+- Create a new connection configuration or use the list filter and / or the list navigation to find the needed connection configuration.
+- Fill in the settings as usual and for password encryption define a password in the "Configuration Password" field and confirm the password in the "Confirm Password" field.
+- For a certificate-based encryption select one of the given certificates within the "Encrypt with Certificate" setting.
+- To upload new certificates that can be used for encryption, please refer to: :ref:`certificates-label`
+- "Use asymmetric only encryption" if you use SEB Clients with version before 2.2. For more details on this subject please see: `SEB Configuration <https://safeexambrowser.org/developer/seb-file-format.html>`_
+- Save and activate the connection configuration. The connection configuration will then be encrypted by either password or certificate on export.
+
+.. image:: images/connection_config/encrypt.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/connection_config/encrypt.png

docs/exam.rst

@@ -1,20 +1,20 @@
 Prepare Exam 
 =============
 
-This chapter is about setting up and prepare a already imported exam on SEB Server. If you don't have imported a course or quiz from LMS
+This chapter is about setting up and prepare a already imported exam on SEB Server. If you don't have imported a course or quiz from LMS/Assessment Tool
 as an exam into SEB Server, please see the previous chapter for detailed guidance about hot to import an exam.
 
 To find a specific exam that has already been imported, go to "Exam Administration" / "Exam" on the navigation menu on the left hand side to
 see a list of all available exams. You are able to filter and sort the list as usual to find to right course for import.
 
 .. note::
-    The "Start-Time" filter is usually set to the date one year before now or to some other default date in the past. The list shows only 
-    the courses that has a start-time after that time. If you have long running courses and it may possible that a course has been stated
-    a year or two ago, you habe to adapt this "Start-Time" filter to view those courses that has been started before. 
+    The Date-Filter above "Start-Time" is usually set to the date one year before now or to some other default date in the past
+    and is applied to the end-date of the exam or quiz. The list shows all running or up-coming exams and only hides finished or
+    archived exams that has an end-date before the Date-Filter date. 
     
-Double click on the list entry of the exam or select the list entry and use the "View Exam" action of the action pain on the right hand side to
-open the exam in the detail view. Within the detail view of the exam you are able to edit the exam attribute, apply SEB exam configuration and
-indicators for monitoring as well as defining details of the SEB restriction if this feature is available from the LMS.
+Double click on the list entry of the exam or select the list entry and use the "View Exam" action of the action pane on the right hand side to
+open the exam in the detail view. Within the detail view of the exam you are able to edit the exam attributes, apply SEB exam configuration and
+indicators for monitoring as well as defining details of the SEB restriction if this feature is available from the LMS/Assessment Tool.
 
 .. note::
     If an exam is already running but is missing some essential setup, this is noted by the system. In the exam detail view the system
@@ -23,20 +23,20 @@ indicators for monitoring as well as defining details of the SEB restriction if
 
 .. image:: images/exam/examNotReady.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examNotReady.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examNotReady.png
     
 
 At the beginning of the page - if there is no note - you see all the details of the exam. 
 
-- **Name**: Is the name of the course, defines on the LMS
-- **LMS Setup**: Is the name of the LMS Setup on the SEB Server from which the course was imported
-- **Start-Time**: Is the date and time when the exam is starting. This is defined on the LMS
-- **End-Time**: Is the date and time when the exam ends. This is defined on the LMS
-- **LMS Exam Identifier**: Is the identity of the course on the LMS (external identifier/primary key)
-- **LMS Exam URL**: Is the start URL of the course/exam
+- **Name**: Is the name of the course, defines on the LMS/Assessment Tool
+- **LMS/Assessment Tool Setup**: Is the name of the LMS/Assessment Tool Setup on the SEB Server from which the course was imported
+- **Start-Time**: Is the date and time when the exam is starting. This is defined on the LMS/Assessment Tool
+- **End-Time**: Is the date and time when the exam ends. This is defined on the LMS/Assessment Tool
+- **LMS/Assessment Tool Exam Identifier**: Is the identity of the course on the LMS/Assessment Tool (external identifier/primary key)
+- **LMS/Assessment Tool Exam URL**: Is the start URL of the course/exam
 
 To edit the SEB Server relevant attributes you can use
-the "Edit Exam" action from the action pain on the right hand side to switch to the exam edit mode. In the exam edit mode you can modify
+the "Edit Exam" action from the action pane on the right hand side to switch to the exam edit mode. In the exam edit mode you can modify
 the type of the exam "Exam Type". The exam type has currently only informational character and has no implication on SEB Server side but may be 
 used in the future to apply to different exam scenarios for SEB Server and SEB. Here you can also manage the accounts that shall be able to 
 support and monitor the exam. To do so, use the multi combo selection within the "Exam Supporter" attribute. Click in the
@@ -52,7 +52,11 @@ Apply SEB Exam Configuration
 Just below the exam details you will find the list of applied SEB exam configurations. Currently the number of SEB exam configurations that can be applied
 to an exam is restricted to one since it is not yet possible to apply a SEB exam configuration not just to the exam but also to a specific user or a 
 specific group of users. This feature may come with a future release of seb server. But for now you are able to apply just one SEB exam configuration 
-to the exam and this configuration gets delivered to all the SEB clients that connect to the SEB server and participate to the exam.
+to the exam and this configuration gets delivered to all the SEB clients that connect to the SEB Server and participate to the exam.
+
+.. image:: images/exam/examConfigAdd.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examConfigAdd.png
 
 To apply a SEB exam configuration to an exam use the "Add Exam Configuration" action on the right action pane. A pop-up will prompt you to select an
 SEB exam configuration by a drop-down selection. The drop-down box will present you all SEB exam configurations that are in state "Ready To Use" and
@@ -66,12 +70,22 @@ the pop-up shows the description and the status of the selected configuration.
 
 .. image:: images/exam/addExamConfig.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/addExamConfig.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/addExamConfig.png
     
 There is also the possibility to encrypt the SEB exam configuration by a password. This is done before the SEB configuration is send to a connecting 
-SEB client. Since in the moste cases the SEB client connections are over HTTPS / TSL there is alrady a good protection in place and an 
-additional encryption of the SEB exam configuration is not recommended. Anyways, if you decide the use the additional password encryption, the SEB 
-client that receives the encrypted SEB exam configuration will prompt the user for the password to proceed and connect to the LMS.
+SEB client. Since in the most cases the SEB client connections are over HTTPS / TSL there is already a good protection in place and an
+additional encryption of the SEB exam configuration is not recommended. Anyway, if you decide the use the additional password encryption, the SEB 
+client that receives the encrypted SEB exam configuration will prompt the user for the password to proceed and connect to the LMS/Assessment Tool.
+
+With SEB Server Version 1.6 it is possible to change the Exam Configuration encryption password of an applied Exam Configuration.
+The new action "Edit Encryption Password" can be used to open up the original apply dialog and to change the password:
+
+.. note::
+    The Encryption Password for applied Exam Configuration can only be changes when there are no active SEB clients available for the exam.
+
+.. image:: images/exam/editEncryptionPassword.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/editEncryptionPassword.png
 
 .. note::
     If you need to use the same SEB exam configuration for different exams, you can just make a copy of a SEB exam configuration that is already used
@@ -82,25 +96,19 @@ client that receives the encrypted SEB exam configuration will prompt the user f
     generate a copy of the original SEB exam configuration with the new name and description and will lead you to the details page of the copy configuration.
 
 Click the "OK" button on the pop-up to apply the selected SEB exam configuration. You will see the applied SEB exam configuration in the list.
-If the automated SEB restriction feature is supported by the LMS of the exam, the application of a SEB exam configuration will automatically update
+If the automated SEB restriction feature is supported by the LMS/Assessment Tool of the exam, the application of a SEB exam configuration will automatically update
 the SEB restriction details with the generated Config-Key. See :ref:`sebRestriction-label` for more information.
 
-.. image:: images/exam/examWithConfig.png
+.. image:: images/exam/examConfig.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examWithConfig.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examConfig.png
     
-When a SEB exam configuration is applied to the exam you are able to export the SEB exam configuration XML in plain text or the generated Config-Key for
-testing purposes. Just select the SEB exam configuration in the list to activate the action on the action pain on the right side and use the
-appropriate action. The SEB exam configuration export action will instruct the browser to open a download dialog. How the download is applied is up the 
-the browser of use. Usually you are able to either save the file or open it up with a application. If you have already installed the Safe Exam Browser on
-your device, the browser probably associates the download file already with the SEB client application.
-
-To just generate the Config-Key for testing purposes or to manually apply it on an LMS without the automated SEB restriction feature you can
+To just generate the Config-Key for testing purposes or to manually apply it on an LMS/Assessment Tool without the automated SEB restriction feature you can
 use the "Export Config-Key" action to generate the key. The Config-Key is presented by a pop-up and can be selected and copied to the clip-board.
 For more information about the Config-Key its purpose and use, please visit the `SEB documentation <https://www.safeexambrowser.org/developer/seb-config-key.html>`_.
 
 To remove an already applied SEB exam configuration from the exam, select the SEB exam configuration in the table and use the "Delete Exam Configuration"
-action form the right action pane. If the automated SEB restriction feature is supported by the LMS of the exam, the removal of a SEB exam configuration will 
+action form the right action pane. If the automated SEB restriction feature is supported by the LMS/Assessment Tool of the exam, the removal of a SEB exam configuration will
 automatically update the SEB restriction details and remove the Config-Key form the restriction details. See :ref:`sebRestriction-label` for more information.
 Once you have removed a SEB exam configuration from the exam you are able to apply another one to the exam.
 
@@ -154,7 +162,7 @@ your institution use the type information of the exam to set them into context.
 **Archive an exam**
 
 Since SEB Server version 1.4 it is possible to archive an exam that has been finished. An archived exam and all its data is still available
-on the SEB Server but read only and the exam is not been updated from the LMS data anymore and it is not possible to run this exam again.
+on the SEB Server but read only and the exam is not been updated from the LMS/Assessment Tool data anymore and it is not possible to run this exam again.
 
 This is a good use-case to organize your exams since archived exam are not shown in the Exam list with the default filter anymore. They are
 only shown if the status filter of the exam list is explicitly set to Archived status. An they are shown within the new "Finished Exam"
@@ -162,10 +170,10 @@ section in the monitoring view.
 
 .. image:: images/exam/archiveExamsFilter.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/archiveExamsFilter.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/archiveExamsFilter.png
 
-This is also a good use-case if you want to remove an LMS and LMS Setup but still want to be able to access the exams data on the SEB Server.
-In this case you can archive all exams from that LMS Setup before deactivating or deleting the respective LMS Setup.
+This is also a good use-case if you want to remove an LMS/Assessment Tool and LMS/Assessment Tool Setup but still want to be able to access the exams data on the SEB Server.
+In this case you can archive all exams from that LMS/Assessment Tool Setup before deactivating or deleting the respective LMS/Assessment Tool Setup.
 
 To archive a finished exam you just have to use the "Archive Exam" action on the right action pane of the exam view:
 
@@ -188,7 +196,7 @@ If you have "Exam Administrator" privileges you are able to entirely delete an e
 
 .. image:: images/exam/deleteExam.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/deleteExam.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/deleteExam.png
     
 - Within the delete exam dialog you see a list of a dependencies that also will be deleted. Please check them carefully before deletion.
 - Use the below action to either delete the exam or cancel the action and go back to the exam view.

docs/exam_ask.rst

@@ -0,0 +1,85 @@
+.. _examASK-label:
+
+SEB App-Signature-Key
+=====================
+
+The SEB App-Signature-Key (ASK) is a new security key accordingly to the already known Browser-Exam-Key (BEK) used by SEB to restrict access and
+ensure SEB client integrity for a SEB Server based setup. This feature is available since SEB Server 1.5 and the respective compatible SEB clients
+noted within the SEB Server compatibility section of the SEB Server about page.
+
+The main goal by using ASK for an exam with SEB and SEB Server is to ensure SEB client integrity. Since there is a unique ASK for every official SEB
+release and build and the ASK is been created at runtime and securely sent to SEB Server, it will prove the SEBs integrity. Additional to this particular
+ASK grant check, SEB Server will also make a heuristic check and considers an ASK as trusted if a particular number of SEB clients with the same 
+ASK has been connected to SEB Server. Since manipulation of the SEB application in any way, will change the ASK of that SEB, SEB Server can recognize 
+SEB clients with different singular ASKs and mark it as not granted as long as an exam administrator or supporter has not granted this specific ASK.
+
+All explicitly granted ASK on the SEB Server are considered as trusted and SEB connecting with respective ASK will automatically get the grant and are
+marked as usual as Active connection.
+
+App-Signature-Key Setup
+-----------------------
+
+You can enable ASK grant check per exam within your exam set up page. Use the new "App Signature Key" action on the left action pane to open the settings
+for this feature. 
+
+.. image:: images/exam/examASK.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASK.png
+    
+Within this settings page you can enable or disable the feature any time also during a running exam. On the exam page you can see if the feature is enabled 
+when the shield-icon is not strike-through.
+
+Within the settings "Numerical Trust Threshold" you can set the threshold for the heuristic check that is applied if there is no explicit grant for an 
+particular ASK. This means if more SEB clients with the same ASK has been connected to an running exam as this threshold points out, all that SEB clients
+will be considered as trusted since one can say, that manipulated SEB clients has also a single unique ASK while official builds of SEB will all have the same
+ASK for the same build.
+
+.. image:: images/exam/examASKedit.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKedit.png
+    
+In the following list you can see all APK that has been sent to the SEB Server by connected SEB clients. For a particular ASK you can also see
+how many SEB Clients has been sent this ASK and has the same signature. 
+
+Within this list you can explicitly grant a particular ASK by selecting the ASK from the list and using the "Add Security Grant" action from the 
+right action pane. You will see a pop-up with the specific ASK hash to be granted and all SEB client connections listed that has sent this ASK 
+below. You can give a name for the grant and save the grant by using "OK" action of the grant pop-up or cancel.
+
+.. image:: images/exam/examASKgrant.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKgrant.png
+    
+You see all granted ASKs within the second list with the ASK hash and the name that was given on grant. All explicitly granted ASKs from that list are
+considered trusted for the exam. And future SEB client connection that connects with one of the ASKs from this list are granted. All SEB clients that
+are connecting to the exam with different ASK will apply to the heuristic check using the given "Numerical Trust Threshold".
+
+Monitoring with App-Signature-Key
+---------------------------------
+
+When the App-Signature-Key check is enabled for an exam, SEB Server will check the ASK sent by a connecting SEB and mark it within the "Status" 
+column of the monitoring table. The App-Signature-Key check is processed in batch for newly connected SEB clients but not within the SEB connecting process
+itself. So when a new SEB client connection appears in the monitoring, the check will probably not be done yet for this new connection. This is marked 
+with "(No ASK Grant) tag after the status name. This will stay so when SEB has not sent an ASK and SEB Server is not able to apply the check on that
+SEB connection. If SEB has sent an ASK, the check will be processed within the next ASK update and the connection gets either granted or denied. Denied
+SEB connections are marked red and with the tag "- ASK Grant Denied" after the status name.
+
+.. image:: images/exam/examASKMonitoring1.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKMonitoring1.png
+    
+In the detail view of a SEB client connection you can see this too and you are able to apply a grant for a denied APK afterwards by using the 
+"Grant App Signature Key" action from the right action pane. This will open a pop-up with the ASK hash and an input field for the name of the 
+grant. 
+
+.. image:: images/exam/examASKMonitoring2.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKMonitoring2.png
+    
+.. image:: images/exam/examASKMonitoring3.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKMonitoring3.png
+
+
+After you have granted a unknown ASK, the grant is also applied to the respective SEB connection and to all following SEB connections that
+come with the same ASK. The grants can be modified within the Exam view as described above.
+

docs/exam_clientgroups.rst

@@ -0,0 +1,89 @@
+.. _examClientgroups-label:
+
+SEB Client Groups
+=================
+
+SEB client groups are a new feature since SEB Server 1.5 release and allows you to group SEB client connection to specified groups that are
+graphically tagged in the exam monitoring view and can be shown or hided by usual filter on the exam monitoring view. Currently there are
+two different group types to group up SEB clients or SEB users, one is the the IP-Address (Internet Protocol Address) group and a second one
+is the SEB OS (Operating System) grouping.
+
+With the IP-Address grouping type you are able to create group SEB clients/users by an IP-Address range. You can make different groups out of
+different IP-Address ranges (that ideally not overlap each other) and give them dedicated colors for identification. This group type is useful for example
+if your infrastructure is dedicated to exam-rooms with given (W)LAN and static IP-Address ranges for that rooms. In this case you can map the rooms
+to SEB groups by the IP Address range of that room and therefore are able to monitor you exam per room. 
+
+With the SEB OS grouping type you are able to group SEB clients/users by the type of the operating system of the device that is used to apply to an exam
+with SEB. This is useful if you want to monitor and support your exam and participants by operating system type what make sense since support might be different
+for different operating system.
+
+.. note:: 
+    Since the grouping is as flexible as possible, it might be that a SEB user applies to no, one ore many groups. For example if you combine the above
+    described grouping type for IP ranges and SEB OS then one SEB user will apply to a certain IP range group type and also to a certain SEB OS group type.
+    This is possible and will also be displayed respectively within the monitoring view. 
+    
+    
+Setup SEB Client Groups
+-----------------------
+
+SEB client groups can be set up with the Exam view on SEB Server. Additionally it is also possible to pre-define SEB client groups for Exam Templates that
+would be applied to an Exam while import with template as usual. Creating and managing SEB client groups for Exam Templates is exactly the same as for Exams.
+
+Client groups are located on an Exam setup page after the indicators at the end of the page.
+
+.. image:: images/exam/examClientgroupAdd.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupAdd.png
+
+To add a new SEB Client Group use the respective action from the right action pane. You will be presented with the SEB Client Group edit page
+where you are able to give the new SEB Client Group a name and choose a type of the client group that you want to create.
+You can also choose a color that is applied in the monitoring view within the "Client Group" column where all client groups that matches a 
+specified SEB client connection are displayed.
+
+When you select the type of the SEB Client Group you want to create, other type specific inputs will appear together with a short description of
+the group type. With the additional, specific inputs, the SEB Client Group can be specified further and finally be saved and applied to the Exam.
+
+.. image:: images/exam/examClientgroupIP.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupIP.png
+    
+For the IP range group type you can give a valid IP range defined with a start IP address and an end IP address. This two inputs are mandatory 
+and must be valid IPv4 addresses. The range must be a valid range and will be inclusive on the IP match (range-start >= IP <= range-end).
+
+For the SEB OS grouping type you have to choose the OS type from the given types that are available to specify the client group.
+
+.. image:: images/exam/examClientgroupWin.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupWin.png
+    
+If you have finished up your SEB Client Group definition you can save it with the "Save" action from the right action pane or cancel the modifications and
+go back to the Exam page. You will see your created SEB Client Groups within its respective section on the Exam page and are able to edit them again, or delete
+a certain SEB Client group from the list.
+
+.. image:: images/exam/examClientgroups.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroups.png
+    
+Monitoring with SEB Client Groups
+---------------------------------
+
+When SEB groups are defined within your exam, you will find the SEB groups also in your monitoring view of the running exam. In the additional column
+named "Client Groups(s)" after "User Name or Session", you will see the applied SEB client groups of each SEB connection. This can be none, one ore more
+depending on what group(s) a particular SEB applies to. 
+
+.. image:: images/exam/examClientgroupMonitoring1.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupMonitoring1.png
+
+With the "Client Group Filter" on the right action pane, you are able to show/hide individual groups. With this filtering you can adapt your monitoring view
+for specialized monitoring view, to only see SEB client connection from one particular room for example or of one particular client OS.
+
+.. note:: 
+    For the Client Group Filter, show has always the higher priority. Since a SEB client can apply to more then one group, all groups that a SEB client
+    belongs to has to be hiden (filter) before the SEB client connection is hided from the monitoring view. So if you have two different group types like
+    in the example, where a SEB client can belong to Room E1 as well as belong to Windows OS, both groups must be hidden to hide the client connection.
+    If only Windows is hidden but Room E1 not, the SEB client connection will still be shown since it belongs to at least one group that is not hided.
+
+.. image:: images/exam/examClientgroupMonitoring2.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupMonitoring2.png

docs/exam_config.rst

@@ -1,246 +1,296 @@
-.. _exam-configuration-label:
-
-Exam Configuration
-==================
-
-Overview
---------
-
-An exam configuration defines all the SEB settings for an exam. A SEB client that is connecting to SEB Server
-and an exam defined by the SEB Server is downloading this exam configuration from SEB Server and reconfigure itself before accessing the
-exam on the learning management system (LMS) and present it to the user.
-
-.. note::
-    For more information and detailed description of the SEB settings, see `SEB Configuration <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_.
-    Currently not all settings are available and some has different uses. For details about differences see :ref:`setting-dif-label` 
-
-An exam administrator is able to create, modify and maintain exam configurations while the SEB Server administrator and the institutional administrator 
-role have only read access either for all exam configurations or for the exam configurations of the institution. 
-A exam supporter role is able to see and modify only the exam configurations to which the user-account is assigned as supporter.
-
-To view the list of available exam configuration go the the sub-menu "Exam Configuration" within the menu "SEB Configurations" on the left
-hand side. The list shows the name, the description and the status of the exam configurations in a column. With SEB Server administrator role
-also an institution column is shown because a SEB Server administrator is able to see all exam configurations of all institutions.
-As usual, to filter the list use the filter inputs above and click on the lens symbol on the right to apply the filter and to clear the 
-filter use the clear symbol right to the lens symbol. See :ref:`gui-label` for more information about the list navigation. 
-
-.. image:: images/exam_config/list.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/list.png
-    
-To view details of a specific exam configuration either double-click on a list entry or select a list entry and use the "View Exam Configuration"
-action from the right action pane. In the detail view all general settings are shown and also a list of exams that uses this exam configuration.
-In the current version of SEB Server, an exam configuration can only be assigned to one exam.
-
-.. note:: 
-    For the actual SEB Server version it is not possible to assign the same exam configuration to more then one exam. This because it shall be
-    possible to change configuration settings for running exams when no active SEB clients are connected within the specified exam. This is 
-    manageable for one exam but is going to become confusing if more exams are involved.
-    But there is the possibility to copy an existing exam configuration to use the same for another exam.
-    
-The status of an exam configuration defines its visibility and assignment possibilities. If an exam configuration is still in the creation process 
-and shall not be to an exam yet, it should stay in the "Under Construction" status.
-This is the default status while creating a new exam configuration. Once a exam configuration is done and ready for assignment, one can change this
-status to "Ready To Use". Exam configurations wihtin this status are available for selection and assignment on exams. When a exam configuration
-is assigned to an exam the status changes automatically to "In Use" and the SEB settings of the exam configuration will appear only in read mode for default.
-
-.. image:: images/exam_config/view.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/view.png
-
-An exam configuration has a general settings part (like other domain objects has within SEB Server) that defines the name, description and status
-of the exam configuration that are used to maintain the exam configurations SEB Server internally. And a exam configuration has, separated from 
-the general settings, the SEB settings that contains most of the SEB setting attributes as they are provided by the SEB.
-
-.. note::
-    For more information and detailed description of the SEB setting attributes, see `SEB Configuration <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_.
-    Currently not all settings are available and some has different uses. For details about differences see :ref:`setting-dif-label` 
-
-The SEB settings differ from the general form-settings also in how they are managed and stored on server-side. Unlike the form-settings,
-the SEB settings are arranged like they are in the SEB Configuration Tool for Windows and they are stored while modifying. This means, 
-a entered value for an attribute is immediately sent to and stored by the SEB Server. There is no additional save action needed and 
-no entered data will be lost. Instead the "Save / Publish Settings" can be used to store the current setting in a new revision in the history 
-while also publish them to exams that uses this exam configuration.
-
-.. image:: images/exam_config/settings.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/settings.png
-
-.. note:: 
-    Changes in SEB settings must be published to be available on exports, exams or other uses. Before publishing they are not
-    available for exams and SEB clients that connect to the SEB Server will still receive the last published version of the SEB settings.
-    To publish SEB setting changes use the "Save / Publish Settings" action from the right action pane.
-    
-.. note:: 
-    Currently there is an "Undo" function to revert the changed made to the last published state. But there is no possibility yet to 
-    maintain the publishing history of a Exam Configuration but may be available in a future release of the SEB Server.
-    
-Since an exam configuration can only be used by one exam it may be convenient to quickly copy an existing exam configuration that is in use
-and use the copy of this exam configuration for another exam or to just change the settings to make a slightly different exam configuration.
-The "Copy Exam Configuration" action can always be used no matter in what state the exam configuration may be at the moment. By using this
-feature there will be a copy dialog shown as pop-up window where one has to give at least a new unique name for the copy. See :ref:`copy-config-label` 
-for detailed step by step guide.
-
-A plain XML export of the SEB settings may be needed for testing. This is always possible by using the "Export SEB Settings" action
-from the right action pane in the SEB settings view. This will start a usual browser download dialog handled by your browser to save or load the file. The default name
-of the file of a exam configuration is "SEBExamSettings.seb".
-
-SEB Server supports also the `SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ that is used to validate the SEB configuration
-on the LMS adds a higher security level to the exam. This supported if the specific type of LMS supports the automated SEB restriction feature. Anyways
-sometimes it may be needed to manually extract the `SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ for a exam configuration.
-Therefore one can use the "Export Client-Key" action from the right action pane to generate the Config-Key form the actual saved SEB settings revision
-of the exam configuration. The key will be presented by a pop-up dialog where it can be copied for further use.
-
-.. image:: images/exam_config/settings.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/config_key.png
-
-
-Use Cases
----------
-
-**Create new Exam Configuration**
-
-For the upcoming semester you have to create several new exam configurations for the different kind of exams your institution is going to provide
-during the semester.
-
-- Sign into SEB Server with your exam administrator role account
-- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left hand side.
-- You see a list of all available exam configuration.
-- Use the "Add Exam Configuration" action on the action pane on the right hand side to create a new exam configuration
-- The creation form at least needs a unique name for the exam configuration. You can also add a description or hint to recognize and find this configuration more easily later on.
-- In the "Status" field you are able to choose if the configuration is still under construction and cannot be added to exams yet, or if it is ready to use.
-- Save the form with the "Save Exam Configuration" action on the right action pane to create the configuration.
-- After successfully saved the new exam configuration use "Edit SEB Settings" to open all the SEB settings that can be defined for a exam.
-- For more information about the individual SEB settings see `SEB Configuration <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_.
-- In the SEB settings view use the "Save / Publish Settings" action to save your settings. 
-
-.. note:: 
-    Changes in SEB settings are automatically sent to the server and stored within the open working revision of the settings.
-    To make a open working revision active and available for export, exams and other uses, you need to save / publish this settings exclusively
-    by using the "Save / Publish Settings" action. After using this action all the changes are saved in a historical revision and 
-    available for use. A new working revision will be created and all the changes until then will go into the new working revision.
-    To revert all the changes done since last save / publish use the "Undo" action.
-
-**Export SEB Settings**
-
-You want to test an exam configuration manually with a SEB client. Therefore you need to export the settings of an existing exam configuration and load
-it with a SEB client or the SEB configuration tool.
-
-- Sign into SEB Server with your exam administrator role account
-- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left hand side.
-- You see a list of all available exam configuration.
-- Use the Filter above the list to narrow down the number of entries and to find a specific exam configuration.
-- Open the exam configuration either by double-click on the list entry or be selecting the list entry and using the "View Exam Configuration" action.
-- Open the SEB settings of the exam configuration by using the action on the right action pane.
-- Use the "Export SEB Settings" action to start the export download.
-- Save the file or open it directly with SEB
-
-**Import an Exam Configuration**
-
-There is an existing SEB configuration file once created with the SEB config tool that must be imported to use with SEB Server. 
-The SEB configuration files where created with the SEB configuration tool and are all saved with the purpose to start an exam (attribute).
-
-- Sign into SEB Server with your exam administrator role account
-- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left hand side.
-- Use the "Import Exam Configuration" action from the right action pane to start an upload dialog.
-- Within the upload dialog use the file selector to select the SEB configuration file for importing.
-- Give a unique name for the imported exam configuration and a description (optional).
-- If the original SEB configuration is password protected, give the password that is needed to decrypt the configuration file.
-- Use the OK action on the upload dialog to start the import.
-- If the import was successful a new exam configuration with the given name exists.
-
-.. _copy-config-label:
-
-**Copy an Exam Configuration**
-
-Since an exam configuration can only be used by one exam you have  periodically to create a copy of an existing exam configuration
-that is already attached to an exam. The copy can then be used to either make first some changes to the settings or add it directly
-to another exam that has to be configured for SEB.
-
-- Sign into SEB Server with your exam administrator role account
-- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left hand side.
-- You see a list of all available exam configuration.
-- Use the Filter above the list to narrow down the number of entries and to find a specific exam configuration.
-- Open the exam configuration either by double-click on the list entry or be selecting the list entry and using the "View Exam Configuration" action.
-- Use the "Copy Exam Configuration" action from the right action pane to open up the copy dialog.
-- Within the copy dialog give a new unique name for the new exam configuration and a description if needed.
-- Use "With History" apply the whole history of the original exam configuration to be copied or let it unchecked to just copy the last saved / published revision of the original.
-- If all information is correct, use the "OK" button of the copy dialog to create the copy.
-
-.. note:: If there where changes in the working revision of the exam configuration to copy, they will not be included in the copy.
-    Only saved / published changes are included in the copy.
-
-**Generate and Export the Config-Key of an Exam Configuration**
-
-Usually the `SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ that is used to validate the SEB configuration
-on the LMS is propagated automatically to a LMS by the SEB Server with the automated SEB restriction feature. But For testing purposes you need to generate and export the 
-`SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ and set it manually on the LMS. 
-
-- Sign into SEB Server with your exam administrator role account
-- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left hand side.
-- You see a list of all available exam configuration.
-- Use the Filter above the list to narrow down the number of entries and to find a specific exam configuration.
-- Open the exam configuration either by double-click on the list entry or be selecting the list entry and using the "View Exam Configuration" action.
-- Use the "Export Config-Key" action from the right action pane to generate the Config-Key and open a dialog that presents this generated Config-Key.
-- Mark the Config-Key hash in the dialog with double-click and copy it (ctrl+c) to the clip-board.
-
-.. note:: If there where changes in the working revision of the exam configuration to create the Config-Key from, they will not be included in the generation of the Config-Key.
-    Only saved / published changes are included in the Config-Key generation.
-
-**Changing SEB Settings of an Exam Configuration in Use**
-
-There is an already fully configured exam within SEB Server that is currently running with a prepared exam configuration. You have now realized that
-some SEB settings are missing or wrong and has to be changed for the exam. This is possible but under some restrictions. See the note below.
-
-.. note:: 
-    When a exam configuration is applied to a currently running exam, the exam configuration is in "Used" state and the SEB settings of the exam configuration 
-    are in read only mode. Changing the SEB settings of a exam configuration during a running exam that has already connected clients can lead to unexpected 
-    behavior. SEB clients that has already been connected and are in a running session will work with the old configuration while SEB clients that are connecting
-    after a SEB settings change will work with the new configuration. Also the automated SEB restriction with the changed `SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_
-    will be updated immediately after saving / publishing the configuration changes. This may also lead to unexpected behavior and eventually blocking of already connected SEB clients.
-    Therefore SEB Server restricts the change of SEB settings for configurations that are attached to an exam that is currently running to be only possible if there are no
-    active SEB client connections for this exam at the moment when save / publish the SEB setting changes. 
-
-- Sign into SEB Server with your exam administrator role account
-- To change the SEB Settings of an exam configuration that is attached to an currently running exam, make sure that there are no active SEB client connections.
-  Go to the "Monitoring" section and find and view the concerned exam to make sure there are currently no active SEB client connections.
-- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left hand side.
-- You see a list of all available exam configuration.
-- Use the Filter above the list to narrow down the number of entries and to find a specific exam configuration.
-- Open the exam configuration either by double-click on the list entry or be selecting the list entry and using the "View Exam Configuration" action.
-- See that you currently are not able to edit the SEB settings. There is only a "View SEB Settings" action that opens the SEB settings in read-only mode.
-- Use the "Edit Exam Configuration" action from the right action pane to open the edit mode of the exam configuration.
-- Change the status from "Used" to "Under Construction" to be able to edit the SEB settings again. There will be a message that tells you the implication with changing SEB settings within a exam configuration that is already used by a running exam.
-- After saving the exam configuration in "Under Construction" it is now possible to edit the SEB settings for this exam configuration.
-- Use the "Edit SEB Settings" action from the right action pane to open the SEB settings form in the edit mode.
-- Apply your changes to the settings and use "Save / Publish Settings" to make the settings take affect and trigger a configuration change to the exam. This will check first if there are currently no active SEB clients connected within the running exam that uses this exam configuration. If there is one or more active SEB client connected, the action will deny and inform you about the the active SEB clients.
-
-
-.. _setting-dif-label:
-
-SEB Setting Differences
------------------------
-
-In the current version of SEB Server, there are some differences to some SEB settings as well as some SEB settings that are slightly different or not available at all on the SEB Server.
-
-**SEB settings currently not supported by the SEB Server**
-
-- Start URL: Since SEB Server has already been contacted by a SEB client when downloading the exam configuration this is not used by the exam configuration on SEB Server. But this can be used as fallback URL in the Connection Configuration.
-- Embedded Resource: There is currently no embedding supported within exam configurations on SEB Server.
-- Additional Dictionaries: There are only the SEB client default dictionaries available in the current SEB Server version.
-- Additional Resources: Additional resources are currently not available in the current SEB Server version.
-- Embedded Certificates: There is currently no certificate management possible on current SEB Server version.
-- Browser Exam Key: There is currently no possibility to generate the Browser Exam Key on the SEB Server. But an already generated Browser Exam Key may be used within the SEB restriction feature on the exam configuration if this feature is supported by the LMS in use.
-
-
-**SEB settings that has a slightly different form or handling in SEB Server comparing to the SEB configuration tool** 
-
-- Download Directory OSX: Since it is not possible within a web-service to choose a local directory on a remote device this is just a text input where one has to give the full-path to the directory on the client device in text form.
-- Log Directory OSX, Log Directory Win: Since it is not possible within a web-service to choose a local directory on a remote device this is just a text input where one has to give the full-path to the directory on the client device in text form.
-- Permitted Processes / Executable: This is also just a text input field where one can give the name of the process in text form.
-
-**SEB settings from versions before 3.0 that are not supported anymore**
-
-- Permitted Processes / Window Handling Process
-    
+.. _exam-configuration-label:
+
+Exam Configuration
+==================
+
+Overview
+--------
+
+An exam configuration defines all the SEB settings for an exam. A SEB client that is connecting to SEB Server
+and an exam defined by the SEB Server is downloading this exam configuration from SEB Server and reconfigure itself before accessing the
+exam on the learning management system (LMS/Assessment Tool) and present it to the user.
+
+.. note::
+    For more information and detailed description of the SEB settings, see `SEB Configuration <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_.
+    Currently not all settings are available, and some have different uses. For details about differences see :ref:`setting-dif-label` 
+
+An exam administrator is able to create, modify and maintain exam configurations while the SEB Server administrator and the institutional administrator 
+role have only read access either for all exam configurations or for the exam configurations of the institution. 
+An exam supporter role is able to see and modify only the exam configurations to which the user-account is assigned as supporter.
+
+To view the list of available exam configuration go the sub-menu "Exam Configuration" within the menu "SEB Configurations" on the left
+hand side. The list shows the name, the description, and the status of the exam configurations in a column. With SEB Server administrator role
+also an institution column is shown because a SEB Server administrator is able to see all exam configurations of all institutions.
+As usual, to filter the list use the filter inputs above and click on the lens symbol on the right to apply the filter and to clear the 
+filter use the clear symbol right to the lens symbol. See :ref:`gui-label` for more information about the list navigation. 
+
+.. image:: images/exam_config/list.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/list.png
+    
+To view details of a specific exam configuration either double-click on a list entry or select a list entry and use the "View Exam Configuration"
+action from the right action pane. In the detail view all general settings are shown and also a list of exams that uses this exam configuration.
+In the current version of SEB Server, an exam configuration can only be assigned to one exam.
+
+.. note:: 
+    For the actual SEB Server version, it is not possible to assign the same exam configuration to more then one exam. This because it shall be
+    possible to change configuration settings for running exams when no active SEB clients are connected within the specified exam. This is 
+    manageable for one exam but is going to become confusing if more exams are involved.
+    But there is the possibility to copy an existing exam configuration to use the same for another exam.
+    
+The status of an exam configuration defines its visibility and assignment possibilities. If an exam configuration is still in the creation process 
+and shall not be to an exam yet, it should stay in the "Under Construction" status.
+This is the default status while creating a new exam configuration. Once an exam configuration is done and ready for assignment, one can change this
+status to "Ready To Use". Exam configurations within this status are available for selection and assignment on exams. When an exam configuration
+is assigned to an exam, the status changes automatically to "In Use" and the SEB settings of the exam configuration will appear only in read mode for default.
+
+.. image:: images/exam_config/view.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/view.png
+
+An exam configuration has a general settings part (like other domain objects has within SEB Server) that defines the name, description and status
+of the exam configuration that are used to maintain the exam configurations SEB Server internally. And an exam configuration has, separated from 
+the general settings, the SEB settings that contains most of the SEB setting attributes as they are provided by the SEB.
+
+.. note::
+    For more information and detailed description of the SEB setting attributes, see `SEB Configuration <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_.
+    Currently not all settings are available, and some have different uses. For details about differences see :ref:`setting-dif-label` 
+
+The SEB settings differ from the general form-settings also in how they are managed and stored on server-side. Unlike the form-settings,
+the SEB settings are arranged like they are in the SEB Configuration Tool for Windows and they are stored while modifying. This means, 
+an entered value for an attribute is immediately sent to and stored by the SEB Server. There is no additional save action needed and 
+no entered data will be lost. Instead, the "Save / Publish Settings" can be used to store the current setting in a new revision in the history 
+while also publish them to exams that uses this exam configuration.
+
+.. image:: images/exam_config/settings.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/settings.png
+
+.. note:: 
+    Changes in SEB settings must be published to be available on exports, exams, or other uses. Before publishing they are not
+    available for exams and SEB clients that connect to the SEB Server will still receive the last published version of the SEB settings.
+    To publish SEB setting changes, use the "Save / Publish Settings" action from the right action pane.
+    
+.. note:: 
+    Currently there is an "Undo" function to revert the changed made to the last published state. But there is no possibility yet to 
+    maintain the publishing history of an Exam Configuration but may be available in a future release of the SEB Server.
+    
+Since an exam configuration can only be used by one exam it may be convenient to quickly copy an existing exam configuration that is in use
+and use the copy of this exam configuration for another exam or to just change the settings to make a slightly different exam configuration.
+The "Copy Exam Configuration" action can always be used no matter in what state the exam configuration may be at the moment. By using this
+feature there will be a copy dialog shown as pop-up window where one has to give at least a new unique name for the copy.
+See :ref:`copy-config-label` for a detailed step by step guide.
+
+A plain XML export of the SEB settings may be needed for testing. This is always possible by using the "Export SEB Settings" action
+from the right action pane in the SEB settings view. This will start a usual browser download dialog handled by your browser to save or load the file. The default name
+of the file of an exam configuration is "SEBExamSettings.seb".
+
+SEB Server supports also the `SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ that is used to validate the SEB configuration
+on the LMS/Assessment Tool and adds a higher security level to the exam. This is supported if the specific type of LMS/Assessment Tool supports the automated SEB restriction feature. Anyways
+sometimes it may be needed to manually extract the `SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ for an exam configuration.
+Therefore, one can use the "Export Client-Key" action from the right action pane to generate the Config-Key from the actual saved SEB settings revision
+of the exam configuration. The key will be presented by a pop-up dialog where it can be copied for further use.
+
+.. image:: images/exam_config/config_key.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/config_key.png
+
+
+Batch Actions
+-------------
+
+Within the Exam Configuration list page there are two different batch-actions with that it is able to apply one action to many selected exam configurations.
+
+For list multi-selection documentation see :ref:`List Multi-Selection <listmultiselect>`.
+
+.. note:: 
+    For all batch actions it is the case that the process try to apply the selected action with a particular selected object. If the action is not possible for the respective
+    object, the failure is ignored and the action will not be applied for such a selection. At the end of the batch action you can see for how many objects this
+    action has been failed.
+
+.. image:: images/exam_config/batch-actions.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/batch-actions.png
+
+
+
+**State Change**
+
+With this batch action you are able to change the state of all selected exam configurations to a specific target state. 
+
+
+.. image:: images/exam_config/batch-actions_statechange.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/batch-actions_statechange.png
+    
+Within the batch-action pop-up you can see how many exam configurations you have selected for the action. Now you are able to select the target state
+to where you would like to change all selected exam configurations state to. Then you can apply the batch action with "Change State" or cancel the batch-action.
+
+While the batch action is running, you see the progress within the pop-up until the batch action has been finished. You also can see how many actions
+has been applied and how many has failed.
+
+.. image:: images/exam_config/batch-actions_statechange_finished.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/batch-actions_statechange_finished.png
+    
+    
+**Reset To Template Settings**
+
+With this batch-action you are able to reset all SEB Settings either to the respective Configuration Template default values, if the Exam Configuration
+has such a Configuration Template, or to the overall SEB default Settings for exam configurations.
+
+Within the batch-action pop-up you can see how many exam configurations you have selected for the action. Now you are able to select the target state
+to where you would like to change all selected exam configurations state to. Then you can apply the batch action with "Reset Settings" or cancel the batch-action.
+
+While the batch action is running, you see the progress within the pop-up until the batch action has been finished. You also can see how many actions
+has been applied and how many has failed.
+
+Use Cases
+---------
+
+**Create new Exam Configuration**
+
+For the upcoming semester you have to create several new exam configurations for the different kind of exams your institution is going to provide
+during the semester.
+
+- Sign into SEB Server with your exam administrator role account.
+- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left-hand side.
+- You see a list of all available exam configuration.
+- Use the "Add Exam Configuration" action on the action pane on the right-hand side to create a new exam configuration
+- The creation form at least needs a unique name for the exam configuration. You can also add a description or hint to recognize and find this configuration more easily later on.
+- In the "Status" field you are able to choose if the configuration is still under construction and cannot be added to exams yet, or if it is ready to use.
+- Save the form with the "Save Exam Configuration" action on the right action pane to create the configuration.
+- After successfully saved the new exam configuration use "Edit SEB Settings" to open all the SEB settings that can be defined for a exam.
+- For more information about the individual SEB settings see `SEB Configuration <https://www.safeexambrowser.org/windows/win_usermanual_en.html#configuration>`_.
+- In the SEB settings view use the "Save / Publish Settings" action to save your settings. 
+
+.. note:: 
+    Changes in SEB settings are automatically sent to the server and stored within the open working revision of the settings.
+    To make an open working revision active and available for export, exams and other uses, you need to save / publish this settings exclusively
+    by using the "Save / Publish Settings" action. After using this action, all the changes are saved in a historical revision and 
+    available for use. A new working revision will be created and all the changes until then will go into the new working revision.
+    To revert all the changes done since last save / publish use the "Undo" action.
+
+**Export SEB Settings**
+
+You want to test an exam configuration manually with a SEB client. Therefore, you need to export the settings of an existing exam configuration and load
+it with a SEB client or the SEB configuration tool.
+
+- Sign into SEB Server with your exam administrator role account.
+- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left-hand side.
+- You see a list of all available exam configuration.
+- Use the Filter above the list to narrow down the number of entries and to find a specific exam configuration.
+- Open the exam configuration either by double-click on the list entry or be selecting the list entry and using the "View Exam Configuration" action.
+- Open the SEB settings of the exam configuration by using the action on the right action pane.
+- Use the "Export SEB Settings" action to start the export download.
+- Save the file or open it directly with SEB.
+
+**Import an Exam Configuration**
+
+There is an existing SEB configuration file once created with the SEB config tool that must be imported to use with SEB Server. 
+The SEB configuration files were created with the SEB configuration tool and are all saved with the purpose to start an exam.
+
+- Sign into SEB Server with your exam administrator role account.
+- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left hand-side.
+- Use the "Import Exam Configuration" action from the right action pane to start an upload dialog.
+- Within the upload dialog use the file selector to select the SEB configuration file for importing.
+- Give a unique name for the imported exam configuration and a description (optional).
+- If the original SEB configuration is password protected, give the password that is needed to decrypt the configuration file.
+- Use the OK action on the upload dialog to start the import.
+- If the import was successful a new exam configuration with the given name exists.
+
+.. _copy-config-label:
+
+**Copy an Exam Configuration**
+
+Since an exam configuration can only be used by one exam you have  periodically to create a copy of an existing exam configuration
+that is already attached to an exam. The copy can then be used to either make first some changes to the settings or add it directly
+to another exam that has to be configured for SEB.
+
+- Sign into SEB Server with your exam administrator role account.
+- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left-hand side.
+- You see a list of all available exam configuration.
+- Use the Filter above the list to narrow down the number of entries and to find a specific exam configuration.
+- Open the exam configuration either by double-click on the list entry or be selecting the list entry and using the "View Exam Configuration" action.
+- Use the "Copy Exam Configuration" action from the right action pane to open up the copy dialog.
+- Within the copy dialog give a new unique name for the new exam configuration and a description if needed.
+- Use "With History" apply the whole history of the original exam configuration to be copied or let it unchecked to just copy the last saved / published revision of the original.
+- If all information is correct, use the "OK" button of the copy dialog to create the copy.
+
+.. note:: If there were changes in the working revision of the exam configuration to copy, they will not be included in the copy.
+    Only saved / published changes are included in the copy.
+
+**Generate and Export the Config-Key of an Exam Configuration**
+
+Usually the `SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ that is used to validate the SEB configuration
+on the LMS/Assessment Tool is propagated automatically to a LMS/Assessment Tool by the SEB Server with the automated SEB restriction feature. But For testing purposes you need to generate and export the
+`SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ and set it manually on the LMS/Assessment Tool.
+
+- Sign into SEB Server with your exam administrator role account.
+- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left-hand side.
+- You see a list of all available exam configuration.
+- Use the Filter above the list to narrow down the number of entries and to find a specific exam configuration.
+- Open the exam configuration either by double-click on the list entry or be selecting the list entry and using the "View Exam Configuration" action.
+- Use the "Export Config-Key" action from the right action pane to generate the Config-Key and open a dialog that presents this generated Config-Key.
+- Mark the Config-Key hash in the dialog with double-click and copy it (ctrl+c) to the clipboard.
+
+.. note:: If there were changes in the working revision of the exam configuration to create the Config-Key from, they will not be included in the generation of the Config-Key.
+    Only saved / published changes are included in the Config-Key generation.
+
+**Changing SEB Settings of an Exam Configuration in Use**
+
+There is an already fully configured exam within SEB Server that is currently running with a prepared exam configuration. You have now realized that
+some SEB settings are missing or wrong and has to be changed for the exam. This is possible but under some restrictions. See the note below.
+
+.. note:: 
+    When an exam configuration is applied to a currently running exam, the exam configuration is in "Used" state and the SEB settings of the exam configuration 
+    are in read only mode. Changing the SEB settings of an exam configuration during a running exam that has already connected clients can lead to unexpected 
+    behavior. SEB clients that have already been connected and are in a running session will work with the old configuration while SEB clients that are connecting
+    after a SEB settings change will work with the new configuration. Also, the automated SEB restriction with the changed `SEB Config-Key <https://safeexambrowser.org/developer/seb-config-key.html>`_
+    will be updated immediately after saving / publishing the configuration changes. This may also lead to unexpected behavior and eventually blocking of already connected SEB clients.
+    Therefore, SEB Server restricts the change of SEB settings for configurations that are attached to an exam that is currently running to be only possible if there are no
+    active SEB client connections for this exam at the moment when save / publish the SEB setting changes. 
+
+- Sign into SEB Server with your exam administrator role account.
+- To change the SEB Settings of an exam configuration that is attached to a currently running exam, make sure that there are no active SEB client connections.
+  Go to the "Monitoring" section and find and view the concerned exam to make sure there are currently no active SEB client connections.
+- Navigate to the "Exam Configuration" menu within the SEB Configuration section on the left-hand side.
+- You see a list of all available exam configuration.
+- Use the Filter above the list to narrow down the number of entries and to find a specific exam configuration.
+- Open the exam configuration either by double-click on the list entry or be selecting the list entry and using the "View Exam Configuration" action.
+- See that you currently are not able to edit the SEB settings. There is only a "View SEB Settings" action that opens the SEB settings in read-only mode.
+- Use the "Edit Exam Configuration" action from the right action pane to open the edit mode of the exam configuration.
+- Change the status from "Used" to "Under Construction" to be able to edit the SEB settings again. There will be a message that tells you the implication with changing SEB settings within an exam configuration that is already 
+used by a running exam.
+- After saving the exam configuration in "Under Construction" it is now possible to edit the SEB settings for this exam configuration.
+- Use the "Edit SEB Settings" action from the right action pane to open the SEB settings form in the edit mode.
+- Apply your changes to the settings and use "Save / Publish Settings" to make the settings take affect and trigger a configuration change to the exam. This will check first if there are currently no active SEB clients connected within the running exam that uses this exam configuration. If there is one or more active SEB client connected, the action will deny and inform you about the active SEB clients.
+
+
+.. _setting-dif-label:
+
+SEB Setting Differences
+-----------------------
+
+In the current version of SEB Server, there are some differences to some SEB settings as well as some SEB settings that are slightly different or not available at all on the SEB Server.
+
+**SEB settings currently not supported by the SEB Server**
+
+- Start URL: Since SEB Server has already been contacted by a SEB client when downloading the exam configuration this is not used by the exam configuration on SEB Server. But this can be used as fallback URL in the Connection Configuration.
+- Embedded Resource: There is currently no embedding supported within exam configurations on SEB Server.
+- Additional Dictionaries: There are only the SEB client default dictionaries available in the current SEB Server version.
+- Additional Resources: Additional resources are currently not available in the current SEB Server version.
+- Embedded Certificates: There is currently no certificate management possible on current SEB Server version.
+- Browser Exam Key: There is currently no possibility to generate the Browser Exam Key on the SEB Server. But an already generated Browser Exam Key may be used within the SEB restriction feature on the exam configuration if this feature is supported by the LMS/Assessment Tool in use.
+
+
+**SEB settings that have a slightly different form or handling in SEB Server comparing to the SEB configuration tool** 
+
+- Download Directory OSX: Since it is not possible within a web-service to choose a local directory on a remote device this is just a text input where one has to give the full-path to the directory on the client device in text form.
+- Log Directory OSX, Log Directory Win: Since it is not possible within a web-service to choose a local directory on a remote device this is just a text input where one has to give the full-path to the directory on the client device in text form.
+- Permitted Processes / Executable: This is also just a text input field where one can give the name of the process in text form.
+
+**SEB settings from versions before 3.0 that are not supported anymore**
+
+- Permitted Processes / Window Handling Process
+    

docs/exam_import.rst

@@ -1,28 +1,39 @@
-Import LMS Course as Exam in SEB Server
+Import LMS/Assessment Tool Course as Exam in SEB Server
 =======================================
 
-To be able to configure and manage a course or parts of a course existing on a LMS as an exam on SEB Server we first need to import
-an exam from the one of the available courses from a LMS that has been setup to use within the SEB Server.
+To be able to configure and manage a course or parts of a course existing on a LMS/Assessment Tool as an exam on SEB Server we first need to import
+an exam from the one of the available courses from a LMS/Assessment Tool that has been setup to use within the SEB Server.
 
 .. note::
-    If you don't have already set up a LMS binding within SEB Server and your institution, you have to do this first.
-    More information about setting up a LMS binding can be found in the chapter :ref:`lms-setup-label`
+    If you don't have already set up a LMS/Assessment Tool binding within SEB Server and your institution, you have to do this first.
+    More information about setting up a LMS/Assessment Tool binding can be found in the chapter :ref:`lms-setup-label`
     
-You will find the list of available courses provided form all LMS that are bound within your institution by going to the "Exam Administration"
-section on the left hand side and choosing "LMS Exam Lookup". The SEB Server will present you the list of all available courses and you
+You will find the list of available courses provided from all LMS/Assessment Tool that are bound within your institution by going to the "Exam Administration"
+section on the left hand side and choosing "LMS/Assessment Tool Exam Lookup". The SEB Server will present you the list of all available courses and you
 are able to filter and sort the list as usual to find to right course for import.
 
 .. note::
-    The "Start-Time" filter is usually set to the date one year before now or to some other default date in the past. The list shows only 
-    the courses that has a start-time after that time. If you have long running courses and it may possible that a course has been stated
-    a year or two ago, you habe to adapt this "Start-Time" filter to view those courses that has been started before. 
+    The “Start-Time” filter is usually set to the date one year before now or to some other default date in the past. 
+    The list shows only the courses that has a start-time after that time. If you have long running courses and it may 
+    possible that a course has been stated a year or two ago, you have to adapt this “Start-Time” filter to view those 
+    courses that has been started before.
 
 .. image:: images/exam/lmsExamLookup.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/lmsExamLookup.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/lmsExamLookup.png
     
-You can view more details of a course by double-click on the specific list entry or by selecting the list entry and click the "Show LMS Exam Details" 
-action form the action pain on the right hand side. The application will open a pop-up with available detail information of the course.
+You can view more details of a course by double-click on the specific list entry or by selecting the list entry and click the "Show LMS/Assessment Tool Exam Details"
+action form the action pane on the right hand side. The application will open a pop-up with available detail information of the course.
+
+Since SEB Server version 1.5 the data-fetching-process to get all course data from bounded LMS/Assessment Tools works as a background task and
+the UI request will return anyway no matter if all data has been fetched already and presents the already available data. 
+If the background task is still running and fetching data, SEB Server will indicate that with a message note on top of the page
+with the ability to reload the page by clicking on the respective icon in the note. With this approach you can now see whether all data
+are available and fetched or not.
+
+.. image:: images/exam/lmsExamLookupLate.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/lmsExamLookupLate.png
 
 To import a course as an exam find the specific course on the list by using the filter and select the list entry. Use the "Import As Exam" action 
 from the action pane on the right hand side. 
@@ -30,26 +41,29 @@ from the action pane on the right hand side.
 .. note::
     If a course has already ended (End-Time passed) it is not possible to import this course and an appropriate message is shown.
     
-On import, the application is creating an exam on SEB Server with a reference to the imported course on the LMS. All course specific data
+On import, the application is creating an exam on SEB Server with a reference to the imported course on the LMS/Assessment Tool. All course specific data
 like name, description, start-, end-time and course-identifier will not be stored on the SEB Server but always be referenced by the underling course.
-This means, that the course data has to be modified on the LMS side as usual and the SEB Server always takes the actual data from the LMS for the 
+This means, that the course data has to be modified on the LMS/Assessment Tool side as usual and the SEB Server always takes the actual data from the LMS/Assessment Tool for the
 course. This has the advantages of the principle of single responsibility and prevents synchronization issues. 
 
-You will see the creation page of the new exam with additional information: 
+You will see the creation page of the new exam with additional information from LMS/Assessment Tool:
 
-- **Name**: Is the name of the course, defines on the LMS
-- **LMS Setup**: Is the name of the LMS Setup on the SEB Server from which the course was imported
-- **Start-Time**: Is the date and time when the exam is starting. This is defined on the LMS
-- **End-Time**: Is the date and time when the exam ends. This is defined on the LMS
-- **LMS Exam Identifier**: Is the identity of the course on the LMS (external identifier/primary key)
-- **LMS Exam URL**: Is the start URL of the course/exam
+- **Name**: Is the name of the course, defines on the LMS/Assessment Tool
+- **LMS/Assessment Tool Setup**: Is the name of the LMS/Assessment Tool Setup on the SEB Server from which the course was imported
+- **Start-Time**: Is the date and time when the exam is starting. This is defined on the LMS/Assessment Tool
+- **End-Time**: Is the date and time when the exam ends. This is defined on the LMS/Assessment Tool
+- **LMS/Assessment Tool Exam Identifier**: Is the identity of the course on the LMS/Assessment Tool (external identifier/primary key)
+- **LMS/Assessment Tool Exam URL**: Is the start URL of the course/exam
 
-You are now able to initially choose a type for the exam - "Exam Type" - that is currently only used 
-for informational purpose and has no further restrictions or consequences on handling on in SEB Server.
+You are now able to either choose an existing :ref:`exam-template-label` to initialize the new exam with the settings defined within the template
+or to set the needed settings only for this exam. If you choose a template, the settings from the template will automatically be added to the exam
+on creation and you are still able to modify them afterwards.
+
+Initially choose a type for the exam - "Exam Type" - that is currently only used for informational purpose and has no further restrictions or consequences on handling on in SEB Server.
 
 .. image:: images/exam/importExam.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/importExam.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/importExam.png
     
 Furthermore you can select and apply all exam supporter that shall be able to see and support this exam while running. To do so, click in the
 input field of the attribute "Exam Supporter" to see a drop down list of all available users for selection. To filter the drop down list, start
@@ -57,19 +71,16 @@ typing characters of the name of the user-account you want to apply to automatic
 specified user that will be added to the list below the input field. To add another user to the selection just click again into the input field
 and select another user. To remove a selected user from the selection-list, double-click on the specified entry of the selection-list.
 
-.. note::
-    At least one user account must be selected for the attribute "Exam Supporter". You are able to change this also later on by editing the exam.
-    
 To confirm the import use the "Save Exam" action of the action pane on the right hand side or use "Cancel" if you want to abort the import of the
 exam and go back to the course list. If you have confirmed and successfully imported the exam, you will see the exam overview page where you are able
-to edit the details of the exam, apply SEB restrictions of supported by the LMS, apply a SEB exam configuration for the exam and define indicators
+to edit the details of the exam, apply SEB restrictions of supported by the LMS/Assessment Tool, apply a SEB exam configuration for the exam and define indicators
 for monitoring the exam later on.
 
 .. image:: images/exam/examReady.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examReady.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examReady.png
 
-How all this different aspects of the exam are defined and prepared is part of the next chapter.
+How all this different aspects of the exam are defined and prepared is part of the next chapters.
     
 
 Use Cases
@@ -77,11 +88,11 @@ Use Cases
 
 **Import a course as exam**
 
-To start setting up a course or quiz form an existing LMS as e-assessment with SEB and SEB Server you have to find this course or quiz on the 
+To start setting up a course or quiz form an existing LMS/Assessment Tool as e-assessment with SEB and SEB Server you have to find this course or quiz on the
 SEB Server and import it as exam. Define a type and apply exam supporter.
 
-- Login as an exam administrator and go to the "LMS Exam Lookup" page under the "Exam Administration" section. 
-- If you are not sure if the LMS that runs your course has already been setup within the SEB server, go first to the "LMS Setup" page and try to find the particular LMS in the list. If you can't find it, please contact an institutional administrator or setup the LMS by yourself as described in :ref:`lms-setup-label`.
+- Login as an exam administrator and go to the "LMS/Assessment Tool Exam Lookup" page under the "Exam Administration" section.
+- If you are not sure if the LMS/Assessment Tool that runs your course has already been setup within the SEB Server, go first to the "LMS/Assessment Tool Setup" page and try to find the particular LMS/Assessment Tool in the list. If you can't find it, please contact an institutional administrator or setup the LMS/Assessment Tool by yourself as described in :ref:`lms-setup-label`.
 - Find your course or quiz by using the filter of the list and the list navigation as usual.
 - Double click on the list entries to get all information about a particular course or quiz.
 - Once you have found the course or quiz, select it on the list and use the "Import Exam" action on the right action pane.

docs/exam_indicator.rst

@@ -3,10 +3,23 @@
 Monitoring Indicators
 =====================
 
-For monitoring connected SEB clients, SEB server supports some indicators that can be defined within an exam and that are shown and measured during an
+For monitoring connected SEB clients, SEB Server supports some indicators that can be defined within an exam and that are shown and measured during an
 exam. When you import, the application automatically creates a default ping-indicator for the exam. You are able to modify this default indicator and also
-add some other indicators to the exam to be able to get notified while monitoring a exam session.
+add some other indicators to the exam to be able to get notified while monitoring an exam session.
 
+.. image:: images/exam/examIndicators.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examIndicators.png
+    
+To add a new indicator to the exam you can use the "Add Indicator" action from the right action pane. In the indicator edit page you are able to give the
+new indicator a name. This name will be displayed in the SEB client connection table on monitoring section as column name for the column of this
+indicator. Then you are able to choose a "Type" that specifies the type of indicator. Choose this from a drop-down selection of supported indicators.
+If you have selected one indicator type, a description will be shown just below the "Type" attribute. 
+
+.. image:: images/exam/editIndicator.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/editIndicator.png
+    
 The type of indicators are pre-defined within the SEB Server and restricts the number of available indicators that can be used. Currently following
 indicators are supported:
 
@@ -14,29 +27,27 @@ indicators are supported:
    This can be used to monitor constant SEB client connections and get notified when a SEB client connection gets lost for some defined 
    time or when a SEB client connection that has been list is back again.
    This indicator is used as default indicator and automatically applied to the exam on import. You are able to modify this indicator 
-   and also delete it but we recommend to have this basic indicator in place for every exam.              
+   and also delete it but we recommend to have this basic indicator in place for every exam.
+- **Battery Status**: This indicator measures the battery load of a SEB client that is not connected to the power grid and can warn you
+  about SEB clients running on devices with low battery load.
+- **WiFi Status** This indicator measures the WiFi connection status for connected SEB client that connects over WiFi and can warn you
+  about low WiFi connection issues.
 - **Errors**: This indicator measures the number of error-logs a specified SEB client is sending to the SEB Server.
 - **Warnings**: This indicator measures the number of warning-logs a specified SEB client is sending to the SEB Server.
+- **Info Log**: This indicator measures if specific SEB client info log events that are sent to SEB Server.
+  This indicator is mostly useful with addition tag information to specify specially tagged SEB info logs.
+
+You can define a "Default Color" for the indicator. An indicator which measured value has not reached any defines threshold will be shown in this 
+color on the SEB client connection table of the monitoring section.
  
 You can define thresholds for each indicator. A threshold is defined by an indication-color and by a threshold-value. On the monitoring side, the 
 indicator for each SEB client connection with change to the threshold color when the measured indicator value has reached the threshold-value.
 
-To add a new indicator to the exam you can use the "Add Indicator" action from the right action pane. In the indicator edit page you are able to give the
-new indicator a name. This name will be displayed in the SEB client connection table on monitoring section as column name for the column of this
-indicator. Then you are able to choose a "Type" that specifies the type of indicator. Choose this from a drop-down selection of supported indicators.
-If you have selected one indicator type, a description will be shown just below the "Type" attribute. 
-
-You can define a "Default Color" for the indicator. An indicator which measured value has not reached any defines threshold will be shown in this 
-color on the SEB client connection table of the monitoring section.
 
 .. note::
     To select a color click on the brush-palette icon of the color input field to open up a color chooser pop-up window. Within the color chooser
     you can select one of the basic colors provided by the chooser or by defining the red, green and blue part of the color.
 
-.. image:: images/exam/editIndicator.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/editIndicator.png
-    
 
 Below the default color you see a list of thresholds. Use the plus sign icon to add a new threshold to the list and on an existing threshold use
 the minus sign icon to remove a particular threshold form the list. A threshold has a threshold-value and a threshold-color. The threshold value
@@ -82,5 +93,5 @@ Use Cases
 - Use the filter to find the exam on that you have to change the supporter assignments. 
 - Double click the list entry of the exam to go to the exam details page. Check if you are on the right exam.
 - Scroll down to the indicator section of the exam details page and find the indicator you want to delete.
-- Select the indicator from the list ans use the "Delete Indicator" action from the right action pane to delete the indicator.
+- Select the indicator from the list and use the "Delete Indicator" action from the right action pane to delete the indicator.
 

docs/exam_list.rst

@@ -0,0 +1,47 @@
+Exam List
+=========
+
+The exam list is shown directly within the "Exam" entry of the "Exam Administration" menu. You will have the usual filter and sort functionality
+of lists within SEB Server. You can see exams that are running but has not complete setup yet, marked in read in the list. Additionally you see 
+Exams that currently has no connection to its origin LMS/Assessment Tool grayed in the list. This exams are not available on the LMS/Assessment Tool either because they didn't
+exists anymore on the LMS/Assessment Tool or the SEB Server cannot connect to the LMS/Assessment Tool anymore. As soon as the SEB Server is able to get the LMS/Assessment Tool data again for a
+once unreachable exam, the respective exam would change back to normal and is not grayed anymore.
+
+.. image:: images/exam/examList.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examList.png
+    
+Sometimes an entire LMS/Assessment Tool is not available and a lot of exams are grayed. In this case you can use the new filter "Show/Hide Missing Exams" from the
+action pane on the right to filter out this exams from the list.
+
+.. image:: images/exam/examListHideMissing.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examListHideMissing.png
+    
+To get more information about what is missing for an exam that is marked in red, just open the exam by select and use "View Exam" or by double-click
+on the list entry. In the Exam view page you will see a warning message pointing out all the missing things to setup the exam.
+
+.. note::
+    The list in the default filter shows you all exams except the archived ones. If you want to show the archived exams you can use the status
+    filter and choose "Archived" from the combo selection. If you want to show all active exams again, you can choose "All" in the status filter. 
+
+Exam Batch Actions
+------------------
+
+Since SEB Server version 1.5 there are two new batch action for exams within the exam list page for archiving and deleting exams in a batch.
+As usual for batch actions you can select multiple exam list entries while also page through the list. After you have selected all exams that
+you want to archive or delete, select the respective batch action on the right action pane to open the batch action pop-up.
+
+.. image:: images/exam/examBatchArchive.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examBatchArchive.png
+    
+You see your selection again within a list on the pop-up and when ready you can start the batch action and apply it to every selected exam
+that is in a valid state to apply the action. 
+
+.. note::
+    For batch-action the same validation is done like for the single action delete and archive. Archive of an exam is only possible if it
+    is not currently running but finished or up-coming. Delete is always possible and you have to be carefully while deleting exams in batch.
+    
+After you have started the batch-action the result pop-up of the batch-action will show you the progress and how many has been processed and
+also how many as failed due to invalid state for batch-action or due to an error.

docs/exam_proctoring.rst

@@ -1,110 +0,0 @@
-.. _sebProctoringSettings-label:
-
-Live Proctoring
-===============
-
-Live proctoring is a new and yet experimental feature of SEB and SEB Server. The main goal of the live proctoring feature is to support the integration
-of an external meeting service like Jitsi Meet or Zoom for example, within a SEB and SEB Server setup for an exam.
-In this scenario a SEB client is able to join a meeting and send audio and video data to the meeting where a proctor can watch the students during 
-an exam within this meeting(s). The role of SEB Server in this scenario is mainly to bind a particular meeting service and automatically create
-meeting rooms, instruct connected SEB clients to join a certain meeting room. SEB Server can also instruct SEB clients to participate in the meeting by
-allowing connected SEB clients to receive audio and video as well as enabling chat functionality.
-
-.. note::
-    This feature is still in a prototype state and not all functionality might work as expected. Basically the meeting features
-    are given or restricted by the meeting service that is used and the API and GUI that is given by that meeting service client
-
-To be able to use the integrated live proctoring feature with SEB and SEB Server you need an external meeting service that can be used by the SEB Server to automatically create meetings.
-If this feature is enabled, you are able to setup a live proctoring service for a specified exam that can be used in the monitoring later on while the exam is running and SEB clients are connected.
-
-Currently supported meeting services are:
-- `Jitsi Meet <https://jitsi.org/jitsi-meet/>`_ with JWT token authentication enabled.
-- `Zoom meeting service <https://zoom.us/>`_ with an account plan that fits your need and supports the `Zoom API and Client SDKs <https://marketplace.zoom.us/docs/sdk/native-sdks/developer-accounts>`_.
-
-
-To bind and setup a live proctoring service in SEB Server for an exam, go to the view page of the exam and use the "Proctoring Settings" action on the right action pain to open up the proctoring settings dialog.
-
-.. image:: images/exam/proctoringSettings.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/proctoringSettings.png
-    
-Within the proctoring settings dialog you are able switch the service on and off by using the "Proctoring enabled" checkbox. You also see if the proctoring service is enabled within 
-the action icon that is either an eye when active or a slashed eye when not active.
-To define and bind a service you have to chose a service type from the available service types. And you need to give the API access credentials like "Application Key" and "Secret" for
-the external meeting service. SEB Server will then try to connect to the meeting service with these credentials to automatically create meetings/rooms for proctoring.
-Within the "Collecting Room Size" field you can define the number of maximal participants that shall be collected within one proctoring room. SEB Server will automatically
-create these collecting rooms while SEB clients are connecting to the running exam in the monitoring view.
-
-.. note::
-    If you choose Zoom as your proctoring service and you also want to conduct your exam with Mac and/or iOS SEB Clients you will also need a Zoom SDK-Key and -Secret since SEB Mac/iOS uses Zoom SDK for proctoring integration.
-
-Scroll down the Proctoring Settings window to see more settings for SEB Server based proctoring features:
-
-.. image:: images/exam/proctoringSettings2.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/proctoringSettings2.png
-    
-- Use Zoom App-Client: Enable this setting to use a Zoom App/Desktop client for the origin proctoring room. This needs an existing Zoom Desktop App installation on the proctor's desktop.
-- Broadcasting Feature: Enable this to see the broadcasting features buttons in the opened proctoring windows. E.g. "Enable/Disable Audio" and "Enable/Disable Video" buttons.
-- Chat Feature: Enable this to see the "Enable/Disable Chat" feature buttons in the opened proctoring windows.
-- One to One Room: Enable this to see the One to One Room feature button during an exam monitoring within a SEB Client detail view
-- Town-Hall Room: Enable this to see the Town-Hall Room feature button in the exam monitoring view
-
-To read more about this proctoring features, please have a look at `Exam Monitoring <https://seb-server.readthedocs.io/en/latest/monitoring.html#live-proctoring>`_.
-
-After you have all the settings done, use "OK" to confirm the settings. SEB Server will then try to connect to the meeting service with the given settings and check the access.
-
-.. note::
-    Once a proctoring service is integrated for an exam, it is currently not possible to switch it to another service anymore. 
-    This is because different services needs different meeting reference data on SEB Server and there is no conversion supported.
-    In the future we will make it possible to at least delete a already existing proctoring setup and to start from scratch.
-
-The SEB client settings for proctoring can be found in the "Exam Configuration" "SEB Settings". There is a new tab with the name "Proctoring" where all SEB settings for proctoring are available.
-These settings are directly used by a SEB client that supports the proctoring feature. SEB will initialize with this settings when connecting to SEB Server and also will use this settings as default settings during an exam.
-    
-.. image:: images/exam/proctoringSEBSettings.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/proctoringSEBSettings.png
-
-Since SEB Server version 1.2 there is also an Zoom service section  that let you define the default SEB settings for a Zoom proctoring setup.
-Please be aware that not all of the settings are functioning yet. Please refer to the the settings tool-tip to get a actual description of
-a particular SEB feature setting
-
-**Jitsi Meet**
-
-To setup and configure a Jitsi Meet service for testing you can refer to the `Docker installation documentation <https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-docker>`_
- 
-.. note::
-    The Jitsi Meet integration works only with JWT authentication. Please refer to the above documentation for how to setup JWT authentication.
-    
-**Zoom**
-
-To integrate Zoom meetings as a live proctoring service within SEB Server you need to have an appropriate Zoom account with API and SDK access.
-`Zoom API and Client SDKs <https://marketplace.zoom.us/docs/sdk/native-sdks/developer-accounts>`_.
-Then you need to setup the Zoom account to run with JWT apps as described:
-
-- Login into your Zoom account and use "App Marketplace" to setup an API app account
-
-.. image:: images/exam/zoom1.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/zoom1.png
-    
-- Within the Zoom Marketplace use "Develop" and select "Build App".
-
-.. image:: images/exam/zoom2.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/zoom2.png
-    
-- Choose either JWT or SDK or both if needed for exams with different SEB clients
-
-.. image:: images/exam/zoom3.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/zoom3.png
-    
-- Follow the instructions to create the API account and use the "App Key" and "App Secret" or SDK Key and SDK Secret within the setup in SEB Server
-
-.. image:: images/exam/zoom4.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/zoom4.png
-
- 

docs/exam_quit_password.rst

@@ -0,0 +1,42 @@
+.. _sebExamQuitPassword-label:
+
+Exam Quit Password (New)
+========================
+
+Since SEB Server Version 1.6 it is possible to set the quit-password (usually set in the Exam Configuration/SEB Settings) while
+creating or importing an Exam as well as for an existing exam. This is convenient if you want to use a different quit password for each exam
+and when using Exam Templates to create Exams.
+
+The quit password within the exam corresponds with the quit-password of an applied Exam Configuration. Thies means, if you change the
+password on either site, it will be reflected on the other site. And, in the case a new Exam Configuration is applied an already set
+quit password in Exam will have prior order against the a quit password set in the Exam Configuration. In any case the there
+is no different quit password in the Exam Configuration then in the Exam. SEB Server guarantees that the quit password is always synchronized
+within the following rules:
+
+- Exam has no Exam Configuration but defines the quit password
+    - An Exam Configuration that is applied to the Exam will get the quit password from the Exam in the SEB Settings.
+    - An Exam Configuration that already has a quit password set and gets applied to the Exam will also get the quit password from the Exam with notify the user about the change.
+- Exam has no Exam Configuration and no quit password set
+    - The Exam will get the quit password from the Exam Configuration if the Exam Configuration has defined such
+- Quit Password is changed in the Exam edit view
+    - On save of the exam the applied Exam Configuration also gets the new quit-password
+- Quit Password is changed in the Exam Configuration SEB Settings
+    - On Save / Publish of the Exam Configuration SEB Settings, an applied Exam will get the newly set quit password from the configuration
+
+The quit password can be set on Exam creation or import:
+
+.. image:: images/exam/quitPasswordImport.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/quitPasswordImport.png
+
+
+As well as in the Exam edit view:
+
+.. image:: images/exam/quitPasswordEdit.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/quitPasswordEdit.png
+
+
+If the Exam was created from an LMS/Assessment Tool with SEB Server integration that allows to send the quit-password
+to the LMS/Assessment Tool for display, SEB Server sends a new quit-password as on save. The LMS/Assessment Tool should
+therefore also display always the actual quit password.

docs/exam_restriction.rst

@@ -3,7 +3,7 @@
 Automated SEB Restriction
 =========================
 
-If the corresponding LMS of an exam supports the automated SEB restriction feature, the SEB restriction can be managed within the exam details page.
+If the corresponding LMS/Assessment Tool of an exam supports the automated SEB restriction feature, the SEB restriction can be managed within the exam details page.
 To navigate to the exam details page of an exam go to the "Exam" page under the "Exam Administration", find the specified exam in the list by using
 the list filter and double click on the list entry of the exam you want to open the details page.
 
@@ -11,35 +11,35 @@ In the exam details page you will see two action related to the SEB restriction
 
 .. image:: images/exam/sebRestriction.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/sebRestriction.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/sebRestriction.png
     
-Use the "Apply SEB Lock" on an exam that has not already locked the course for SEB on the LMS to do apply the restriction and lock the course or quiz
-for SEB access only. This will call the SEB course restriction API on the LMS and will send all information to lock the course on the LMS.
-On an exam where the restriction lock is already in place, use the "Release SEB Lock" action to remove the restriction in the LMS and unlock the course.
+Use the "Apply SEB Lock" on an exam that has not already locked the course for SEB on the LMS/Assessment Tool to do apply the restriction and lock the course or quiz
+for SEB access only. This will call the SEB course restriction API on the LMS/Assessment Tool and will send all information to lock the course on the LMS/Assessment Tool.
+On an exam where the restriction lock is already in place, use the "Release SEB Lock" action to remove the restriction in the LMS/Assessment Tool and unlock the course.
 
 .. note::
-    If the exam is already running on import the system will automatically restrict the course on the LMS with the available restriction details.
+    If the exam is already running on import the system will automatically restrict the course on the LMS/Assessment Tool with the available restriction details.
 
-Use the "SEB Restriction Details" action to open up a dialog to define all SEB restriction details that the LMS of the exam and its SEB course 
-restriction API is supporting. There are two global restriction details that are SEB specific and should be supported by every LMS that serves 
+Use the "SEB Restriction Details" action to open up a dialog to define all SEB restriction details that the LMS/Assessment Tool of the exam and its SEB course
+restriction API is supporting. There are two global restriction details that are SEB specific and should be supported by every LMS/Assessment Tool that serves
 a course restriction API for SEB. The `Config Key <https://safeexambrowser.org/developer/seb-config-key.html>`_ and the `Browser Exam Key <https://safeexambrowser.org/developer/documents/SEB-Specification-BrowserExamKey.pdf>`_.
 The Config Key is automatically generated by the exam configuration that is applied to the exam. And the Browser Exam Key can be applied within a 
 comma separated list if needed.
 
 .. image:: images/exam/sebRestrictionDetails.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/sebRestrictionDetails.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/sebRestrictionDetails.png
 
 **SEB restriction on Open edX**
 
-To be able to use the SEB restriction feature with a Open edX LMS, you need to install the `SEB Open edX plugin <https://seb-openedx.readthedocs.io/en/latest/index.html>`_
+To be able to use the SEB restriction feature with an Open edX LMS/Assessment Tool, you need to install the `SEB Open edX plugin <https://seb-openedx.readthedocs.io/en/latest/index.html>`_
 from eduNEXT. Please consult the documentation for installing the `SEB Open edX plugin <https://seb-openedx.readthedocs.io/en/latest/index.html>`_ as well as for the
 use of all additional supported restriction attributes. 
 
 .. note::
     If you change the attached exam configuration either by changing the attachment or by changing the attributes of a attached exam configuration
     for an exam that has the SEB restriction in place, the Config Key generated from the exam config that is also changing, will automatically be
-    updated on the LMS. Therefore such an action that triggers an update may take some more time to complete as when the restriction is not in place. 
+    updated on the LMS/Assessment Tool. Therefore such an action that triggers an update may take some more time to complete as when the restriction is not in place.
 
 
 Use Cases
@@ -53,7 +53,7 @@ Use Cases
 - Use the "SEB Restriction Details" action from the right action pane to open the restriction details dialog.
 - In the restriction details dialog you will see all supported restriction attributes and you can define the restriction for your needs.
 - To apply the new restriction details use the "OK" action of the dialog or use the "Cancel" action to abort and close the dialog.
-- When the SEB restriction is active on the LMS, the system will automatically update the SEB restriction with the new details on the LMS.
+- When the SEB restriction is active on the LMS/Assessment Tool, the system will automatically update the SEB restriction with the new details on the LMS/Assessment Tool.
 - If the SEB restriction is not active in this moment, the details will be saved and applied when the restriction is activated.
 
 
@@ -62,9 +62,9 @@ Use Cases
 - Login as an exam administrator and go to the "Exam" page under the "Exam Administration" section.
 - Use the filter to find the exam on that you have to change the supporter assignments. 
 - Double click the list entry of the exam to go to the exam details page. Check if you are on the right exam.
-- Use the "Apply SEB Lock" action from the right action pane to activate the SEB restriction lock for this course on the LMS.
-- Use the "Release SEB Lock" action from the right action pane to deactivate the SEB restriction lock for this course on the LMS.
+- Use the "Apply SEB Lock" action from the right action pane to activate the SEB restriction lock for this course on the LMS/Assessment Tool.
+- Use the "Release SEB Lock" action from the right action pane to deactivate the SEB restriction lock for this course on the LMS/Assessment Tool.
 
 .. note::
-    If a SEB restriction lock is active on the LMS, every change on the exam or related components that will affect a change on the restriction
-    details will automatically be updated on the LMS. You don't have to apply the SEB restriction lock again for update. 
+    If a SEB restriction lock is active on the LMS/Assessment Tool, every change on the exam or related components that will affect a change on the restriction
+    details will automatically be updated on the LMS/Assessment Tool. You don't have to apply the SEB restriction lock again for update.

docs/exam_template.rst

@@ -7,9 +7,9 @@ Overview
 --------
 
 Exam templates are a new, useful feature available since SEB Server version 1.3. Within exam templates it is possible to create specific named templates that can be 
-used by an exam import from LMS course/quiz and defines default settings and indicators that are automatically be applied on the exam import.
-Furthermore exam templates gives you the possibility to map exam configuration template to automatically create and map an exam configuration for an exam on import.
-This is very convenient if you have a lot of exams to setup that all has the same or similar settings. In such a case you can create an exam template that
+used by an exam import from LMS/Assessment Tool course/quiz and define default settings and indicators that are automatically be applied on the exam import.
+Furthermore, exam templates gives you the possibility to map exam configuration template to automatically create and map an exam configuration for an exam on import.
+This is very convenient if you have a lot of exams to set up that all have the same or similar settings. In such a case you can create an exam template 
 with all the common settings for that exams and use it on exam import.
 
 Exam templates can be created and managed just like other SEB Server documents within its list/library. The list can be filtered by name and type of the exam template
@@ -17,7 +17,7 @@ and also shows which one is the default for the institution.
 
 .. image:: images/exam_template/list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/list.png
     
 .. note:: 
     The "Default Template" flag indicates the one exam template that is the default template for an institution. This just means that this template
@@ -32,21 +32,21 @@ SEB Server will then present you the exam template creation view on that some in
 
 .. image:: images/exam_template/new.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/new.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/new.png
 
 - **Name** The name of the exam template to identify it in the list/library
 - **Description** A short description ideally describing the purpose of the exam template
 - **Institutional Default** This flag indicated if the exam template shall become the default exam template for the institution.
-- **Exam Type** Here you can set the exam type that shall be used when a exam is imported within this template
-- **Configuration Template** Select a existing exam configuration template. This template will be used to automatically create and map an exam configuration for an exam that is imported with this template
+- **Exam Type** Here you can set the exam type that shall be used when an exam is imported within this template
+- **Configuration Template** Select an existing exam configuration template. This template will be used to automatically create and map an exam configuration for an exam that is imported with this template
 - **Exam Supporter** Add a list of available exam supporter to the template. These exam supporter will then be assigned to an exam that is imported with this template
 
-After having done all the initial settings, the exam template can be created by saving the settings. SEB server will then present you the exam template administration
+After having done all the initial settings, the exam template can be created by saving the settings. SEB Server will then present you the exam template administration
 view that looks similar to the exam administration view.
 
 .. image:: images/exam_template/view.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/view.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/view.png
 
 Here you can edit the settings done before by using the "Edit Exam Template" action form the right action pane.
 You can also delete an exam template entirely by using the "Delete Exam Template" action from the right action pane.
@@ -54,25 +54,20 @@ And you are able to add/edit/remove monitoring indicators for the exam template
 
 .. image:: images/exam_template/indicator.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/indicator.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/indicator.png
     
-There are also proctoring settings available since SEB Server version 1.4 for the exam template. They just have the same settings and
-look like the ones on the Exam and will get copied for an exam imported with the respective template that defines the proctoring settings.
-
-.. image:: images/exam_template/proctoringSettings.png
-    :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/proctoringSettings.png
+TODO Screen Proctoring Settings
 
 
 Import Exam with Template
 -------------------------
 
-Once one or more exam template exists, you are able to select one while importing an exam from the LMS in the "LMS Exam Lookup" section. Just as usual
-use the "Import as Exam" action for a LMS exam that you want to import.
+Once one or more exam template exists, you are able to select one while importing an exam from the LMS/Assessment Tool in the "LMS/Assessment Tool Exam Lookup" section. Just as usual
+use the "Import as Exam" action for a LMS/Assessment Tool exam that you want to import.
 
 .. image:: images/exam_template/select1.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/select1.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/select1.png
     
 Now there is a new selector field named "Exam Template" where you can choose the exam template to use on import. When you select one the template attributes
 like "Exam Type" or "Exam Supporter" are automatically applied from the template settings. You are still able to edit the settings e.g. add more or remove supporter.
@@ -93,7 +88,7 @@ overview as a reference.
 
 .. note:: 
     A Change in a template is not reflected within already existing exams that used that template on import.
-    But will effect all future exams that this template on import.
+    But it will affect all future exams that use this template on import.
 
 
 Use Cases
@@ -115,14 +110,14 @@ a of great help while shorten the setup process and reduces the work that must b
 - Now select the previously prepared "Configuration Template" that shall be used by this template. On import of an exam with this template, SEB Server will automatically create a Exam Configuration out of this template and assign it to the imported exam.
 - After all initial settings are made correctly you can save the exam template with the "Save" action on the right action pane.
 - Add additional indicators to the exam template just like you do in a usual exam administration. These indicators will be copied and applied to an exam that is imported with this template.
-- You can change the initial settings any-time by edit the exam template. Use the "Edit" action form the right action pain to do so.
+- You can change the initial settings any-time by edit the exam template. Use the "Edit" action form the right action pane to do so.
 
 **Use an existing Exam Template on Exam import**
 
-- Sign in as an Exam Administrator and select the "LMS Exam Lookup" sub-menu of the "Exam Administration" section in the left menu pane.
-- Here you can see all exams form the LMS that are bound to the SEB Server. Select the specific exam that you want to import.
-- Use "Import as Exam" from the right action pain to import that exam from the LMS as usual.
-- In the exam import initialization step you new have a new selector to select an Exam Template that shall be applied.
+- Sign in as an Exam Administrator and select the "LMS/Assessment Tool Exam Lookup" sub-menu of the "Exam Administration" section in the left menu pane.
+- Here you can see all exams form the LMS/Assessment Tool that are bound to the SEB Server. Select the specific exam that you want to import.
+- Use "Import as Exam" from the right action pane to import that exam from the LMS/Assessment Tool as usual.
+- In the exam import initialization step you now have a new selector to select an Exam Template that shall be applied.
 - If there is a default Exam Template defined for the institution, this is pre-selected and already applied. If not you have to select the template of your choice.
 - By selecting an Exam Template the template attributes are already applied and you see the respective attributes in the exam settings.
 - Now you can still change the settings the shall differ to the one from the template.

docs/exam_testrun.rst

@@ -0,0 +1,30 @@
+Exam Test-Run (New)
+--------------------------------
+
+With the new SEB Server version 2.0 there is a new feature Test-Run for none running / upcoming exams. Since upcoming
+Exams on SEB Server are not available for SEB connections and Monitoring one have to has to change the course start date
+to apply testing beforehand of an Exam.Server
+
+With new new Rest-Run feature it is now possible to change an Exam in upcoming status to a dedicated Test-Run status where
+SEB clients are able to connect and SEB Server Exam Administrator or Supporter are able to Monitor the Exam as long a
+the Exam stays within this Test-Run status. 
+
+You can set an Exam into Test-Run status by using the respective action on the Exam view:
+
+.. image:: images/exam/examEnableTestrun.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examEnableTestrun.png
+
+After enable Test-Run for an Exam, you can see an information at the top if the Exam view that informs you about the 
+Test Run status of the Exam.
+
+After testing is done you can disable the Test-Run status just by using the respective action on the right and the Exam
+goes back to up-coming status and is not available anymore for SEB connections and Monitoring.
+
+.. image:: images/exam/examEnableTestrun.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examEnableTestrun.png
+
+.. note:: 
+    If an Exam changes to Running status due to the start time passing and is still in status Test-Run, SEB Sever will
+    automatically change the Exam from Test-Run to Running status and all features of a running Exam are available. 

docs/exam_with_url.rst

@@ -0,0 +1,69 @@
+.. _sebExamWithURL-label:
+
+Exam With URL (New)
+========================
+
+This is a new feature since SEB Server Version 1.6 and allows to create SEB Server Exams without the need of a
+dedicated LMS/Assessment Tool integration but by providing an course URL, start- and end-type by its own.
+SEB will then the given URL use as a start URL and just forward to the given URL page as usual. This of course has
+some limitations in comparison to a Exam with LMS/Assessment Tool integration that are described at the end of
+this chapter.
+
+To create a new Exam with URL please select the Exam tab on the left menu pane and the "Add Exam with URL" Action
+on the right action pane. Click on the action to open the creation view. This is the same view as on Exam import
+put with some fields you have to provide instead of they coming from LMS/Assessment Tool.
+
+.. image:: images/exam/examWithURL.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examWithURL.png
+
+
+.. image:: images/exam/examWithURLNew.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examWithURLNew.png
+
+
+
+You are now able to either choose an existing :ref:`exam-template-label` to initialize the new exam with the settings defined within the template
+or to set the needed settings only for this exam. If you choose a template, the settings from the template will automatically be added to the exam
+on creation and you are still able to modify them afterwards.
+
+For this kind of Exam you also have to provide additional data that usually comes from LMS/Assessment Tool.
+
+- The name of the Exam - mandatory
+- A description of the Exam - optional
+- The start date and time of the Exam - mandatory
+- The end date and time of the Exam - optional
+
+Initially also choose a type for the exam - "Exam Type" - that is currently only used for informational purpose and has no further restrictions or consequences on handling on in SEB Server.
+Furthermore you can select and apply all exam supporter that shall be able to see and support this exam while running. To do so, click in the
+input field of the attribute "Exam Supporter" to see a drop down list of all available users for selection. To filter the drop down list, start
+typing characters of the name of the user-account you want to apply to automatically filter the list. Click on the drop-down list entry to select the
+specified user that will be added to the list below the input field. To add another user to the selection just click again into the input field
+and select another user. To remove a selected user from the selection-list, double-click on the specified entry of the selection-list.
+
+To finally create the new Exam use the save action from the right action pane. New you are in the usual Exam view and can
+go one with setting up your Exam.
+
+.. image:: images/exam/examWithURLView.png
+    :align: center
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examWithURLView.png
+
+If you want to edit the Exam settings please use the edit action on the right action pane. Here you can also modify
+the data that usually comes from LMS/Assessment Tool. You can change name, start- and end-date directly here within
+the Exam on the SEB Server.
+
+**Restrictions**
+
+There are a few restrictions for an Exam with URL. First of all, since there os no LMS/Assessment Tool binding available,
+SEB Server cannot call an LMS/Assessment Tool and restrict access for SEB only with either Config Key or Browser Exam key.
+If an LMS/Assessment Tool supports such, one is of course be able to put the Config Key from SEB Server to the LMS manually
+by copy und past it.
+
+The other restriction is about the student login name resolving that is used and shown in the monitoring view of SEB Server.
+Since this login name resolving needs a LMS/Assessment Tool binding to request the students LMS account name by SEB Server
+this is not possible with this setup. But SEB Server will display other information within the User Name or Session column
+of the SEB Server monitoring. SEB Server will show either the client IP address or the client machine name or the client
+user device login, depending on what SEB is able to sends to the SEB Server.
+
+

docs/exams.rst

@@ -1,10 +1,10 @@
 Exams
 =====
 
-Within an exam in SEB server all threads come together to set up a e-assessment with Safe Exam Browser and SEB Server. An exam can be imported
-from a course that exists on an LMS that was binded with a LMS Setup. An exam configuration that was formerly created can be attached to the exam by 
+Within an exam in SEB Server all threads come together to set up a e-assessment with Safe Exam Browser and SEB Server. An exam can be imported
+from a course that exists on an LMS/Assessment Tool that was bound with a LMS/Assessment Tool Setup. An exam configuration that was formerly created can be attached to the exam by
 choosing one from the library. Indicators can be defined that are shown in the monitoring section while monitoring a running exam. And if
-the API of the specified LMS integration supports individual SEB restriction attributes for a e-assessment, this can also be defined and managed
+the API of the specified LMS/Assessment Tool integration supports individual SEB restriction attributes for a e-assessment, this can also be defined and managed
 on the exam management of SEB Server.
 
 We will go through all the steps to setting up an exam for Safe Exam Browser with SEB Server one by one.
@@ -13,8 +13,16 @@ We will go through all the steps to setting up an exam for Safe Exam Browser wit
    :maxdepth: 1
 
    exam_import
+   exam_with_url
    exam
+   exam_quit_password
    exam_indicator
+   exam_clientgroups
+   exam_ask
    exam_restriction
-   exam_proctoring
-   exam_template
+   exam_screen_proctoring
+   exam_list
+   exam_template
+   exam_testrun
+   screen_proctoring
+