Skip to content

Commit 2625185

Browse files
committed
docs: use preference links where possible
1 parent fdcae98 commit 2625185

File tree

6 files changed

+83
-58
lines changed

6 files changed

+83
-58
lines changed

app/display/convert-medm/doc/index.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ To use the EDM converter, add the following to your settings::
7171
org.csstudio.display.converter.edm/edm_paths_config=/path/to/edm_paths.txt
7272
org.csstudio.display.converter.edm/colors_list=/path/to/edm/colors.list
7373

74-
For details, see full description of :ref:`preference_settings`.
74+
.. seealso::
75+
76+
For details, see the :prefs:pack:`org.csstudio.display.converter.edm` preferences.
7577

7678
Each time you now try to open an ``*.edl`` file,
7779
the converter will create a ``*.bob`` file in the same location and then open it.

app/logbook/olog/client-es/src/main/resources/olog_es_preferences.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
# --------------------------------------
44

55
# The Olog URL.
6+
#
7+
# :format: `http(s)://foo.com/Olog`
8+
#
9+
# :::{important}
10+
# The `Olog` path element may *not* be omitted.
11+
# :::
612
olog_url=http://localhost:8080/Olog
713

814
# The connection timeout for HttpClient, in milliseconds.

app/logbook/olog/ui/doc/index.rst

Lines changed: 55 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,34 @@ https://github.com/ControlSystemStudio/phoebus/tree/master/phoebus-product.
77

88
Features
99
--------
10+
1011
- Arbitrary number of "logbooks", configured in the service. A logbook entry is contained in one or several logbooks.
1112

1213
- Arbitrary number of "tags", configured in the service. A logbook entry may be associated with zero or several tags.
1314

1415
- Arbitrary number of "properties", configured on the service. A property is a named list of key/value pairs. The user may define values for the items in a property. A logbook entry is associated with zero or several properties.
1516

