From 5cc58f7928b9dce64fe82e3bdad1b3143abb596e Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Fri, 20 Dec 2024 10:34:14 +0100 Subject: [PATCH] Several fixes Fix some typos Add few todos Fix some RST syntax --- source/advanced/custom_palettes.rst | 2 +- source/advanced/status.rst | 2 +- source/conf.py | 2 +- source/first-steps/access-glpi.rst | 2 +- source/first-steps/interfaces.rst | 4 +- source/first-steps/preferences.rst | 68 +++++++++---------- source/first-steps/search.rst | 4 +- source/glossary.rst | 6 +- source/index.rst | 2 +- .../modules/administration/dictionnaries.rst | 4 +- source/modules/administration/index.rst | 2 +- .../administration/profiles/profiles.rst | 2 +- .../administration/rules/inventorytools.rst | 4 +- .../rules/userauthorizations.rst | 2 +- source/modules/assets/computers.rst | 2 +- source/modules/assets/softwares.rst | 2 +- source/modules/assistance/index.rst | 2 +- source/modules/assistance/planning.rst | 2 +- .../configuration/authentication/ldap.rst | 6 +- .../configuration/authentication/other.rst | 6 +- source/modules/configuration/crontasks.rst | 2 +- .../configuration/dropdowns/assistance.rst | 2 +- .../configuration/dropdowns/network-name.rst | 4 +- .../configuration/general/sql_replicas.rst | 2 +- source/modules/configuration/locks.rst | 1 - .../modules/management/database_instances.rst | 1 + source/modules/management/documents.rst | 10 +-- source/modules/management/licenses.rst | 2 +- source/modules/overview/kanban.rst | 15 ++-- source/modules/tabs/changes.rst | 2 +- source/modules/tabs/problems.rst | 2 +- source/modules/tools/knowledgebase.rst | 2 +- .../user-settings/authorized-substitutes.rst | 2 +- .../common_fields/data_center_position.rst | 1 + source/tabs/common_fields/group.rst | 4 +- source/tabs/common_fields/group_in_charge.rst | 4 +- source/tabs/common_fields/management_type.rst | 4 +- source/tabs/common_fields/manufacturer.rst | 2 +- source/tabs/common_fields/model.rst | 2 +- source/tabs/common_fields/monitor_type.rst | 4 +- source/tabs/common_fields/network.rst | 2 +- source/tabs/common_fields/pictures.rst | 2 +- source/tabs/common_fields/ports.rst | 4 +- source/tabs/common_fields/status.rst | 6 +- source/tabs/common_fields/update_source.rst | 2 +- source/tabs/common_fields/uuid.rst | 2 +- source/tabs/connections.rst | 2 +- source/tabs/contracts.rst | 4 +- source/tabs/impact_analysis.rst | 6 +- source/tabs/links.rst | 1 + source/tabs/operating_systems.rst | 12 ++-- source/tabs/remote-management.rst | 4 +- source/tabs/sockets.rst | 2 - source/tabs/software.rst | 6 +- source/tabs/volume.rst | 4 +- 55 files changed, 132 insertions(+), 121 deletions(-) diff --git a/source/advanced/custom_palettes.rst b/source/advanced/custom_palettes.rst index e7e451e0..1a46fe62 100644 --- a/source/advanced/custom_palettes.rst +++ b/source/advanced/custom_palettes.rst @@ -7,7 +7,7 @@ They are SCSS files which contain CSS rules and they may be used in the same man Custom palettes must be placed in the `files/_themes` folder inside your GLPI installation or the location determined by the `GLPI_VAR_DIR` or `GLPI_THEMES_DIR` configuration options if you overrode them. All palette files are loaded at all times. This allows the instant preview when switching the palette selection in the user preferences and also makes debugging easier. -Because of this, the CSS rules inside palettes must be restricted using the `:root[data-glpi-theme='mycustompalette']` selector (where mycustompalette is the name of the file and therefor the palette). +Because of this, the CSS rules inside palettes must be restricted using the `:root[data-glpi-theme='mycustompalette']` selector (where *mycustompalette* is the name of the file and therefor the palette). Custom palettes should also attempt to restrict themselves to changing only the CSS variables that are prefixed with `--tblr` or `--glpi`. This helps keep the styling of GLPI uniform. However, you are free to make fine-tuned adjustments by changing CSS properties on specific elements as well. diff --git a/source/advanced/status.rst b/source/advanced/status.rst index cc6fd4b9..633a13e1 100644 --- a/source/advanced/status.rst +++ b/source/advanced/status.rst @@ -3,7 +3,7 @@ GLPI Status Monitoring GLPI contains a helpful endpoint for monitoring its health at `/status.php` and the `glpi:system:status` CLI command. The `/status.php` endpoint does not require you to be logged in and therefore only shows basic status information. -Sensitive information like the GLPI version and plugin names and versions (could be used to identify vulerabilities) are not shown. +Sensitive information like the GLPI version and plugin names and versions (could be used to identify vulnerabilities) are not shown. Information from the PHP script and the CLI command is presented as JSON. The difference with the CLI command though is that since it isn't accessible from the web, you can optionally retrieve private information too. diff --git a/source/conf.py b/source/conf.py index 701d5ac7..80a0fa0d 100644 --- a/source/conf.py +++ b/source/conf.py @@ -81,7 +81,7 @@ # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/source/first-steps/access-glpi.rst b/source/first-steps/access-glpi.rst index 32d44f11..e4539cb6 100644 --- a/source/first-steps/access-glpi.rst +++ b/source/first-steps/access-glpi.rst @@ -11,7 +11,7 @@ The first step is to configure the desired authentication method(s). GLPI is able to manage user authentication and information completely locally in its database, however it is recommended to delegate the authentication to an external service like LDAP. See :doc:`Configuring authentication methods <../modules/configuration/authentication/index>` for more information. -The import or creation of new users and management of users known to GLPI including deletion, syncronization, activation/deactivation and management of information such as email, phone, etc is covered in :doc:`the user administration documentation <../modules/administration/users/users>`. +The import or creation of new users and management of users known to GLPI including deletion, synchronization, activation/deactivation and management of information such as email, phone, etc is covered in :doc:`the user administration documentation <../modules/administration/users/users>`. A user can associated with groups, entities, and profiles which are the means of determining usage contexts. diff --git a/source/first-steps/interfaces.rst b/source/first-steps/interfaces.rst index 50c37c6b..730cb62e 100644 --- a/source/first-steps/interfaces.rst +++ b/source/first-steps/interfaces.rst @@ -3,7 +3,7 @@ User interfaces .. note:: - The choice of the default interface as well as the visiblity of different modules can be configured in the profiles or from :doc:`the user's preferences `. + The choice of the default interface as well as the visibility of different modules can be configured in the profiles or from :doc:`the user's preferences `. .. _standard_interface: @@ -26,7 +26,7 @@ It is divided into 5 views: A customizable dashboard * *Personal view* - Shows the tickets opened, rejected, to be processed, to be approved (for which the logged-in user is the requestor) or those on which this user has an interaction as a validator or technician (awaiting validation, in progress, to be closed, in waiting). This view also offers him current issues, his schedule and available notes. + Shows the tickets opened, rejected, to be processed, to be approved (for which the logged-in user is the requester) or those on which this user has an interaction as a validator or technician (awaiting validation, in progress, to be closed, in waiting). This view also offers him current issues, his schedule and available notes. * *Group view* Offers the same information about tickets and issues as the personal view, but using the groups to which it belongs as a reference. Depending on their profile, they may or may not have access to the tickets for which their groups are requesting. diff --git a/source/first-steps/preferences.rst b/source/first-steps/preferences.rst index fded5cb2..0d5d06ef 100644 --- a/source/first-steps/preferences.rst +++ b/source/first-steps/preferences.rst @@ -92,29 +92,29 @@ General customisation :align: center :scale: 42 % -- **Language** : change the language of your interface (the language in this section takes over if another language is defined in the `default values <../../../modules/configuration/general/default_values.html>`_ of the general configuration) -- **Display order of surnames** : how do you want to display the identity of your contacts (surname, first name or first name, surname) -- **Results to display by page** : select the number of results to display for the various searches carried out in the modules (1 to 50) -- **Display the tree dropdown complete name in dropdown inputs** : whether or not to display the full names of drop-down lists (if not, this may affect the layout in some cases) (Yes / No) -- **Diplay counters** : display the counters of saved searches (Yes / No) -- **Keep devices when purging an item** : (Yes / No. No by default) -- **Results to display on home page** : display the number of results on the home page of a module (tickets, computers, etc.) (5 to 30) -- **CSV delimiter** : delimiter for import/export CSV (; or , by default **;**) -- **Page layout** : change the position of the main menu (horizontal or vertical) -- **Enable high constrast** : feature that alters the colors (Yes / No) -- **Default central bar** : choose which element will be visible on your home page (dashboard, personal view, group view, global view, RSS feeds) -- **Show search from above results** : whether or not to include the search engine in the toolbar (Yes / No) -- **Date format** : how to display date (YYY-MM-DD,DD-MM-YYYY, MM-DD-YYYY) -- **Number format** : how to display number (1 234.56 / 1,2345.56 / 1 234,56 / 1234.56 / 1234,56) -- **Go to created item after creation** : After creating an object, you can go directly to this object (Yes / No) -- **Display the complete name of tree dopdown in search results** : Yes / No -- **Show GLPI ID** : show the ID of the GLPI's objects (Yes / No) -- Notifications for my changes : -- **PDF export font** : choose the font for PDF exports -- **Color palette** : Choose your theme for your GLPI interface -- **Rich text field layout** : define the behaviour of the text formatting bar -- **Timezone** : select your timezone -- **Timeline order** : order of display of the history of the different types of follow-up in a ticket (natural order (old items on top, recent on bottom) reverse order (old times on bottom, recent on top)) +- **Language**: change the language of your interface (the language in this section takes over if another language is defined in the `default values <../../../modules/configuration/general/default_values.html>`_ of the general configuration) +- **Display order of surnames**: how do you want to display the identity of your contacts (surname, first name or first name, surname) +- **Results to display by page**: select the number of results to display for the various searches carried out in the modules (1 to 50) +- **Display the tree dropdown complete name in dropdown inputs**: whether or not to display the full names of drop-down lists (if not, this may affect the layout in some cases) (Yes / No) +- **Display counters**: display the counters of saved searches (Yes / No) +- **Keep devices when purging an item**: (Yes / No. No by default) +- **Results to display on home page**: display the number of results on the home page of a module (tickets, computers, etc.) (5 to 30) +- **CSV delimiter**: delimiter for import/export CSV (; or , by default **;**) +- **Page layout**: change the position of the main menu (horizontal or vertical) +- **Enable high contrast**: feature that alters the colors (Yes / No) +- **Default central bar**: choose which element will be visible on your home page (dashboard, personal view, group view, global view, RSS feeds) +- **Show search from above results**: whether or not to include the search engine in the toolbar (Yes / No) +- **Date format**: how to display date (YYY-MM-DD,DD-MM-YYYY, MM-DD-YYYY) +- **Number format**: how to display number (1 234.56 / 1,2345.56 / 1 234,56 / 1234.56 / 1234,56) +- **Go to created item after creation**: After creating an object, you can go directly to this object (Yes / No) +- **Display the complete name of tree dropdown in search results**: Yes / No +- **Show GLPI ID**: show the ID of the GLPI objects (Yes / No) +- **Notifications for my changes**: begin notified for your own changes +- **PDF export font**: choose the font for PDF exports +- **Color palette**: Choose your theme for your GLPI interface +- **Rich text field layout**: define the behaviour of the text formatting bar +- **Timezone**: select your timezone +- **Timeline order**: order of display of the history of the different types of follow-up in a ticket (natural order (old items on top, recent on bottom) reverse order (old times on bottom, recent on top)) .. note:: @@ -129,23 +129,23 @@ Assistance customisation and priority colors :align: center :scale: 42 % -- **Private followups by default** : all your follow-ups will be considered private. To make them public, uncheck the private box (Yes / No) -- **Private tasks by default** : all your tasks will be considered private. To make them public, uncheck the private box (Yes / No) -- **Tasks state by default** : choose the default status for your tasks (Information, To do, Done) -- **Pre-select me as a technician when adding a ticket follow-up** : when you create a ticket as a technician, choose whether you will be selected as "assigned to" (Yes / No) +- **Private followups by default**: all your follow-ups will be considered private. To make them public, uncheck the private box (Yes / No) +- **Private tasks by default**: all your tasks will be considered private. To make them public, uncheck the private box (Yes / No) +- **Tasks state by default**: choose the default status for your tasks (Information, To do, Done) +- **Pre-select me as a technician when adding a ticket follow-up**: when you create a ticket as a technician, choose whether you will be selected as "assigned to" (Yes / No) - **Add me as a technician when adding a ticket follow-up**: if you are not assigned to the ticket and you add a follow-up, you will be assigned to this ticket (Yes / No) -- **Action button layout** : choose the layout of the buttons when you are about to reply to a ticket (Splitted or Merged) -- **Show new tickets on the home page** : display tickets in the global view from the home page (Yes / No) -- **Request sources bu default** : when creating a ticket (before submission), define the source of the request (Direct / E-Mail / Fromcreator / Other / Phone / Written) -- **Automatically refresh data (tickets list, project kanban) in minutes** : Choose whether you want to update your interface pages regularly (never to 30) +- **Action button layout**: choose the layout of the buttons when you are about to reply to a ticket (*Splitted* or *Merged*) +- **Show new tickets on the home page**: display tickets in the global view from the home page (Yes / No) +- **Request sources bu default**: when creating a ticket (before submission), define the source of the request (Direct / E-Mail / Fromcreator / Other / Phone / Written) +- **Automatically refresh data (tickets list, project kanban) in minutes**: Choose whether you want to update your interface pages regularly (never to 30) .. Warning:: Be careful, if you activate this option, it is possible that the refresh will take place when you write a follow-up, for example, which will cause you to lose what you have written. We advise you to deactivate this option. -- **Pre-select me as a requester when creating a ticket** : indicate me as the requester when I write a new ticket (this does not prevent you from selecting other people/groups at a later date if you have the rights to do so). (Yes / No) -- **Add me as a technician when adding a ticket solution** : Add me as a technician when I add a solution to the ticket if it wasn't already assigned to me (Yes /No) -- **Timeline date display** : deletes seconds from dates (Precise / Relative) +- **Pre-select me as a requester when creating a ticket**: indicate me as the requester when I write a new ticket (this does not prevent you from selecting other people/groups at a later date if you have the rights to do so). (Yes / No) +- **Add me as a technician when adding a ticket solution**: Add me as a technician when I add a solution to the ticket if it wasn't already assigned to me (Yes /No) +- **Timeline date display**: deletes seconds from dates (Precise / Relative) You can change the priority colours. This will change all the colours for the : diff --git a/source/first-steps/search.rst b/source/first-steps/search.rst index bf36c8bb..99d9bcdb 100644 --- a/source/first-steps/search.rst +++ b/source/first-steps/search.rst @@ -129,7 +129,7 @@ Using the table view -------------------- In the table view, you have the option to sort the results by any of the displayed fields by clicking on the relevant column headers. -You may perform a multi-sort by holding the ``Ctrl`` or ``Command (MacOS)`` keys while left clicking on the column header. +You may perform a multi-sort by holding the ``Ctrl`` or ``Command`` (MacOS) keys while left clicking on the column header. Clicking on column headers multiple times will cycle between sort directions and removing the sort. At the bottom of the results table is a dropdown that can be used to change the number of results that will show on each page. @@ -162,7 +162,7 @@ The results of the actions as well as the information messages are presented at .. warning:: - The number of elements that can be handled simultaneously is limited by the values ​​of ``max_input_vars`` or ``suhosin.post.max_vars`` in your PHP configuration. You may therefore get a message indicating that massive edits are disabled. You just need to increase the values ​​of your PHP configuration or reduce the number of items displayed. + The number of elements that can be handled simultaneously is limited by the values of ``max_input_vars`` or ``suhosin.post.max_vars`` in your PHP configuration. You may therefore get a message indicating that massive edits are disabled. You just need to increase the values ​​of your PHP configuration or reduce the number of items displayed. Quick search ------------ diff --git a/source/glossary.rst b/source/glossary.rst index cf36a819..92f8283d 100644 --- a/source/glossary.rst +++ b/source/glossary.rst @@ -101,7 +101,7 @@ Glossary Permission applicable to a given scope (entity). Tacit renewal - The contract is renewed automaticaly if none of the parties declares its will to break it. + The contract is renewed automatically if none of the parties declares its will to break it. External link Link displayed on an asset form in GLPI and built dynamically using the asset data. @@ -323,7 +323,7 @@ Glossary :abbr:`VLAN (Virtual Local Area Network)` : Virtual Local Network. Tagged VLAN - A tagged :abbr:`VLAN (Virtual Local Area Network)` is a :term:`VLAN` which tag is transmited in network frame (see `802.1Q `_). + A tagged :abbr:`VLAN (Virtual Local Area Network)` is a :term:`VLAN` which tag is transmitted in network frame (see `802.1Q `_). Virtual network port A virtual network port is a port which does not correspond to a physical network hardware. @@ -335,7 +335,7 @@ Glossary User in charge of tickets processing. Template - Reusable model of object containing predefined fieds and allowing easier user entry. + Reusable model of object containing predefined fields and allowing easier user entry. Tier type Category of providers. diff --git a/source/index.rst b/source/index.rst index b953062d..9ab60c7e 100644 --- a/source/index.rst +++ b/source/index.rst @@ -13,7 +13,7 @@ GLPI User Documentation Preface ------- -This documentation covers the installation and use of GLPI (Gestion Libre de Parc Informatique) ! +This documentation covers the installation and use of :abbr:`GLPI (Gestion Libre de Parc Informatique)`! Free and open-source solution for IT asset management and helpdesk, and more. GLPI is a web application designed to manage all of your IT asset management issues from inventory management of hardware components and software to the management of user assistance. diff --git a/source/modules/administration/dictionnaries.rst b/source/modules/administration/dictionnaries.rst index 0eb979ff..e4915853 100644 --- a/source/modules/administration/dictionnaries.rst +++ b/source/modules/administration/dictionnaries.rst @@ -27,7 +27,7 @@ The *Replay the dictionary rules* button (under the list of rules of the diction .. hint:: * it is highly recommended to play rules on a test database and to backup database before production launch of the dictionary or before inserting new rules - * a script is available in directory *scripts* of GLPI installation, named *compute\_dictionnary.php*, that allows to launch dictionnary processing in command line mode; this allows to bypass problems of execution limit and provides a significant speedup + * a script is available in directory *scripts* of GLPI installation, named *compute\_dictionnary.php*, that allows to launch dictionary processing in command line mode; this allows to bypass problems of execution limit and provides a significant speedup Global dictionaries ~~~~~~~~~~~~~~~~~~~ @@ -39,7 +39,7 @@ The software dictionary modifies software data (name, version, manufacturer) in This dictionary allows also to redirect the creation of a software or of a set of software in a given entity, by choosing action *Entity* and to select the entity in which to create the software. This functionality can also be used with general option *Entity for software* available in entity configuration. -.. note:: for an optimal management of software and licenses in a multi-entity environment, it is possible to use the software dictionnary simultaneously with software visible in sub-entities and thus to use grouping functionality. +.. note:: for an optimal management of software and licenses in a multi-entity environment, it is possible to use the software dictionary simultaneously with software visible in sub-entities and thus to use grouping functionality. .. warning:: using action *Add regexp result* on a version must be used with maximum care; indeed, this action is only taken into account when importing data coming from an inventory tool and will be ignored when re-applying dictionary on an existing database. diff --git a/source/modules/administration/index.rst b/source/modules/administration/index.rst index 440b8689..3ef3f5c3 100644 --- a/source/modules/administration/index.rst +++ b/source/modules/administration/index.rst @@ -1,7 +1,7 @@ Administration ============== -Administration module allows to administrate users, groups, entities, profiles, rules and dictionnaries. +Administration module allows to administrate users, groups, entities, profiles, rules and dictionaries. .. toctree:: :maxdepth: 1 diff --git a/source/modules/administration/profiles/profiles.rst b/source/modules/administration/profiles/profiles.rst index 380f9039..5513c44c 100644 --- a/source/modules/administration/profiles/profiles.rst +++ b/source/modules/administration/profiles/profiles.rst @@ -40,7 +40,7 @@ The different permissions of an object are listed on the line of its name. To ac .. warning:: no permission deduction is done; for example in order to be able to modify an object, read permission must also be granted. -Permissions after migration: migration takes over old permissions in full, regardless of the purpose, and activates the corresponding values ​​in the new system. Previous *Write* permission is transformed into *Read*, *Update*, *Create*, *Delete* and *Purge* for most objects and must then be refined if needed. For others, the permissions are grouped by object, for example, FAQ permission are permissions of the Knowledge Base object. +Permissions after migration: migration takes over old permissions in full, regardless of the purpose, and activates the corresponding values in the new system. Previous *Write* permission is transformed into *Read*, *Update*, *Create*, *Delete* and *Purge* for most objects and must then be refined if needed. For others, the permissions are grouped by object, for example, FAQ permission are permissions of the Knowledge Base object. Some permissions are standards for all objects: diff --git a/source/modules/administration/rules/inventorytools.rst b/source/modules/administration/rules/inventorytools.rst index 6a37a697..aac8f047 100644 --- a/source/modules/administration/rules/inventorytools.rst +++ b/source/modules/administration/rules/inventorytools.rst @@ -19,7 +19,7 @@ The available actions are: .. warning:: The engine stops at the first matching rule. It is therefore necessary to carefully order the list of rules. In addition, it is preferable to put the rules which are most likely to be verified first, for example for entities containing a lot of assets. The rules for assignment to an entity are only played during the initial import of the machine into GLPI, which means that once a machine is imported, there is no automated process to change its entity and that manual **transfer** must be used. -Using GLPI blacklist mechanism, it is possible to exclude certain values ​​from processing by the rules engine such as certain IP or MAC addresses, for example an IP 127.0.0.1; see :doc:`Blacklists `. +Using GLPI blacklist mechanism, it is possible to exclude certain values from processing by the rules engine such as certain IP or MAC addresses, for example an IP 127.0.0.1; see :doc:`Blacklists `. Rules for importing and linking computers ----------------------------------------- @@ -51,7 +51,7 @@ The possible actions are to ignore the import, to link it if possible, if not to .. code-block:: if machine to import : serial number is already present in GLPI yes AND Lookup computers in GLPI which status is in stock - then link assing link if possible, else no import + then link assign link if possible, else no import Refuse a computer because of wrong serial number: diff --git a/source/modules/administration/rules/userauthorizations.rst b/source/modules/administration/rules/userauthorizations.rst index 74f170eb..edfc2c5f 100644 --- a/source/modules/administration/rules/userauthorizations.rst +++ b/source/modules/administration/rules/userauthorizations.rst @@ -115,7 +115,7 @@ Given an LDAP directory where the organization of branches (organizational units * Criteria: (LDAP)DistinghuishedName matches following regular expression: ``/(ou=.*)/`` * Actions: assign entity full name value from regular expression: Root entity > ``#0`` - Running the rule retrieves its organizational unit (``ou``) from the user's *distinguished name*. It will then compare it to the values ​​of the LDAP Information attribute representing the entity in the database. If an entity has the attribute whose value matches, then that attribute is used as the result of the rule. + Running the rule retrieves its organizational unit (``ou``) from the user's *distinguished name*. It will then compare it to the values of the LDAP Information attribute representing the entity in the database. If an entity has the attribute whose value matches, then that attribute is used as the result of the rule. .. note:: the value of the action ``#0`` indicates that we must use the first result of the regular expression. ``#1`` indicates the second and so on. The **Test** button of the form allows you to try values ​​and see the result obtained. diff --git a/source/modules/assets/computers.rst b/source/modules/assets/computers.rst index 726c97cb..ec5201e2 100644 --- a/source/modules/assets/computers.rst +++ b/source/modules/assets/computers.rst @@ -89,7 +89,7 @@ This tab lists the PC's :doc:`components <../../tabs/components>` : * Drive * Battery * Graphics card -* Soundcard +* Sound card * Controller Each item has its :doc:`own information <../../tabs/components>` (name, model, brand, memory capacity, number of cores/threads, etc.). diff --git a/source/modules/assets/softwares.rst b/source/modules/assets/softwares.rst index 48f6a4c9..422721ad 100644 --- a/source/modules/assets/softwares.rst +++ b/source/modules/assets/softwares.rst @@ -44,7 +44,7 @@ It is possible to use :doc:`templates with software <../overview/templates>`. Some fields are specific in the software form: - **Upgrade From** is an information, with no processing associated and which tells whether the software is an update of another software -- **Sofware category** allows to group software in the list of software of an asset +- **Software category** allows to group software in the list of software of an asset - **Associable to a ticket** defines whether the software can be seen in the drop-down list "Hardware" of a ticket diff --git a/source/modules/assistance/index.rst b/source/modules/assistance/index.rst index 998a6695..50139643 100644 --- a/source/modules/assistance/index.rst +++ b/source/modules/assistance/index.rst @@ -5,7 +5,7 @@ Assistance module allows users to create, follow and process tickets. Plannings, Depending on profile permissions, it is possible as well to create, follow and process problems and changes. -GLPI assistance module is compliant with ITIL best practises guide and integrates therefore some fields normalization. However, following ITIL best practises is recommanded but not mandatory and it is perfectly feasible, thanks to module's flexibility, to implement an assistance service tailored to the organization's needs. +GLPI assistance module is compliant with ITIL best practises guide and integrates therefore some fields normalization. However, following ITIL best practises is recommended but not mandatory and it is perfectly feasible, thanks to module's flexibility, to implement an assistance service tailored to the organization's needs. .. toctree:: :maxdepth: 2 diff --git a/source/modules/assistance/planning.rst b/source/modules/assistance/planning.rst index ec0d4877..2d114c0b 100644 --- a/source/modules/assistance/planning.rst +++ b/source/modules/assistance/planning.rst @@ -21,6 +21,6 @@ This information can be exported in two formats: .. note:: - * Access to Ical and Webcall feed is protected by a security key integrated into the URL. It is possible to regenerate this key in menu `Preferences`. See :doc:`Manage preferences `. + * Access to Ical and Webcal feed is protected by a security key integrated into the URL. It is possible to regenerate this key in menu `Preferences`. See :doc:`Manage preferences `. * User's planning can be displayed on home page if profile has authorization *See my personal planning*. However, it is not possible to add an element to a planning from this interface; it is mandatory to plan a task or a note so that planning fills up. diff --git a/source/modules/configuration/authentication/ldap.rst b/source/modules/configuration/authentication/ldap.rst index 1f1bca64..3298f8b2 100644 --- a/source/modules/configuration/authentication/ldap.rst +++ b/source/modules/configuration/authentication/ldap.rst @@ -123,7 +123,7 @@ Allows you to configure how the link between the fields of the directory and tho Groups ~~~~~~ -Allows you to configure the method for retreiving groups from the LDAP directory. +Allows you to configure the method for retrieving groups from the LDAP directory. .. image:: images/ldap-groups.png :alt: Confiuguration of LDAP groups @@ -143,7 +143,7 @@ In case the server hosting the LDAP directory is in a different timezone as GLPI **Limit of the number of records returned** -There are often two limits on the number of records retured per request. +There are often two limits on the number of records returned per request. * The client limit (defined for example on Debian/Ubuntu in ``/etc/ldap/ldap.conf``) * The server limit: If the server limit is lower than the client limit, then that is the effective limit @@ -156,7 +156,7 @@ There are often two limits on the number of records retured per request. It is possible to bypass the limitation by enabling **Pagination of results** in the **Advanced Information** tab of the LDAP directory in GLPI. This will split requests into smaller requests that are under the configured limit. -The **Page size** option adjusts the number of results retreived per "page" with pagination enabled. +The **Page size** option adjusts the number of results retrieved per "page" with pagination enabled. The **Maximum number of results** option is the limit for the total number of records. This option may be useful to avoid high memory usage. .. note:: diff --git a/source/modules/configuration/authentication/other.rst b/source/modules/configuration/authentication/other.rst index df1749e0..dfb8b8d7 100644 --- a/source/modules/configuration/authentication/other.rst +++ b/source/modules/configuration/authentication/other.rst @@ -14,7 +14,7 @@ The return web address parameter allows you to redirect the user to a specific p .. warning:: Once the CAS authentication is activated, each authentication is automatically redirected to the CAS server. - In order to log into an internal account or one authenticated through a different method, you have to add "?noAUTO=1" to the login URL. + In order to log into an internal account or one authenticated through a different method, you have to add ``?noAUTO=1`` to the login URL. .. note:: The `php-curl` or `php-dom` extensions are required to be enabled for CAS authentication to function. @@ -24,9 +24,9 @@ The return web address parameter allows you to redirect the user to a specific p x509 certificate ---------------- -The **Email attribute for x509 authentication** tells GLPI to look at the value of this attribute in the SSL\_CLIENT\_S\_DN HTTP request variable passed by the authentication system. +The **Email attribute for x509 authentication** tells GLPI to look at the value of this attribute in the ``SSL\_CLIENT\_S\_DN`` HTTP request variable passed by the authentication system. -It is possible to restrict the accepted values for the O, OR, and CN fields of the client certificate. +It is possible to restrict the accepted values for the ``O``, ``OR``, and ``CN`` fields of the client certificate. In order to specify multiple values for each field, you may separate each value with the *$* symbol. .. _auth_other: diff --git a/source/modules/configuration/crontasks.rst b/source/modules/configuration/crontasks.rst index 8f632b8e..511a2dc8 100644 --- a/source/modules/configuration/crontasks.rst +++ b/source/modules/configuration/crontasks.rst @@ -12,7 +12,7 @@ Some actions may support only one of the modes. Configure CLI mode ------------------ -To run CLI mode tasks, you will need to configure your external task scheduler to call GLPI's `front/cron.php` file periodically. +To run CLI mode tasks, you will need to configure your external task scheduler to call GLPI `front/cron.php` file periodically. It is recommended to have it run every minute to ensure that actions that are ready to run, get ran as soon as possible. For Linux/MacOS, you should add the following to the web server's user's (www-data, apache, etc) crontab: diff --git a/source/modules/configuration/dropdowns/assistance.rst b/source/modules/configuration/dropdowns/assistance.rst index e2872d68..ffb5e2c2 100644 --- a/source/modules/configuration/dropdowns/assistance.rst +++ b/source/modules/configuration/dropdowns/assistance.rst @@ -9,7 +9,7 @@ The list of ticket categories is tree-like: each element can have sub-elements. In the form of a ticket category, you can find some information about this category including but not limited to: * Responsible and technical group for the automatic assignment of tickets -* Default category of the knowledgebase when you want to add a solution of a ticket +* Default category of the knowledge base when you want to add a solution of a ticket * Visibility of the category depending on the interface (simplified/standard) or object * Ticket template to use for this category * Parent category diff --git a/source/modules/configuration/dropdowns/network-name.rst b/source/modules/configuration/dropdowns/network-name.rst index 1b5c8c6c..25ffa708 100644 --- a/source/modules/configuration/dropdowns/network-name.rst +++ b/source/modules/configuration/dropdowns/network-name.rst @@ -1,2 +1,4 @@ Network Name ------------- \ No newline at end of file +------------ + +.. todo:: This page must be redacted \ No newline at end of file diff --git a/source/modules/configuration/general/sql_replicas.rst b/source/modules/configuration/general/sql_replicas.rst index dc208cef..3c8fcb0f 100644 --- a/source/modules/configuration/general/sql_replicas.rst +++ b/source/modules/configuration/general/sql_replicas.rst @@ -12,7 +12,7 @@ To activate the replica management, you just have to fill in the connection para It is advisable to use a login that has only read privileges on the database. You can use several replicates by separating them with a **blank space**. -As the result in the config_db_slave.php file, the dbhost parameter will be an array. +As the result in the config_db_slave.php file, the ``dbhost`` parameter will be an array. A specific port can also be added. diff --git a/source/modules/configuration/locks.rst b/source/modules/configuration/locks.rst index c5b9c3b5..86f7b845 100644 --- a/source/modules/configuration/locks.rst +++ b/source/modules/configuration/locks.rst @@ -1,6 +1,5 @@ Locks ===== - .. todo:: This page must be redacted diff --git a/source/modules/management/database_instances.rst b/source/modules/management/database_instances.rst index 8bc98bec..e78455fe 100644 --- a/source/modules/management/database_instances.rst +++ b/source/modules/management/database_instances.rst @@ -1,3 +1,4 @@ Database instances ================== +.. todo:: This page must be redacted \ No newline at end of file diff --git a/source/modules/management/documents.rst b/source/modules/management/documents.rst index a150a730..fe7e012d 100644 --- a/source/modules/management/documents.rst +++ b/source/modules/management/documents.rst @@ -51,7 +51,7 @@ It is possible to link several types of objects to GLPI : * Budget * Camera * Camera item - * Cartbridge Model + * Cartridge Model * Case * Case item * Certificate @@ -103,12 +103,12 @@ It is possible to link several types of objects to GLPI : * Reminder * Sensor * Sensor item - * Simcard - * Simcard item + * Sim card + * Sim card item * Software * Solution - * Soundcard - * Soundcard item + * Sound card + * Sound card item * Supplier * System board * System board item diff --git a/source/modules/management/licenses.rst b/source/modules/management/licenses.rst index c6e7321f..d992f5a6 100644 --- a/source/modules/management/licenses.rst +++ b/source/modules/management/licenses.rst @@ -114,4 +114,4 @@ This tab allows to attach a certificate present in GLPI to the license. .. note:: You can prevent certain software, such as Microsoft KBs, from being brought up. - To do this, you need to set their parameters in :doc:`Management > Dictionnaries <../administration/dictionnaries>` \ No newline at end of file + To do this, you need to set their parameters in :doc:`Management > Dictionaries <../administration/dictionnaries>` \ No newline at end of file diff --git a/source/modules/overview/kanban.rst b/source/modules/overview/kanban.rst index 1515bd85..c9619d1e 100644 --- a/source/modules/overview/kanban.rst +++ b/source/modules/overview/kanban.rst @@ -6,7 +6,7 @@ The Kanban is a view to display Projects, Tickets, Changes or Problems on a task For Projects, you can view a global Kanban involving all current Projects and Project Tasks or view a Kanban for a specific Project and its child Projects and tasks. For Tickets, Changes, and Problems, only a global Kanban is available and is specific to each type (you cannot view tickets and changes on the same Kanban). -For the sake of berevity, the Kanban for Tickets, Changes and Problems is refered to as the *ITIL Kanban* in the rest of this document. +For the sake of berevity, the Kanban for Tickets, Changes and Problems is referred to as the *ITIL Kanban* in the rest of this document. Currently, the columns of the Kanban represent the status of the items. Each item is represented by a card inside the columns. @@ -22,6 +22,7 @@ Cards ----- Each card on the Kanban shows some basic information including: + - The name of the item which is shown as the card's titles - The progress of sub-tasks (Project tasks and child projects for Project Kanban and child tickets for Ticket Kanban) - If the item is a milestone (Project Kanban) @@ -30,10 +31,12 @@ Each card on the Kanban shows some basic information including: Hovering over the title of a Kanban card will show a preview of the item's content/description. Each card also has a "..." menu which includes: + - Goto: Navigates to the item's full form - Delete: Delete the item (this actually deletes the item and doesn't just remove it from the Kanban) Clicking on the card's title will display a flyout panel which displays some of the same information as the card itself but also includes: + - A read-only view of the item's content - A full list of the item's team along with the ability to add and remove team members directly without having to go to the item's full form @@ -46,6 +49,7 @@ For Tickets, Changes, and Problems you have requesters, observers, and assignees For Projects and Project tasks you have a simple "team" (assigned in the team tab) along with managers (assigned on the main form). .. note:: + The Kanban team management feature does not currently allow changing managers from the Project Kanban The Kanban presents these different notions as a simple "Team" where each member has a specific role and shows them all in a centralized list. @@ -61,10 +65,11 @@ The Kanban has a search and filter system that lets you filter which items are s Regular searches can be done by simply typing one or more search terms into the search box. -When you click in the search box, a suggestion tooltop will be displayed that shows a list of the available filter *tags*. +When you click in the search box, a suggestion tooltip will be displayed that shows a list of the available filter *tags*. There are different tags depending on which Kanban you are using and new tags can be added by plugins. Some of these tags incluse: + - title: The name or title of the item - type: The type of the item (On the Project Kanban you can use this to filter Projects or Project tasks) - content: The content of the item @@ -73,12 +78,14 @@ Some of these tags incluse: Each suggested tag may have zero or more buttons with an icon or character in them which represent different modifiers for the filter. The common modifiers: -- !: Represents a negation or exclusion -- #: Represents a regular expression + +- ``!``: Represents a negation or exclusion +- ``#``: Represents a regular expression As you type, the list of suggested tags will be adjusted to match what you have typed. You can manually add a filter by typing it out such as: `title:this` or `!title:notthis` + You can also select the tag or modifier from the list of suggestions using your mouse (or touch) or using the keyboard arrow keys to navigate and the enter key to select. If you select a tag or modifier from the suggestion list, it will add it to the search box in *edit* mode which lets you add the term. diff --git a/source/modules/tabs/changes.rst b/source/modules/tabs/changes.rst index 1170db92..7ce6292c 100644 --- a/source/modules/tabs/changes.rst +++ b/source/modules/tabs/changes.rst @@ -8,7 +8,7 @@ This summary table includes the following fields for each object: * Status * Date (opening or expiry date, resolution or closing date depending on the status of the change) * Priority -* Requestor(s) and assigned technician(s) +* Requester(s) and assigned technician(s) * Associated elements * Category * Name diff --git a/source/modules/tabs/problems.rst b/source/modules/tabs/problems.rst index 0fe75680..8538ddb9 100644 --- a/source/modules/tabs/problems.rst +++ b/source/modules/tabs/problems.rst @@ -8,7 +8,7 @@ This summary table includes for each object: * Status * Date (opening or expiry date, resolution or closing date depending on the status of the problem) * Priority -* Requestor(s) and assigned technician(s) +* Requester(s) and assigned technician(s) * Associated elements * Category * Name diff --git a/source/modules/tools/knowledgebase.rst b/source/modules/tools/knowledgebase.rst index 39077dbc..ad6415d2 100644 --- a/source/modules/tools/knowledgebase.rst +++ b/source/modules/tools/knowledgebase.rst @@ -27,7 +27,7 @@ It is possible to attach documents to articles of the knowledge base. An article can be made visible during a time slot by defining a start date and an end date. .. warning:: - Elements which should not be interpreted when displayed can be defined with preformated style (``
`` in HTML). Tags like ```` can therefore be inserted and will be displayed. Other HTML tags (``...`` may disappear when editing; to have complete visibility of the text, it is possible to switch to HTML mode where all elements will be visible. The browser may also modify dynamically content (case change, tags adding) when editing.
+   Elements which should not be interpreted when displayed can be defined with pre-formated style (``
`` in HTML). Tags like ```` can therefore be inserted and will be displayed. Other HTML tags (``...`` may disappear when editing; to have complete visibility of the text, it is possible to switch to HTML mode where all elements will be visible. The browser may also modify dynamically content (case change, tags adding) when editing.
 
 It is possible to create categories and sub-categories in order to organize browsing (see :doc:`Configure drop-downs `). User can then use several tabs to search and browse knowledge base:
 
diff --git a/source/modules/user-settings/authorized-substitutes.rst b/source/modules/user-settings/authorized-substitutes.rst
index ee40e816..24dcb305 100644
--- a/source/modules/user-settings/authorized-substitutes.rst
+++ b/source/modules/user-settings/authorized-substitutes.rst
@@ -5,6 +5,6 @@ Authorized substitutes
 
 Substitutes are user accounts that are authorized to act on behalf of an other user to validate or refuse a ticket or a change.
 
-The user can choose one or more accounts to delegate the validation task to. They may optionaly limit the date range of the delegation by setting one or both date limits.
+The user can choose one or more accounts to delegate the validation task to. They may optionally limit the date range of the delegation by setting one or both date limits.
 
 The user may also be a delegatee of another user. In this case, they will see a table of their delegators and the date range of each delegation.
\ No newline at end of file
diff --git a/source/tabs/common_fields/data_center_position.rst b/source/tabs/common_fields/data_center_position.rst
index 7a308ae3..40be6224 100644
--- a/source/tabs/common_fields/data_center_position.rst
+++ b/source/tabs/common_fields/data_center_position.rst
@@ -1,3 +1,4 @@
 Data center position
 ~~~~~~~~~~~~~~~~~~~~
 
+.. todo:: This page must be redacted
\ No newline at end of file
diff --git a/source/tabs/common_fields/group.rst b/source/tabs/common_fields/group.rst
index 2ebf895c..825d41ac 100644
--- a/source/tabs/common_fields/group.rst
+++ b/source/tabs/common_fields/group.rst
@@ -12,7 +12,7 @@ You can add a group manually or create a group directly by this field.
 - To create a group, click on **+ Add**
 - If it's necessary, check the box **Child entities** (this group will be visible in the sub-entity of the one you are in)
 - Enter a **Name**
-- A **Code** (optionnal)
+- A **Code** (optional)
 - Choose if this group is **Child of**
 - Select yes or no to **Recursive membership** (if enabled, members of this group will also become implicit members of its children groups)
 - You can define whether this group can be **visible in a ticket** (as a requester, observer, assigned to, task, can be notified)
@@ -37,7 +37,7 @@ You can add a group manually or create a group directly by this field.
    :scale: 43%
 
 1. Select **user**
-2. Define it this user can be **Manage** group (add/modify memebers, name, etc.)
+2. Define it this user can be **Manage** group (add/modify members, name, etc.)
 3. whether or not to authorise **Delegatee** rights (can open ticket for the group)
 4. **Add** your group
 
diff --git a/source/tabs/common_fields/group_in_charge.rst b/source/tabs/common_fields/group_in_charge.rst
index 26d9bd0d..26e38faa 100644
--- a/source/tabs/common_fields/group_in_charge.rst
+++ b/source/tabs/common_fields/group_in_charge.rst
@@ -11,7 +11,7 @@ A group in charge can modify the information of the computer and his elements (s
 - To create a group, click on **+ Add**
 - If it's necessary, check the box **Child entities** (this group will be visible in the sub-entity of the one you are in)
 - Enter a **Name**
-- A **Code** (optionnal)
+- A **Code** (optional)
 - Choose if this group is **Child of**
 - Select yes or no to **Recursive membership** (if enabled, members of this group will also become implicit members of its children groups)
 - You can define whether this group can be **visible in a ticket** (as a requester, observer, assigned to, task, can be notified)
@@ -37,7 +37,7 @@ A group in charge can modify the information of the computer and his elements (s
    :scale: 43%
 
 1. Select **user**
-2. Define it this user can be **Manage** group (add/modify memebers, name, etc.)
+2. Define it this user can be **Manage** group (add/modify members, name, etc.)
 3. whether or not to authorise **Delegatee** rights (can open ticket for the group)
 4. **Add** your group
 
diff --git a/source/tabs/common_fields/management_type.rst b/source/tabs/common_fields/management_type.rst
index ce717612..d54f5ce9 100644
--- a/source/tabs/common_fields/management_type.rst
+++ b/source/tabs/common_fields/management_type.rst
@@ -1,2 +1,4 @@
 Management type
-~~~~~~~~~~~~~~~
\ No newline at end of file
+~~~~~~~~~~~~~~~
+
+.. todo:: This page must be redacted
\ No newline at end of file
diff --git a/source/tabs/common_fields/manufacturer.rst b/source/tabs/common_fields/manufacturer.rst
index e9e9d202..01db66d4 100644
--- a/source/tabs/common_fields/manufacturer.rst
+++ b/source/tabs/common_fields/manufacturer.rst
@@ -10,7 +10,7 @@ Manufacturers are automatically retrieved by the automatic inventory and assigne
 
 - To create a manufacturer, click **+**
 - Add a **Name**
-- You can add a registrered ID issued by `PCI-SIG `_ for USB or/and PCI. You can add more by clicking **+**.
+- You can add a registered ID issued by `PCI-SIG `_ for USB or/and PCI. You can add more by clicking **+**.
 
 Once the manufacturer has been created, you can add another or select it from the drop-down list.
 
diff --git a/source/tabs/common_fields/model.rst b/source/tabs/common_fields/model.rst
index 77989547..5e06b7ca 100644
--- a/source/tabs/common_fields/model.rst
+++ b/source/tabs/common_fields/model.rst
@@ -2,7 +2,7 @@ Model
 ~~~~~
 
 When the inventory is uploaded, the template field is filled in automatically. You can also create/add templates manually.
-Modeles can also be used by templates and rules.
+Models can also be used by templates and rules.
 
 .. image:: /tabs/common_fields/images/model.png
    :alt: computer model
diff --git a/source/tabs/common_fields/monitor_type.rst b/source/tabs/common_fields/monitor_type.rst
index b50a43be..027f0289 100644
--- a/source/tabs/common_fields/monitor_type.rst
+++ b/source/tabs/common_fields/monitor_type.rst
@@ -1,2 +1,4 @@
 Monitor type
-~~~~~~~~~~~~
\ No newline at end of file
+~~~~~~~~~~~~
+
+.. todo:: This page must be redacted
\ No newline at end of file
diff --git a/source/tabs/common_fields/network.rst b/source/tabs/common_fields/network.rst
index 4ce77204..9b93f1e2 100644
--- a/source/tabs/common_fields/network.rst
+++ b/source/tabs/common_fields/network.rst
@@ -12,7 +12,7 @@ Network
 
 - To create a network, click **+**
 - Enter a **Name**
-- Enter a **Comment** (optionnal)
+- Enter a **Comment** (optional)
 - Click **+ Add**
 - You can add another one or close this window
 - Then select the network you want from the drop-down list
diff --git a/source/tabs/common_fields/pictures.rst b/source/tabs/common_fields/pictures.rst
index 563a554a..26bc418b 100644
--- a/source/tabs/common_fields/pictures.rst
+++ b/source/tabs/common_fields/pictures.rst
@@ -10,7 +10,7 @@ For Software :
 Add an image
 ^^^^^^^^^^^^
 
-- To add an image, click on "Chosse files" and select the image that you want (png, jpg, jpeg).
+- To add an image, click on "Choose files" and select the image that you want (png, jpg, jpeg).
 - Click on Save to add your image
 
 
diff --git a/source/tabs/common_fields/ports.rst b/source/tabs/common_fields/ports.rst
index 9ad92319..4b035955 100644
--- a/source/tabs/common_fields/ports.rst
+++ b/source/tabs/common_fields/ports.rst
@@ -1,2 +1,4 @@
 Ports
-~~~~~
\ No newline at end of file
+~~~~~
+
+.. todo:: This page must be redacted
\ No newline at end of file
diff --git a/source/tabs/common_fields/status.rst b/source/tabs/common_fields/status.rst
index 00abf44c..787378d5 100644
--- a/source/tabs/common_fields/status.rst
+++ b/source/tabs/common_fields/status.rst
@@ -38,7 +38,7 @@ You can also add statuses in **Setup > Dropdowns > Common > Statuses of items**
   * Database instances
   * Cables
   * Unmanaged devices
-  * Passivces devices
+  * Passives devices
   * System board items
   * Firmware items
   * Processor items
@@ -48,13 +48,13 @@ You can also add statuses in **Setup > Dropdowns > Common > Statuses of items**
   * Drive items
   * Battery items
   * Graphical card items
-  * Soudncard items
+  * Sound card items
   * Controller items
   * PCI device items
   * Case items
   * Power supply items
   * Generic device items
-  * Simcar items
+  * Sim card items
   * Sensor items
   * Camera items
 
diff --git a/source/tabs/common_fields/update_source.rst b/source/tabs/common_fields/update_source.rst
index cb715317..efc6dbe4 100644
--- a/source/tabs/common_fields/update_source.rst
+++ b/source/tabs/common_fields/update_source.rst
@@ -11,7 +11,7 @@ If it was done by the agent, GLPI Native Inventory will be indicated. For a manu
 
 - To create update source, click **+**
 - Enter a **Name**
-- Enter a comment (optionnal)
+- Enter a comment (optional)
 - Close the window and select the value in the drop-down list
 
 .. image:: /tabs/common_fields/images/add-update-source.png
diff --git a/source/tabs/common_fields/uuid.rst b/source/tabs/common_fields/uuid.rst
index 22485d7a..5f9d1363 100644
--- a/source/tabs/common_fields/uuid.rst
+++ b/source/tabs/common_fields/uuid.rst
@@ -6,7 +6,7 @@ UUID
    :align: center
    :scale: 51%
 
-The **UUID** (Universally Unique IDentifier) is automatically update by the automatic inventory. This UUID is the unique identifier of the motherboard.
+The :abbr:`UUID (Universally Unique IDentifier)`` is automatically update by the automatic inventory. This UUID is the unique identifier of the motherboard.
 You can add/modify this information manually. By default, if you add or modify this field it will be locked, the automatic inventory will not modify this information. You can unlock the field.
 
 You can retrieve this value using :
diff --git a/source/tabs/connections.rst b/source/tabs/connections.rst
index 6a665bb2..a420a11f 100644
--- a/source/tabs/connections.rst
+++ b/source/tabs/connections.rst
@@ -38,7 +38,7 @@ Delete a connection
 ~~~~~~~~~~~~~~~~~~~
 
 The deletion of a connection can be made from the entry of each connected hardware via mass actions (select the **check box** and
-click on **Actions** buttom)
+click on **Actions** button)
 
 .. note::
    Every deletion or addition of a connection is recorded in the history of the computer.
diff --git a/source/tabs/contracts.rst b/source/tabs/contracts.rst
index 9a99acd5..114a86f8 100644
--- a/source/tabs/contracts.rst
+++ b/source/tabs/contracts.rst
@@ -1,2 +1,4 @@
 Contracts
----------
\ No newline at end of file
+---------
+
+.. todo:: This page must be redacted
\ No newline at end of file
diff --git a/source/tabs/impact_analysis.rst b/source/tabs/impact_analysis.rst
index 0258723c..c8981529 100644
--- a/source/tabs/impact_analysis.rst
+++ b/source/tabs/impact_analysis.rst
@@ -4,7 +4,6 @@ Impact Analysis
 Impact analysis enables an infrastructure diagram to be drawn up, showing the dependencies and impacts in the event of equipment loss.
 This can be saved and exported
 
-
 .. Note:: We'll take a simple example. A router is connected to a switch to which a rack containing a server is attached.
 
    .. image:: images/analysis_impact-1.png
@@ -12,14 +11,11 @@ This can be saved and exported
       :align: center
       :scale: 60%
 
-
-
 Notions
 ~~~~~~~
 
 Two concepts need to be understood:
 
-
 - **Impact**: represented by default by a red arrow. If this element encounters a problem, it will impact all linked elements.
 - **Dependency**: represented by default by a blue arrow. A dependency is an element which will be directly affected by the impact. A dependency does not necessarily affect the elements linked to it.
 
@@ -120,7 +116,7 @@ Groups allow you to see all the elements that depend on another piece of equipme
 
 To delete a group, right-click on it and select delete. This only deletes the group, not the items it contains.
 
-Save your imapct analysis
+Save your impact analysis
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Remember to save your project with the **floppy** icon
diff --git a/source/tabs/links.rst b/source/tabs/links.rst
index e4809471..3a6a9ece 100644
--- a/source/tabs/links.rst
+++ b/source/tabs/links.rst
@@ -1,3 +1,4 @@
 Links
 -----
 
+.. todo:: This page must be redacted
\ No newline at end of file
diff --git a/source/tabs/operating_systems.rst b/source/tabs/operating_systems.rst
index e0196842..917d6674 100644
--- a/source/tabs/operating_systems.rst
+++ b/source/tabs/operating_systems.rst
@@ -13,7 +13,7 @@ This information is updated by the automatic inventory. You can add/modify it ma
 
 * To create a name, click **+**
 * Enter the **Name**
-* Enter a comment (optionnal)
+* Enter a comment (optional)
 * Click **+ Add** to save your OS
 * You can, now, select your OS in the drop-down list
 
@@ -34,7 +34,7 @@ This information can be provided automatically via the automatic inventory or ca
 
 * To create an architecture, click **+**
 * Enter the **Name**
-* Enter a comment (optionnal)
+* Enter a comment (optional)
 * Click **+ Add** to save your architecture
 * You can, now, select your OS in the drop-down list
 
@@ -53,7 +53,7 @@ It is the version of the kernel. This information can be updated by the automati
 
 * To create a Kernel, click **+**
 * Enter the **Name** (the version)
-* Enter a comment (optionnal)
+* Enter a comment (optional)
 * In Kernel field, select the one that suits you best.
 
   * If none match, click on the **i**
@@ -107,7 +107,7 @@ You can create a version if you want to customize this field :
 
 * To create a version, click on **+**
 * Enter a **Name**
-* Enter a **Comment** (optionnal)
+* Enter a **Comment** (optional)
 * Click **+ Add**
 * Select now the version you want by the drop-down list
 
@@ -119,7 +119,7 @@ This information can be provided automatically via the automatic inventory or ca
 
 * To create a service pack, click **+**
 * Enter a **Name**
-* Enter a **Comment** (optionnal)
+* Enter a **Comment** (optional)
 * Click **+ Add**
 * Select now the service pack you want by the drop-down list
 
@@ -132,7 +132,7 @@ This information can be provided automatically via the automatic inventory or ca
 
 * To create an Edition, click **+**
 * Enter a **Name**
-* Enter a **Comment** (optionnal)
+* Enter a **Comment** (optional)
 * Click **+ Add**
 * Select now the edition you want by the drop-down list
 
diff --git a/source/tabs/remote-management.rst b/source/tabs/remote-management.rst
index 3b2b0798..6e732552 100644
--- a/source/tabs/remote-management.rst
+++ b/source/tabs/remote-management.rst
@@ -1,7 +1,7 @@
 Remote Management
 =================
 
-Remote mamagement is used to reference the remote access software installed on the workstation, such as Teamviewer, Anydesk, etc.
+Remote management is used to reference the remote access software installed on the workstation, such as Teamviewer, Anydesk, etc.
 It is possible to add software manually if required, but the information can be fed back via the automatic inventory.
 
 .. image:: images/remote-management.png
@@ -25,7 +25,7 @@ The applications detected are :
 Add a new remote access
 -----------------------
 
-- To add a remote access manually, click on **Add a remote mannagement**
+- To add a remote access manually, click on **Add a remote management**
 - Enter the ID number (which can be found on the user's PC or on a management console if your tool has one)
 - Select the tool from the list
 - Click on  **+ Add**
diff --git a/source/tabs/sockets.rst b/source/tabs/sockets.rst
index f5a9df03..70a0f68d 100644
--- a/source/tabs/sockets.rst
+++ b/source/tabs/sockets.rst
@@ -59,8 +59,6 @@ When the socket is validated, you can setup the advanced options.
    :align: center
    :scale: 49%
 
-
-
 .. tip:: In the case of a bulk addition, you will need to select each socket and add the information to it
 
 .. note:: To connect this computer to an other equipment, go to :doc:`cables <../modules/assets/cables>`
diff --git a/source/tabs/software.rst b/source/tabs/software.rst
index 9ab37f5c..97d04c68 100644
--- a/source/tabs/software.rst
+++ b/source/tabs/software.rst
@@ -13,12 +13,10 @@ Install a Software
 
 You can install new software from the list of existing applications
 
-
 - In **software** field, select the desired application,
 - Select the **version**
 - click on **install**
 
-
 .. image:: images/software-install.png
    :alt: software-install
    :align: center
@@ -27,9 +25,9 @@ You can install new software from the list of existing applications
 Delete a software
 ~~~~~~~~~~~~~~~~~
 
-You can delete one or more softwares, you can select the check box, and click on **Actions** and select **Delete permanently**.
+You can delete one or more software, you can select the check box, and click on **Actions** and select **Delete permanently**.
 
 If you make a mistake, you can always go back to the previous step to add it again
 
 .. Note::
-   If you need to add or modify a software  (not already presents in the list),  you need to go to the `Assets > Software `_ tab.
\ No newline at end of file
+   If you need to add or modify a software (not already present in the list), you need to go to the `Assets > Software `_ tab.
\ No newline at end of file
diff --git a/source/tabs/volume.rst b/source/tabs/volume.rst
index dd46219f..324d1cca 100644
--- a/source/tabs/volume.rst
+++ b/source/tabs/volume.rst
@@ -18,7 +18,7 @@ Volumes are added by the automatic inventory, but can also be added manually.
 Add a volume
 ~~~~~~~~~~~~~
 
-You can delete one or more softwares, you can select the check box, and click on **Actions** and select **Delete permanently**.
+You can delete one or more software, you can select the check box, and click on **Actions** and select **Delete permanently**.
 
 * To add a new volume, click on **Add a volume**
 * Fill in the necessary fields
@@ -29,4 +29,4 @@ You can delete one or more softwares, you can select the check box, and click on
 Delete a volume
 ~~~~~~~~~~~~~~~~~
 
-You can delete one or more volume, you can select the check box, and click on **Actions** and select **Delete permanently**.
\ No newline at end of file
+You can delete one or more volume, you can select the check box, and click on **Actions** and select **Delete permanently**.