Skip to content

Commit e90723f

Browse files
committed
doc: remove all Doxygen rst utilities/references
We no longer insert Doxygen content in Sphinx after the removal of breathe, so let's align Doxyfiles and fix some broken references. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent a18ec10 commit e90723f

File tree

5 files changed

+27
-38
lines changed

5 files changed

+27
-38
lines changed

doc/nrf/nrf.doxyfile.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,7 @@ TAB_SIZE = 8
279279
# with the commands \{ and \} for these it is advised to use the version @{ and
280280
# @} or use a double escape (\\{ and \\})
281281

282-
ALIASES = "rst=\verbatim embed:rst" \
283-
"endrst=\endverbatim" \
284-
"rststar=\verbatim embed:rst:leading-asterisk" \
285-
"endrststar=\endverbatim" \
286-
"r=\verbatim embed:rst:leading-asterisk" \
287-
"er=\endverbatim" \
288-
"kconfig{1}=\verbatim embed:rst:inline :kconfig:option:`\1` \endverbatim" \
282+
ALIASES = "kconfig{1}=\verbatim \1 \endverbatim" \
289283
"req=\xrefitem req \"Requirement\" \"Requirements\""
290284

291285
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources

doc/nrfx/nrfx.doxyfile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ TAB_SIZE = 4
285285
# with the commands \{ and \} for these it is advised to use the version @{ and
286286
# @} or use a double escape (\\{ and \\})
287287

288-
ALIASES = "tagGreenTick=\htmlonly<CENTER><font color=\"green\">✔</font></CENTER>\endhtmlonly \xmlonly<verbatim>embed:rst:inline :green:`✔`</verbatim>\endxmlonly" \
289-
"tagRedCross=\htmlonly<CENTER><font color=\"red\">✖</font></CENTER>\endhtmlonly \xmlonly<verbatim>embed:rst:inline :red:`✖`</verbatim>\endxmlonly" \
288+
ALIASES = "tagGreenTick=\htmlonly<CENTER><font color=\"green\">✔</font></CENTER>\endhtmlonly" \
289+
"tagRedCross=\htmlonly<CENTER><font color=\"red\">✖</font></CENTER>\endhtmlonly" \
290290
"nRF5340pinAssignmentsURL=\"https://infocenter.nordicsemi.com/index.jsp?topic=%2Fps_nrf5340%2Fchapters%2Fpin.html\"" \
291291
"refhal{1}=\sa \1 \copydoc \1"
292292

doc/nrfxlib/nrfxlib.doxyfile.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,7 @@ TAB_SIZE = 8
279279
# with the commands \{ and \} for these it is advised to use the version @{ and
280280
# @} or use a double escape (\\{ and \\})
281281

282-
ALIASES = "rst=\verbatim embed:rst" \
283-
"endrst=\endverbatim" \
284-
"rststar=\verbatim embed:rst:leading-asterisk" \
285-
"endrststar=\endverbatim" \
286-
"r=\verbatim embed:rst:leading-asterisk" \
287-
"er=\endverbatim" \
288-
"kconfig{1}=\verbatim embed:rst:inline :kconfig:option:`\1` \endverbatim" \
282+
ALIASES = "kconfig{1}=\verbatim \1 \endverbatim" \
289283
"req=\xrefitem req \"Requirement\" \"Requirements\""
290284

291285
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources

doc/zephyr/zephyr.doxyfile.in

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -279,21 +279,22 @@ TAB_SIZE = 8
279279
# with the commands \{ and \} for these it is advised to use the version @{ and
280280
# @} or use a double escape (\\{ and \\})
281281

