Skip to content

Commit c62cbb7

Browse files
Merge pull request ceph#63706 from zdover23/wip-doc-2025-06-04-backport-63686-to-tentacle
tentacle: doc/start: edit documenting-ceph.rst
2 parents e7484eb + fb6352f commit c62cbb7

File tree

1 file changed

+33
-30
lines changed

1 file changed

+33
-30
lines changed

doc/start/documenting-ceph.rst

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,16 @@ documentation in HTML and manpage formats respectively.
282282
Build the Source (First Time)
283283
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
284284

285-
Ceph uses Python Sphinx, which is generally distribution agnostic. The first
286-
time you build Ceph documentation, it will generate a doxygen XML tree, which
287-
is a bit time consuming.
285+
Ceph uses Python Sphinx, which is distribution agnostic. The first time you
286+
build the Ceph documentation, a doxygen XML tree is generated. This can be time
287+
-consuming.
288288

289-
Python Sphinx does have some dependencies that vary across distributions. The
290-
first time you build the documentation, the script will notify you if you do not
291-
have the dependencies installed. To run Sphinx and build documentation successfully,
292-
the following packages are required:
289+
Some of Python Sphinx's dependencies vary across distributions. The first time
290+
you build the documentation, the build script notifies you of uninstalled
291+
dependencies.
292+
293+
To run Sphinx and build documentation successfully, the following packages are
294+
required:
293295

294296
.. raw:: html
295297

@@ -350,14 +352,14 @@ the following packages are required:
350352

351353

352354
Install each dependency that is not installed on your host. For Debian/Ubuntu
353-
distributions, execute the following:
355+
distributions, run the following commands:
354356

355357
.. prompt:: bash $
356358

357359
sudo apt-get install gcc python-dev python3-pip libxml2-dev libxslt-dev doxygen graphviz ant ditaa
358360
sudo apt-get install python3-sphinx python3-venv cython3
359361

360-
For Fedora distributions, execute the following:
362+
For Fedora distributions, run the following commands:
361363

362364
.. prompt:: bash $
363365

@@ -366,25 +368,26 @@ For Fedora distributions, execute the following:
366368
sudo yum install python-jinja2 python-pygments python-docutils python-sphinx
367369
sudo yum install jericho-html ditaa
368370

369-
For CentOS/RHEL distributions, it is recommended to have ``epel`` (Extra
370-
Packages for Enterprise Linux) repository as it provides some extra packages
371-
which are not available in the default repository. To install ``epel``, execute
372-
the following:
371+
For CentOS/RHEL distributions, it is recommended to enable the ``epel`` (Extra
372+
Packages for Enterprise Linux) repository, because it provides extra packages
373+
not available in the default repository. To install ``epel``, run the following
374+
command:
373375

374376
.. prompt:: bash $
375377

376-
sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
378+
sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
377379

378-
For CentOS/RHEL distributions, execute the following:
380+
For CentOS/RHEL distributions, run the following commands:
379381

380382
.. prompt:: bash $
381383

382-
sudo yum install gcc python-devel python-pip libxml2-devel libxslt-devel doxygen graphviz ant
383-
sudo pip install html2text
384+
sudo yum install gcc python-devel python-pip libxml2-devel libxslt-devel doxygen graphviz ant
385+
sudo pip install html2text
384386

385-
For CentOS/RHEL distributions, the remaining python packages are not available
386-
in the default and ``epel`` repositories. So, use http://rpmfind.net/ to find
387-
the packages. Then, download them from a mirror and install them. For example:
387+
For CentOS/RHEL distributions, the remaining Python packages are not available
388+
in the default repositories or the ``epel`` repositories. Use
389+
http://rpmfind.net/ to find the packages. Then download them from a mirror and
390+
install them. For example:
388391

389392
.. prompt:: bash $
390393

@@ -397,19 +400,19 @@ the packages. Then, download them from a mirror and install them. For example:
397400
wget http://rpmfind.net/linux/centos/7/os/x86_64/Packages/python-sphinx-1.1.3-11.el7.noarch.rpm
398401
sudo yum install python-sphinx-1.1.3-11.el7.noarch.rpm
399402

400-
Ceph documentation makes extensive use of `ditaa`_, which is not presently built
401-
for CentOS/RHEL7. You must install ``ditaa`` if you are making changes to
402-
``ditaa`` diagrams so that you can verify that they render properly before you
403-
commit new or modified ``ditaa`` diagrams. You may retrieve compatible required
404-
packages for CentOS/RHEL distributions and install them manually. To run
405-
``ditaa`` on CentOS/RHEL7, following dependencies are required:
403+
Ceph documentation makes extensive use of `ditaa`_, which is not built for
404+
CentOS/RHEL. If you make changes to ``ditaa`` diagrams, you must install
405+
``ditaa`` to verify that they render properly before you commit your changes.
406+
You may retrieve compatible required packages for CentOS/RHEL distributions and
407+
install them manually. To run ``ditaa`` on CentOS/RHEL, following dependencies
408+
are required:
406409

407410
- jericho-html
408411
- jai-imageio-core
409412
- batik
410413

411-
Use http://rpmfind.net/ to find compatible ``ditaa`` and the dependencies.
412-
Then, download them from a mirror and install them. For example:
414+
Use http://rpmfind.net/ to find compatible ``ditaa`` and its dependencies.
415+
Then download them from a mirror and install them. For example:
413416

414417
.. prompt:: bash $
415418

@@ -422,8 +425,8 @@ Then, download them from a mirror and install them. For example:
422425
wget http://rpmfind.net/linux/fedora/linux/releases/22/Everything/x86_64/os/Packages/d/ditaa-0.9-13.r74.fc21.noarch.rpm
423426
sudo yum install ditaa-0.9-13.r74.fc21.noarch.rpm
424427

425-
Once you have installed all these packages, build the documentation by following
426-
the steps given in `Build the Source`_.
428+
After you have installed these packages, build the documentation by following
429+
the steps in `Build the Source`_.
427430

428431

429432
Commit the Change

0 commit comments

Comments
 (0)