diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2019-05-23 13:14:00 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-05-23 13:14:00 +0000 |
| commit | ced1711297347f24fee45e75e73c7767507a0982 (patch) | |
| tree | 56fa3ad15c1f5b8a6d2b2953cb7c0c2a4eb4ba1e /docs/acknowledgements.rst | |
| parent | 1665bcd0cf75efc862684418480be0076eb8c920 (diff) | |
| parent | e1c5026ac7e9da1b74047bf8cb9be2a5c9564532 (diff) | |
Merge changes from topic "pb/sphinx-doc" into integration
* changes:
doc: Use proper note and warning annotations
doc: Refactor contributor acknowledgements
doc: Reorganise images and update links
doc: Set correct syntax highlighting style
doc: Add minimal glossary
doc: Remove per-page contents lists
doc: Make checkpatch ignore rst files
doc: Format security advisory titles and headings
doc: Reformat platform port documents
doc: Normalise section numbering and headings
doc: Reword document titles
Diffstat (limited to 'docs/acknowledgements.rst')
| -rw-r--r-- | docs/acknowledgements.rst | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/docs/acknowledgements.rst b/docs/acknowledgements.rst index 095b5adb..74b77ff1 100644 --- a/docs/acknowledgements.rst +++ b/docs/acknowledgements.rst @@ -1,28 +1,17 @@ -**Note: This file is only relevant for legacy contributions, to acknowledge the -specific contributors referred to in "Arm Limited and Contributors" copyright -notices. As contributors are now encouraged to put their name or company name -directly into the copyright notices, this file is not relevant for new -contributions.** - Contributor Acknowledgements ============================ -Companies ---------- - -Linaro Limited - -NVIDIA Corporation - -Socionext Inc. - -Xilinx, Inc. - -NXP Semiconductors - -Marvell International Ltd. - -STMicroelectronics - -Individuals ------------ +.. note:: + This file is only relevant for legacy contributions, to acknowledge the + specific contributors referred to in "Arm Limited and Contributors" copyright + notices. As contributors are now encouraged to put their name or company name + directly into the copyright notices, this file is not relevant for new + contributions. + +- Linaro Limited +- Marvell International Ltd. +- NVIDIA Corporation +- NXP Semiconductors +- Socionext Inc. +- STMicroelectronics +- Xilinx, Inc. |