diff --git a/docs/user-documentation/general-admin-users/admins-documentation/customise-the-main-menu.md b/docs/user-documentation/general-admin-users/admins-documentation/customise-the-main-menu.md
index 3f6fa14043d1b5e118f76286af6bf7eeb4b09a4b..e729d06cae77e8b73e1248b6f78ce0e5adf109a3 100644
--- a/docs/user-documentation/general-admin-users/admins-documentation/customise-the-main-menu.md
+++ b/docs/user-documentation/general-admin-users/admins-documentation/customise-the-main-menu.md
@@ -77,7 +77,7 @@ The main menu can be customised from the **Settings**, under
([Export to
Zenodo](../../general-users/data-export.md#export-to-zenodo))
will be hidden.
-13. **showBarcodes**: if unselected, the **Barcodes Generator**Â under
+13. **showBarcodes**: if unselected, the **Barcodes/QR codes Generator**Â under
**Utilities** in the main menu
([Barcodes)](../../general-users/barcodes.md)
will be hidden.
diff --git a/docs/user-documentation/general-admin-users/admins-documentation/enable-barcodes.md b/docs/user-documentation/general-admin-users/admins-documentation/enable-barcodes.md
index 8f5f1a2a46bc263d92ed359ae58f4bbd5d8358a6..b913c094b8f0bdfe7a21114e7e7aa0da34c4933c 100644
--- a/docs/user-documentation/general-admin-users/admins-documentation/enable-barcodes.md
+++ b/docs/user-documentation/general-admin-users/admins-documentation/enable-barcodes.md
@@ -20,13 +20,13 @@ edit the **Settings**, as shown below.
Â
-After enabling the option, please refresh your browser. The **Barcodes
-Generator** will be shown in the main menu under **Utilities** and a
+After enabling the option, please refresh your browser. The **Barcodes/QR Codes Generator** will be shown in the main menu under **Utilities** and a
barcode icon will be added above the menu.
Â
-
+
+
Â
diff --git a/docs/user-documentation/general-admin-users/admins-documentation/masterdata-exports-and-imports.md b/docs/user-documentation/general-admin-users/admins-documentation/masterdata-exports-and-imports.md
index b754541d0770a33fc231c1ba73ac306da8719826..172c6737ff1c97e170c629befe12fc7ac89fc281 100644
--- a/docs/user-documentation/general-admin-users/admins-documentation/masterdata-exports-and-imports.md
+++ b/docs/user-documentation/general-admin-users/admins-documentation/masterdata-exports-and-imports.md
@@ -87,10 +87,13 @@ Since openBIS 20.10.6, the import of zip files is supported.
The masterdata Excel file exported from openBIS, contains in the first column the version number of the masterdata. Since openBIS version 20.10.7.2 the version number is ignored on import if:
-1. the version column is removed from the masterdata file
+1. the version column is completely removed from the masterdata file
+
+or
+
2. the version column is left empty
-If the version column is present in the Excel file and version numbers are present, in order to update a type, the number of the type that should be updated must be increased by 1, as described in ([New entity type registration)](../new-entity-type-registration.md).
+If the version column is present in the Excel file and version numbers are present, in order to update a type, the number of the type that should be updated must be increased by 1, as described in ([New entity type registration)](docs/user-documentation/general-admin-users/admins-documentation/new-entity-type-registration.md).
diff --git a/docs/user-documentation/general-users/additional-functionalities.md b/docs/user-documentation/general-users/additional-functionalities.md
index 43e89671a86a3064568bede111e80c769e421eb7..9e2a38515052256fa62d5f9a75d1318f18ed6d63 100644
--- a/docs/user-documentation/general-users/additional-functionalities.md
+++ b/docs/user-documentation/general-users/additional-functionalities.md
@@ -193,17 +193,17 @@ By clicking the checkbox in the table header, all entries of the table
are selected. After selection of entries, some actions become available:
> - **Delete**: allows to move the selected entries to the trashcan.
-> - **Move**: allows to move the selected entries to a different
-> *Collection/Experiment.*
+> - **Move**: allows to move the selected entries to a different existing
+> *Collection/Experiment* or to a new one.
> - **Generate barcodes**: allows to generate custom barcodes for the
> selected entries.
-> - **Update custom barcodes**: allows to update existing custom
+> - **Update custom barcodes/QR codes**: allows to update existing custom
> barcodes of the selected entries.
> - **Clear selection**: allows to clear the selection made.
Â
-
+
Â
@@ -212,8 +212,8 @@ In *Object* tables inside *Experiments/Collections* there is an
*Object*:
> 1. Upload a file to the *Object*
-> 2. Move the *Object* to another Experiment/Collection.
-> 3. Update Barcode.
+> 2. Move the *Object* to another exiting *Experiment/Collection*.
+> 3. Update Barcode/QR code.
> 4. Open the hierarchy graph. This is the graph showing parent/child
> connections of the *Object*.
> 5. Open the hierarchy table. This is the table showing parent/child
@@ -221,7 +221,7 @@ In *Object* tables inside *Experiments/Collections* there is an
Â
-
+
Updated on April 26, 2023
diff --git a/docs/user-documentation/general-users/barcodes.md b/docs/user-documentation/general-users/barcodes.md
index 32a3e1bde7e922098c5e1af1272869d5b8142d76..a2f8d6b4daeb7313d804f62721991420047150b4 100644
--- a/docs/user-documentation/general-users/barcodes.md
+++ b/docs/user-documentation/general-users/barcodes.md
@@ -18,28 +18,28 @@ This barcode can be printed and the label can be added to the vial
containing the sample. The option to print the barcode is under theÂ
**More..** menu
-
+
-If a sample already has it own barcode, it is possible to scan this with
+If a sample already has its own barcode or QR code, it is possible to scan this with
a scanner or the camera of a mobile device and assign it to the sample.
This can be done after registration of a sample, with the **Custom
-Barcode Update** option under the **More..** drop down.
+Barcode/QR Code Update** option under the **More..** drop down.
-
+
The custom barcode will appear in the *Identification Info*. If a custom
-barcode is registered, the print function shown above will print the
-custom barcode, instead of the default one.
+barcode/QR code is registered, the print function shown above will print the
+custom barcode /QR code, instead of the default one.
-### Generate batches of barcodes
+### Generate batches of barcodes / QR codes
-In some cases there is the need to generate several barcodes that can be
+In some cases there is the need to generate several barcodes/QR codes that can be
later on assigned to samples registered in openBIS.
-To generate new barcodes, go to the **Barcodes Generator** in the main
+To generate new barcodes, go to the **Barcodes/QR codes Generator** in the main
menu under **Utilities**.
-
+
Users can select:
@@ -58,7 +58,7 @@ After selecting the desired parameters, click the **Generate Custom
Barcodes** button.
To print the barcodes use the **print icon** on the form, next to
-**Generate Custom Barcodes**. These barcodes can be printed on labels to
+**Generate Custom Barcodes/QR Codes**. These barcodes can be printed on labels to
be attached to vials. When the samples are registered in openBIS, these
barcodes can be scanned and assigned to the samples as explained above.
diff --git a/docs/user-documentation/general-users/img/Generate-custom-barcodes-qrcodes.png b/docs/user-documentation/general-users/img/Generate-custom-barcodes-qrcodes.png
new file mode 100644
index 0000000000000000000000000000000000000000..929b9bf71dfd45660100cf510c741047e4df1a47
Binary files /dev/null and b/docs/user-documentation/general-users/img/Generate-custom-barcodes-qrcodes.png differ
diff --git a/docs/user-documentation/general-users/img/Object-table-buttons-on-selection.png b/docs/user-documentation/general-users/img/Object-table-buttons-on-selection.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8ff5a0cf33297b4cf784967c5191d9b2b3b2ec0
Binary files /dev/null and b/docs/user-documentation/general-users/img/Object-table-buttons-on-selection.png differ
diff --git a/docs/user-documentation/general-users/img/Object-table-operations-column.png b/docs/user-documentation/general-users/img/Object-table-operations-column.png
new file mode 100644
index 0000000000000000000000000000000000000000..3075694f56612e2af3a2fe510ad60447670bbf88
Binary files /dev/null and b/docs/user-documentation/general-users/img/Object-table-operations-column.png differ
diff --git a/docs/user-documentation/general-users/img/barcode-print-more-dropdown-slide.png b/docs/user-documentation/general-users/img/barcode-print-more-dropdown-slide.png
new file mode 100644
index 0000000000000000000000000000000000000000..754efde8785075f335a94a1a5bb7ac95f0b3b20a
Binary files /dev/null and b/docs/user-documentation/general-users/img/barcode-print-more-dropdown-slide.png differ
diff --git a/docs/user-documentation/general-users/img/barcode-udate-more-dropdown-slide.png b/docs/user-documentation/general-users/img/barcode-udate-more-dropdown-slide.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc29d393f0da770cd44f8f57b0ee4b654b1729f6
Binary files /dev/null and b/docs/user-documentation/general-users/img/barcode-udate-more-dropdown-slide.png differ
diff --git a/docs/user-documentation/general-users/lab-notebook.md b/docs/user-documentation/general-users/lab-notebook.md
index 3b00940c003fe0941fe960d818027d79d895fe25..4dd11fe4245fc721d649d7eb0408227e5b716624 100644
--- a/docs/user-documentation/general-users/lab-notebook.md
+++ b/docs/user-documentation/general-users/lab-notebook.md
@@ -199,9 +199,9 @@ barcode associated with it by scanning the barcode:
-2. A **Barcode Reader** window opens
+2. A **Barcode/QR code reader** window opens
-
+
3. Scan the barcode/QR code of the entry you want to add as parent with
a scanner or with the camera of a mobile device