Skip to content

Commit 54af6db

Browse files
author
Ken Gaillot
authored
Merge pull request #2009 from kgaillot/doc
Convert "Pacemaker Development" to reStructuredText + sphinx
2 parents b9fa064 + dc765ab commit 54af6db

208 files changed

Lines changed: 1403 additions & 75455 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ publican.cfg
145145
/doc/shared/en-US/*.xml
146146
/doc/shared/en-US/images/pcmk-*.png
147147
/doc/shared/en-US/images/Policy-Engine-*.png
148+
/doc/sphinx/*/_build
149+
/doc/sphinx/*/conf.py
148150
/lib/common/md5.c
149151
/maint/testcc
150152
/maint/mocked/based

INSTALL.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ Also: GNU make, and Python 2.7 or Python 3.2 or later
4646
| documentation | | publican | | publican |
4747
| documentation | | inkscape | inkscape | inkscape |
4848
| documentation | | docbook-style-xsl | docbook-xsl-stylesheets | docbook-xsl |
49+
| documentation | | python-sphinx or python3-sphinx | python-sphinx or python3-sphinx | python-sphinx or python3-sphinx |
50+
| documentation (PDF) | | texlive, texlive-titlesec, texlive-framed, texlive-threeparttable texlive-wrapfig texlive-multirow | texlive, texlive-latex | texlive, texlive-latex-extra |
4951

5052
## Optional testing dependencies
5153
* valgrind (if running CTS valgrind tests)

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ esac
681681
AC_PATH_PROGS([ASCIIDOC_CONV], [asciidoc asciidoctor])
682682
AC_PATH_PROG([HELP2MAN], [help2man])
683683
AC_PATH_PROG([PUBLICAN], [publican])
684+
AC_PATH_PROG([SPHINX], [sphinx-build])
684685
AC_PATH_PROG([INKSCAPE], [inkscape])
685686
AC_PATH_PROG([XSLTPROC], [xsltproc])
686687
AC_PATH_PROG([XMLCATALOG], [xmlcatalog])
@@ -776,6 +777,8 @@ AM_CONDITIONAL([BUILD_DOCBOOK],
776777
&& test x"${INKSCAPE}" != x""])
777778
AM_CONDITIONAL([PUBLICAN_INTREE_BRAND],
778779
[test x"${publican_intree_brand}" = x"yes"])
780+
AM_CONDITIONAL([BUILD_SPHINX_DOCS],
781+
[test x"${SPHINX}" != x""])
779782

780783
dnl Pacemaker's shell scripts (and thus man page builders) rely on GNU getopt
781784
AC_MSG_CHECKING([for GNU-compatible getopt])
@@ -1978,6 +1981,7 @@ AC_CONFIG_FILES(Makefile \
19781981
doc/Pacemaker_Development/publican.cfg \
19791982
doc/Pacemaker_Explained/publican.cfg \
19801983
doc/Pacemaker_Remote/publican.cfg \
1984+
doc/sphinx/Makefile \
19811985
extra/Makefile \
19821986
extra/alerts/Makefile \
19831987
extra/resources/Makefile \

doc/Clusters_from_Scratch/it-IT/Ap-Configuration.po

Lines changed: 0 additions & 455 deletions
This file was deleted.

doc/Clusters_from_Scratch/it-IT/Ap-Corosync-Conf.po

Lines changed: 0 additions & 55 deletions
This file was deleted.

doc/Clusters_from_Scratch/it-IT/Ap-Reading.po

Lines changed: 0 additions & 46 deletions
This file was deleted.

doc/Clusters_from_Scratch/it-IT/Author_Group.po

Lines changed: 0 additions & 64 deletions
This file was deleted.

doc/Clusters_from_Scratch/it-IT/Book_Info.po

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)