Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…t-docs into 5.x
  • Loading branch information
flmaxey committed Feb 8, 2021
2 parents 5d317e5 + 0ea1dd3 commit 037cb91
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion administration/access_rights_management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Paste the contents into the import dialog.
Privileges
^^^^^^^^^^

The button opens a window that displays all current exisiting |sf| and their
The button opens a window that displays all current existing |sf| and their
privileges for selected user from the grid. How the privileges are stored is
described further down in the `shared folder <#shared-folder>`_ section.

Expand Down
11 changes: 11 additions & 0 deletions administration/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
Administration
##############

Configuration changes are not applied immediately, instead you can
determine when this happens. This enables several changes to be activated
at the same time, which reduces unnecessary waiting times.

.. note::

|omv| does not display the submodules that are affected by the
configuration changes. If you still want to know which submodules are
affected, simply run ``cat /var/lib/openmediavault/dirtymodules.json``
in the CLI.

.. toctree::
:maxdepth: 3

Expand Down
2 changes: 1 addition & 1 deletion various/advset.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ To get the value of a specific environment variable use::

# omv-env get <OMV_NAME_OF_VARIABLE>

The list of environmental variables used for ``/etc/fstab`` filesystem with the
The list of environmental variables used for :file:`/etc/fstab` filesystem with the
defaults options and how to use them is described :doc:`here </various/fs_env_vars>`.

Modify environment variables
Expand Down

2 comments on commit 037cb91

@flmaxey
Copy link
Author

@flmaxey flmaxey commented on 037cb91 Feb 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how these edits were merged to the Master. I pushed commits to 5.X branch, for the User guide.

At least, as it appears, these edits should be commited to the Master.

@votdev
Copy link
Member

@votdev votdev commented on 037cb91 Feb 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes come from master (3782f10)

Please sign in to comment.