282-
ALIASES = "rst=\verbatim embed:rst:leading-asterisk" \
283-
endrst=\endverbatim \
284-
"kconfig{1}=\htmlonly <code>\1</code> \endhtmlonly \xmlonly <verbatim>embed:rst:inline :kconfig:option:`\1`</verbatim> \endxmlonly" \
282+
ALIASES = "kconfig{1}=\verbatim \1 \endverbatim" \
285283
"req{1}=\ref ZEPH_\1 \"ZEPH-\1\"" \
286284
"satisfy{1}=\xrefitem satisfy \"Satisfies requirement\" \"Requirement Implementation\" \1" \
287285
"verify{1}=\xrefitem verify \"Verifies requirement\" \"Requirement Verification\" \1" \
286+
"kconfig_dep{1}=\attention Available only when the following Kconfig option is enabled: \kconfig{\1}." \
287+
"kconfig_dep{2}=\attention Available only when the following Kconfig options are enabled: \kconfig{\1}, \kconfig{\2}." \
288+
"kconfig_dep{3}=\attention Available only when the following Kconfig options are enabled: \kconfig{\1}, \kconfig{\2}, \kconfig{\3}." \
288289
"funcprops=\par \"Function properties (list may not be complete)\"" \
289-
"reschedule=\htmlonly reschedule \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_reschedule`</verbatim> \endxmlonly" \
290-
"sleep=\htmlonly sleep \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_sleep`</verbatim> \endxmlonly" \
291-
"no_wait=\htmlonly no-wait \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_no-wait`</verbatim> \endxmlonly" \
292-
"isr_ok=\htmlonly isr-ok \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_isr-ok`</verbatim> \endxmlonly" \
293-
"pre_kernel_ok=\htmlonly pre-kernel-ok \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_pre-kernel-ok`</verbatim> \endxmlonly" \
294-
"async=\htmlonly async \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_async`</verbatim> \endxmlonly" \
290+
"reschedule=\qualifier reschedule" \
291+
"sleep=\qualifier sleep" \
292+
"no_wait=\qualifier no-wait" \
293+
"isr_ok=\qualifier isr-ok" \
294+
"pre_kernel_ok=\qualifier pre-kernel-ok" \
295+
"async=\qualifier async" \
295296
"atomic_api=As for all atomic APIs, includes a full/sequentially-consistent memory barrier (where applicable)." \
296-
"supervisor=\htmlonly supervisor \endhtmlonly \xmlonly <verbatim>embed:rst:inline :ref:`api_term_supervisor`</verbatim> \endxmlonly"
297+
"supervisor=\qualifier supervisor"
297298

298299
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
299300
# only. Doxygen will then generate output that is more tailored for C. For

