Merge branch 'tempuserdoc' into 'master'

Tempuserdoc

See merge request !44

docs/user-documentation/general-users/ELN-types.md

+# ELN types
+
+
+## Standard types
+
+When the eln-lims plugin is enabled the following types are installed by default.
+
+### Object types
+
+- General protocol
+- Storage
+- Storage position
+- Product
+- Supplier
+- Order
+- Request
+- Publication
+
+
+### Collection types
+
+- Collection
+
+### Dataset types
+
+- ELN preview
+- Raw data 
+- Processed data 
+- Analyzed data 
+- Attachment
+- Other data
+- Source code
+- Analysis notebook
+- Publication data
+
+
+
+
+## Basic default types
+
+The following Object types are created if the **eln-lims-template-types** is enabled in core plugins. This can be enabled by a _system admin_ when openBIS is first installed (see [installation steps](docs/system-documentation/standalone/installation.md#installation-steps)) or at any time afterwards.
+
+- Entry
+- Experimental Step
+- Default Experiment
+
+
+
+## Life science types
+
+The following Object types are provided with the **eln-lims-life-science** data model which can be downloaded from [Community data model](https://github.com/openbis/community-data-models). An openBIS _instance admin_ can upload these types from the admin UI, as explained  [here](docs/user-documentation/general-admin-users/admins-documentation/masterdata-exports-and-imports.md#masterdata-import).
+
+- Antibodies
+- Chemicals
+- Enzymes
+- Media
+- Solutions and Buffers
+- Plasmids
+- Plants
+- Oligos
+- RNA
+- Bacteria
+- Cell lines
+- Flies
+- Yeasts
+- General protocols
+- PCR protocol
+- Western blotting protocols
+
+
+

docs/user-documentation/general-users/data-export.md

@@ -63,7 +63,7 @@ _Note: ensure that pop-ups are not disabled in your browser_.
 Server](../../system-documentation/configuration/optional-datastore-server-configuration.md)
 
 
-> ![image info](img/warning.png) **Known limitation of openBIS 20.10.8**: images embedded in text fields are not currently exported. This limitation will be fixed in the upcoming 20.10.8.1 release. 
+> ![image info](img/warning.png) **Known limitation of openBIS 20.10.8**: images embedded in text fields are not currently exported. This limitation will be fixed in the release after 20.10.8. 
 
 
 

docs/user-documentation/general-users/general-overview.md

@@ -49,9 +49,9 @@ where *openbis-xxx* is the name of the server specified in the openBIS
 configuration file, during the installation by a system admin.
 
 
-# Login
+## Login
 
-## File based and/or LDAP authentication
+### File based and/or LDAP authentication
 
 When file based and/or LDAP authentication are used in openBIS, the login interface is as shown below. Users need to provide their username and password to login.
 Only registered users with assigned rights can login to openBIS.
@@ -61,7 +61,7 @@ Only registered users with assigned rights can login to openBIS.
 
 
 
-## SWITCHaai authentication
+### SWITCHaai authentication
 
 When SWITCHaai (SSO) authentication is used in addition to file based and/or LDAP authentication, the login interface is as shown below. 
 

docs/user-documentation/general-users/index.rst

@@ -5,6 +5,7 @@ General Users
    :maxdepth: 4
 
    general-overview
+   ELN-types
    inventory-of-materials-and-methods
    managing-storage-of-samples
    barcodes

docs/user-documentation/general-users/inventory-of-materials-and-methods.md

@@ -7,7 +7,7 @@ These are used to organise respectively samples and materials of any type and la
 
 Samples, materials and protocols are modelled in openBIS as **Objects.**
 
-In the **openBIS ELN-LIMS for life sciences**, the following Object types are preconfigured in the database:
+In the **openBIS ELN-LIMS for life sciences**, the following Object types are provided:
 
 *Antibodies, Chemicals, Enzymes, Media, Solutions and Buffers, Plasmids, Plants, Oligos, RNAs, Bacteria, Cell lines, Flies, Yeasts, General protocols, PCR protocols, Western blotting protocols.*
 
@@ -17,7 +17,7 @@ These Objects are organised in **Collections** in the **Materials** and **Method
 
 ![image](img/inventory-methods-life-sciences-2.png)
 
-The generic openBIS ELN-LIMS only has one predefined Object type for the Inventory, General Protocol, in the General Protocols Collection in the Methods folder. The Material folder is empty. Additional Object types and Collections must be created by an openBIS instance admin, based on the needs of the lab(s).
+The generic openBIS ELN-LIMS only has one predefined Object type for the Inventory, _General Protocol_, in the General Protocols Collection in the Methods folder. The Material folder is empty. Additional Object types and Collections must be created by an openBIS instance admin, based on the needs of the lab(s).
 
  
 ## Customise Collection View