Skip to content

Commit 28d419c

Browse files
committed
Use RSt for versionadded/deprecated
1 parent d96b99e commit 28d419c

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

managed_davx5.rst

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ It's advisable to set an expiration time for the configuration file on the Web s
7272
Configuration variables
7373
=======================
7474

75-
These variables can be used for Managed DAVx⁵ configuration:
75+
These variables can be used for Managed DAVx⁵ configuration.
76+
77+
If they are specific to a certain version, this is mentioned before the variable. Deprecated variables shouldn't be used anymore and will be removed in the future. Use their replacements instead.
7678

7779
:Name: license
7880
:Type: text
@@ -140,6 +142,7 @@ These variables can be used for Managed DAVx⁵ configuration:
140142
Using ``login_password`` is only recommended with app-specific per-user passwords. Keep in mind that the user
141143
may be able to retrieve the password even if ``login_credentials_lock`` is set.
142144
..
145+
.. versionadded:: 4.4.8 replaces ``login_lock_credentials``
143146
:Name: login_credentials_lock
144147
:Type: integer
145148
:Required: no
@@ -148,7 +151,13 @@ These variables can be used for Managed DAVx⁵ configuration:
148151
0 = don't lock (user can change credentials) |br|
149152
1 = lock at login (user can still change credentials in account settings) |br|
150153
2 = lock at login and in account settings (user can't change credentials)
151-
.. Note:: Since version 4.4.8-mgd ``login_credentials_lock`` replaces ``login_lock_credentials``. See :ref:`Deprecated Variables<Deprecated variables>`.
154+
..
155+
.. deprecated:: 4.4.8 replaced by ``login_credentials_lock``
156+
:Name: login_lock_credentials
157+
:Type: boolean
158+
:Required: no
159+
:Default: false
160+
:Description: whether user name and password are locked (= can't be edited by the user) in case they are provided by managed configuration.
152161
..
153162
:Name: login_certificate_alias
154163
:Type: text
@@ -265,17 +274,6 @@ These variables can be used for Managed DAVx⁵ configuration:
265274
0 = show all collections |br|
266275
1 = show only collections in the user's own home-sets
267276

268-
Deprecated variables
269-
====================
270-
Please stop using the following variables and use the new ones as indicated instead.
271-
272-
:Name: login_lock_credentials (**Deprecated since v4.4.8-mgd**. Use ``login_credentials_lock`` instead.)
273-
:Type: boolean
274-
:Required: no
275-
:Default: false
276-
:Description: whether user name and password are locked (= can't be edited by the user) in case they are provided by managed configuration.
277-
278-
279277

280278

281279
Configuration file syntax

0 commit comments

Comments
 (0)