include/net/nrf_cloud_rest.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ struct nrf_cloud_rest_pgps_request {
181181
*
182182
* @retval 0 If successful.
183183
* Otherwise, a (negative) error code is returned.
184-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
184+
* See "nRF Cloud: Request Failure" for details.
185185
*/
186186
int nrf_cloud_rest_location_get(struct nrf_cloud_rest_context *const rest_ctx,
187187
struct nrf_cloud_rest_location_request const *const request,
@@ -210,7 +210,7 @@ int nrf_cloud_rest_location_get(struct nrf_cloud_rest_context *const rest_ctx,
210210
* request type.
211211
* - -ENOBUFS will be returned, and an error message printed, if there is not enough
212212
* buffer space to store retrieved AGNSS data.
213-
* - See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for all
213+
* - See "nRF Cloud: Request Failure" for all
214214
* other possible error codes.
215215
*
216216
*/
@@ -231,7 +231,7 @@ int nrf_cloud_rest_agnss_data_get(struct nrf_cloud_rest_context *const rest_ctx,
231231
*
232232
* @retval 0 If successful.
233233
* Otherwise, a (negative) error code is returned.
234-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
234+
* See "nRF Cloud: Request Failure" for details.
235235
*/
236236
int nrf_cloud_rest_pgps_data_get(struct nrf_cloud_rest_context *const rest_ctx,
237237
struct nrf_cloud_rest_pgps_request const *const request);
@@ -252,7 +252,7 @@ int nrf_cloud_rest_pgps_data_get(struct nrf_cloud_rest_context *const rest_ctx,
252252
*
253253
* @retval 0 If successful.
254254
* Otherwise, a (negative) error code is returned.
255-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
255+
* See "nRF Cloud: Request Failure" for details.
256256
*/
257257
int nrf_cloud_rest_fota_job_get(struct nrf_cloud_rest_context *const rest_ctx,
258258
const char *const device_id, struct nrf_cloud_fota_job_info *const job);
@@ -278,7 +278,7 @@ void nrf_cloud_rest_fota_job_free(struct nrf_cloud_fota_job_info *const job);
278278
*
279279
* @retval 0 If successful.
280280
* Otherwise, a (negative) error code is returned.
281-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
281+
* See "nRF Cloud: Request Failure" for details.
282282
*/
283283
int nrf_cloud_rest_fota_job_update(struct nrf_cloud_rest_context *const rest_ctx,
284284
const char *const device_id, const char *const job_id,
@@ -298,7 +298,7 @@ int nrf_cloud_rest_fota_job_update(struct nrf_cloud_rest_context *const rest_ctx
298298
*
299299
* @retval 0 If successful.
300300
* Otherwise, a (negative) error code is returned.
301-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
301+
* See "nRF Cloud: Request Failure" for details.
302302
*/
303303
int nrf_cloud_rest_shadow_transform_request(struct nrf_cloud_rest_context *const rest_ctx,
304304
const char *const device_id, char const *const transform);
@@ -312,7 +312,7 @@ int nrf_cloud_rest_shadow_transform_request(struct nrf_cloud_rest_context *const
312312
*
313313
* @retval 0 If successful.
314314
* Otherwise, a (negative) error code is returned.
315-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
315+
* See "nRF Cloud: Request Failure" for details.
316316
*/
317317
int nrf_cloud_rest_shadow_state_update(struct nrf_cloud_rest_context *const rest_ctx,
318318
const char *const device_id, const char * const shadow_json);
@@ -326,7 +326,7 @@ int nrf_cloud_rest_shadow_state_update(struct nrf_cloud_rest_context *const rest
326326
*
327327
* @retval 0 If successful.
328328
* Otherwise, a (negative) error code is returned.
329-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
329+
* See "nRF Cloud: Request Failure" for details.
330330
*/
331331
int nrf_cloud_rest_shadow_service_info_update(struct nrf_cloud_rest_context *const rest_ctx,
332332
const char *const device_id, const struct nrf_cloud_svc_info * const svc_inf);
@@ -340,7 +340,7 @@ int nrf_cloud_rest_shadow_service_info_update(struct nrf_cloud_rest_context *con
340340
*
341341
* @retval 0 If successful.
342342
* Otherwise, a (negative) error code is returned.
343-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
343+
* See "nRF Cloud: Request Failure" for details.
344344
*/
345345
int nrf_cloud_rest_shadow_device_status_update(struct nrf_cloud_rest_context *const rest_ctx,
346346
const char *const device_id, const struct nrf_cloud_device_status *const dev_status);
@@ -390,7 +390,7 @@ int nrf_cloud_rest_jitp(const sec_tag_t nrf_cloud_sec_tag);
390390
*
391391
* @retval 0 If successful.
392392
* Otherwise, a (negative) error code is returned.
393-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
393+
* See "nRF Cloud: Request Failure" for details.
394394
*/
395395
int nrf_cloud_rest_send_device_message(struct nrf_cloud_rest_context *const rest_ctx,
396396
const char *const device_id, const char *const json_msg, const bool bulk,
@@ -405,7 +405,7 @@ int nrf_cloud_rest_send_device_message(struct nrf_cloud_rest_context *const rest
405405
*
406406
* @retval 0 If successful.
407407
* Otherwise, a (negative) error code is returned.
408-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
408+
* See "nRF Cloud: Request Failure" for details.
409409
*/
410410
int nrf_cloud_rest_send_location(struct nrf_cloud_rest_context *const rest_ctx,
411411
const char *const device_id, const struct nrf_cloud_gnss_data * const gnss);
@@ -421,7 +421,7 @@ int nrf_cloud_rest_send_location(struct nrf_cloud_rest_context *const rest_ctx,
421421
*
422422
* @retval 0 If successful.
423423
* Otherwise, a (negative) error code is returned.
424-
* See @verbatim embed:rst:inline :ref:`nrf_cloud_rest_failure` @endverbatim for details.
424+
* See "nRF Cloud: Request Failure" for details.
425425
*/
426426
int nrf_cloud_rest_device_status_message_send(struct nrf_cloud_rest_context *const rest_ctx,
427427
const char *const device_id, const struct nrf_cloud_device_status *const dev_status,

0 commit comments

Comments
 (0)