1617
- Arbitrary number of attachments, i.e. images or other file types.
17-
18+
1819
- Markup as defined by the Commonmark specification (https://commonmark.org).
19-
20+
2021
- Log entry editor invocation from context menu whereby context specific attachments or data are automatically appended to the log entry.
2122

2223
- Log entry viewers offer search capabilities based on meta data and content.
2324

2425
Launching the log entry editor
2526
------------------------------
27+
2628
The log entry editor is launched as a non-modal window using one of the following methods:
2729

2830
- From the dedicated button in the application toolbar.
2931

30-
- From application menu Applications -> Utility -> Send to Logbook.
32+
- From application menu :menuselection:`Applications --> Utility --> Send to Logbook`.
3133

3234
- Using the New Log Entry button in the log entry details view of the logbook application.
3335

34-
- Using the New Log Entry context menu item in the search result list view of the logbook application. This option also supports the keyboard combination CTRL+N.
36+
- Using the New Log Entry context menu item in the search result list view of the logbook application.
37+
This option also supports the keyboard combination :kbd:`CTRL-N`.
3538

3639
The log entry editor may also be launched from context menus, where applicable. For instance, with a right click on
3740
the background of an OPI the launched context menu will include the Create Log item:
@@ -48,9 +51,9 @@ The log entry editor is a non-modal dialog:
4851
Mandatory data are:
4952

5053
- Username and password, see also preferences_.
51-
54+
5255
- Title
53-
56+
5457
- At least one logbook, see also preferences_. Additional logbooks - configured in the service - can be added from a list shown when pressing the down button:
5558

5659
.. image:: images/LogbookSelection.png
@@ -67,19 +70,26 @@ Additional images (or other type of attachments) may be added by expanding the A
6770
.. image:: images/Attachments.png
6871
Here user may attach any number of files of arbitrary types:
6972

70-
- ``Add Files`` will launch the native file browser dialog from which user may select any number of files.
71-
- ``Clipboard`` will attach the file - if any - currently copied to the host OS clipboard.
72-
- ``CSS Window`` will attach an image of the current application window.
73-
- ``Embed New`` will launch the dialog to embed an image to the log entry body, see below.
74-
- ``Embed Selected`` will embed user selected image files previously added to the list of attachments.
73+
- :guilabel:`Add Files` will launch the native file browser dialog from which user may select any number of files.
74+
- :guilabel:`Clipboard` will attach the file - if any - currently copied to the host OS clipboard.
75+
- :guilabel:`CSS Window` will attach an image of the current application window.
76+
- :guilabel:`Embed New` will launch the dialog to embed an image to the log entry body, see below.
77+
- :guilabel:`Embed Selected` will embed user selected image files previously added to the list of attachments.
7578

76-
**NOTE**: The Olog service will not accept upload of attachments larger than the configured limit of 50MB. The Olog service
77-
can be configured to use a different limit, but users should keep in mind that download of large attachments to
78-
the log viewer may incur delays in terms of UI updates.
79+
.. note::
7980

80-
**NOTE**: Since iOS 11 the default camera image format is HEIC/HEIF (High-Efficiency Image Format). This type of
81-
image file is not supported. Consequently upload of HEIC files is blocked by the application. Moreover, HEIC files converted to JPEG
82-
in native Mac OS applications (e.g. Preview) may also fail to render and are also blocked from upload.
81+
The Olog service will not accept upload of attachments larger than the configured limit of 50MB.
82+
The Olog service can be configured to use a different limit,
83+
but users should keep in mind that download of large attachments to the log viewer
84+
may incur delays in terms of UI updates.
85+
86+
.. note::
87+
88+
Since iOS 11 the default camera image format is HEIC/HEIF (High-Efficiency Image Format).
89+
This type of image file is not supported.
90+
Consequently upload of HEIC files is blocked by the application.
91+
Moreover, HEIC files converted to JPEG in native Mac OS applications (e.g. Preview)
92+
may also fail to render and are also blocked from upload.
8393

8494
Embedded images
8595
---------------
@@ -106,14 +116,15 @@ User may select what properties to include in the log entry, and edit the values
106116

107117
Log entry viewer
108118
----------------
109-
The menu item Applications -> Utility -> Log Entry Table will launch an application (in a new tab) in which the user may
110-
search and view log entries:
119+
120+
The menu item :menuselection:`Applications --> Utility --> Log Entry Table` will launch an application (in a new tab)
121+
in which the user may search and view log entries:
111122

112123
.. image:: images/LogEntryTable.png
113124

114125
User may choose to hide some details of each log entry in the list in order to fit more items in the view and to reduce the need
115-
for scrolling. This can be done using the keyboard shortcut ``CTRL+SHIFT+D``, or by selecting the
116-
``Show/Hide Details`` item from the context menu invoked through a right click in the table view. The choice
126+
for scrolling. This can be done using the keyboard shortcut :kbd:`CTRL-SHIFT-D`, or by selecting the
127+
:guilabel:`Show/Hide Details` item from the context menu invoked through a right click in the table view. The choice
117128
to show or hide details is persisted between restarts of the application.
118129

119130
.. image:: images/ContextMenuLogEntryTable.png
@@ -174,8 +185,6 @@ The navigation buttons are not rendered if hit count less or equal to the page s
174185

175186
.. image:: images/pagination.png
176187

177-
.. _preferences:
178-
179188
Periodic Search
180189
^^^^^^^^^^^^^^^
181190

@@ -200,14 +209,16 @@ If user double-clicks on a OPI file attachment (.bob file), the application will
200209
If user double-clicks on a Data Browser attachment (.plt file), the application will launch the Data Browser.
201210

202211
Preview of non-image files is not offered in the application. However, external viewers may be configured for
203-
arbitrary file extensions, see preference_settings_ (framework.workbench) for more information.
212+
arbitrary file extensions, see :prefs:pack:`org.phoebus.framework.workbench` preferences for more information.
204213

205214
Log Entry Grouping
206215
------------------
207216

208-
The preference setting ``log_entry_groups_support`` - if set to ``true`` - will enable the "log entry grouping"
209-
feature. With this users will be able to reply to individual log entries implicitly creating a group of log entries. To use this
210-
feature user can choose to:
217+
The preference setting :prefs:pref:`org.phoebus.logbook.olog.ui/log_entry_groups_support`,
218+
if set to ``true``,
219+
will enable the "log entry grouping" feature.
220+
With this users will be able to reply to individual log entries implicitly creating a group of log entries.
221+
To use this feature user can choose to:
211222

212223
- Press the Reply button shown in the log entry view:
213224

@@ -225,10 +236,13 @@ In the log entry view, the "Show/Hide Group" button (see screen shot above) can
225236
ordered on created date with oldest log entry on top. In this merged view attachments and properties are not shown.
226237
Clicking on a header in the merged view will show that log entry in full.
227238

228-
**NOTE**: To be able to group log entries user must be authenticated in one of the following manners:
239+
.. important::
229240

230-
* Use "credentials caching" through preference setting ``org.phoebus.logbook.olog.ui/save_credentials``. Once a log entry has been created, credentials will be reused when creating a group.
231-
* Use the Credentials Management app to sign in to the logbook context.
241+
To be able to group log entries user must be authenticated in one of the following manners:
242+
243+
* Use "credentials caching" through preference setting :prefs:pref:`org.phoebus.ui/save_credentials`.
244+
Once a log entry has been created, credentials will be reused when creating a group.
245+
* Use the Credentials Management app to sign in to the logbook context.
232246

233247
Limitations
234248
^^^^^^^^^^^
@@ -240,25 +254,19 @@ Please consider the following limitations of the log entry group feature:
240254
- There is no parent-child relation between log entries in a group, i.e. there is no internal structure of the log entries in a group.
241255
- A log entry may be included in only one log entry group. It is hence not possible to create a new group of log entries if these are already contained in different groups.
242256

257+
.. _preferences:
258+
243259
Preferences
244260
-----------
245-
Preferences related to the electronic logbook are the following:
246-
247-
- ``org.phoebus.olog.es.api/olog_url``. This should be on the format ``http(s)://foo.com/Olog``, where the path element ``Olog`` may not be omitted.
248-
249-
- ``org.phoebus.logbook.olog.ui/default_logbooks``. This is a comma separated list of logbooks automatically associated with a new log entry.
250-
251-
- ``org.phoebus.logbook.olog.ui/level_field_name``. The text shown next to the drop-down below the password field. Sites may wish to customize this to override the default value "Level".
252-
253-
- ``org.phoebus.olog.es.api/levels``. List of items shown in the "Level" drop-down.
254-
255-
- ``org.phoebus.logbook.ui/save_credentials``. Indicates if user credentials should be cached. If ``true``, the user will
256-
have to specify credentials only for the first new log entry after launch of CS Studio. The side effect of credentials caching is that all entries will be created with the same user (owner) identity.
257-
258-
- ``search_result_page_size``. The maximum number of hits per page to fetch and render in a search. User may override in the UI. Value must be 1 - 999, default is 30.
259-
260-
- ``log_entry_groups_support``. If true, user may reply to log entries and create a log entry group from a selection of existing log entries.
261-
262261

262+
See the :prefs:pack:`org.phoebus.olog.es.api` and :prefs:pack:`org.phoebus.logbook.olog.ui` preference packages,
263+
in particular:
263264

265+
- :prefs:pref:`org.phoebus.olog.es.api/olog_url`
266+
- :prefs:pref:`org.phoebus.olog.es.api/levels`
267+
- :prefs:pref:`org.phoebus.logbook.olog.ui/default_logbooks`
268+
- :prefs:pref:`org.phoebus.logbook.olog.ui/level_field_name`
269+
- :prefs:pref:`org.phoebus.logbook.olog.ui/search_result_page_size`
270+
- :prefs:pref:`org.phoebus.logbook.olog.ui/log_entry_groups_support`
264271

272+
The :prefs:pref:`org.phoebus.ui/save_credentials` is also used.

app/logbook/olog/ui/src/main/resources/log_olog_ui_preferences.properties

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Package org.phoebus.logbook.olog.ui
33
# ------------------------------
44

5-
# Comma-separated list of default logbooks for new log entries.
5+
# Comma-separated list of logbooks automatically associated with a new log entry.
66
default_logbooks=Scratch Pad
77

88
# The default query for logbook applications.
@@ -13,6 +13,8 @@ calendar_view_item_stylesheet=Agenda.css
1313

1414
# Text to render for the "LogEntryLevel" field of a log entry.
1515
#
16+
# The text is shown next to the drop-down below the password field.
17+
#
1618
# Sites may wish to customize this with respect to its wording and its implied purpose.
1719
level_field_name=Level:
1820

@@ -31,6 +33,9 @@ web_client_root_URL=
3133
#
3234
# If set to `false` user will not be able to create replies to log entries,
3335
# and consequently UI elements and views related to log entry groups will not be shown.
36+
#
37+
# If set to `true`, user may reply to log entries and create a log entry group
38+
# from a selection of existing log entries.
3439
log_entry_groups_support=false
3540

3641
# Log entry update support.
@@ -80,6 +85,10 @@ log_entry_calendar_display_name=
8085
log_attribute_desc=
8186

8287
# Limit used in "paginated" search, i.e. the number of search results per page.
88+
#
89+
# :format: value must be 1-999
90+
#
91+
# User may override in the UI.
8392
search_result_page_size=30
8493

8594
# Number of queries maintained by the `OlogQueryManager`.

core/pv/doc/index.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Process Variables
32
=================
43

@@ -20,11 +19,9 @@ Examples::
2019
ca://SomePVName
2120
SomeMotor.RBV
2221

23-
Channel Access settings are configured via :ref:`preference_settings`, most important::
24-
25-
# Channel Access address list
26-
org.phoebus.pv.ca/addr_list=...
27-
22+
Channel Access settings are configured via settings
23+
under the :prefs:pack:`org.phoebus.pv.ca` package,
24+
such as :prefs:pref:`org.phoebus.pv.ca/addr_list`.
2825

2926
PV Access
3027
---------

services/archive-engine/doc/index.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ change these settings in your :ref:`preference_settings` ::
146146
org.phoebus.archive.reader.rdb/user=report
147147
org.phoebus.archive.reader.rdb/password=$report
148148

149+
See the :prefs:pack:`org.csstudio.trends.databrowser3`
150+
and :prefs:pack:`org.phoebus.archive.reader.rdb` preferences
151+
for more information.
152+
149153
The ``MySQL.dbd`` used to install the archive tables adds a few demo samples
150154
for ``sim://sine(0, 10, 50, 0.1)`` around 2004-01-10 13:01, so you can simply
151155
add that channel to a Data Browser and find data at that time.
@@ -221,9 +225,8 @@ To start the archive engine for a configuration::
221225
The engine name ('Demo') needs to match a previously imported configuration name,
222226
and the port number (4812) needs to match the port number used when importing the configuration.
223227

224-
The settings (my_settings.ini) typically contain the EPICS CA address list settings
225-
as well as archive engine configuration details, see archive engine settings
226-
in :ref:`preference_settings`.
228+
The settings (``my_settings.ini``) typically contain the EPICS CA address list settings
229+
as well as archive engine configuration details, see the :prefs:pack:`org.csstudio.archive` settings.
227230

228231
In a production setup, the archive engine is best run under ``procServ``
229232
(https://github.com/ralphlange/procServ).

0 commit comments

Comments
 (0)