From aaba1628c10275f73f93f00ca149dc3aad572203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 10:42:10 +0100
Subject: [PATCH 01/20] Rename to rst.pp

---
 doc/source/{acb.rst => acb.rst.pp}                                | 0
 doc/source/{acb_calc.rst => acb_calc.rst.pp}                      | 0
 doc/source/{acb_dft.rst => acb_dft.rst.pp}                        | 0
 doc/source/{acb_dirichlet.rst => acb_dirichlet.rst.pp}            | 0
 doc/source/{acb_elliptic.rst => acb_elliptic.rst.pp}              | 0
 doc/source/{acb_hypgeom.rst => acb_hypgeom.rst.pp}                | 0
 doc/source/{acb_mat.rst => acb_mat.rst.pp}                        | 0
 doc/source/{acb_modular.rst => acb_modular.rst.pp}                | 0
 doc/source/{acb_poly.rst => acb_poly.rst.pp}                      | 0
 doc/source/{acb_theta.rst => acb_theta.rst.pp}                    | 0
 doc/source/{acf.rst => acf.rst.pp}                                | 0
 doc/source/{agm.rst => agm.rst.pp}                                | 0
 doc/source/{aprcl.rst => aprcl.rst.pp}                            | 0
 doc/source/{arb.rst => arb.rst.pp}                                | 0
 doc/source/{arb_calc.rst => arb_calc.rst.pp}                      | 0
 doc/source/{arb_fmpz_poly.rst => arb_fmpz_poly.rst.pp}            | 0
 doc/source/{arb_fpwrap.rst => arb_fpwrap.rst.pp}                  | 0
 doc/source/{arb_hypgeom.rst => arb_hypgeom.rst.pp}                | 0
 doc/source/{arb_mat.rst => arb_mat.rst.pp}                        | 0
 doc/source/{arb_poly.rst => arb_poly.rst.pp}                      | 0
 doc/source/{arf.rst => arf.rst.pp}                                | 0
 doc/source/{arith.rst => arith.rst.pp}                            | 0
 doc/source/{bernoulli.rst => bernoulli.rst.pp}                    | 0
 doc/source/{bool_mat.rst => bool_mat.rst.pp}                      | 0
 doc/source/{bug_reporting.rst => bug_reporting.rst.pp}            | 0
 doc/source/{building.rst => building.rst.pp}                      | 0
 doc/source/{ca.rst => ca.rst.pp}                                  | 0
 doc/source/{ca_ext.rst => ca_ext.rst.pp}                          | 0
 doc/source/{ca_field.rst => ca_field.rst.pp}                      | 0
 doc/source/{ca_mat.rst => ca_mat.rst.pp}                          | 0
 doc/source/{ca_poly.rst => ca_poly.rst.pp}                        | 0
 doc/source/{ca_vec.rst => ca_vec.rst.pp}                          | 0
 doc/source/{calcium.rst => calcium.rst.pp}                        | 0
 doc/source/{constants.rst => constants.rst.pp}                    | 0
 doc/source/{contributing.rst => contributing.rst.pp}              | 0
 doc/source/{contributors.rst => contributors.rst.pp}              | 0
 doc/source/{d_mat.rst => d_mat.rst.pp}                            | 0
 doc/source/{d_vec.rst => d_vec.rst.pp}                            | 0
 doc/source/{dirichlet.rst => dirichlet.rst.pp}                    | 0
 doc/source/{dlog.rst => dlog.rst.pp}                              | 0
 doc/source/{double_extras.rst => double_extras.rst.pp}            | 0
 doc/source/{double_interval.rst => double_interval.rst.pp}        | 0
 doc/source/{examples.rst => examples.rst.pp}                      | 0
 doc/source/{examples_arb.rst => examples_arb.rst.pp}              | 0
 doc/source/{examples_calcium.rst => examples_calcium.rst.pp}      | 0
 doc/source/{fexpr.rst => fexpr.rst.pp}                            | 0
 doc/source/{fexpr_builtin.rst => fexpr_builtin.rst.pp}            | 0
 doc/source/{fft.rst => fft.rst.pp}                                | 0
 doc/source/{fft_small.rst => fft_small.rst.pp}                    | 0
 doc/source/{flint.rst => flint.rst.pp}                            | 0
 doc/source/{fmpq.rst => fmpq.rst.pp}                              | 0
 doc/source/{fmpq_mat.rst => fmpq_mat.rst.pp}                      | 0
 doc/source/{fmpq_mpoly.rst => fmpq_mpoly.rst.pp}                  | 0
 doc/source/{fmpq_mpoly_factor.rst => fmpq_mpoly_factor.rst.pp}    | 0
 doc/source/{fmpq_poly.rst => fmpq_poly.rst.pp}                    | 0
 doc/source/{fmpq_vec.rst => fmpq_vec.rst.pp}                      | 0
 doc/source/{fmpz.rst => fmpz.rst.pp}                              | 0
 doc/source/{fmpz_extras.rst => fmpz_extras.rst.pp}                | 0
 doc/source/{fmpz_factor.rst => fmpz_factor.rst.pp}                | 0
 doc/source/{fmpz_lll.rst => fmpz_lll.rst.pp}                      | 0
 doc/source/{fmpz_mat.rst => fmpz_mat.rst.pp}                      | 0
 doc/source/{fmpz_mod.rst => fmpz_mod.rst.pp}                      | 0
 doc/source/{fmpz_mod_mat.rst => fmpz_mod_mat.rst.pp}              | 0
 doc/source/{fmpz_mod_mpoly.rst => fmpz_mod_mpoly.rst.pp}          | 0
 .../{fmpz_mod_mpoly_factor.rst => fmpz_mod_mpoly_factor.rst.pp}   | 0
 doc/source/{fmpz_mod_poly.rst => fmpz_mod_poly.rst.pp}            | 0
 .../{fmpz_mod_poly_factor.rst => fmpz_mod_poly_factor.rst.pp}     | 0
 doc/source/{fmpz_mod_vec.rst => fmpz_mod_vec.rst.pp}              | 0
 doc/source/{fmpz_mpoly.rst => fmpz_mpoly.rst.pp}                  | 0
 doc/source/{fmpz_mpoly_factor.rst => fmpz_mpoly_factor.rst.pp}    | 0
 doc/source/{fmpz_mpoly_q.rst => fmpz_mpoly_q.rst.pp}              | 0
 doc/source/{fmpz_poly.rst => fmpz_poly.rst.pp}                    | 0
 doc/source/{fmpz_poly_factor.rst => fmpz_poly_factor.rst.pp}      | 0
 doc/source/{fmpz_poly_mat.rst => fmpz_poly_mat.rst.pp}            | 0
 doc/source/{fmpz_poly_q.rst => fmpz_poly_q.rst.pp}                | 0
 doc/source/{fmpz_vec.rst => fmpz_vec.rst.pp}                      | 0
 doc/source/{fmpzi.rst => fmpzi.rst.pp}                            | 0
 doc/source/{formulas.rst => formulas.rst.pp}                      | 0
 doc/source/{fq.rst => fq.rst.pp}                                  | 0
 doc/source/{fq_default.rst => fq_default.rst.pp}                  | 0
 doc/source/{fq_default_mat.rst => fq_default_mat.rst.pp}          | 0
 doc/source/{fq_default_poly.rst => fq_default_poly.rst.pp}        | 0
 .../{fq_default_poly_factor.rst => fq_default_poly_factor.rst.pp} | 0
 doc/source/{fq_embed.rst => fq_embed.rst.pp}                      | 0
 doc/source/{fq_mat.rst => fq_mat.rst.pp}                          | 0
 doc/source/{fq_nmod.rst => fq_nmod.rst.pp}                        | 0
 doc/source/{fq_nmod_embed.rst => fq_nmod_embed.rst.pp}            | 0
 doc/source/{fq_nmod_mat.rst => fq_nmod_mat.rst.pp}                | 0
 doc/source/{fq_nmod_mpoly.rst => fq_nmod_mpoly.rst.pp}            | 0
 .../{fq_nmod_mpoly_factor.rst => fq_nmod_mpoly_factor.rst.pp}     | 0
 doc/source/{fq_nmod_poly.rst => fq_nmod_poly.rst.pp}              | 0
 .../{fq_nmod_poly_factor.rst => fq_nmod_poly_factor.rst.pp}       | 0
 doc/source/{fq_nmod_vec.rst => fq_nmod_vec.rst.pp}                | 0
 doc/source/{fq_poly.rst => fq_poly.rst.pp}                        | 0
 doc/source/{fq_poly_factor.rst => fq_poly_factor.rst.pp}          | 0
 doc/source/{fq_vec.rst => fq_vec.rst.pp}                          | 0
 doc/source/{fq_zech.rst => fq_zech.rst.pp}                        | 0
 doc/source/{fq_zech_embed.rst => fq_zech_embed.rst.pp}            | 0
 doc/source/{fq_zech_mat.rst => fq_zech_mat.rst.pp}                | 0
 doc/source/{fq_zech_poly.rst => fq_zech_poly.rst.pp}              | 0
 .../{fq_zech_poly_factor.rst => fq_zech_poly_factor.rst.pp}       | 0
 doc/source/{fq_zech_vec.rst => fq_zech_vec.rst.pp}                | 0
 doc/source/{gamma.rst => gamma.rst.pp}                            | 0
 doc/source/{gr.rst => gr.rst.pp}                                  | 0
 doc/source/{gr_domains.rst => gr_domains.rst.pp}                  | 0
 doc/source/{gr_generic.rst => gr_generic.rst.pp}                  | 0
 doc/source/{gr_implementing.rst => gr_implementing.rst.pp}        | 0
 doc/source/{gr_mat.rst => gr_mat.rst.pp}                          | 0
 doc/source/{gr_mpoly.rst => gr_mpoly.rst.pp}                      | 0
 doc/source/{gr_poly.rst => gr_poly.rst.pp}                        | 0
 doc/source/{gr_special.rst => gr_special.rst.pp}                  | 0
 doc/source/{gr_vec.rst => gr_vec.rst.pp}                          | 0
 doc/source/{history.rst => history.rst.pp}                        | 0
 doc/source/{hurwitz.rst => hurwitz.rst.pp}                        | 0
 doc/source/{hypergeometric.rst => hypergeometric.rst.pp}          | 0
 doc/source/{hypgeom.rst => hypgeom.rst.pp}                        | 0
 doc/source/{index.rst => index.rst.pp}                            | 0
 doc/source/{index_arb.rst => index_arb.rst.pp}                    | 0
 doc/source/{index_generic.rst => index_generic.rst.pp}            | 0
 doc/source/{index_integers.rst => index_integers.rst.pp}          | 0
 doc/source/{index_integers_mod.rst => index_integers_mod.rst.pp}  | 0
 doc/source/{index_rationals.rst => index_rationals.rst.pp}        | 0
 doc/source/{introduction.rst => introduction.rst.pp}              | 0
 .../{introduction_calcium.rst => introduction_calcium.rst.pp}     | 0
 doc/source/{issues.rst => issues.rst.pp}                          | 0
 doc/source/{long_extras.rst => long_extras.rst.pp}                | 0
 doc/source/{longlong.rst => longlong.rst.pp}                      | 0
 doc/source/{machine_vectors.rst => machine_vectors.rst.pp}        | 0
 doc/source/{mag.rst => mag.rst.pp}                                | 0
 doc/source/{memory.rst => memory.rst.pp}                          | 0
 doc/source/{mpfr_mat.rst => mpfr_mat.rst.pp}                      | 0
 doc/source/{mpfr_vec.rst => mpfr_vec.rst.pp}                      | 0
 doc/source/{mpn_extras.rst => mpn_extras.rst.pp}                  | 0
 doc/source/{mpn_mod.rst => mpn_mod.rst.pp}                        | 0
 doc/source/{mpoly.rst => mpoly.rst.pp}                            | 0
 doc/source/{nf.rst => nf.rst.pp}                                  | 0
 doc/source/{nf_elem.rst => nf_elem.rst.pp}                        | 0
 doc/source/{nfloat.rst => nfloat.rst.pp}                          | 0
 doc/source/{nmod.rst => nmod.rst.pp}                              | 0
 doc/source/{nmod_mat.rst => nmod_mat.rst.pp}                      | 0
 doc/source/{nmod_mpoly.rst => nmod_mpoly.rst.pp}                  | 0
 doc/source/{nmod_mpoly_factor.rst => nmod_mpoly_factor.rst.pp}    | 0
 doc/source/{nmod_poly.rst => nmod_poly.rst.pp}                    | 0
 doc/source/{nmod_poly_factor.rst => nmod_poly_factor.rst.pp}      | 0
 doc/source/{nmod_poly_mat.rst => nmod_poly_mat.rst.pp}            | 0
 doc/source/{nmod_vec.rst => nmod_vec.rst.pp}                      | 0
 doc/source/{overview.rst => overview.rst.pp}                      | 0
 doc/source/{padic.rst => padic.rst.pp}                            | 0
 doc/source/{padic_mat.rst => padic_mat.rst.pp}                    | 0
 doc/source/{padic_poly.rst => padic_poly.rst.pp}                  | 0
 doc/source/{partitions.rst => partitions.rst.pp}                  | 0
 doc/source/{perm.rst => perm.rst.pp}                              | 0
 doc/source/{polylogarithms.rst => polylogarithms.rst.pp}          | 0
 doc/source/{portability.rst => portability.rst.pp}                | 0
 doc/source/{profiler.rst => profiler.rst.pp}                      | 0
 doc/source/{python_flint.rst => python_flint.rst.pp}              | 0
 doc/source/{qadic.rst => qadic.rst.pp}                            | 0
 doc/source/{qfb.rst => qfb.rst.pp}                                | 0
 doc/source/{qqbar.rst => qqbar.rst.pp}                            | 0
 doc/source/{qsieve.rst => qsieve.rst.pp}                          | 0
 doc/source/{references.rst => references.rst.pp}                  | 0
 doc/source/{thread_pool.rst => thread_pool.rst.pp}                | 0
 doc/source/{threading.rst => threading.rst.pp}                    | 0
 doc/source/{ulong_extras.rst => ulong_extras.rst.pp}              | 0
 doc/source/{using.rst => using.rst.pp}                            | 0
 165 files changed, 0 insertions(+), 0 deletions(-)
 rename doc/source/{acb.rst => acb.rst.pp} (100%)
 rename doc/source/{acb_calc.rst => acb_calc.rst.pp} (100%)
 rename doc/source/{acb_dft.rst => acb_dft.rst.pp} (100%)
 rename doc/source/{acb_dirichlet.rst => acb_dirichlet.rst.pp} (100%)
 rename doc/source/{acb_elliptic.rst => acb_elliptic.rst.pp} (100%)
 rename doc/source/{acb_hypgeom.rst => acb_hypgeom.rst.pp} (100%)
 rename doc/source/{acb_mat.rst => acb_mat.rst.pp} (100%)
 rename doc/source/{acb_modular.rst => acb_modular.rst.pp} (100%)
 rename doc/source/{acb_poly.rst => acb_poly.rst.pp} (100%)
 rename doc/source/{acb_theta.rst => acb_theta.rst.pp} (100%)
 rename doc/source/{acf.rst => acf.rst.pp} (100%)
 rename doc/source/{agm.rst => agm.rst.pp} (100%)
 rename doc/source/{aprcl.rst => aprcl.rst.pp} (100%)
 rename doc/source/{arb.rst => arb.rst.pp} (100%)
 rename doc/source/{arb_calc.rst => arb_calc.rst.pp} (100%)
 rename doc/source/{arb_fmpz_poly.rst => arb_fmpz_poly.rst.pp} (100%)
 rename doc/source/{arb_fpwrap.rst => arb_fpwrap.rst.pp} (100%)
 rename doc/source/{arb_hypgeom.rst => arb_hypgeom.rst.pp} (100%)
 rename doc/source/{arb_mat.rst => arb_mat.rst.pp} (100%)
 rename doc/source/{arb_poly.rst => arb_poly.rst.pp} (100%)
 rename doc/source/{arf.rst => arf.rst.pp} (100%)
 rename doc/source/{arith.rst => arith.rst.pp} (100%)
 rename doc/source/{bernoulli.rst => bernoulli.rst.pp} (100%)
 rename doc/source/{bool_mat.rst => bool_mat.rst.pp} (100%)
 rename doc/source/{bug_reporting.rst => bug_reporting.rst.pp} (100%)
 rename doc/source/{building.rst => building.rst.pp} (100%)
 rename doc/source/{ca.rst => ca.rst.pp} (100%)
 rename doc/source/{ca_ext.rst => ca_ext.rst.pp} (100%)
 rename doc/source/{ca_field.rst => ca_field.rst.pp} (100%)
 rename doc/source/{ca_mat.rst => ca_mat.rst.pp} (100%)
 rename doc/source/{ca_poly.rst => ca_poly.rst.pp} (100%)
 rename doc/source/{ca_vec.rst => ca_vec.rst.pp} (100%)
 rename doc/source/{calcium.rst => calcium.rst.pp} (100%)
 rename doc/source/{constants.rst => constants.rst.pp} (100%)
 rename doc/source/{contributing.rst => contributing.rst.pp} (100%)
 rename doc/source/{contributors.rst => contributors.rst.pp} (100%)
 rename doc/source/{d_mat.rst => d_mat.rst.pp} (100%)
 rename doc/source/{d_vec.rst => d_vec.rst.pp} (100%)
 rename doc/source/{dirichlet.rst => dirichlet.rst.pp} (100%)
 rename doc/source/{dlog.rst => dlog.rst.pp} (100%)
 rename doc/source/{double_extras.rst => double_extras.rst.pp} (100%)
 rename doc/source/{double_interval.rst => double_interval.rst.pp} (100%)
 rename doc/source/{examples.rst => examples.rst.pp} (100%)
 rename doc/source/{examples_arb.rst => examples_arb.rst.pp} (100%)
 rename doc/source/{examples_calcium.rst => examples_calcium.rst.pp} (100%)
 rename doc/source/{fexpr.rst => fexpr.rst.pp} (100%)
 rename doc/source/{fexpr_builtin.rst => fexpr_builtin.rst.pp} (100%)
 rename doc/source/{fft.rst => fft.rst.pp} (100%)
 rename doc/source/{fft_small.rst => fft_small.rst.pp} (100%)
 rename doc/source/{flint.rst => flint.rst.pp} (100%)
 rename doc/source/{fmpq.rst => fmpq.rst.pp} (100%)
 rename doc/source/{fmpq_mat.rst => fmpq_mat.rst.pp} (100%)
 rename doc/source/{fmpq_mpoly.rst => fmpq_mpoly.rst.pp} (100%)
 rename doc/source/{fmpq_mpoly_factor.rst => fmpq_mpoly_factor.rst.pp} (100%)
 rename doc/source/{fmpq_poly.rst => fmpq_poly.rst.pp} (100%)
 rename doc/source/{fmpq_vec.rst => fmpq_vec.rst.pp} (100%)
 rename doc/source/{fmpz.rst => fmpz.rst.pp} (100%)
 rename doc/source/{fmpz_extras.rst => fmpz_extras.rst.pp} (100%)
 rename doc/source/{fmpz_factor.rst => fmpz_factor.rst.pp} (100%)
 rename doc/source/{fmpz_lll.rst => fmpz_lll.rst.pp} (100%)
 rename doc/source/{fmpz_mat.rst => fmpz_mat.rst.pp} (100%)
 rename doc/source/{fmpz_mod.rst => fmpz_mod.rst.pp} (100%)
 rename doc/source/{fmpz_mod_mat.rst => fmpz_mod_mat.rst.pp} (100%)
 rename doc/source/{fmpz_mod_mpoly.rst => fmpz_mod_mpoly.rst.pp} (100%)
 rename doc/source/{fmpz_mod_mpoly_factor.rst => fmpz_mod_mpoly_factor.rst.pp} (100%)
 rename doc/source/{fmpz_mod_poly.rst => fmpz_mod_poly.rst.pp} (100%)
 rename doc/source/{fmpz_mod_poly_factor.rst => fmpz_mod_poly_factor.rst.pp} (100%)
 rename doc/source/{fmpz_mod_vec.rst => fmpz_mod_vec.rst.pp} (100%)
 rename doc/source/{fmpz_mpoly.rst => fmpz_mpoly.rst.pp} (100%)
 rename doc/source/{fmpz_mpoly_factor.rst => fmpz_mpoly_factor.rst.pp} (100%)
 rename doc/source/{fmpz_mpoly_q.rst => fmpz_mpoly_q.rst.pp} (100%)
 rename doc/source/{fmpz_poly.rst => fmpz_poly.rst.pp} (100%)
 rename doc/source/{fmpz_poly_factor.rst => fmpz_poly_factor.rst.pp} (100%)
 rename doc/source/{fmpz_poly_mat.rst => fmpz_poly_mat.rst.pp} (100%)
 rename doc/source/{fmpz_poly_q.rst => fmpz_poly_q.rst.pp} (100%)
 rename doc/source/{fmpz_vec.rst => fmpz_vec.rst.pp} (100%)
 rename doc/source/{fmpzi.rst => fmpzi.rst.pp} (100%)
 rename doc/source/{formulas.rst => formulas.rst.pp} (100%)
 rename doc/source/{fq.rst => fq.rst.pp} (100%)
 rename doc/source/{fq_default.rst => fq_default.rst.pp} (100%)
 rename doc/source/{fq_default_mat.rst => fq_default_mat.rst.pp} (100%)
 rename doc/source/{fq_default_poly.rst => fq_default_poly.rst.pp} (100%)
 rename doc/source/{fq_default_poly_factor.rst => fq_default_poly_factor.rst.pp} (100%)
 rename doc/source/{fq_embed.rst => fq_embed.rst.pp} (100%)
 rename doc/source/{fq_mat.rst => fq_mat.rst.pp} (100%)
 rename doc/source/{fq_nmod.rst => fq_nmod.rst.pp} (100%)
 rename doc/source/{fq_nmod_embed.rst => fq_nmod_embed.rst.pp} (100%)
 rename doc/source/{fq_nmod_mat.rst => fq_nmod_mat.rst.pp} (100%)
 rename doc/source/{fq_nmod_mpoly.rst => fq_nmod_mpoly.rst.pp} (100%)
 rename doc/source/{fq_nmod_mpoly_factor.rst => fq_nmod_mpoly_factor.rst.pp} (100%)
 rename doc/source/{fq_nmod_poly.rst => fq_nmod_poly.rst.pp} (100%)
 rename doc/source/{fq_nmod_poly_factor.rst => fq_nmod_poly_factor.rst.pp} (100%)
 rename doc/source/{fq_nmod_vec.rst => fq_nmod_vec.rst.pp} (100%)
 rename doc/source/{fq_poly.rst => fq_poly.rst.pp} (100%)
 rename doc/source/{fq_poly_factor.rst => fq_poly_factor.rst.pp} (100%)
 rename doc/source/{fq_vec.rst => fq_vec.rst.pp} (100%)
 rename doc/source/{fq_zech.rst => fq_zech.rst.pp} (100%)
 rename doc/source/{fq_zech_embed.rst => fq_zech_embed.rst.pp} (100%)
 rename doc/source/{fq_zech_mat.rst => fq_zech_mat.rst.pp} (100%)
 rename doc/source/{fq_zech_poly.rst => fq_zech_poly.rst.pp} (100%)
 rename doc/source/{fq_zech_poly_factor.rst => fq_zech_poly_factor.rst.pp} (100%)
 rename doc/source/{fq_zech_vec.rst => fq_zech_vec.rst.pp} (100%)
 rename doc/source/{gamma.rst => gamma.rst.pp} (100%)
 rename doc/source/{gr.rst => gr.rst.pp} (100%)
 rename doc/source/{gr_domains.rst => gr_domains.rst.pp} (100%)
 rename doc/source/{gr_generic.rst => gr_generic.rst.pp} (100%)
 rename doc/source/{gr_implementing.rst => gr_implementing.rst.pp} (100%)
 rename doc/source/{gr_mat.rst => gr_mat.rst.pp} (100%)
 rename doc/source/{gr_mpoly.rst => gr_mpoly.rst.pp} (100%)
 rename doc/source/{gr_poly.rst => gr_poly.rst.pp} (100%)
 rename doc/source/{gr_special.rst => gr_special.rst.pp} (100%)
 rename doc/source/{gr_vec.rst => gr_vec.rst.pp} (100%)
 rename doc/source/{history.rst => history.rst.pp} (100%)
 rename doc/source/{hurwitz.rst => hurwitz.rst.pp} (100%)
 rename doc/source/{hypergeometric.rst => hypergeometric.rst.pp} (100%)
 rename doc/source/{hypgeom.rst => hypgeom.rst.pp} (100%)
 rename doc/source/{index.rst => index.rst.pp} (100%)
 rename doc/source/{index_arb.rst => index_arb.rst.pp} (100%)
 rename doc/source/{index_generic.rst => index_generic.rst.pp} (100%)
 rename doc/source/{index_integers.rst => index_integers.rst.pp} (100%)
 rename doc/source/{index_integers_mod.rst => index_integers_mod.rst.pp} (100%)
 rename doc/source/{index_rationals.rst => index_rationals.rst.pp} (100%)
 rename doc/source/{introduction.rst => introduction.rst.pp} (100%)
 rename doc/source/{introduction_calcium.rst => introduction_calcium.rst.pp} (100%)
 rename doc/source/{issues.rst => issues.rst.pp} (100%)
 rename doc/source/{long_extras.rst => long_extras.rst.pp} (100%)
 rename doc/source/{longlong.rst => longlong.rst.pp} (100%)
 rename doc/source/{machine_vectors.rst => machine_vectors.rst.pp} (100%)
 rename doc/source/{mag.rst => mag.rst.pp} (100%)
 rename doc/source/{memory.rst => memory.rst.pp} (100%)
 rename doc/source/{mpfr_mat.rst => mpfr_mat.rst.pp} (100%)
 rename doc/source/{mpfr_vec.rst => mpfr_vec.rst.pp} (100%)
 rename doc/source/{mpn_extras.rst => mpn_extras.rst.pp} (100%)
 rename doc/source/{mpn_mod.rst => mpn_mod.rst.pp} (100%)
 rename doc/source/{mpoly.rst => mpoly.rst.pp} (100%)
 rename doc/source/{nf.rst => nf.rst.pp} (100%)
 rename doc/source/{nf_elem.rst => nf_elem.rst.pp} (100%)
 rename doc/source/{nfloat.rst => nfloat.rst.pp} (100%)
 rename doc/source/{nmod.rst => nmod.rst.pp} (100%)
 rename doc/source/{nmod_mat.rst => nmod_mat.rst.pp} (100%)
 rename doc/source/{nmod_mpoly.rst => nmod_mpoly.rst.pp} (100%)
 rename doc/source/{nmod_mpoly_factor.rst => nmod_mpoly_factor.rst.pp} (100%)
 rename doc/source/{nmod_poly.rst => nmod_poly.rst.pp} (100%)
 rename doc/source/{nmod_poly_factor.rst => nmod_poly_factor.rst.pp} (100%)
 rename doc/source/{nmod_poly_mat.rst => nmod_poly_mat.rst.pp} (100%)
 rename doc/source/{nmod_vec.rst => nmod_vec.rst.pp} (100%)
 rename doc/source/{overview.rst => overview.rst.pp} (100%)
 rename doc/source/{padic.rst => padic.rst.pp} (100%)
 rename doc/source/{padic_mat.rst => padic_mat.rst.pp} (100%)
 rename doc/source/{padic_poly.rst => padic_poly.rst.pp} (100%)
 rename doc/source/{partitions.rst => partitions.rst.pp} (100%)
 rename doc/source/{perm.rst => perm.rst.pp} (100%)
 rename doc/source/{polylogarithms.rst => polylogarithms.rst.pp} (100%)
 rename doc/source/{portability.rst => portability.rst.pp} (100%)
 rename doc/source/{profiler.rst => profiler.rst.pp} (100%)
 rename doc/source/{python_flint.rst => python_flint.rst.pp} (100%)
 rename doc/source/{qadic.rst => qadic.rst.pp} (100%)
 rename doc/source/{qfb.rst => qfb.rst.pp} (100%)
 rename doc/source/{qqbar.rst => qqbar.rst.pp} (100%)
 rename doc/source/{qsieve.rst => qsieve.rst.pp} (100%)
 rename doc/source/{references.rst => references.rst.pp} (100%)
 rename doc/source/{thread_pool.rst => thread_pool.rst.pp} (100%)
 rename doc/source/{threading.rst => threading.rst.pp} (100%)
 rename doc/source/{ulong_extras.rst => ulong_extras.rst.pp} (100%)
 rename doc/source/{using.rst => using.rst.pp} (100%)

diff --git a/doc/source/acb.rst b/doc/source/acb.rst.pp
similarity index 100%
rename from doc/source/acb.rst
rename to doc/source/acb.rst.pp
diff --git a/doc/source/acb_calc.rst b/doc/source/acb_calc.rst.pp
similarity index 100%
rename from doc/source/acb_calc.rst
rename to doc/source/acb_calc.rst.pp
diff --git a/doc/source/acb_dft.rst b/doc/source/acb_dft.rst.pp
similarity index 100%
rename from doc/source/acb_dft.rst
rename to doc/source/acb_dft.rst.pp
diff --git a/doc/source/acb_dirichlet.rst b/doc/source/acb_dirichlet.rst.pp
similarity index 100%
rename from doc/source/acb_dirichlet.rst
rename to doc/source/acb_dirichlet.rst.pp
diff --git a/doc/source/acb_elliptic.rst b/doc/source/acb_elliptic.rst.pp
similarity index 100%
rename from doc/source/acb_elliptic.rst
rename to doc/source/acb_elliptic.rst.pp
diff --git a/doc/source/acb_hypgeom.rst b/doc/source/acb_hypgeom.rst.pp
similarity index 100%
rename from doc/source/acb_hypgeom.rst
rename to doc/source/acb_hypgeom.rst.pp
diff --git a/doc/source/acb_mat.rst b/doc/source/acb_mat.rst.pp
similarity index 100%
rename from doc/source/acb_mat.rst
rename to doc/source/acb_mat.rst.pp
diff --git a/doc/source/acb_modular.rst b/doc/source/acb_modular.rst.pp
similarity index 100%
rename from doc/source/acb_modular.rst
rename to doc/source/acb_modular.rst.pp
diff --git a/doc/source/acb_poly.rst b/doc/source/acb_poly.rst.pp
similarity index 100%
rename from doc/source/acb_poly.rst
rename to doc/source/acb_poly.rst.pp
diff --git a/doc/source/acb_theta.rst b/doc/source/acb_theta.rst.pp
similarity index 100%
rename from doc/source/acb_theta.rst
rename to doc/source/acb_theta.rst.pp
diff --git a/doc/source/acf.rst b/doc/source/acf.rst.pp
similarity index 100%
rename from doc/source/acf.rst
rename to doc/source/acf.rst.pp
diff --git a/doc/source/agm.rst b/doc/source/agm.rst.pp
similarity index 100%
rename from doc/source/agm.rst
rename to doc/source/agm.rst.pp
diff --git a/doc/source/aprcl.rst b/doc/source/aprcl.rst.pp
similarity index 100%
rename from doc/source/aprcl.rst
rename to doc/source/aprcl.rst.pp
diff --git a/doc/source/arb.rst b/doc/source/arb.rst.pp
similarity index 100%
rename from doc/source/arb.rst
rename to doc/source/arb.rst.pp
diff --git a/doc/source/arb_calc.rst b/doc/source/arb_calc.rst.pp
similarity index 100%
rename from doc/source/arb_calc.rst
rename to doc/source/arb_calc.rst.pp
diff --git a/doc/source/arb_fmpz_poly.rst b/doc/source/arb_fmpz_poly.rst.pp
similarity index 100%
rename from doc/source/arb_fmpz_poly.rst
rename to doc/source/arb_fmpz_poly.rst.pp
diff --git a/doc/source/arb_fpwrap.rst b/doc/source/arb_fpwrap.rst.pp
similarity index 100%
rename from doc/source/arb_fpwrap.rst
rename to doc/source/arb_fpwrap.rst.pp
diff --git a/doc/source/arb_hypgeom.rst b/doc/source/arb_hypgeom.rst.pp
similarity index 100%
rename from doc/source/arb_hypgeom.rst
rename to doc/source/arb_hypgeom.rst.pp
diff --git a/doc/source/arb_mat.rst b/doc/source/arb_mat.rst.pp
similarity index 100%
rename from doc/source/arb_mat.rst
rename to doc/source/arb_mat.rst.pp
diff --git a/doc/source/arb_poly.rst b/doc/source/arb_poly.rst.pp
similarity index 100%
rename from doc/source/arb_poly.rst
rename to doc/source/arb_poly.rst.pp
diff --git a/doc/source/arf.rst b/doc/source/arf.rst.pp
similarity index 100%
rename from doc/source/arf.rst
rename to doc/source/arf.rst.pp
diff --git a/doc/source/arith.rst b/doc/source/arith.rst.pp
similarity index 100%
rename from doc/source/arith.rst
rename to doc/source/arith.rst.pp
diff --git a/doc/source/bernoulli.rst b/doc/source/bernoulli.rst.pp
similarity index 100%
rename from doc/source/bernoulli.rst
rename to doc/source/bernoulli.rst.pp
diff --git a/doc/source/bool_mat.rst b/doc/source/bool_mat.rst.pp
similarity index 100%
rename from doc/source/bool_mat.rst
rename to doc/source/bool_mat.rst.pp
diff --git a/doc/source/bug_reporting.rst b/doc/source/bug_reporting.rst.pp
similarity index 100%
rename from doc/source/bug_reporting.rst
rename to doc/source/bug_reporting.rst.pp
diff --git a/doc/source/building.rst b/doc/source/building.rst.pp
similarity index 100%
rename from doc/source/building.rst
rename to doc/source/building.rst.pp
diff --git a/doc/source/ca.rst b/doc/source/ca.rst.pp
similarity index 100%
rename from doc/source/ca.rst
rename to doc/source/ca.rst.pp
diff --git a/doc/source/ca_ext.rst b/doc/source/ca_ext.rst.pp
similarity index 100%
rename from doc/source/ca_ext.rst
rename to doc/source/ca_ext.rst.pp
diff --git a/doc/source/ca_field.rst b/doc/source/ca_field.rst.pp
similarity index 100%
rename from doc/source/ca_field.rst
rename to doc/source/ca_field.rst.pp
diff --git a/doc/source/ca_mat.rst b/doc/source/ca_mat.rst.pp
similarity index 100%
rename from doc/source/ca_mat.rst
rename to doc/source/ca_mat.rst.pp
diff --git a/doc/source/ca_poly.rst b/doc/source/ca_poly.rst.pp
similarity index 100%
rename from doc/source/ca_poly.rst
rename to doc/source/ca_poly.rst.pp
diff --git a/doc/source/ca_vec.rst b/doc/source/ca_vec.rst.pp
similarity index 100%
rename from doc/source/ca_vec.rst
rename to doc/source/ca_vec.rst.pp
diff --git a/doc/source/calcium.rst b/doc/source/calcium.rst.pp
similarity index 100%
rename from doc/source/calcium.rst
rename to doc/source/calcium.rst.pp
diff --git a/doc/source/constants.rst b/doc/source/constants.rst.pp
similarity index 100%
rename from doc/source/constants.rst
rename to doc/source/constants.rst.pp
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst.pp
similarity index 100%
rename from doc/source/contributing.rst
rename to doc/source/contributing.rst.pp
diff --git a/doc/source/contributors.rst b/doc/source/contributors.rst.pp
similarity index 100%
rename from doc/source/contributors.rst
rename to doc/source/contributors.rst.pp
diff --git a/doc/source/d_mat.rst b/doc/source/d_mat.rst.pp
similarity index 100%
rename from doc/source/d_mat.rst
rename to doc/source/d_mat.rst.pp
diff --git a/doc/source/d_vec.rst b/doc/source/d_vec.rst.pp
similarity index 100%
rename from doc/source/d_vec.rst
rename to doc/source/d_vec.rst.pp
diff --git a/doc/source/dirichlet.rst b/doc/source/dirichlet.rst.pp
similarity index 100%
rename from doc/source/dirichlet.rst
rename to doc/source/dirichlet.rst.pp
diff --git a/doc/source/dlog.rst b/doc/source/dlog.rst.pp
similarity index 100%
rename from doc/source/dlog.rst
rename to doc/source/dlog.rst.pp
diff --git a/doc/source/double_extras.rst b/doc/source/double_extras.rst.pp
similarity index 100%
rename from doc/source/double_extras.rst
rename to doc/source/double_extras.rst.pp
diff --git a/doc/source/double_interval.rst b/doc/source/double_interval.rst.pp
similarity index 100%
rename from doc/source/double_interval.rst
rename to doc/source/double_interval.rst.pp
diff --git a/doc/source/examples.rst b/doc/source/examples.rst.pp
similarity index 100%
rename from doc/source/examples.rst
rename to doc/source/examples.rst.pp
diff --git a/doc/source/examples_arb.rst b/doc/source/examples_arb.rst.pp
similarity index 100%
rename from doc/source/examples_arb.rst
rename to doc/source/examples_arb.rst.pp
diff --git a/doc/source/examples_calcium.rst b/doc/source/examples_calcium.rst.pp
similarity index 100%
rename from doc/source/examples_calcium.rst
rename to doc/source/examples_calcium.rst.pp
diff --git a/doc/source/fexpr.rst b/doc/source/fexpr.rst.pp
similarity index 100%
rename from doc/source/fexpr.rst
rename to doc/source/fexpr.rst.pp
diff --git a/doc/source/fexpr_builtin.rst b/doc/source/fexpr_builtin.rst.pp
similarity index 100%
rename from doc/source/fexpr_builtin.rst
rename to doc/source/fexpr_builtin.rst.pp
diff --git a/doc/source/fft.rst b/doc/source/fft.rst.pp
similarity index 100%
rename from doc/source/fft.rst
rename to doc/source/fft.rst.pp
diff --git a/doc/source/fft_small.rst b/doc/source/fft_small.rst.pp
similarity index 100%
rename from doc/source/fft_small.rst
rename to doc/source/fft_small.rst.pp
diff --git a/doc/source/flint.rst b/doc/source/flint.rst.pp
similarity index 100%
rename from doc/source/flint.rst
rename to doc/source/flint.rst.pp
diff --git a/doc/source/fmpq.rst b/doc/source/fmpq.rst.pp
similarity index 100%
rename from doc/source/fmpq.rst
rename to doc/source/fmpq.rst.pp
diff --git a/doc/source/fmpq_mat.rst b/doc/source/fmpq_mat.rst.pp
similarity index 100%
rename from doc/source/fmpq_mat.rst
rename to doc/source/fmpq_mat.rst.pp
diff --git a/doc/source/fmpq_mpoly.rst b/doc/source/fmpq_mpoly.rst.pp
similarity index 100%
rename from doc/source/fmpq_mpoly.rst
rename to doc/source/fmpq_mpoly.rst.pp
diff --git a/doc/source/fmpq_mpoly_factor.rst b/doc/source/fmpq_mpoly_factor.rst.pp
similarity index 100%
rename from doc/source/fmpq_mpoly_factor.rst
rename to doc/source/fmpq_mpoly_factor.rst.pp
diff --git a/doc/source/fmpq_poly.rst b/doc/source/fmpq_poly.rst.pp
similarity index 100%
rename from doc/source/fmpq_poly.rst
rename to doc/source/fmpq_poly.rst.pp
diff --git a/doc/source/fmpq_vec.rst b/doc/source/fmpq_vec.rst.pp
similarity index 100%
rename from doc/source/fmpq_vec.rst
rename to doc/source/fmpq_vec.rst.pp
diff --git a/doc/source/fmpz.rst b/doc/source/fmpz.rst.pp
similarity index 100%
rename from doc/source/fmpz.rst
rename to doc/source/fmpz.rst.pp
diff --git a/doc/source/fmpz_extras.rst b/doc/source/fmpz_extras.rst.pp
similarity index 100%
rename from doc/source/fmpz_extras.rst
rename to doc/source/fmpz_extras.rst.pp
diff --git a/doc/source/fmpz_factor.rst b/doc/source/fmpz_factor.rst.pp
similarity index 100%
rename from doc/source/fmpz_factor.rst
rename to doc/source/fmpz_factor.rst.pp
diff --git a/doc/source/fmpz_lll.rst b/doc/source/fmpz_lll.rst.pp
similarity index 100%
rename from doc/source/fmpz_lll.rst
rename to doc/source/fmpz_lll.rst.pp
diff --git a/doc/source/fmpz_mat.rst b/doc/source/fmpz_mat.rst.pp
similarity index 100%
rename from doc/source/fmpz_mat.rst
rename to doc/source/fmpz_mat.rst.pp
diff --git a/doc/source/fmpz_mod.rst b/doc/source/fmpz_mod.rst.pp
similarity index 100%
rename from doc/source/fmpz_mod.rst
rename to doc/source/fmpz_mod.rst.pp
diff --git a/doc/source/fmpz_mod_mat.rst b/doc/source/fmpz_mod_mat.rst.pp
similarity index 100%
rename from doc/source/fmpz_mod_mat.rst
rename to doc/source/fmpz_mod_mat.rst.pp
diff --git a/doc/source/fmpz_mod_mpoly.rst b/doc/source/fmpz_mod_mpoly.rst.pp
similarity index 100%
rename from doc/source/fmpz_mod_mpoly.rst
rename to doc/source/fmpz_mod_mpoly.rst.pp
diff --git a/doc/source/fmpz_mod_mpoly_factor.rst b/doc/source/fmpz_mod_mpoly_factor.rst.pp
similarity index 100%
rename from doc/source/fmpz_mod_mpoly_factor.rst
rename to doc/source/fmpz_mod_mpoly_factor.rst.pp
diff --git a/doc/source/fmpz_mod_poly.rst b/doc/source/fmpz_mod_poly.rst.pp
similarity index 100%
rename from doc/source/fmpz_mod_poly.rst
rename to doc/source/fmpz_mod_poly.rst.pp
diff --git a/doc/source/fmpz_mod_poly_factor.rst b/doc/source/fmpz_mod_poly_factor.rst.pp
similarity index 100%
rename from doc/source/fmpz_mod_poly_factor.rst
rename to doc/source/fmpz_mod_poly_factor.rst.pp
diff --git a/doc/source/fmpz_mod_vec.rst b/doc/source/fmpz_mod_vec.rst.pp
similarity index 100%
rename from doc/source/fmpz_mod_vec.rst
rename to doc/source/fmpz_mod_vec.rst.pp
diff --git a/doc/source/fmpz_mpoly.rst b/doc/source/fmpz_mpoly.rst.pp
similarity index 100%
rename from doc/source/fmpz_mpoly.rst
rename to doc/source/fmpz_mpoly.rst.pp
diff --git a/doc/source/fmpz_mpoly_factor.rst b/doc/source/fmpz_mpoly_factor.rst.pp
similarity index 100%
rename from doc/source/fmpz_mpoly_factor.rst
rename to doc/source/fmpz_mpoly_factor.rst.pp
diff --git a/doc/source/fmpz_mpoly_q.rst b/doc/source/fmpz_mpoly_q.rst.pp
similarity index 100%
rename from doc/source/fmpz_mpoly_q.rst
rename to doc/source/fmpz_mpoly_q.rst.pp
diff --git a/doc/source/fmpz_poly.rst b/doc/source/fmpz_poly.rst.pp
similarity index 100%
rename from doc/source/fmpz_poly.rst
rename to doc/source/fmpz_poly.rst.pp
diff --git a/doc/source/fmpz_poly_factor.rst b/doc/source/fmpz_poly_factor.rst.pp
similarity index 100%
rename from doc/source/fmpz_poly_factor.rst
rename to doc/source/fmpz_poly_factor.rst.pp
diff --git a/doc/source/fmpz_poly_mat.rst b/doc/source/fmpz_poly_mat.rst.pp
similarity index 100%
rename from doc/source/fmpz_poly_mat.rst
rename to doc/source/fmpz_poly_mat.rst.pp
diff --git a/doc/source/fmpz_poly_q.rst b/doc/source/fmpz_poly_q.rst.pp
similarity index 100%
rename from doc/source/fmpz_poly_q.rst
rename to doc/source/fmpz_poly_q.rst.pp
diff --git a/doc/source/fmpz_vec.rst b/doc/source/fmpz_vec.rst.pp
similarity index 100%
rename from doc/source/fmpz_vec.rst
rename to doc/source/fmpz_vec.rst.pp
diff --git a/doc/source/fmpzi.rst b/doc/source/fmpzi.rst.pp
similarity index 100%
rename from doc/source/fmpzi.rst
rename to doc/source/fmpzi.rst.pp
diff --git a/doc/source/formulas.rst b/doc/source/formulas.rst.pp
similarity index 100%
rename from doc/source/formulas.rst
rename to doc/source/formulas.rst.pp
diff --git a/doc/source/fq.rst b/doc/source/fq.rst.pp
similarity index 100%
rename from doc/source/fq.rst
rename to doc/source/fq.rst.pp
diff --git a/doc/source/fq_default.rst b/doc/source/fq_default.rst.pp
similarity index 100%
rename from doc/source/fq_default.rst
rename to doc/source/fq_default.rst.pp
diff --git a/doc/source/fq_default_mat.rst b/doc/source/fq_default_mat.rst.pp
similarity index 100%
rename from doc/source/fq_default_mat.rst
rename to doc/source/fq_default_mat.rst.pp
diff --git a/doc/source/fq_default_poly.rst b/doc/source/fq_default_poly.rst.pp
similarity index 100%
rename from doc/source/fq_default_poly.rst
rename to doc/source/fq_default_poly.rst.pp
diff --git a/doc/source/fq_default_poly_factor.rst b/doc/source/fq_default_poly_factor.rst.pp
similarity index 100%
rename from doc/source/fq_default_poly_factor.rst
rename to doc/source/fq_default_poly_factor.rst.pp
diff --git a/doc/source/fq_embed.rst b/doc/source/fq_embed.rst.pp
similarity index 100%
rename from doc/source/fq_embed.rst
rename to doc/source/fq_embed.rst.pp
diff --git a/doc/source/fq_mat.rst b/doc/source/fq_mat.rst.pp
similarity index 100%
rename from doc/source/fq_mat.rst
rename to doc/source/fq_mat.rst.pp
diff --git a/doc/source/fq_nmod.rst b/doc/source/fq_nmod.rst.pp
similarity index 100%
rename from doc/source/fq_nmod.rst
rename to doc/source/fq_nmod.rst.pp
diff --git a/doc/source/fq_nmod_embed.rst b/doc/source/fq_nmod_embed.rst.pp
similarity index 100%
rename from doc/source/fq_nmod_embed.rst
rename to doc/source/fq_nmod_embed.rst.pp
diff --git a/doc/source/fq_nmod_mat.rst b/doc/source/fq_nmod_mat.rst.pp
similarity index 100%
rename from doc/source/fq_nmod_mat.rst
rename to doc/source/fq_nmod_mat.rst.pp
diff --git a/doc/source/fq_nmod_mpoly.rst b/doc/source/fq_nmod_mpoly.rst.pp
similarity index 100%
rename from doc/source/fq_nmod_mpoly.rst
rename to doc/source/fq_nmod_mpoly.rst.pp
diff --git a/doc/source/fq_nmod_mpoly_factor.rst b/doc/source/fq_nmod_mpoly_factor.rst.pp
similarity index 100%
rename from doc/source/fq_nmod_mpoly_factor.rst
rename to doc/source/fq_nmod_mpoly_factor.rst.pp
diff --git a/doc/source/fq_nmod_poly.rst b/doc/source/fq_nmod_poly.rst.pp
similarity index 100%
rename from doc/source/fq_nmod_poly.rst
rename to doc/source/fq_nmod_poly.rst.pp
diff --git a/doc/source/fq_nmod_poly_factor.rst b/doc/source/fq_nmod_poly_factor.rst.pp
similarity index 100%
rename from doc/source/fq_nmod_poly_factor.rst
rename to doc/source/fq_nmod_poly_factor.rst.pp
diff --git a/doc/source/fq_nmod_vec.rst b/doc/source/fq_nmod_vec.rst.pp
similarity index 100%
rename from doc/source/fq_nmod_vec.rst
rename to doc/source/fq_nmod_vec.rst.pp
diff --git a/doc/source/fq_poly.rst b/doc/source/fq_poly.rst.pp
similarity index 100%
rename from doc/source/fq_poly.rst
rename to doc/source/fq_poly.rst.pp
diff --git a/doc/source/fq_poly_factor.rst b/doc/source/fq_poly_factor.rst.pp
similarity index 100%
rename from doc/source/fq_poly_factor.rst
rename to doc/source/fq_poly_factor.rst.pp
diff --git a/doc/source/fq_vec.rst b/doc/source/fq_vec.rst.pp
similarity index 100%
rename from doc/source/fq_vec.rst
rename to doc/source/fq_vec.rst.pp
diff --git a/doc/source/fq_zech.rst b/doc/source/fq_zech.rst.pp
similarity index 100%
rename from doc/source/fq_zech.rst
rename to doc/source/fq_zech.rst.pp
diff --git a/doc/source/fq_zech_embed.rst b/doc/source/fq_zech_embed.rst.pp
similarity index 100%
rename from doc/source/fq_zech_embed.rst
rename to doc/source/fq_zech_embed.rst.pp
diff --git a/doc/source/fq_zech_mat.rst b/doc/source/fq_zech_mat.rst.pp
similarity index 100%
rename from doc/source/fq_zech_mat.rst
rename to doc/source/fq_zech_mat.rst.pp
diff --git a/doc/source/fq_zech_poly.rst b/doc/source/fq_zech_poly.rst.pp
similarity index 100%
rename from doc/source/fq_zech_poly.rst
rename to doc/source/fq_zech_poly.rst.pp
diff --git a/doc/source/fq_zech_poly_factor.rst b/doc/source/fq_zech_poly_factor.rst.pp
similarity index 100%
rename from doc/source/fq_zech_poly_factor.rst
rename to doc/source/fq_zech_poly_factor.rst.pp
diff --git a/doc/source/fq_zech_vec.rst b/doc/source/fq_zech_vec.rst.pp
similarity index 100%
rename from doc/source/fq_zech_vec.rst
rename to doc/source/fq_zech_vec.rst.pp
diff --git a/doc/source/gamma.rst b/doc/source/gamma.rst.pp
similarity index 100%
rename from doc/source/gamma.rst
rename to doc/source/gamma.rst.pp
diff --git a/doc/source/gr.rst b/doc/source/gr.rst.pp
similarity index 100%
rename from doc/source/gr.rst
rename to doc/source/gr.rst.pp
diff --git a/doc/source/gr_domains.rst b/doc/source/gr_domains.rst.pp
similarity index 100%
rename from doc/source/gr_domains.rst
rename to doc/source/gr_domains.rst.pp
diff --git a/doc/source/gr_generic.rst b/doc/source/gr_generic.rst.pp
similarity index 100%
rename from doc/source/gr_generic.rst
rename to doc/source/gr_generic.rst.pp
diff --git a/doc/source/gr_implementing.rst b/doc/source/gr_implementing.rst.pp
similarity index 100%
rename from doc/source/gr_implementing.rst
rename to doc/source/gr_implementing.rst.pp
diff --git a/doc/source/gr_mat.rst b/doc/source/gr_mat.rst.pp
similarity index 100%
rename from doc/source/gr_mat.rst
rename to doc/source/gr_mat.rst.pp
diff --git a/doc/source/gr_mpoly.rst b/doc/source/gr_mpoly.rst.pp
similarity index 100%
rename from doc/source/gr_mpoly.rst
rename to doc/source/gr_mpoly.rst.pp
diff --git a/doc/source/gr_poly.rst b/doc/source/gr_poly.rst.pp
similarity index 100%
rename from doc/source/gr_poly.rst
rename to doc/source/gr_poly.rst.pp
diff --git a/doc/source/gr_special.rst b/doc/source/gr_special.rst.pp
similarity index 100%
rename from doc/source/gr_special.rst
rename to doc/source/gr_special.rst.pp
diff --git a/doc/source/gr_vec.rst b/doc/source/gr_vec.rst.pp
similarity index 100%
rename from doc/source/gr_vec.rst
rename to doc/source/gr_vec.rst.pp
diff --git a/doc/source/history.rst b/doc/source/history.rst.pp
similarity index 100%
rename from doc/source/history.rst
rename to doc/source/history.rst.pp
diff --git a/doc/source/hurwitz.rst b/doc/source/hurwitz.rst.pp
similarity index 100%
rename from doc/source/hurwitz.rst
rename to doc/source/hurwitz.rst.pp
diff --git a/doc/source/hypergeometric.rst b/doc/source/hypergeometric.rst.pp
similarity index 100%
rename from doc/source/hypergeometric.rst
rename to doc/source/hypergeometric.rst.pp
diff --git a/doc/source/hypgeom.rst b/doc/source/hypgeom.rst.pp
similarity index 100%
rename from doc/source/hypgeom.rst
rename to doc/source/hypgeom.rst.pp
diff --git a/doc/source/index.rst b/doc/source/index.rst.pp
similarity index 100%
rename from doc/source/index.rst
rename to doc/source/index.rst.pp
diff --git a/doc/source/index_arb.rst b/doc/source/index_arb.rst.pp
similarity index 100%
rename from doc/source/index_arb.rst
rename to doc/source/index_arb.rst.pp
diff --git a/doc/source/index_generic.rst b/doc/source/index_generic.rst.pp
similarity index 100%
rename from doc/source/index_generic.rst
rename to doc/source/index_generic.rst.pp
diff --git a/doc/source/index_integers.rst b/doc/source/index_integers.rst.pp
similarity index 100%
rename from doc/source/index_integers.rst
rename to doc/source/index_integers.rst.pp
diff --git a/doc/source/index_integers_mod.rst b/doc/source/index_integers_mod.rst.pp
similarity index 100%
rename from doc/source/index_integers_mod.rst
rename to doc/source/index_integers_mod.rst.pp
diff --git a/doc/source/index_rationals.rst b/doc/source/index_rationals.rst.pp
similarity index 100%
rename from doc/source/index_rationals.rst
rename to doc/source/index_rationals.rst.pp
diff --git a/doc/source/introduction.rst b/doc/source/introduction.rst.pp
similarity index 100%
rename from doc/source/introduction.rst
rename to doc/source/introduction.rst.pp
diff --git a/doc/source/introduction_calcium.rst b/doc/source/introduction_calcium.rst.pp
similarity index 100%
rename from doc/source/introduction_calcium.rst
rename to doc/source/introduction_calcium.rst.pp
diff --git a/doc/source/issues.rst b/doc/source/issues.rst.pp
similarity index 100%
rename from doc/source/issues.rst
rename to doc/source/issues.rst.pp
diff --git a/doc/source/long_extras.rst b/doc/source/long_extras.rst.pp
similarity index 100%
rename from doc/source/long_extras.rst
rename to doc/source/long_extras.rst.pp
diff --git a/doc/source/longlong.rst b/doc/source/longlong.rst.pp
similarity index 100%
rename from doc/source/longlong.rst
rename to doc/source/longlong.rst.pp
diff --git a/doc/source/machine_vectors.rst b/doc/source/machine_vectors.rst.pp
similarity index 100%
rename from doc/source/machine_vectors.rst
rename to doc/source/machine_vectors.rst.pp
diff --git a/doc/source/mag.rst b/doc/source/mag.rst.pp
similarity index 100%
rename from doc/source/mag.rst
rename to doc/source/mag.rst.pp
diff --git a/doc/source/memory.rst b/doc/source/memory.rst.pp
similarity index 100%
rename from doc/source/memory.rst
rename to doc/source/memory.rst.pp
diff --git a/doc/source/mpfr_mat.rst b/doc/source/mpfr_mat.rst.pp
similarity index 100%
rename from doc/source/mpfr_mat.rst
rename to doc/source/mpfr_mat.rst.pp
diff --git a/doc/source/mpfr_vec.rst b/doc/source/mpfr_vec.rst.pp
similarity index 100%
rename from doc/source/mpfr_vec.rst
rename to doc/source/mpfr_vec.rst.pp
diff --git a/doc/source/mpn_extras.rst b/doc/source/mpn_extras.rst.pp
similarity index 100%
rename from doc/source/mpn_extras.rst
rename to doc/source/mpn_extras.rst.pp
diff --git a/doc/source/mpn_mod.rst b/doc/source/mpn_mod.rst.pp
similarity index 100%
rename from doc/source/mpn_mod.rst
rename to doc/source/mpn_mod.rst.pp
diff --git a/doc/source/mpoly.rst b/doc/source/mpoly.rst.pp
similarity index 100%
rename from doc/source/mpoly.rst
rename to doc/source/mpoly.rst.pp
diff --git a/doc/source/nf.rst b/doc/source/nf.rst.pp
similarity index 100%
rename from doc/source/nf.rst
rename to doc/source/nf.rst.pp
diff --git a/doc/source/nf_elem.rst b/doc/source/nf_elem.rst.pp
similarity index 100%
rename from doc/source/nf_elem.rst
rename to doc/source/nf_elem.rst.pp
diff --git a/doc/source/nfloat.rst b/doc/source/nfloat.rst.pp
similarity index 100%
rename from doc/source/nfloat.rst
rename to doc/source/nfloat.rst.pp
diff --git a/doc/source/nmod.rst b/doc/source/nmod.rst.pp
similarity index 100%
rename from doc/source/nmod.rst
rename to doc/source/nmod.rst.pp
diff --git a/doc/source/nmod_mat.rst b/doc/source/nmod_mat.rst.pp
similarity index 100%
rename from doc/source/nmod_mat.rst
rename to doc/source/nmod_mat.rst.pp
diff --git a/doc/source/nmod_mpoly.rst b/doc/source/nmod_mpoly.rst.pp
similarity index 100%
rename from doc/source/nmod_mpoly.rst
rename to doc/source/nmod_mpoly.rst.pp
diff --git a/doc/source/nmod_mpoly_factor.rst b/doc/source/nmod_mpoly_factor.rst.pp
similarity index 100%
rename from doc/source/nmod_mpoly_factor.rst
rename to doc/source/nmod_mpoly_factor.rst.pp
diff --git a/doc/source/nmod_poly.rst b/doc/source/nmod_poly.rst.pp
similarity index 100%
rename from doc/source/nmod_poly.rst
rename to doc/source/nmod_poly.rst.pp
diff --git a/doc/source/nmod_poly_factor.rst b/doc/source/nmod_poly_factor.rst.pp
similarity index 100%
rename from doc/source/nmod_poly_factor.rst
rename to doc/source/nmod_poly_factor.rst.pp
diff --git a/doc/source/nmod_poly_mat.rst b/doc/source/nmod_poly_mat.rst.pp
similarity index 100%
rename from doc/source/nmod_poly_mat.rst
rename to doc/source/nmod_poly_mat.rst.pp
diff --git a/doc/source/nmod_vec.rst b/doc/source/nmod_vec.rst.pp
similarity index 100%
rename from doc/source/nmod_vec.rst
rename to doc/source/nmod_vec.rst.pp
diff --git a/doc/source/overview.rst b/doc/source/overview.rst.pp
similarity index 100%
rename from doc/source/overview.rst
rename to doc/source/overview.rst.pp
diff --git a/doc/source/padic.rst b/doc/source/padic.rst.pp
similarity index 100%
rename from doc/source/padic.rst
rename to doc/source/padic.rst.pp
diff --git a/doc/source/padic_mat.rst b/doc/source/padic_mat.rst.pp
similarity index 100%
rename from doc/source/padic_mat.rst
rename to doc/source/padic_mat.rst.pp
diff --git a/doc/source/padic_poly.rst b/doc/source/padic_poly.rst.pp
similarity index 100%
rename from doc/source/padic_poly.rst
rename to doc/source/padic_poly.rst.pp
diff --git a/doc/source/partitions.rst b/doc/source/partitions.rst.pp
similarity index 100%
rename from doc/source/partitions.rst
rename to doc/source/partitions.rst.pp
diff --git a/doc/source/perm.rst b/doc/source/perm.rst.pp
similarity index 100%
rename from doc/source/perm.rst
rename to doc/source/perm.rst.pp
diff --git a/doc/source/polylogarithms.rst b/doc/source/polylogarithms.rst.pp
similarity index 100%
rename from doc/source/polylogarithms.rst
rename to doc/source/polylogarithms.rst.pp
diff --git a/doc/source/portability.rst b/doc/source/portability.rst.pp
similarity index 100%
rename from doc/source/portability.rst
rename to doc/source/portability.rst.pp
diff --git a/doc/source/profiler.rst b/doc/source/profiler.rst.pp
similarity index 100%
rename from doc/source/profiler.rst
rename to doc/source/profiler.rst.pp
diff --git a/doc/source/python_flint.rst b/doc/source/python_flint.rst.pp
similarity index 100%
rename from doc/source/python_flint.rst
rename to doc/source/python_flint.rst.pp
diff --git a/doc/source/qadic.rst b/doc/source/qadic.rst.pp
similarity index 100%
rename from doc/source/qadic.rst
rename to doc/source/qadic.rst.pp
diff --git a/doc/source/qfb.rst b/doc/source/qfb.rst.pp
similarity index 100%
rename from doc/source/qfb.rst
rename to doc/source/qfb.rst.pp
diff --git a/doc/source/qqbar.rst b/doc/source/qqbar.rst.pp
similarity index 100%
rename from doc/source/qqbar.rst
rename to doc/source/qqbar.rst.pp
diff --git a/doc/source/qsieve.rst b/doc/source/qsieve.rst.pp
similarity index 100%
rename from doc/source/qsieve.rst
rename to doc/source/qsieve.rst.pp
diff --git a/doc/source/references.rst b/doc/source/references.rst.pp
similarity index 100%
rename from doc/source/references.rst
rename to doc/source/references.rst.pp
diff --git a/doc/source/thread_pool.rst b/doc/source/thread_pool.rst.pp
similarity index 100%
rename from doc/source/thread_pool.rst
rename to doc/source/thread_pool.rst.pp
diff --git a/doc/source/threading.rst b/doc/source/threading.rst.pp
similarity index 100%
rename from doc/source/threading.rst
rename to doc/source/threading.rst.pp
diff --git a/doc/source/ulong_extras.rst b/doc/source/ulong_extras.rst.pp
similarity index 100%
rename from doc/source/ulong_extras.rst
rename to doc/source/ulong_extras.rst.pp
diff --git a/doc/source/using.rst b/doc/source/using.rst.pp
similarity index 100%
rename from doc/source/using.rst
rename to doc/source/using.rst.pp

From a9b42d76427a5a4c12509de049f88acc2d3e84a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 11:00:59 +0100
Subject: [PATCH 02/20] Add .rst files to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ce3195baac..4eff07daf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ doc/latex/flint-manual.*
 !doc/latex/flint-manual.tex
 doc/latex/input/*
 doc/latex/create_doc
+doc/source/*.rst
 libflint*
 *.suo
 *.pyc

From dd4ef7990f2f2f7f1a39af775316fc89e69192a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 11:01:40 +0100
Subject: [PATCH 03/20] Fix Makefile for rst files

---
 doc/Makefile | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 27cc27e70a..618ebc2722 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,13 +8,23 @@ SPHINXPROJ    = flint
 SOURCEDIR     = source
 BUILDDIR      = build
 
+M4 := m4
+
+SRCS := $(wildcard $(SOURCEDIR)/*.rst.pp)
+OBJS := $(patsubst %.pp,%,$(SRCS))
+
 # Put it first so that "make" without argument is like "make help".
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-.PHONY: help Makefile
+preprocess: $(OBJS)
+
+%.rst: %.rst.pp
+	@$(M4) -I $(SOURCEDIR) $< > $@
+
+.PHONY: help Makefile preprocess
 
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+# # Catch-all target: route all unknown targets to Sphinx using the new
+# # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+# %: Makefile preprocess
+# 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

From 4d4d41bc05f62d0b980139b4a3b5e1102527c35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 11:08:07 +0100
Subject: [PATCH 04/20] Add macros.m4

---
 doc/source/macros.m4 | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/source/macros.m4

diff --git a/doc/source/macros.m4 b/doc/source/macros.m4
new file mode 100644
index 0000000000..fa390f2611
--- /dev/null
+++ b/doc/source/macros.m4
@@ -0,0 +1,2 @@
+dnl Define stuff here
+changequote({{{,}}})dnl

From 31acb8c56cbbff8d78c5123c279a65d93a62e681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 11:11:40 +0100
Subject: [PATCH 05/20] Push inclusion of macros into every rst file

---
 doc/source/acb.rst.pp                    | 1 +
 doc/source/acb_calc.rst.pp               | 1 +
 doc/source/acb_dft.rst.pp                | 1 +
 doc/source/acb_dirichlet.rst.pp          | 1 +
 doc/source/acb_elliptic.rst.pp           | 1 +
 doc/source/acb_hypgeom.rst.pp            | 1 +
 doc/source/acb_mat.rst.pp                | 1 +
 doc/source/acb_modular.rst.pp            | 1 +
 doc/source/acb_poly.rst.pp               | 1 +
 doc/source/acb_theta.rst.pp              | 1 +
 doc/source/acf.rst.pp                    | 1 +
 doc/source/agm.rst.pp                    | 1 +
 doc/source/aprcl.rst.pp                  | 1 +
 doc/source/arb.rst.pp                    | 1 +
 doc/source/arb_calc.rst.pp               | 1 +
 doc/source/arb_fmpz_poly.rst.pp          | 1 +
 doc/source/arb_fpwrap.rst.pp             | 1 +
 doc/source/arb_hypgeom.rst.pp            | 1 +
 doc/source/arb_mat.rst.pp                | 1 +
 doc/source/arb_poly.rst.pp               | 1 +
 doc/source/arf.rst.pp                    | 1 +
 doc/source/arith.rst.pp                  | 1 +
 doc/source/bernoulli.rst.pp              | 1 +
 doc/source/bool_mat.rst.pp               | 1 +
 doc/source/bug_reporting.rst.pp          | 1 +
 doc/source/building.rst.pp               | 1 +
 doc/source/ca.rst.pp                     | 1 +
 doc/source/ca_ext.rst.pp                 | 1 +
 doc/source/ca_field.rst.pp               | 1 +
 doc/source/ca_mat.rst.pp                 | 1 +
 doc/source/ca_poly.rst.pp                | 1 +
 doc/source/ca_vec.rst.pp                 | 1 +
 doc/source/calcium.rst.pp                | 1 +
 doc/source/constants.rst.pp              | 1 +
 doc/source/contributing.rst.pp           | 1 +
 doc/source/contributors.rst.pp           | 1 +
 doc/source/d_mat.rst.pp                  | 1 +
 doc/source/d_vec.rst.pp                  | 1 +
 doc/source/dirichlet.rst.pp              | 1 +
 doc/source/dlog.rst.pp                   | 1 +
 doc/source/double_extras.rst.pp          | 1 +
 doc/source/double_interval.rst.pp        | 1 +
 doc/source/examples.rst.pp               | 1 +
 doc/source/examples_arb.rst.pp           | 1 +
 doc/source/examples_calcium.rst.pp       | 1 +
 doc/source/fexpr.rst.pp                  | 1 +
 doc/source/fexpr_builtin.rst.pp          | 1 +
 doc/source/fft.rst.pp                    | 1 +
 doc/source/fft_small.rst.pp              | 1 +
 doc/source/flint.rst.pp                  | 1 +
 doc/source/fmpq.rst.pp                   | 1 +
 doc/source/fmpq_mat.rst.pp               | 1 +
 doc/source/fmpq_mpoly.rst.pp             | 1 +
 doc/source/fmpq_mpoly_factor.rst.pp      | 1 +
 doc/source/fmpq_poly.rst.pp              | 1 +
 doc/source/fmpq_vec.rst.pp               | 1 +
 doc/source/fmpz.rst.pp                   | 1 +
 doc/source/fmpz_extras.rst.pp            | 1 +
 doc/source/fmpz_factor.rst.pp            | 1 +
 doc/source/fmpz_lll.rst.pp               | 1 +
 doc/source/fmpz_mat.rst.pp               | 1 +
 doc/source/fmpz_mod.rst.pp               | 1 +
 doc/source/fmpz_mod_mat.rst.pp           | 1 +
 doc/source/fmpz_mod_mpoly.rst.pp         | 1 +
 doc/source/fmpz_mod_mpoly_factor.rst.pp  | 1 +
 doc/source/fmpz_mod_poly.rst.pp          | 1 +
 doc/source/fmpz_mod_poly_factor.rst.pp   | 1 +
 doc/source/fmpz_mod_vec.rst.pp           | 1 +
 doc/source/fmpz_mpoly.rst.pp             | 1 +
 doc/source/fmpz_mpoly_factor.rst.pp      | 1 +
 doc/source/fmpz_mpoly_q.rst.pp           | 1 +
 doc/source/fmpz_poly.rst.pp              | 1 +
 doc/source/fmpz_poly_factor.rst.pp       | 1 +
 doc/source/fmpz_poly_mat.rst.pp          | 1 +
 doc/source/fmpz_poly_q.rst.pp            | 1 +
 doc/source/fmpz_vec.rst.pp               | 1 +
 doc/source/fmpzi.rst.pp                  | 1 +
 doc/source/formulas.rst.pp               | 1 +
 doc/source/fq.rst.pp                     | 1 +
 doc/source/fq_default.rst.pp             | 1 +
 doc/source/fq_default_mat.rst.pp         | 1 +
 doc/source/fq_default_poly.rst.pp        | 1 +
 doc/source/fq_default_poly_factor.rst.pp | 1 +
 doc/source/fq_embed.rst.pp               | 1 +
 doc/source/fq_mat.rst.pp                 | 1 +
 doc/source/fq_nmod.rst.pp                | 1 +
 doc/source/fq_nmod_embed.rst.pp          | 1 +
 doc/source/fq_nmod_mat.rst.pp            | 1 +
 doc/source/fq_nmod_mpoly.rst.pp          | 1 +
 doc/source/fq_nmod_mpoly_factor.rst.pp   | 1 +
 doc/source/fq_nmod_poly.rst.pp           | 1 +
 doc/source/fq_nmod_poly_factor.rst.pp    | 1 +
 doc/source/fq_nmod_vec.rst.pp            | 1 +
 doc/source/fq_poly.rst.pp                | 1 +
 doc/source/fq_poly_factor.rst.pp         | 1 +
 doc/source/fq_vec.rst.pp                 | 1 +
 doc/source/fq_zech.rst.pp                | 1 +
 doc/source/fq_zech_embed.rst.pp          | 1 +
 doc/source/fq_zech_mat.rst.pp            | 1 +
 doc/source/fq_zech_poly.rst.pp           | 1 +
 doc/source/fq_zech_poly_factor.rst.pp    | 1 +
 doc/source/fq_zech_vec.rst.pp            | 1 +
 doc/source/gamma.rst.pp                  | 1 +
 doc/source/gr.rst.pp                     | 1 +
 doc/source/gr_domains.rst.pp             | 1 +
 doc/source/gr_generic.rst.pp             | 1 +
 doc/source/gr_implementing.rst.pp        | 1 +
 doc/source/gr_mat.rst.pp                 | 1 +
 doc/source/gr_mpoly.rst.pp               | 1 +
 doc/source/gr_poly.rst.pp                | 1 +
 doc/source/gr_special.rst.pp             | 1 +
 doc/source/gr_vec.rst.pp                 | 1 +
 doc/source/history.rst.pp                | 1 +
 doc/source/hurwitz.rst.pp                | 1 +
 doc/source/hypergeometric.rst.pp         | 1 +
 doc/source/hypgeom.rst.pp                | 1 +
 doc/source/index.rst.pp                  | 1 +
 doc/source/index_arb.rst.pp              | 1 +
 doc/source/index_generic.rst.pp          | 1 +
 doc/source/index_integers.rst.pp         | 1 +
 doc/source/index_integers_mod.rst.pp     | 1 +
 doc/source/index_rationals.rst.pp        | 1 +
 doc/source/introduction.rst.pp           | 1 +
 doc/source/introduction_calcium.rst.pp   | 1 +
 doc/source/issues.rst.pp                 | 1 +
 doc/source/long_extras.rst.pp            | 1 +
 doc/source/longlong.rst.pp               | 1 +
 doc/source/machine_vectors.rst.pp        | 1 +
 doc/source/mag.rst.pp                    | 1 +
 doc/source/memory.rst.pp                 | 1 +
 doc/source/mpfr_mat.rst.pp               | 1 +
 doc/source/mpfr_vec.rst.pp               | 1 +
 doc/source/mpn_extras.rst.pp             | 1 +
 doc/source/mpn_mod.rst.pp                | 1 +
 doc/source/mpoly.rst.pp                  | 1 +
 doc/source/nf.rst.pp                     | 1 +
 doc/source/nf_elem.rst.pp                | 1 +
 doc/source/nfloat.rst.pp                 | 1 +
 doc/source/nmod.rst.pp                   | 1 +
 doc/source/nmod_mat.rst.pp               | 1 +
 doc/source/nmod_mpoly.rst.pp             | 1 +
 doc/source/nmod_mpoly_factor.rst.pp      | 1 +
 doc/source/nmod_poly.rst.pp              | 1 +
 doc/source/nmod_poly_factor.rst.pp       | 1 +
 doc/source/nmod_poly_mat.rst.pp          | 1 +
 doc/source/nmod_vec.rst.pp               | 1 +
 doc/source/overview.rst.pp               | 1 +
 doc/source/padic.rst.pp                  | 1 +
 doc/source/padic_mat.rst.pp              | 1 +
 doc/source/padic_poly.rst.pp             | 1 +
 doc/source/partitions.rst.pp             | 1 +
 doc/source/perm.rst.pp                   | 1 +
 doc/source/polylogarithms.rst.pp         | 1 +
 doc/source/portability.rst.pp            | 1 +
 doc/source/profiler.rst.pp               | 1 +
 doc/source/python_flint.rst.pp           | 1 +
 doc/source/qadic.rst.pp                  | 1 +
 doc/source/qfb.rst.pp                    | 1 +
 doc/source/qqbar.rst.pp                  | 1 +
 doc/source/qsieve.rst.pp                 | 1 +
 doc/source/references.rst.pp             | 1 +
 doc/source/thread_pool.rst.pp            | 1 +
 doc/source/threading.rst.pp              | 1 +
 doc/source/ulong_extras.rst.pp           | 1 +
 doc/source/using.rst.pp                  | 1 +
 165 files changed, 165 insertions(+)

diff --git a/doc/source/acb.rst.pp b/doc/source/acb.rst.pp
index a4d0f54136..2f49da9c0f 100644
--- a/doc/source/acb.rst.pp
+++ b/doc/source/acb.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb:
 
 **acb.h** -- complex numbers
diff --git a/doc/source/acb_calc.rst.pp b/doc/source/acb_calc.rst.pp
index de67707534..327da58009 100644
--- a/doc/source/acb_calc.rst.pp
+++ b/doc/source/acb_calc.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-calc:
 
 **acb_calc.h** -- calculus with complex-valued functions
diff --git a/doc/source/acb_dft.rst.pp b/doc/source/acb_dft.rst.pp
index b4d8ff9fb5..a4a27715fc 100644
--- a/doc/source/acb_dft.rst.pp
+++ b/doc/source/acb_dft.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-dft:
 
 **acb_dft.h** -- Discrete Fourier transform
diff --git a/doc/source/acb_dirichlet.rst.pp b/doc/source/acb_dirichlet.rst.pp
index 44b812543e..b9f2f125f7 100644
--- a/doc/source/acb_dirichlet.rst.pp
+++ b/doc/source/acb_dirichlet.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-dirichlet:
 
 **acb_dirichlet.h** -- Dirichlet L-functions, Riemann zeta and related functions
diff --git a/doc/source/acb_elliptic.rst.pp b/doc/source/acb_elliptic.rst.pp
index d74ecafba3..7a9e66dc10 100644
--- a/doc/source/acb_elliptic.rst.pp
+++ b/doc/source/acb_elliptic.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-elliptic:
 
 **acb_elliptic.h** -- elliptic integrals and functions of complex variables
diff --git a/doc/source/acb_hypgeom.rst.pp b/doc/source/acb_hypgeom.rst.pp
index 13299b7114..7b02895d3f 100644
--- a/doc/source/acb_hypgeom.rst.pp
+++ b/doc/source/acb_hypgeom.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-hypgeom:
 
 **acb_hypgeom.h** -- hypergeometric functions of complex variables
diff --git a/doc/source/acb_mat.rst.pp b/doc/source/acb_mat.rst.pp
index b3b5eddb8f..8e3c6230a4 100644
--- a/doc/source/acb_mat.rst.pp
+++ b/doc/source/acb_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-mat:
 
 **acb_mat.h** -- matrices over the complex numbers
diff --git a/doc/source/acb_modular.rst.pp b/doc/source/acb_modular.rst.pp
index ca05f2dd17..f79e901084 100644
--- a/doc/source/acb_modular.rst.pp
+++ b/doc/source/acb_modular.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-modular:
 
 **acb_modular.h** -- modular forms of complex variables
diff --git a/doc/source/acb_poly.rst.pp b/doc/source/acb_poly.rst.pp
index 66148a38a0..d56536c2b1 100644
--- a/doc/source/acb_poly.rst.pp
+++ b/doc/source/acb_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-poly:
 
 **acb_poly.h** -- polynomials over the complex numbers
diff --git a/doc/source/acb_theta.rst.pp b/doc/source/acb_theta.rst.pp
index 1f4700352e..b9328d65c1 100644
--- a/doc/source/acb_theta.rst.pp
+++ b/doc/source/acb_theta.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acb-theta:
 
 **acb_theta.h** -- Riemann theta functions
diff --git a/doc/source/acf.rst.pp b/doc/source/acf.rst.pp
index 0d06433a49..dc015afa4a 100644
--- a/doc/source/acf.rst.pp
+++ b/doc/source/acf.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _acf:
 
 **acf.h** -- complex floating-point numbers
diff --git a/doc/source/agm.rst.pp b/doc/source/agm.rst.pp
index fc846267d9..163fa7c442 100644
--- a/doc/source/agm.rst.pp
+++ b/doc/source/agm.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _algorithms_agm:
 
 Algorithms for the arithmetic-geometric mean
diff --git a/doc/source/aprcl.rst.pp b/doc/source/aprcl.rst.pp
index 1d593f0ba7..33e87f12e8 100644
--- a/doc/source/aprcl.rst.pp
+++ b/doc/source/aprcl.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _aprcl:
 
 **aprcl.h** -- APRCL primality testing
diff --git a/doc/source/arb.rst.pp b/doc/source/arb.rst.pp
index 0dd829f8d9..d2f3f722a9 100644
--- a/doc/source/arb.rst.pp
+++ b/doc/source/arb.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arb:
 
 **arb.h** -- real numbers
diff --git a/doc/source/arb_calc.rst.pp b/doc/source/arb_calc.rst.pp
index 33b45abf37..4d9f130ca1 100644
--- a/doc/source/arb_calc.rst.pp
+++ b/doc/source/arb_calc.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arb-calc:
 
 **arb_calc.h** -- calculus with real-valued functions
diff --git a/doc/source/arb_fmpz_poly.rst.pp b/doc/source/arb_fmpz_poly.rst.pp
index baebf8521e..7f664f5b5e 100644
--- a/doc/source/arb_fmpz_poly.rst.pp
+++ b/doc/source/arb_fmpz_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arb_fmpz_poly:
 
 **arb_fmpz_poly.h** -- extra methods for integer polynomials
diff --git a/doc/source/arb_fpwrap.rst.pp b/doc/source/arb_fpwrap.rst.pp
index ac494a79e1..caa1e0791f 100644
--- a/doc/source/arb_fpwrap.rst.pp
+++ b/doc/source/arb_fpwrap.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arb_fpwrap:
 
 **arb_fpwrap.h** -- floating-point wrappers of Arb mathematical functions
diff --git a/doc/source/arb_hypgeom.rst.pp b/doc/source/arb_hypgeom.rst.pp
index c31fdaed56..2a47d53fda 100644
--- a/doc/source/arb_hypgeom.rst.pp
+++ b/doc/source/arb_hypgeom.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arb-hypgeom:
 
 **arb_hypgeom.h** -- hypergeometric functions of real variables
diff --git a/doc/source/arb_mat.rst.pp b/doc/source/arb_mat.rst.pp
index 3c56495354..dd7a364a36 100644
--- a/doc/source/arb_mat.rst.pp
+++ b/doc/source/arb_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arb-mat:
 
 **arb_mat.h** -- matrices over the real numbers
diff --git a/doc/source/arb_poly.rst.pp b/doc/source/arb_poly.rst.pp
index 14d330b2bd..605e830186 100644
--- a/doc/source/arb_poly.rst.pp
+++ b/doc/source/arb_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arb-poly:
 
 **arb_poly.h** -- polynomials over the real numbers
diff --git a/doc/source/arf.rst.pp b/doc/source/arf.rst.pp
index e35b3d23d2..080ef49264 100644
--- a/doc/source/arf.rst.pp
+++ b/doc/source/arf.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arf:
 
 **arf.h** -- arbitrary-precision floating-point numbers
diff --git a/doc/source/arith.rst.pp b/doc/source/arith.rst.pp
index e311f69ecc..ae68e25a39 100644
--- a/doc/source/arith.rst.pp
+++ b/doc/source/arith.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _arith:
 
 **arith.h** -- arithmetic and special functions
diff --git a/doc/source/bernoulli.rst.pp b/doc/source/bernoulli.rst.pp
index 7cc7deee24..3a30fe168b 100644
--- a/doc/source/bernoulli.rst.pp
+++ b/doc/source/bernoulli.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _bernoulli:
 
 **bernoulli.h** -- support for Bernoulli numbers
diff --git a/doc/source/bool_mat.rst.pp b/doc/source/bool_mat.rst.pp
index c97ee95b81..bbb7af9907 100644
--- a/doc/source/bool_mat.rst.pp
+++ b/doc/source/bool_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _bool-mat:
 
 **bool_mat.h** -- matrices over booleans
diff --git a/doc/source/bug_reporting.rst.pp b/doc/source/bug_reporting.rst.pp
index 4a15f37d7c..406cd18873 100644
--- a/doc/source/bug_reporting.rst.pp
+++ b/doc/source/bug_reporting.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _bug_reporting:
 
 **Bug reporting**
diff --git a/doc/source/building.rst.pp b/doc/source/building.rst.pp
index 37fbcd01a9..51f23ad66b 100644
--- a/doc/source/building.rst.pp
+++ b/doc/source/building.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _building:
 
 **Building, testing and installing**
diff --git a/doc/source/ca.rst.pp b/doc/source/ca.rst.pp
index 891b511b4a..c9009b20db 100644
--- a/doc/source/ca.rst.pp
+++ b/doc/source/ca.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _ca:
 
 **ca.h** -- exact real and complex numbers
diff --git a/doc/source/ca_ext.rst.pp b/doc/source/ca_ext.rst.pp
index a39390ab16..92c780d509 100644
--- a/doc/source/ca_ext.rst.pp
+++ b/doc/source/ca_ext.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _ca-ext:
 
 **ca_ext.h** -- real and complex extension numbers
diff --git a/doc/source/ca_field.rst.pp b/doc/source/ca_field.rst.pp
index 37a4792a02..e07dfbd977 100644
--- a/doc/source/ca_field.rst.pp
+++ b/doc/source/ca_field.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _ca-field:
 
 **ca_field.h** -- extension fields
diff --git a/doc/source/ca_mat.rst.pp b/doc/source/ca_mat.rst.pp
index 4d38fef58a..d72edd14ed 100644
--- a/doc/source/ca_mat.rst.pp
+++ b/doc/source/ca_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _ca-mat:
 
 **ca_mat.h** -- matrices over the real and complex numbers
diff --git a/doc/source/ca_poly.rst.pp b/doc/source/ca_poly.rst.pp
index 982bba34ff..5c0b48ec9d 100644
--- a/doc/source/ca_poly.rst.pp
+++ b/doc/source/ca_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _ca-poly:
 
 **ca_poly.h** -- dense univariate polynomials over the real and complex numbers
diff --git a/doc/source/ca_vec.rst.pp b/doc/source/ca_vec.rst.pp
index ac4ce9960c..afad15d0b0 100644
--- a/doc/source/ca_vec.rst.pp
+++ b/doc/source/ca_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _ca-vec:
 
 **ca_vec.h** -- vectors of real and complex numbers
diff --git a/doc/source/calcium.rst.pp b/doc/source/calcium.rst.pp
index cc4bbbe542..8784ea81ce 100644
--- a/doc/source/calcium.rst.pp
+++ b/doc/source/calcium.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _calcium:
 
 **calcium.h** -- global definitions
diff --git a/doc/source/constants.rst.pp b/doc/source/constants.rst.pp
index 11b1392cce..62e6813b5e 100644
--- a/doc/source/constants.rst.pp
+++ b/doc/source/constants.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _algorithms_constants:
 
 Algorithms for mathematical constants
diff --git a/doc/source/contributing.rst.pp b/doc/source/contributing.rst.pp
index 464a70f920..a961eff2aa 100644
--- a/doc/source/contributing.rst.pp
+++ b/doc/source/contributing.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _contributing:
 
 **Contributing to FLINT**
diff --git a/doc/source/contributors.rst.pp b/doc/source/contributors.rst.pp
index 11af33c890..d42bb24d95 100644
--- a/doc/source/contributors.rst.pp
+++ b/doc/source/contributors.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _contributors:
 
 **Contributors**
diff --git a/doc/source/d_mat.rst.pp b/doc/source/d_mat.rst.pp
index 76aa25c756..5136388280 100644
--- a/doc/source/d_mat.rst.pp
+++ b/doc/source/d_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _d-mat:
 
 **d_mat.h** -- double precision matrices
diff --git a/doc/source/d_vec.rst.pp b/doc/source/d_vec.rst.pp
index cad3446898..30edf0546f 100644
--- a/doc/source/d_vec.rst.pp
+++ b/doc/source/d_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _d-vec:
 
 **d_vec.h** -- double precision vectors
diff --git a/doc/source/dirichlet.rst.pp b/doc/source/dirichlet.rst.pp
index 15e564614b..7d29adb2d7 100644
--- a/doc/source/dirichlet.rst.pp
+++ b/doc/source/dirichlet.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _dirichlet:
 
 **dirichlet.h** -- Dirichlet characters
diff --git a/doc/source/dlog.rst.pp b/doc/source/dlog.rst.pp
index 2ca95eb451..e65516dd79 100644
--- a/doc/source/dlog.rst.pp
+++ b/doc/source/dlog.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _dlog:
 
 **dlog.h** -- discrete logarithms mod ulong primes
diff --git a/doc/source/double_extras.rst.pp b/doc/source/double_extras.rst.pp
index 725892e011..d71bb745f1 100644
--- a/doc/source/double_extras.rst.pp
+++ b/doc/source/double_extras.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _double-extras:
 
 **double_extras.h** -- support functions for double arithmetic
diff --git a/doc/source/double_interval.rst.pp b/doc/source/double_interval.rst.pp
index c53e5724fd..7185936066 100644
--- a/doc/source/double_interval.rst.pp
+++ b/doc/source/double_interval.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _double_interval:
 
 **double_interval.h** -- double-precision interval arithmetic and helpers
diff --git a/doc/source/examples.rst.pp b/doc/source/examples.rst.pp
index dc76d5237b..d00082f87d 100644
--- a/doc/source/examples.rst.pp
+++ b/doc/source/examples.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _examples:
 
 **Examples**
diff --git a/doc/source/examples_arb.rst.pp b/doc/source/examples_arb.rst.pp
index 0a9901c6aa..2ccde5d5f7 100644
--- a/doc/source/examples_arb.rst.pp
+++ b/doc/source/examples_arb.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _examples-arb:
 
 Arb example programs
diff --git a/doc/source/examples_calcium.rst.pp b/doc/source/examples_calcium.rst.pp
index 5a36132844..8c948548da 100644
--- a/doc/source/examples_calcium.rst.pp
+++ b/doc/source/examples_calcium.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _examples-calcium:
 
 Calcium example programs
diff --git a/doc/source/fexpr.rst.pp b/doc/source/fexpr.rst.pp
index 8633d53f5d..4aff61f36b 100644
--- a/doc/source/fexpr.rst.pp
+++ b/doc/source/fexpr.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fexpr:
 
 **fexpr.h** -- flat-packed symbolic expressions
diff --git a/doc/source/fexpr_builtin.rst.pp b/doc/source/fexpr_builtin.rst.pp
index 38c7900ca3..5bd0a555e6 100644
--- a/doc/source/fexpr_builtin.rst.pp
+++ b/doc/source/fexpr_builtin.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fexpr-builtin:
 
 **fexpr_builtin.h** -- builtin symbols
diff --git a/doc/source/fft.rst.pp b/doc/source/fft.rst.pp
index fcda6a9ba9..3f029cf96b 100644
--- a/doc/source/fft.rst.pp
+++ b/doc/source/fft.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fft:
 
 **fft.h** -- Schoenhage-Strassen FFT
diff --git a/doc/source/fft_small.rst.pp b/doc/source/fft_small.rst.pp
index 2bfda79400..2574150529 100644
--- a/doc/source/fft_small.rst.pp
+++ b/doc/source/fft_small.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fft-small:
 
 **fft_small.h** -- FFT modulo word-size primes
diff --git a/doc/source/flint.rst.pp b/doc/source/flint.rst.pp
index f8790d1482..90eaf291e8 100644
--- a/doc/source/flint.rst.pp
+++ b/doc/source/flint.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _flint:
 
 **flint.h** -- global definitions
diff --git a/doc/source/fmpq.rst.pp b/doc/source/fmpq.rst.pp
index 7e6e28bf69..d3d655b081 100644
--- a/doc/source/fmpq.rst.pp
+++ b/doc/source/fmpq.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpq:
 
 **fmpq.h** -- rational numbers
diff --git a/doc/source/fmpq_mat.rst.pp b/doc/source/fmpq_mat.rst.pp
index 0db4365fd7..b8dba40d69 100644
--- a/doc/source/fmpq_mat.rst.pp
+++ b/doc/source/fmpq_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpq-mat:
 
 **fmpq_mat.h** -- matrices over the rational numbers
diff --git a/doc/source/fmpq_mpoly.rst.pp b/doc/source/fmpq_mpoly.rst.pp
index dd6fa7d4de..7987416150 100644
--- a/doc/source/fmpq_mpoly.rst.pp
+++ b/doc/source/fmpq_mpoly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpq-mpoly:
 
 **fmpq_mpoly.h** -- multivariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_mpoly_factor.rst.pp b/doc/source/fmpq_mpoly_factor.rst.pp
index 5812a4daaa..4c81efa61b 100644
--- a/doc/source/fmpq_mpoly_factor.rst.pp
+++ b/doc/source/fmpq_mpoly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpq-mpoly-factor:
 
 **fmpq_mpoly_factor.h** -- factorisation of multivariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_poly.rst.pp b/doc/source/fmpq_poly.rst.pp
index b678b6fbbf..456e875b8c 100644
--- a/doc/source/fmpq_poly.rst.pp
+++ b/doc/source/fmpq_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpq-poly:
 
 **fmpq_poly.h** -- univariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_vec.rst.pp b/doc/source/fmpq_vec.rst.pp
index d177c86803..298df29b52 100644
--- a/doc/source/fmpq_vec.rst.pp
+++ b/doc/source/fmpq_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpq-vec:
 
 **fmpq_vec.h** -- vectors over rational numbers
diff --git a/doc/source/fmpz.rst.pp b/doc/source/fmpz.rst.pp
index 4f71a9da28..ea8dd126e4 100644
--- a/doc/source/fmpz.rst.pp
+++ b/doc/source/fmpz.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz:
 
 **fmpz.h** -- integers
diff --git a/doc/source/fmpz_extras.rst.pp b/doc/source/fmpz_extras.rst.pp
index bbcad16a5c..b6706d036b 100644
--- a/doc/source/fmpz_extras.rst.pp
+++ b/doc/source/fmpz_extras.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz_extras:
 
 **fmpz_extras.h** -- extra methods for FLINT integers
diff --git a/doc/source/fmpz_factor.rst.pp b/doc/source/fmpz_factor.rst.pp
index b8bca58aa2..72164d046e 100644
--- a/doc/source/fmpz_factor.rst.pp
+++ b/doc/source/fmpz_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-factor:
 
 **fmpz_factor.h** -- integer factorisation
diff --git a/doc/source/fmpz_lll.rst.pp b/doc/source/fmpz_lll.rst.pp
index d2601d2938..6fab07b5d8 100644
--- a/doc/source/fmpz_lll.rst.pp
+++ b/doc/source/fmpz_lll.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-lll:
 
 **fmpz_lll.h** -- LLL reduction
diff --git a/doc/source/fmpz_mat.rst.pp b/doc/source/fmpz_mat.rst.pp
index 684ae2bdbc..2ff118f077 100644
--- a/doc/source/fmpz_mat.rst.pp
+++ b/doc/source/fmpz_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mat:
 
 **fmpz_mat.h** -- matrices over the integers
diff --git a/doc/source/fmpz_mod.rst.pp b/doc/source/fmpz_mod.rst.pp
index eca14a0394..dc6e8985bc 100644
--- a/doc/source/fmpz_mod.rst.pp
+++ b/doc/source/fmpz_mod.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mod:
 
 **fmpz_mod.h** -- arithmetic modulo integers
diff --git a/doc/source/fmpz_mod_mat.rst.pp b/doc/source/fmpz_mod_mat.rst.pp
index e667b240b0..3707d46962 100644
--- a/doc/source/fmpz_mod_mat.rst.pp
+++ b/doc/source/fmpz_mod_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz_mod_mat:
 
 **fmpz_mod_mat.h** -- matrices over integers mod n
diff --git a/doc/source/fmpz_mod_mpoly.rst.pp b/doc/source/fmpz_mod_mpoly.rst.pp
index 7a40c58829..93e0b472f0 100644
--- a/doc/source/fmpz_mod_mpoly.rst.pp
+++ b/doc/source/fmpz_mod_mpoly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mod-mpoly:
 
 **fmpz_mod_mpoly.h** -- polynomials over the integers mod n
diff --git a/doc/source/fmpz_mod_mpoly_factor.rst.pp b/doc/source/fmpz_mod_mpoly_factor.rst.pp
index eebe1677b1..10150d6e28 100644
--- a/doc/source/fmpz_mod_mpoly_factor.rst.pp
+++ b/doc/source/fmpz_mod_mpoly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mod-mpoly-factor:
 
 **fmpz_mod_mpoly_factor.h** -- factorisation of multivariate polynomials over the integers mod n
diff --git a/doc/source/fmpz_mod_poly.rst.pp b/doc/source/fmpz_mod_poly.rst.pp
index 566ade3258..9dc26b6556 100644
--- a/doc/source/fmpz_mod_poly.rst.pp
+++ b/doc/source/fmpz_mod_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mod-poly:
 
 **fmpz_mod_poly.h** -- polynomials over integers mod n
diff --git a/doc/source/fmpz_mod_poly_factor.rst.pp b/doc/source/fmpz_mod_poly_factor.rst.pp
index 94f43b9bb7..a16847b1f1 100644
--- a/doc/source/fmpz_mod_poly_factor.rst.pp
+++ b/doc/source/fmpz_mod_poly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mod-poly-factor:
 
 **fmpz_mod_poly_factor.h** -- factorisation of polynomials over integers mod n
diff --git a/doc/source/fmpz_mod_vec.rst.pp b/doc/source/fmpz_mod_vec.rst.pp
index dd6902b76e..533a8a5dc3 100644
--- a/doc/source/fmpz_mod_vec.rst.pp
+++ b/doc/source/fmpz_mod_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mod-vec:
 
 **fmpz_mod_vec.h** -- vectors over integers mod n
diff --git a/doc/source/fmpz_mpoly.rst.pp b/doc/source/fmpz_mpoly.rst.pp
index c8ad7e0e1d..c7c7da38ce 100644
--- a/doc/source/fmpz_mpoly.rst.pp
+++ b/doc/source/fmpz_mpoly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mpoly:
 
 **fmpz_mpoly.h** -- multivariate polynomials over the integers
diff --git a/doc/source/fmpz_mpoly_factor.rst.pp b/doc/source/fmpz_mpoly_factor.rst.pp
index 84d33bb4d6..8f986a60ec 100644
--- a/doc/source/fmpz_mpoly_factor.rst.pp
+++ b/doc/source/fmpz_mpoly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mpoly-factor:
 
 **fmpz_mpoly_factor.h** -- factorisation of multivariate polynomials over the integers
diff --git a/doc/source/fmpz_mpoly_q.rst.pp b/doc/source/fmpz_mpoly_q.rst.pp
index 42baa26a88..dadfd6829e 100644
--- a/doc/source/fmpz_mpoly_q.rst.pp
+++ b/doc/source/fmpz_mpoly_q.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-mpoly-q:
 
 **fmpz_mpoly_q.h** -- multivariate rational functions over Q
diff --git a/doc/source/fmpz_poly.rst.pp b/doc/source/fmpz_poly.rst.pp
index a2df9dea5f..45fdfb4924 100644
--- a/doc/source/fmpz_poly.rst.pp
+++ b/doc/source/fmpz_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-poly:
 
 **fmpz_poly.h** -- univariate polynomials over the integers
diff --git a/doc/source/fmpz_poly_factor.rst.pp b/doc/source/fmpz_poly_factor.rst.pp
index df6d93e9d8..496cdf0561 100644
--- a/doc/source/fmpz_poly_factor.rst.pp
+++ b/doc/source/fmpz_poly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-poly-factor:
 
 **fmpz_poly_factor.h** -- factorisation of polynomials over the integers
diff --git a/doc/source/fmpz_poly_mat.rst.pp b/doc/source/fmpz_poly_mat.rst.pp
index 985f5589d7..2b65e7f363 100644
--- a/doc/source/fmpz_poly_mat.rst.pp
+++ b/doc/source/fmpz_poly_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-poly-mat:
 
 **fmpz_poly_mat.h** -- matrices of polynomials over the integers
diff --git a/doc/source/fmpz_poly_q.rst.pp b/doc/source/fmpz_poly_q.rst.pp
index 98dc654652..c78afce747 100644
--- a/doc/source/fmpz_poly_q.rst.pp
+++ b/doc/source/fmpz_poly_q.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-poly-q:
 
 **fmpz_poly_q.h** -- rational functions over the rational numbers
diff --git a/doc/source/fmpz_vec.rst.pp b/doc/source/fmpz_vec.rst.pp
index 04f4e2437e..093da36bf3 100644
--- a/doc/source/fmpz_vec.rst.pp
+++ b/doc/source/fmpz_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpz-vec:
 
 **fmpz_vec.h** -- vectors of integers
diff --git a/doc/source/fmpzi.rst.pp b/doc/source/fmpzi.rst.pp
index ebe9fd3c16..6d5f214397 100644
--- a/doc/source/fmpzi.rst.pp
+++ b/doc/source/fmpzi.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fmpzi:
 
 **fmpzi.h** -- Gaussian integers
diff --git a/doc/source/formulas.rst.pp b/doc/source/formulas.rst.pp
index 5815d18390..afc0621caa 100644
--- a/doc/source/formulas.rst.pp
+++ b/doc/source/formulas.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _general_formulas:
 
 General formulas and bounds
diff --git a/doc/source/fq.rst.pp b/doc/source/fq.rst.pp
index f97caf31fd..2a6ed380ba 100644
--- a/doc/source/fq.rst.pp
+++ b/doc/source/fq.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq:
 
 **fq.h** -- finite fields
diff --git a/doc/source/fq_default.rst.pp b/doc/source/fq_default.rst.pp
index 190da0c868..ae67cd9f89 100644
--- a/doc/source/fq_default.rst.pp
+++ b/doc/source/fq_default.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq_default:
 
 **fq_default.h** -- unified finite fields
diff --git a/doc/source/fq_default_mat.rst.pp b/doc/source/fq_default_mat.rst.pp
index 88e8573ecc..2d6e501977 100644
--- a/doc/source/fq_default_mat.rst.pp
+++ b/doc/source/fq_default_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq_default_mat:
 
 **fq_default_mat.h** -- matrices over finite fields
diff --git a/doc/source/fq_default_poly.rst.pp b/doc/source/fq_default_poly.rst.pp
index 213fb0474a..abd71ab007 100644
--- a/doc/source/fq_default_poly.rst.pp
+++ b/doc/source/fq_default_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq_default_poly:
 
 **fq_default_poly.h** -- univariate polynomials over finite fields
diff --git a/doc/source/fq_default_poly_factor.rst.pp b/doc/source/fq_default_poly_factor.rst.pp
index 842897c602..de820cce59 100644
--- a/doc/source/fq_default_poly_factor.rst.pp
+++ b/doc/source/fq_default_poly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-poly_factor:
 
 **fq_default_poly_factor.h** -- factorisation of univariate polynomials over finite fields
diff --git a/doc/source/fq_embed.rst.pp b/doc/source/fq_embed.rst.pp
index 6d4c84daf4..a7ba2fb6be 100644
--- a/doc/source/fq_embed.rst.pp
+++ b/doc/source/fq_embed.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-embed:
 
 **fq_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_mat.rst.pp b/doc/source/fq_mat.rst.pp
index 9814c80dd1..8556400f79 100644
--- a/doc/source/fq_mat.rst.pp
+++ b/doc/source/fq_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-mat:
 
 **fq_mat.h** -- matrices over finite fields
diff --git a/doc/source/fq_nmod.rst.pp b/doc/source/fq_nmod.rst.pp
index 0e34f03f23..81e805c3a6 100644
--- a/doc/source/fq_nmod.rst.pp
+++ b/doc/source/fq_nmod.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-nmod:
 
 **fq_nmod.h** -- finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_embed.rst.pp b/doc/source/fq_nmod_embed.rst.pp
index 876d9c0ec5..a0cf262041 100644
--- a/doc/source/fq_nmod_embed.rst.pp
+++ b/doc/source/fq_nmod_embed.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-nmod-embed:
 
 **fq_nmod_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_nmod_mat.rst.pp b/doc/source/fq_nmod_mat.rst.pp
index 9ca80b7435..db4850527d 100644
--- a/doc/source/fq_nmod_mat.rst.pp
+++ b/doc/source/fq_nmod_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-nmod-mat:
 
 **fq_nmod_mat.h** -- matrices over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_mpoly.rst.pp b/doc/source/fq_nmod_mpoly.rst.pp
index 567e93491d..1c9ea82468 100644
--- a/doc/source/fq_nmod_mpoly.rst.pp
+++ b/doc/source/fq_nmod_mpoly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq_nmod-mpoly:
 
 **fq_nmod_mpoly.h** -- multivariate polynomials over finite fields of word-sized characteristic
diff --git a/doc/source/fq_nmod_mpoly_factor.rst.pp b/doc/source/fq_nmod_mpoly_factor.rst.pp
index 7281ae792d..e1c9a132dc 100644
--- a/doc/source/fq_nmod_mpoly_factor.rst.pp
+++ b/doc/source/fq_nmod_mpoly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq_nmod-mpoly-factor:
 
 **fq_nmod_mpoly_factor.h** -- factorisation of multivariate polynomials over finite fields of word-sized characteristic
diff --git a/doc/source/fq_nmod_poly.rst.pp b/doc/source/fq_nmod_poly.rst.pp
index a38a702f99..73f2db0c8d 100644
--- a/doc/source/fq_nmod_poly.rst.pp
+++ b/doc/source/fq_nmod_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-nmod-poly:
 
 **fq_nmod_poly.h** -- univariate polynomials over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_poly_factor.rst.pp b/doc/source/fq_nmod_poly_factor.rst.pp
index 10350b97f7..176273d8a9 100644
--- a/doc/source/fq_nmod_poly_factor.rst.pp
+++ b/doc/source/fq_nmod_poly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-nmod-poly-factor:
 
 **fq_nmod_poly_factor.h** -- factorisation of univariate polynomials over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_vec.rst.pp b/doc/source/fq_nmod_vec.rst.pp
index e3d9f87706..e5ab025863 100644
--- a/doc/source/fq_nmod_vec.rst.pp
+++ b/doc/source/fq_nmod_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-nmod-vec:
 
 **fq_nmod_vec.h** -- vectors over finite fields (word-size characteristic)
diff --git a/doc/source/fq_poly.rst.pp b/doc/source/fq_poly.rst.pp
index 6a047bfba3..c6979ac77f 100644
--- a/doc/source/fq_poly.rst.pp
+++ b/doc/source/fq_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-poly:
 
 **fq_poly.h** -- univariate polynomials over finite fields
diff --git a/doc/source/fq_poly_factor.rst.pp b/doc/source/fq_poly_factor.rst.pp
index b1e98c0438..820d68660c 100644
--- a/doc/source/fq_poly_factor.rst.pp
+++ b/doc/source/fq_poly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-poly-factor:
 
 **fq_poly_factor.h** -- factorisation of univariate polynomials over finite fields
diff --git a/doc/source/fq_vec.rst.pp b/doc/source/fq_vec.rst.pp
index 8e7e78267b..556b8cc646 100644
--- a/doc/source/fq_vec.rst.pp
+++ b/doc/source/fq_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-vec:
 
 **fq_vec.h** -- vectors over finite fields
diff --git a/doc/source/fq_zech.rst.pp b/doc/source/fq_zech.rst.pp
index efc1e6f17c..f92ee2c96e 100644
--- a/doc/source/fq_zech.rst.pp
+++ b/doc/source/fq_zech.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-zech:
 
 **fq_zech.h** -- finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_embed.rst.pp b/doc/source/fq_zech_embed.rst.pp
index 2511f5d57b..4f90b1e7a2 100644
--- a/doc/source/fq_zech_embed.rst.pp
+++ b/doc/source/fq_zech_embed.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-zech-embed:
 
 **fq_zech_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_zech_mat.rst.pp b/doc/source/fq_zech_mat.rst.pp
index dda2515d6c..d98263c4b8 100644
--- a/doc/source/fq_zech_mat.rst.pp
+++ b/doc/source/fq_zech_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-zech-mat:
 
 **fq_zech_mat.h** -- matrices over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_poly.rst.pp b/doc/source/fq_zech_poly.rst.pp
index 6d76c9fac7..ef8e7d7fd7 100644
--- a/doc/source/fq_zech_poly.rst.pp
+++ b/doc/source/fq_zech_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-zech-poly:
 
 **fq_zech_poly.h** -- univariate polynomials over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_poly_factor.rst.pp b/doc/source/fq_zech_poly_factor.rst.pp
index 256b437bea..bc28ab3cce 100644
--- a/doc/source/fq_zech_poly_factor.rst.pp
+++ b/doc/source/fq_zech_poly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-zech-poly-factor:
 
 **fq_zech_poly_factor.h** -- factorisation of univariate polynomials over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_vec.rst.pp b/doc/source/fq_zech_vec.rst.pp
index a4d383ec8b..367ae3c802 100644
--- a/doc/source/fq_zech_vec.rst.pp
+++ b/doc/source/fq_zech_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _fq-zech-vec:
 
 **fq_zech_vec.h** -- vectors over finite fields (Zech logarithm representation)
diff --git a/doc/source/gamma.rst.pp b/doc/source/gamma.rst.pp
index c2ea71cd81..f624b970e2 100644
--- a/doc/source/gamma.rst.pp
+++ b/doc/source/gamma.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _algorithms_gamma:
 
 Algorithms for the gamma function
diff --git a/doc/source/gr.rst.pp b/doc/source/gr.rst.pp
index 79992c8a4d..fc6011fb32 100644
--- a/doc/source/gr.rst.pp
+++ b/doc/source/gr.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr:
 
 **gr.h** -- generic structures and their elements
diff --git a/doc/source/gr_domains.rst.pp b/doc/source/gr_domains.rst.pp
index 67658cfc8b..5b91e0ef78 100644
--- a/doc/source/gr_domains.rst.pp
+++ b/doc/source/gr_domains.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr-domains:
 
 **gr.h (continued)** -- builtin domains and types
diff --git a/doc/source/gr_generic.rst.pp b/doc/source/gr_generic.rst.pp
index 4defbb6c36..8db609df63 100644
--- a/doc/source/gr_generic.rst.pp
+++ b/doc/source/gr_generic.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr-generic:
 
 **gr_generic.h** -- basic algorithms and fallback implementations for generic elements
diff --git a/doc/source/gr_implementing.rst.pp b/doc/source/gr_implementing.rst.pp
index 281a91fc53..aac06bfa6f 100644
--- a/doc/source/gr_implementing.rst.pp
+++ b/doc/source/gr_implementing.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr-implementing:
 
 **gr.h (continued)** -- implementing rings
diff --git a/doc/source/gr_mat.rst.pp b/doc/source/gr_mat.rst.pp
index 9ea85cddc8..cd7605949e 100644
--- a/doc/source/gr_mat.rst.pp
+++ b/doc/source/gr_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr-mat:
 
 **gr_mat.h** -- dense matrices over generic rings
diff --git a/doc/source/gr_mpoly.rst.pp b/doc/source/gr_mpoly.rst.pp
index 1a8c8a08f1..73480aa1fe 100644
--- a/doc/source/gr_mpoly.rst.pp
+++ b/doc/source/gr_mpoly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr-mpoly:
 
 **gr_mpoly.h** -- sparse multivariate polynomials over generic rings
diff --git a/doc/source/gr_poly.rst.pp b/doc/source/gr_poly.rst.pp
index 810f914087..d088fa96e5 100644
--- a/doc/source/gr_poly.rst.pp
+++ b/doc/source/gr_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr-poly:
 
 **gr_poly.h** -- dense univariate polynomials over generic rings
diff --git a/doc/source/gr_special.rst.pp b/doc/source/gr_special.rst.pp
index 68c68793be..99fb109988 100644
--- a/doc/source/gr_special.rst.pp
+++ b/doc/source/gr_special.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr-special:
 
 **gr_special.h** -- special arithmetic and transcendental functions
diff --git a/doc/source/gr_vec.rst.pp b/doc/source/gr_vec.rst.pp
index db158b380a..c97fb6ce06 100644
--- a/doc/source/gr_vec.rst.pp
+++ b/doc/source/gr_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _gr-vec:
 
 **gr_vec.h** -- vectors over generic rings
diff --git a/doc/source/history.rst.pp b/doc/source/history.rst.pp
index aefb1a19b9..338728b10d 100644
--- a/doc/source/history.rst.pp
+++ b/doc/source/history.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _history:
 
 History and changes
diff --git a/doc/source/hurwitz.rst.pp b/doc/source/hurwitz.rst.pp
index 50ac135823..6b7aa663c0 100644
--- a/doc/source/hurwitz.rst.pp
+++ b/doc/source/hurwitz.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _algorithms_hurwitz:
 
 Algorithms for the Hurwitz zeta function
diff --git a/doc/source/hypergeometric.rst.pp b/doc/source/hypergeometric.rst.pp
index e602d9c2bf..474d6f106c 100644
--- a/doc/source/hypergeometric.rst.pp
+++ b/doc/source/hypergeometric.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _algorithms_hypergeometric:
 
 Algorithms for hypergeometric functions
diff --git a/doc/source/hypgeom.rst.pp b/doc/source/hypgeom.rst.pp
index dc25d800db..c3138c9c72 100644
--- a/doc/source/hypgeom.rst.pp
+++ b/doc/source/hypgeom.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _hypgeom:
 
 **hypgeom.h** -- support for hypergeometric series
diff --git a/doc/source/index.rst.pp b/doc/source/index.rst.pp
index a2012745a9..4f3ce561c9 100644
--- a/doc/source/index.rst.pp
+++ b/doc/source/index.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. FLINT documentation master file, created by
    sphinx-quickstart on Fri Nov 16 21:59:21 2018.
    You can adapt this file completely to your liking, but it should at least
diff --git a/doc/source/index_arb.rst.pp b/doc/source/index_arb.rst.pp
index 1505571700..049f672498 100644
--- a/doc/source/index_arb.rst.pp
+++ b/doc/source/index_arb.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _index-arb:
 
 **Real and complex numbers (Arb)** : *detailed table of contents*
diff --git a/doc/source/index_generic.rst.pp b/doc/source/index_generic.rst.pp
index e435030fdf..05c388bb2f 100644
--- a/doc/source/index_generic.rst.pp
+++ b/doc/source/index_generic.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _index-generic:
 
 **Generic rings** : *detailed table of contents*
diff --git a/doc/source/index_integers.rst.pp b/doc/source/index_integers.rst.pp
index 4b7853ac79..3e320051e5 100644
--- a/doc/source/index_integers.rst.pp
+++ b/doc/source/index_integers.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _index-integers:
 
 **Integers** : *detailed table of contents*
diff --git a/doc/source/index_integers_mod.rst.pp b/doc/source/index_integers_mod.rst.pp
index 719a7babf6..140d02d73c 100644
--- a/doc/source/index_integers_mod.rst.pp
+++ b/doc/source/index_integers_mod.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _index-integers-mod:
 
 **Integers mod n** : *detailed table of contents*
diff --git a/doc/source/index_rationals.rst.pp b/doc/source/index_rationals.rst.pp
index 7d75c5f6ef..126f991f18 100644
--- a/doc/source/index_rationals.rst.pp
+++ b/doc/source/index_rationals.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _index-rationals:
 
 **Rational numbers** : *detailed table of contents*
diff --git a/doc/source/introduction.rst.pp b/doc/source/introduction.rst.pp
index 01575b5816..41f49a3e7b 100644
--- a/doc/source/introduction.rst.pp
+++ b/doc/source/introduction.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _introduction:
 
 **Introduction**
diff --git a/doc/source/introduction_calcium.rst.pp b/doc/source/introduction_calcium.rst.pp
index 899fc5af7a..8edc545508 100644
--- a/doc/source/introduction_calcium.rst.pp
+++ b/doc/source/introduction_calcium.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _introduction-calcium:
 
 Introduction
diff --git a/doc/source/issues.rst.pp b/doc/source/issues.rst.pp
index 3e9827b176..1df4a766b9 100644
--- a/doc/source/issues.rst.pp
+++ b/doc/source/issues.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _issues:
 
 Technical conventions and potential issues
diff --git a/doc/source/long_extras.rst.pp b/doc/source/long_extras.rst.pp
index a9f90d511c..4c5ea2e6f7 100644
--- a/doc/source/long_extras.rst.pp
+++ b/doc/source/long_extras.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _long-extras:
 
 **long_extras.h** -- support functions for signed word arithmetic
diff --git a/doc/source/longlong.rst.pp b/doc/source/longlong.rst.pp
index bcfdd6cf67..0e897dc0c7 100644
--- a/doc/source/longlong.rst.pp
+++ b/doc/source/longlong.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _longlong:
 
 **longlong.h** -- support functions for multi-word arithmetic
diff --git a/doc/source/machine_vectors.rst.pp b/doc/source/machine_vectors.rst.pp
index e10c79a53e..5d8dccbec9 100644
--- a/doc/source/machine_vectors.rst.pp
+++ b/doc/source/machine_vectors.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _machine-vectors:
 
 **machine_vectors.h** -- SIMD-accelerated operations on fixed-length vectors
diff --git a/doc/source/mag.rst.pp b/doc/source/mag.rst.pp
index 4a18c5b986..1c81a9ea4b 100644
--- a/doc/source/mag.rst.pp
+++ b/doc/source/mag.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _mag:
 
 **mag.h** -- fixed-precision unsigned floating-point numbers for bounds
diff --git a/doc/source/memory.rst.pp b/doc/source/memory.rst.pp
index 44f0aab9a6..a1d2fce068 100644
--- a/doc/source/memory.rst.pp
+++ b/doc/source/memory.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _memory:
 
 **Memory management**
diff --git a/doc/source/mpfr_mat.rst.pp b/doc/source/mpfr_mat.rst.pp
index cc3ad6eee6..3cc641006e 100644
--- a/doc/source/mpfr_mat.rst.pp
+++ b/doc/source/mpfr_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _mpfr-mat:
 
 **mpfr_mat.h** -- matrices of MPFR floating-point numbers
diff --git a/doc/source/mpfr_vec.rst.pp b/doc/source/mpfr_vec.rst.pp
index 84631ebdf7..30754d9d66 100644
--- a/doc/source/mpfr_vec.rst.pp
+++ b/doc/source/mpfr_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _mpfr-vec:
 
 **mpfr_vec.h** -- vectors of MPFR floating-point numbers
diff --git a/doc/source/mpn_extras.rst.pp b/doc/source/mpn_extras.rst.pp
index 9921451b22..3b6ecb8f0f 100644
--- a/doc/source/mpn_extras.rst.pp
+++ b/doc/source/mpn_extras.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _mpn-extras:
 
 **mpn_extras.h** -- support functions for limb arrays
diff --git a/doc/source/mpn_mod.rst.pp b/doc/source/mpn_mod.rst.pp
index 3ce0598566..54d6f57a3c 100644
--- a/doc/source/mpn_mod.rst.pp
+++ b/doc/source/mpn_mod.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _mpn-mod:
 
 **mpn_mod.h** -- integers mod n (packed multi-word n)
diff --git a/doc/source/mpoly.rst.pp b/doc/source/mpoly.rst.pp
index 55f2cce507..9c22c1da9a 100644
--- a/doc/source/mpoly.rst.pp
+++ b/doc/source/mpoly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _mpoly:
 
 **mpoly.h** -- support functions for multivariate polynomials
diff --git a/doc/source/nf.rst.pp b/doc/source/nf.rst.pp
index ce5825e775..0829457f70 100644
--- a/doc/source/nf.rst.pp
+++ b/doc/source/nf.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nf:
 
 **nf.h** -- number fields
diff --git a/doc/source/nf_elem.rst.pp b/doc/source/nf_elem.rst.pp
index f95ca1de6b..691ece4f69 100644
--- a/doc/source/nf_elem.rst.pp
+++ b/doc/source/nf_elem.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nf_elem:
 
 **nf_elem.h** -- number field elements
diff --git a/doc/source/nfloat.rst.pp b/doc/source/nfloat.rst.pp
index 9ac02883cd..205ebcbe5a 100644
--- a/doc/source/nfloat.rst.pp
+++ b/doc/source/nfloat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nfloat:
 
 **nfloat.h** -- packed floating-point numbers with n-word precision
diff --git a/doc/source/nmod.rst.pp b/doc/source/nmod.rst.pp
index fcb5921812..8231bd6dae 100644
--- a/doc/source/nmod.rst.pp
+++ b/doc/source/nmod.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nmod:
 
 **nmod.h** -- integers mod n (word-size n)
diff --git a/doc/source/nmod_mat.rst.pp b/doc/source/nmod_mat.rst.pp
index b1da8f22ca..f30b43006f 100644
--- a/doc/source/nmod_mat.rst.pp
+++ b/doc/source/nmod_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nmod-mat:
 
 **nmod_mat.h** -- matrices over integers mod n (word-size n)
diff --git a/doc/source/nmod_mpoly.rst.pp b/doc/source/nmod_mpoly.rst.pp
index 7553315112..cf32cfc45c 100644
--- a/doc/source/nmod_mpoly.rst.pp
+++ b/doc/source/nmod_mpoly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nmod-mpoly:
 
 **nmod_mpoly.h** -- multivariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_mpoly_factor.rst.pp b/doc/source/nmod_mpoly_factor.rst.pp
index c6d39ddf00..6304330dbc 100644
--- a/doc/source/nmod_mpoly_factor.rst.pp
+++ b/doc/source/nmod_mpoly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nmod-mpoly-factor:
 
 **nmod_mpoly_factor.h** -- factorisation of multivariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly.rst.pp b/doc/source/nmod_poly.rst.pp
index 6bb0e4d6ee..1773697525 100644
--- a/doc/source/nmod_poly.rst.pp
+++ b/doc/source/nmod_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nmod-poly:
 
 **nmod_poly.h** -- univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly_factor.rst.pp b/doc/source/nmod_poly_factor.rst.pp
index a9b9a6bf4e..cc46093506 100644
--- a/doc/source/nmod_poly_factor.rst.pp
+++ b/doc/source/nmod_poly_factor.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nmod-poly-factor:
 
 **nmod_poly_factor.h** -- factorisation of univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly_mat.rst.pp b/doc/source/nmod_poly_mat.rst.pp
index 1979f2243b..a2ae0db2fa 100644
--- a/doc/source/nmod_poly_mat.rst.pp
+++ b/doc/source/nmod_poly_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nmod-poly-mat:
 
 **nmod_poly_mat.h** -- matrices of univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_vec.rst.pp b/doc/source/nmod_vec.rst.pp
index 55c4e6c14d..ed730aa460 100644
--- a/doc/source/nmod_vec.rst.pp
+++ b/doc/source/nmod_vec.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _nmod-vec:
 
 **nmod_vec.h** -- vectors over integers mod n (word-size n)
diff --git a/doc/source/overview.rst.pp b/doc/source/overview.rst.pp
index 9f797c43ed..5c1758a2d8 100644
--- a/doc/source/overview.rst.pp
+++ b/doc/source/overview.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _overview:
 
 Feature overview
diff --git a/doc/source/padic.rst.pp b/doc/source/padic.rst.pp
index f7ac874b4b..3b836385f8 100644
--- a/doc/source/padic.rst.pp
+++ b/doc/source/padic.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _padic:
 
 **padic.h** -- p-adic numbers
diff --git a/doc/source/padic_mat.rst.pp b/doc/source/padic_mat.rst.pp
index da8d19a3f9..d424f537b3 100644
--- a/doc/source/padic_mat.rst.pp
+++ b/doc/source/padic_mat.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _padic-mat:
 
 **padic_mat.h** -- matrices over p-adic numbers
diff --git a/doc/source/padic_poly.rst.pp b/doc/source/padic_poly.rst.pp
index 9d7c8c657b..4aef08bc9f 100644
--- a/doc/source/padic_poly.rst.pp
+++ b/doc/source/padic_poly.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _padic-poly:
 
 **padic_poly.h** -- polynomials over p-adic numbers
diff --git a/doc/source/partitions.rst.pp b/doc/source/partitions.rst.pp
index 3b2aca6ed4..8f0d5caf1f 100644
--- a/doc/source/partitions.rst.pp
+++ b/doc/source/partitions.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _partitions:
 
 **partitions.h** -- computation of the partition function
diff --git a/doc/source/perm.rst.pp b/doc/source/perm.rst.pp
index 9dfde7fe80..aa1670ea52 100644
--- a/doc/source/perm.rst.pp
+++ b/doc/source/perm.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _perm:
 
 **perm.h** -- permutations
diff --git a/doc/source/polylogarithms.rst.pp b/doc/source/polylogarithms.rst.pp
index b26c32cddf..3f2a487d9e 100644
--- a/doc/source/polylogarithms.rst.pp
+++ b/doc/source/polylogarithms.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _algorithms_polylogarithms:
 
 Algorithms for polylogarithms
diff --git a/doc/source/portability.rst.pp b/doc/source/portability.rst.pp
index 96531d2a66..55370e1400 100644
--- a/doc/source/portability.rst.pp
+++ b/doc/source/portability.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _portability:
 
 **Portability**
diff --git a/doc/source/profiler.rst.pp b/doc/source/profiler.rst.pp
index abb5c613a6..02b16239aa 100644
--- a/doc/source/profiler.rst.pp
+++ b/doc/source/profiler.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _profiler:
 
 **profiler.h** -- performance profiling
diff --git a/doc/source/python_flint.rst.pp b/doc/source/python_flint.rst.pp
index 499cdd5a99..ac65fc0903 100644
--- a/doc/source/python_flint.rst.pp
+++ b/doc/source/python_flint.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _pyflint:
 
 **flint_ctypes** - Python interface
diff --git a/doc/source/qadic.rst.pp b/doc/source/qadic.rst.pp
index 22d48d0434..3ab050d793 100644
--- a/doc/source/qadic.rst.pp
+++ b/doc/source/qadic.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _qadic:
 
 **qadic.h** -- unramified extensions over p-adic numbers
diff --git a/doc/source/qfb.rst.pp b/doc/source/qfb.rst.pp
index cc6290bc95..bd6ae158af 100644
--- a/doc/source/qfb.rst.pp
+++ b/doc/source/qfb.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _qfb:
 
 **qfb.h** -- binary quadratic forms
diff --git a/doc/source/qqbar.rst.pp b/doc/source/qqbar.rst.pp
index 45ecb00a2e..b9395e8a08 100644
--- a/doc/source/qqbar.rst.pp
+++ b/doc/source/qqbar.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _qqbar:
 
 **qqbar.h** -- algebraic numbers represented by minimal polynomials
diff --git a/doc/source/qsieve.rst.pp b/doc/source/qsieve.rst.pp
index cd497140a3..3db47d2e01 100644
--- a/doc/source/qsieve.rst.pp
+++ b/doc/source/qsieve.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _qsieve:
 
 **qsieve.h** -- Quadratic sieve
diff --git a/doc/source/references.rst.pp b/doc/source/references.rst.pp
index 83ed474d26..b5003eda72 100644
--- a/doc/source/references.rst.pp
+++ b/doc/source/references.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 References
 ------------
 
diff --git a/doc/source/thread_pool.rst.pp b/doc/source/thread_pool.rst.pp
index 028f8e0104..1c81f028fe 100644
--- a/doc/source/thread_pool.rst.pp
+++ b/doc/source/thread_pool.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _thread-pool:
 
 **thread_pool.h** -- thread pool
diff --git a/doc/source/threading.rst.pp b/doc/source/threading.rst.pp
index 815544fe19..bff5c4d6ef 100644
--- a/doc/source/threading.rst.pp
+++ b/doc/source/threading.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _threading:
 
 **Threading**
diff --git a/doc/source/ulong_extras.rst.pp b/doc/source/ulong_extras.rst.pp
index 9e3e30f244..0ebbb19b0c 100644
--- a/doc/source/ulong_extras.rst.pp
+++ b/doc/source/ulong_extras.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _ulong-extras:
 
 **ulong_extras.h** -- arithmetic and number-theoretic functions for single-word integers
diff --git a/doc/source/using.rst.pp b/doc/source/using.rst.pp
index 04ec07a033..aa8daacfd4 100644
--- a/doc/source/using.rst.pp
+++ b/doc/source/using.rst.pp
@@ -1,3 +1,4 @@
+include(`config.m4')dnl
 .. _using:
 
 Using ball arithmetic

From d9c39c1546802dbd6a10ce6158daf79008488e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 11:23:21 +0100
Subject: [PATCH 06/20] Include macros.m4 instead of config.m4

---
 doc/source/acb.rst.pp                    | 2 +-
 doc/source/acb_calc.rst.pp               | 2 +-
 doc/source/acb_dft.rst.pp                | 2 +-
 doc/source/acb_dirichlet.rst.pp          | 2 +-
 doc/source/acb_elliptic.rst.pp           | 2 +-
 doc/source/acb_hypgeom.rst.pp            | 2 +-
 doc/source/acb_mat.rst.pp                | 2 +-
 doc/source/acb_modular.rst.pp            | 2 +-
 doc/source/acb_poly.rst.pp               | 2 +-
 doc/source/acb_theta.rst.pp              | 2 +-
 doc/source/acf.rst.pp                    | 2 +-
 doc/source/agm.rst.pp                    | 2 +-
 doc/source/aprcl.rst.pp                  | 2 +-
 doc/source/arb.rst.pp                    | 2 +-
 doc/source/arb_calc.rst.pp               | 2 +-
 doc/source/arb_fmpz_poly.rst.pp          | 2 +-
 doc/source/arb_fpwrap.rst.pp             | 2 +-
 doc/source/arb_hypgeom.rst.pp            | 2 +-
 doc/source/arb_mat.rst.pp                | 2 +-
 doc/source/arb_poly.rst.pp               | 2 +-
 doc/source/arf.rst.pp                    | 2 +-
 doc/source/arith.rst.pp                  | 2 +-
 doc/source/bernoulli.rst.pp              | 2 +-
 doc/source/bool_mat.rst.pp               | 2 +-
 doc/source/bug_reporting.rst.pp          | 2 +-
 doc/source/building.rst.pp               | 2 +-
 doc/source/ca.rst.pp                     | 2 +-
 doc/source/ca_ext.rst.pp                 | 2 +-
 doc/source/ca_field.rst.pp               | 2 +-
 doc/source/ca_mat.rst.pp                 | 2 +-
 doc/source/ca_poly.rst.pp                | 2 +-
 doc/source/ca_vec.rst.pp                 | 2 +-
 doc/source/calcium.rst.pp                | 2 +-
 doc/source/constants.rst.pp              | 2 +-
 doc/source/contributing.rst.pp           | 2 +-
 doc/source/contributors.rst.pp           | 2 +-
 doc/source/d_mat.rst.pp                  | 2 +-
 doc/source/d_vec.rst.pp                  | 2 +-
 doc/source/dirichlet.rst.pp              | 2 +-
 doc/source/dlog.rst.pp                   | 2 +-
 doc/source/double_extras.rst.pp          | 2 +-
 doc/source/double_interval.rst.pp        | 2 +-
 doc/source/examples.rst.pp               | 2 +-
 doc/source/examples_arb.rst.pp           | 2 +-
 doc/source/examples_calcium.rst.pp       | 2 +-
 doc/source/fexpr.rst.pp                  | 2 +-
 doc/source/fexpr_builtin.rst.pp          | 2 +-
 doc/source/fft.rst.pp                    | 2 +-
 doc/source/fft_small.rst.pp              | 2 +-
 doc/source/flint.rst.pp                  | 2 +-
 doc/source/fmpq.rst.pp                   | 2 +-
 doc/source/fmpq_mat.rst.pp               | 2 +-
 doc/source/fmpq_mpoly.rst.pp             | 2 +-
 doc/source/fmpq_mpoly_factor.rst.pp      | 2 +-
 doc/source/fmpq_poly.rst.pp              | 2 +-
 doc/source/fmpq_vec.rst.pp               | 2 +-
 doc/source/fmpz.rst.pp                   | 2 +-
 doc/source/fmpz_extras.rst.pp            | 2 +-
 doc/source/fmpz_factor.rst.pp            | 2 +-
 doc/source/fmpz_lll.rst.pp               | 2 +-
 doc/source/fmpz_mat.rst.pp               | 2 +-
 doc/source/fmpz_mod.rst.pp               | 2 +-
 doc/source/fmpz_mod_mat.rst.pp           | 2 +-
 doc/source/fmpz_mod_mpoly.rst.pp         | 2 +-
 doc/source/fmpz_mod_mpoly_factor.rst.pp  | 2 +-
 doc/source/fmpz_mod_poly.rst.pp          | 2 +-
 doc/source/fmpz_mod_poly_factor.rst.pp   | 2 +-
 doc/source/fmpz_mod_vec.rst.pp           | 2 +-
 doc/source/fmpz_mpoly.rst.pp             | 2 +-
 doc/source/fmpz_mpoly_factor.rst.pp      | 2 +-
 doc/source/fmpz_mpoly_q.rst.pp           | 2 +-
 doc/source/fmpz_poly.rst.pp              | 2 +-
 doc/source/fmpz_poly_factor.rst.pp       | 2 +-
 doc/source/fmpz_poly_mat.rst.pp          | 2 +-
 doc/source/fmpz_poly_q.rst.pp            | 2 +-
 doc/source/fmpz_vec.rst.pp               | 2 +-
 doc/source/fmpzi.rst.pp                  | 2 +-
 doc/source/formulas.rst.pp               | 2 +-
 doc/source/fq.rst.pp                     | 2 +-
 doc/source/fq_default.rst.pp             | 2 +-
 doc/source/fq_default_mat.rst.pp         | 2 +-
 doc/source/fq_default_poly.rst.pp        | 2 +-
 doc/source/fq_default_poly_factor.rst.pp | 2 +-
 doc/source/fq_embed.rst.pp               | 2 +-
 doc/source/fq_mat.rst.pp                 | 2 +-
 doc/source/fq_nmod.rst.pp                | 2 +-
 doc/source/fq_nmod_embed.rst.pp          | 2 +-
 doc/source/fq_nmod_mat.rst.pp            | 2 +-
 doc/source/fq_nmod_mpoly.rst.pp          | 2 +-
 doc/source/fq_nmod_mpoly_factor.rst.pp   | 2 +-
 doc/source/fq_nmod_poly.rst.pp           | 2 +-
 doc/source/fq_nmod_poly_factor.rst.pp    | 2 +-
 doc/source/fq_nmod_vec.rst.pp            | 2 +-
 doc/source/fq_poly.rst.pp                | 2 +-
 doc/source/fq_poly_factor.rst.pp         | 2 +-
 doc/source/fq_vec.rst.pp                 | 2 +-
 doc/source/fq_zech.rst.pp                | 2 +-
 doc/source/fq_zech_embed.rst.pp          | 2 +-
 doc/source/fq_zech_mat.rst.pp            | 2 +-
 doc/source/fq_zech_poly.rst.pp           | 2 +-
 doc/source/fq_zech_poly_factor.rst.pp    | 2 +-
 doc/source/fq_zech_vec.rst.pp            | 2 +-
 doc/source/gamma.rst.pp                  | 2 +-
 doc/source/gr.rst.pp                     | 2 +-
 doc/source/gr_domains.rst.pp             | 2 +-
 doc/source/gr_generic.rst.pp             | 2 +-
 doc/source/gr_implementing.rst.pp        | 2 +-
 doc/source/gr_mat.rst.pp                 | 2 +-
 doc/source/gr_mpoly.rst.pp               | 2 +-
 doc/source/gr_poly.rst.pp                | 2 +-
 doc/source/gr_special.rst.pp             | 2 +-
 doc/source/gr_vec.rst.pp                 | 2 +-
 doc/source/history.rst.pp                | 2 +-
 doc/source/hurwitz.rst.pp                | 2 +-
 doc/source/hypergeometric.rst.pp         | 2 +-
 doc/source/hypgeom.rst.pp                | 2 +-
 doc/source/index.rst.pp                  | 2 +-
 doc/source/index_arb.rst.pp              | 2 +-
 doc/source/index_generic.rst.pp          | 2 +-
 doc/source/index_integers.rst.pp         | 2 +-
 doc/source/index_integers_mod.rst.pp     | 2 +-
 doc/source/index_rationals.rst.pp        | 2 +-
 doc/source/introduction.rst.pp           | 2 +-
 doc/source/introduction_calcium.rst.pp   | 2 +-
 doc/source/issues.rst.pp                 | 2 +-
 doc/source/long_extras.rst.pp            | 2 +-
 doc/source/longlong.rst.pp               | 2 +-
 doc/source/machine_vectors.rst.pp        | 2 +-
 doc/source/mag.rst.pp                    | 2 +-
 doc/source/memory.rst.pp                 | 2 +-
 doc/source/mpfr_mat.rst.pp               | 2 +-
 doc/source/mpfr_vec.rst.pp               | 2 +-
 doc/source/mpn_extras.rst.pp             | 2 +-
 doc/source/mpn_mod.rst.pp                | 2 +-
 doc/source/mpoly.rst.pp                  | 2 +-
 doc/source/nf.rst.pp                     | 2 +-
 doc/source/nf_elem.rst.pp                | 2 +-
 doc/source/nfloat.rst.pp                 | 2 +-
 doc/source/nmod.rst.pp                   | 2 +-
 doc/source/nmod_mat.rst.pp               | 2 +-
 doc/source/nmod_mpoly.rst.pp             | 2 +-
 doc/source/nmod_mpoly_factor.rst.pp      | 2 +-
 doc/source/nmod_poly.rst.pp              | 2 +-
 doc/source/nmod_poly_factor.rst.pp       | 2 +-
 doc/source/nmod_poly_mat.rst.pp          | 2 +-
 doc/source/nmod_vec.rst.pp               | 2 +-
 doc/source/overview.rst.pp               | 2 +-
 doc/source/padic.rst.pp                  | 2 +-
 doc/source/padic_mat.rst.pp              | 2 +-
 doc/source/padic_poly.rst.pp             | 2 +-
 doc/source/partitions.rst.pp             | 2 +-
 doc/source/perm.rst.pp                   | 2 +-
 doc/source/polylogarithms.rst.pp         | 2 +-
 doc/source/portability.rst.pp            | 2 +-
 doc/source/profiler.rst.pp               | 2 +-
 doc/source/python_flint.rst.pp           | 2 +-
 doc/source/qadic.rst.pp                  | 2 +-
 doc/source/qfb.rst.pp                    | 2 +-
 doc/source/qqbar.rst.pp                  | 2 +-
 doc/source/qsieve.rst.pp                 | 2 +-
 doc/source/references.rst.pp             | 2 +-
 doc/source/thread_pool.rst.pp            | 2 +-
 doc/source/threading.rst.pp              | 2 +-
 doc/source/ulong_extras.rst.pp           | 2 +-
 doc/source/using.rst.pp                  | 2 +-
 165 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/doc/source/acb.rst.pp b/doc/source/acb.rst.pp
index 2f49da9c0f..d0e29cb178 100644
--- a/doc/source/acb.rst.pp
+++ b/doc/source/acb.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb:
 
 **acb.h** -- complex numbers
diff --git a/doc/source/acb_calc.rst.pp b/doc/source/acb_calc.rst.pp
index 327da58009..1bc21a1fdc 100644
--- a/doc/source/acb_calc.rst.pp
+++ b/doc/source/acb_calc.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-calc:
 
 **acb_calc.h** -- calculus with complex-valued functions
diff --git a/doc/source/acb_dft.rst.pp b/doc/source/acb_dft.rst.pp
index a4a27715fc..2e683963b6 100644
--- a/doc/source/acb_dft.rst.pp
+++ b/doc/source/acb_dft.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-dft:
 
 **acb_dft.h** -- Discrete Fourier transform
diff --git a/doc/source/acb_dirichlet.rst.pp b/doc/source/acb_dirichlet.rst.pp
index b9f2f125f7..33200505b7 100644
--- a/doc/source/acb_dirichlet.rst.pp
+++ b/doc/source/acb_dirichlet.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-dirichlet:
 
 **acb_dirichlet.h** -- Dirichlet L-functions, Riemann zeta and related functions
diff --git a/doc/source/acb_elliptic.rst.pp b/doc/source/acb_elliptic.rst.pp
index 7a9e66dc10..237b4239d7 100644
--- a/doc/source/acb_elliptic.rst.pp
+++ b/doc/source/acb_elliptic.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-elliptic:
 
 **acb_elliptic.h** -- elliptic integrals and functions of complex variables
diff --git a/doc/source/acb_hypgeom.rst.pp b/doc/source/acb_hypgeom.rst.pp
index 7b02895d3f..f1775f6a75 100644
--- a/doc/source/acb_hypgeom.rst.pp
+++ b/doc/source/acb_hypgeom.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-hypgeom:
 
 **acb_hypgeom.h** -- hypergeometric functions of complex variables
diff --git a/doc/source/acb_mat.rst.pp b/doc/source/acb_mat.rst.pp
index 8e3c6230a4..9a10beb2fb 100644
--- a/doc/source/acb_mat.rst.pp
+++ b/doc/source/acb_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-mat:
 
 **acb_mat.h** -- matrices over the complex numbers
diff --git a/doc/source/acb_modular.rst.pp b/doc/source/acb_modular.rst.pp
index f79e901084..898885a2e3 100644
--- a/doc/source/acb_modular.rst.pp
+++ b/doc/source/acb_modular.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-modular:
 
 **acb_modular.h** -- modular forms of complex variables
diff --git a/doc/source/acb_poly.rst.pp b/doc/source/acb_poly.rst.pp
index d56536c2b1..ae0f8d9c7f 100644
--- a/doc/source/acb_poly.rst.pp
+++ b/doc/source/acb_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-poly:
 
 **acb_poly.h** -- polynomials over the complex numbers
diff --git a/doc/source/acb_theta.rst.pp b/doc/source/acb_theta.rst.pp
index b9328d65c1..d08320ab21 100644
--- a/doc/source/acb_theta.rst.pp
+++ b/doc/source/acb_theta.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acb-theta:
 
 **acb_theta.h** -- Riemann theta functions
diff --git a/doc/source/acf.rst.pp b/doc/source/acf.rst.pp
index dc015afa4a..3cf542cc2f 100644
--- a/doc/source/acf.rst.pp
+++ b/doc/source/acf.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _acf:
 
 **acf.h** -- complex floating-point numbers
diff --git a/doc/source/agm.rst.pp b/doc/source/agm.rst.pp
index 163fa7c442..4096224fcc 100644
--- a/doc/source/agm.rst.pp
+++ b/doc/source/agm.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _algorithms_agm:
 
 Algorithms for the arithmetic-geometric mean
diff --git a/doc/source/aprcl.rst.pp b/doc/source/aprcl.rst.pp
index 33e87f12e8..dbb4d85d46 100644
--- a/doc/source/aprcl.rst.pp
+++ b/doc/source/aprcl.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _aprcl:
 
 **aprcl.h** -- APRCL primality testing
diff --git a/doc/source/arb.rst.pp b/doc/source/arb.rst.pp
index d2f3f722a9..d24d0a4f15 100644
--- a/doc/source/arb.rst.pp
+++ b/doc/source/arb.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arb:
 
 **arb.h** -- real numbers
diff --git a/doc/source/arb_calc.rst.pp b/doc/source/arb_calc.rst.pp
index 4d9f130ca1..cbd8a9c837 100644
--- a/doc/source/arb_calc.rst.pp
+++ b/doc/source/arb_calc.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arb-calc:
 
 **arb_calc.h** -- calculus with real-valued functions
diff --git a/doc/source/arb_fmpz_poly.rst.pp b/doc/source/arb_fmpz_poly.rst.pp
index 7f664f5b5e..4db0914e44 100644
--- a/doc/source/arb_fmpz_poly.rst.pp
+++ b/doc/source/arb_fmpz_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arb_fmpz_poly:
 
 **arb_fmpz_poly.h** -- extra methods for integer polynomials
diff --git a/doc/source/arb_fpwrap.rst.pp b/doc/source/arb_fpwrap.rst.pp
index caa1e0791f..2c37f52d6f 100644
--- a/doc/source/arb_fpwrap.rst.pp
+++ b/doc/source/arb_fpwrap.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arb_fpwrap:
 
 **arb_fpwrap.h** -- floating-point wrappers of Arb mathematical functions
diff --git a/doc/source/arb_hypgeom.rst.pp b/doc/source/arb_hypgeom.rst.pp
index 2a47d53fda..59f2d5966c 100644
--- a/doc/source/arb_hypgeom.rst.pp
+++ b/doc/source/arb_hypgeom.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arb-hypgeom:
 
 **arb_hypgeom.h** -- hypergeometric functions of real variables
diff --git a/doc/source/arb_mat.rst.pp b/doc/source/arb_mat.rst.pp
index dd7a364a36..ea775a6284 100644
--- a/doc/source/arb_mat.rst.pp
+++ b/doc/source/arb_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arb-mat:
 
 **arb_mat.h** -- matrices over the real numbers
diff --git a/doc/source/arb_poly.rst.pp b/doc/source/arb_poly.rst.pp
index 605e830186..5e30631c12 100644
--- a/doc/source/arb_poly.rst.pp
+++ b/doc/source/arb_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arb-poly:
 
 **arb_poly.h** -- polynomials over the real numbers
diff --git a/doc/source/arf.rst.pp b/doc/source/arf.rst.pp
index 080ef49264..ccee5e8bf5 100644
--- a/doc/source/arf.rst.pp
+++ b/doc/source/arf.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arf:
 
 **arf.h** -- arbitrary-precision floating-point numbers
diff --git a/doc/source/arith.rst.pp b/doc/source/arith.rst.pp
index ae68e25a39..db7d7991c1 100644
--- a/doc/source/arith.rst.pp
+++ b/doc/source/arith.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _arith:
 
 **arith.h** -- arithmetic and special functions
diff --git a/doc/source/bernoulli.rst.pp b/doc/source/bernoulli.rst.pp
index 3a30fe168b..59b7e5d272 100644
--- a/doc/source/bernoulli.rst.pp
+++ b/doc/source/bernoulli.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _bernoulli:
 
 **bernoulli.h** -- support for Bernoulli numbers
diff --git a/doc/source/bool_mat.rst.pp b/doc/source/bool_mat.rst.pp
index bbb7af9907..78c2a21abf 100644
--- a/doc/source/bool_mat.rst.pp
+++ b/doc/source/bool_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _bool-mat:
 
 **bool_mat.h** -- matrices over booleans
diff --git a/doc/source/bug_reporting.rst.pp b/doc/source/bug_reporting.rst.pp
index 406cd18873..337fac8b66 100644
--- a/doc/source/bug_reporting.rst.pp
+++ b/doc/source/bug_reporting.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _bug_reporting:
 
 **Bug reporting**
diff --git a/doc/source/building.rst.pp b/doc/source/building.rst.pp
index 51f23ad66b..b63b1e307a 100644
--- a/doc/source/building.rst.pp
+++ b/doc/source/building.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _building:
 
 **Building, testing and installing**
diff --git a/doc/source/ca.rst.pp b/doc/source/ca.rst.pp
index c9009b20db..aeeb4a9754 100644
--- a/doc/source/ca.rst.pp
+++ b/doc/source/ca.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _ca:
 
 **ca.h** -- exact real and complex numbers
diff --git a/doc/source/ca_ext.rst.pp b/doc/source/ca_ext.rst.pp
index 92c780d509..353668907d 100644
--- a/doc/source/ca_ext.rst.pp
+++ b/doc/source/ca_ext.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _ca-ext:
 
 **ca_ext.h** -- real and complex extension numbers
diff --git a/doc/source/ca_field.rst.pp b/doc/source/ca_field.rst.pp
index e07dfbd977..bd8e0e5c53 100644
--- a/doc/source/ca_field.rst.pp
+++ b/doc/source/ca_field.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _ca-field:
 
 **ca_field.h** -- extension fields
diff --git a/doc/source/ca_mat.rst.pp b/doc/source/ca_mat.rst.pp
index d72edd14ed..1161f2fa8c 100644
--- a/doc/source/ca_mat.rst.pp
+++ b/doc/source/ca_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _ca-mat:
 
 **ca_mat.h** -- matrices over the real and complex numbers
diff --git a/doc/source/ca_poly.rst.pp b/doc/source/ca_poly.rst.pp
index 5c0b48ec9d..a6a3022cba 100644
--- a/doc/source/ca_poly.rst.pp
+++ b/doc/source/ca_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _ca-poly:
 
 **ca_poly.h** -- dense univariate polynomials over the real and complex numbers
diff --git a/doc/source/ca_vec.rst.pp b/doc/source/ca_vec.rst.pp
index afad15d0b0..f8fc6df8c2 100644
--- a/doc/source/ca_vec.rst.pp
+++ b/doc/source/ca_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _ca-vec:
 
 **ca_vec.h** -- vectors of real and complex numbers
diff --git a/doc/source/calcium.rst.pp b/doc/source/calcium.rst.pp
index 8784ea81ce..6b480f3086 100644
--- a/doc/source/calcium.rst.pp
+++ b/doc/source/calcium.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _calcium:
 
 **calcium.h** -- global definitions
diff --git a/doc/source/constants.rst.pp b/doc/source/constants.rst.pp
index 62e6813b5e..09e17e4aae 100644
--- a/doc/source/constants.rst.pp
+++ b/doc/source/constants.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _algorithms_constants:
 
 Algorithms for mathematical constants
diff --git a/doc/source/contributing.rst.pp b/doc/source/contributing.rst.pp
index a961eff2aa..404ae4198b 100644
--- a/doc/source/contributing.rst.pp
+++ b/doc/source/contributing.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _contributing:
 
 **Contributing to FLINT**
diff --git a/doc/source/contributors.rst.pp b/doc/source/contributors.rst.pp
index d42bb24d95..f0bf610471 100644
--- a/doc/source/contributors.rst.pp
+++ b/doc/source/contributors.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _contributors:
 
 **Contributors**
diff --git a/doc/source/d_mat.rst.pp b/doc/source/d_mat.rst.pp
index 5136388280..0abff86631 100644
--- a/doc/source/d_mat.rst.pp
+++ b/doc/source/d_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _d-mat:
 
 **d_mat.h** -- double precision matrices
diff --git a/doc/source/d_vec.rst.pp b/doc/source/d_vec.rst.pp
index 30edf0546f..0b757356e7 100644
--- a/doc/source/d_vec.rst.pp
+++ b/doc/source/d_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _d-vec:
 
 **d_vec.h** -- double precision vectors
diff --git a/doc/source/dirichlet.rst.pp b/doc/source/dirichlet.rst.pp
index 7d29adb2d7..3bd74afad2 100644
--- a/doc/source/dirichlet.rst.pp
+++ b/doc/source/dirichlet.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _dirichlet:
 
 **dirichlet.h** -- Dirichlet characters
diff --git a/doc/source/dlog.rst.pp b/doc/source/dlog.rst.pp
index e65516dd79..7d10bdec16 100644
--- a/doc/source/dlog.rst.pp
+++ b/doc/source/dlog.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _dlog:
 
 **dlog.h** -- discrete logarithms mod ulong primes
diff --git a/doc/source/double_extras.rst.pp b/doc/source/double_extras.rst.pp
index d71bb745f1..ff9a31a55b 100644
--- a/doc/source/double_extras.rst.pp
+++ b/doc/source/double_extras.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _double-extras:
 
 **double_extras.h** -- support functions for double arithmetic
diff --git a/doc/source/double_interval.rst.pp b/doc/source/double_interval.rst.pp
index 7185936066..4a9774e752 100644
--- a/doc/source/double_interval.rst.pp
+++ b/doc/source/double_interval.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _double_interval:
 
 **double_interval.h** -- double-precision interval arithmetic and helpers
diff --git a/doc/source/examples.rst.pp b/doc/source/examples.rst.pp
index d00082f87d..42f0da8f28 100644
--- a/doc/source/examples.rst.pp
+++ b/doc/source/examples.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _examples:
 
 **Examples**
diff --git a/doc/source/examples_arb.rst.pp b/doc/source/examples_arb.rst.pp
index 2ccde5d5f7..727513f3f1 100644
--- a/doc/source/examples_arb.rst.pp
+++ b/doc/source/examples_arb.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _examples-arb:
 
 Arb example programs
diff --git a/doc/source/examples_calcium.rst.pp b/doc/source/examples_calcium.rst.pp
index 8c948548da..e5c0ea85b3 100644
--- a/doc/source/examples_calcium.rst.pp
+++ b/doc/source/examples_calcium.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _examples-calcium:
 
 Calcium example programs
diff --git a/doc/source/fexpr.rst.pp b/doc/source/fexpr.rst.pp
index 4aff61f36b..16eedddcc7 100644
--- a/doc/source/fexpr.rst.pp
+++ b/doc/source/fexpr.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fexpr:
 
 **fexpr.h** -- flat-packed symbolic expressions
diff --git a/doc/source/fexpr_builtin.rst.pp b/doc/source/fexpr_builtin.rst.pp
index 5bd0a555e6..3275c06f38 100644
--- a/doc/source/fexpr_builtin.rst.pp
+++ b/doc/source/fexpr_builtin.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fexpr-builtin:
 
 **fexpr_builtin.h** -- builtin symbols
diff --git a/doc/source/fft.rst.pp b/doc/source/fft.rst.pp
index 3f029cf96b..ea67f6c731 100644
--- a/doc/source/fft.rst.pp
+++ b/doc/source/fft.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fft:
 
 **fft.h** -- Schoenhage-Strassen FFT
diff --git a/doc/source/fft_small.rst.pp b/doc/source/fft_small.rst.pp
index 2574150529..edf4f208db 100644
--- a/doc/source/fft_small.rst.pp
+++ b/doc/source/fft_small.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fft-small:
 
 **fft_small.h** -- FFT modulo word-size primes
diff --git a/doc/source/flint.rst.pp b/doc/source/flint.rst.pp
index 90eaf291e8..e9f9468260 100644
--- a/doc/source/flint.rst.pp
+++ b/doc/source/flint.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _flint:
 
 **flint.h** -- global definitions
diff --git a/doc/source/fmpq.rst.pp b/doc/source/fmpq.rst.pp
index d3d655b081..667a3b760d 100644
--- a/doc/source/fmpq.rst.pp
+++ b/doc/source/fmpq.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpq:
 
 **fmpq.h** -- rational numbers
diff --git a/doc/source/fmpq_mat.rst.pp b/doc/source/fmpq_mat.rst.pp
index b8dba40d69..93aa3c3376 100644
--- a/doc/source/fmpq_mat.rst.pp
+++ b/doc/source/fmpq_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpq-mat:
 
 **fmpq_mat.h** -- matrices over the rational numbers
diff --git a/doc/source/fmpq_mpoly.rst.pp b/doc/source/fmpq_mpoly.rst.pp
index 7987416150..ba81b9f494 100644
--- a/doc/source/fmpq_mpoly.rst.pp
+++ b/doc/source/fmpq_mpoly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpq-mpoly:
 
 **fmpq_mpoly.h** -- multivariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_mpoly_factor.rst.pp b/doc/source/fmpq_mpoly_factor.rst.pp
index 4c81efa61b..721bb4784d 100644
--- a/doc/source/fmpq_mpoly_factor.rst.pp
+++ b/doc/source/fmpq_mpoly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpq-mpoly-factor:
 
 **fmpq_mpoly_factor.h** -- factorisation of multivariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_poly.rst.pp b/doc/source/fmpq_poly.rst.pp
index 456e875b8c..36b7d8934d 100644
--- a/doc/source/fmpq_poly.rst.pp
+++ b/doc/source/fmpq_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpq-poly:
 
 **fmpq_poly.h** -- univariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_vec.rst.pp b/doc/source/fmpq_vec.rst.pp
index 298df29b52..8230d16014 100644
--- a/doc/source/fmpq_vec.rst.pp
+++ b/doc/source/fmpq_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpq-vec:
 
 **fmpq_vec.h** -- vectors over rational numbers
diff --git a/doc/source/fmpz.rst.pp b/doc/source/fmpz.rst.pp
index ea8dd126e4..00a48b62fd 100644
--- a/doc/source/fmpz.rst.pp
+++ b/doc/source/fmpz.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz:
 
 **fmpz.h** -- integers
diff --git a/doc/source/fmpz_extras.rst.pp b/doc/source/fmpz_extras.rst.pp
index b6706d036b..00cb7aa7bc 100644
--- a/doc/source/fmpz_extras.rst.pp
+++ b/doc/source/fmpz_extras.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz_extras:
 
 **fmpz_extras.h** -- extra methods for FLINT integers
diff --git a/doc/source/fmpz_factor.rst.pp b/doc/source/fmpz_factor.rst.pp
index 72164d046e..bde954996e 100644
--- a/doc/source/fmpz_factor.rst.pp
+++ b/doc/source/fmpz_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-factor:
 
 **fmpz_factor.h** -- integer factorisation
diff --git a/doc/source/fmpz_lll.rst.pp b/doc/source/fmpz_lll.rst.pp
index 6fab07b5d8..52d16fd4bf 100644
--- a/doc/source/fmpz_lll.rst.pp
+++ b/doc/source/fmpz_lll.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-lll:
 
 **fmpz_lll.h** -- LLL reduction
diff --git a/doc/source/fmpz_mat.rst.pp b/doc/source/fmpz_mat.rst.pp
index 2ff118f077..0fdde78cf8 100644
--- a/doc/source/fmpz_mat.rst.pp
+++ b/doc/source/fmpz_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mat:
 
 **fmpz_mat.h** -- matrices over the integers
diff --git a/doc/source/fmpz_mod.rst.pp b/doc/source/fmpz_mod.rst.pp
index dc6e8985bc..71be997433 100644
--- a/doc/source/fmpz_mod.rst.pp
+++ b/doc/source/fmpz_mod.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mod:
 
 **fmpz_mod.h** -- arithmetic modulo integers
diff --git a/doc/source/fmpz_mod_mat.rst.pp b/doc/source/fmpz_mod_mat.rst.pp
index 3707d46962..0f802a64e4 100644
--- a/doc/source/fmpz_mod_mat.rst.pp
+++ b/doc/source/fmpz_mod_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz_mod_mat:
 
 **fmpz_mod_mat.h** -- matrices over integers mod n
diff --git a/doc/source/fmpz_mod_mpoly.rst.pp b/doc/source/fmpz_mod_mpoly.rst.pp
index 93e0b472f0..f2cc9f55d3 100644
--- a/doc/source/fmpz_mod_mpoly.rst.pp
+++ b/doc/source/fmpz_mod_mpoly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mod-mpoly:
 
 **fmpz_mod_mpoly.h** -- polynomials over the integers mod n
diff --git a/doc/source/fmpz_mod_mpoly_factor.rst.pp b/doc/source/fmpz_mod_mpoly_factor.rst.pp
index 10150d6e28..057fe90dd5 100644
--- a/doc/source/fmpz_mod_mpoly_factor.rst.pp
+++ b/doc/source/fmpz_mod_mpoly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mod-mpoly-factor:
 
 **fmpz_mod_mpoly_factor.h** -- factorisation of multivariate polynomials over the integers mod n
diff --git a/doc/source/fmpz_mod_poly.rst.pp b/doc/source/fmpz_mod_poly.rst.pp
index 9dc26b6556..ee6ebbb28f 100644
--- a/doc/source/fmpz_mod_poly.rst.pp
+++ b/doc/source/fmpz_mod_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mod-poly:
 
 **fmpz_mod_poly.h** -- polynomials over integers mod n
diff --git a/doc/source/fmpz_mod_poly_factor.rst.pp b/doc/source/fmpz_mod_poly_factor.rst.pp
index a16847b1f1..8882e1026a 100644
--- a/doc/source/fmpz_mod_poly_factor.rst.pp
+++ b/doc/source/fmpz_mod_poly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mod-poly-factor:
 
 **fmpz_mod_poly_factor.h** -- factorisation of polynomials over integers mod n
diff --git a/doc/source/fmpz_mod_vec.rst.pp b/doc/source/fmpz_mod_vec.rst.pp
index 533a8a5dc3..f5d0994509 100644
--- a/doc/source/fmpz_mod_vec.rst.pp
+++ b/doc/source/fmpz_mod_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mod-vec:
 
 **fmpz_mod_vec.h** -- vectors over integers mod n
diff --git a/doc/source/fmpz_mpoly.rst.pp b/doc/source/fmpz_mpoly.rst.pp
index c7c7da38ce..5312cbaf1d 100644
--- a/doc/source/fmpz_mpoly.rst.pp
+++ b/doc/source/fmpz_mpoly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mpoly:
 
 **fmpz_mpoly.h** -- multivariate polynomials over the integers
diff --git a/doc/source/fmpz_mpoly_factor.rst.pp b/doc/source/fmpz_mpoly_factor.rst.pp
index 8f986a60ec..b534f538d9 100644
--- a/doc/source/fmpz_mpoly_factor.rst.pp
+++ b/doc/source/fmpz_mpoly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mpoly-factor:
 
 **fmpz_mpoly_factor.h** -- factorisation of multivariate polynomials over the integers
diff --git a/doc/source/fmpz_mpoly_q.rst.pp b/doc/source/fmpz_mpoly_q.rst.pp
index dadfd6829e..135e75c62d 100644
--- a/doc/source/fmpz_mpoly_q.rst.pp
+++ b/doc/source/fmpz_mpoly_q.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-mpoly-q:
 
 **fmpz_mpoly_q.h** -- multivariate rational functions over Q
diff --git a/doc/source/fmpz_poly.rst.pp b/doc/source/fmpz_poly.rst.pp
index 45fdfb4924..8ad2c2b8e8 100644
--- a/doc/source/fmpz_poly.rst.pp
+++ b/doc/source/fmpz_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-poly:
 
 **fmpz_poly.h** -- univariate polynomials over the integers
diff --git a/doc/source/fmpz_poly_factor.rst.pp b/doc/source/fmpz_poly_factor.rst.pp
index 496cdf0561..6299cc8e9b 100644
--- a/doc/source/fmpz_poly_factor.rst.pp
+++ b/doc/source/fmpz_poly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-poly-factor:
 
 **fmpz_poly_factor.h** -- factorisation of polynomials over the integers
diff --git a/doc/source/fmpz_poly_mat.rst.pp b/doc/source/fmpz_poly_mat.rst.pp
index 2b65e7f363..d2e09b8920 100644
--- a/doc/source/fmpz_poly_mat.rst.pp
+++ b/doc/source/fmpz_poly_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-poly-mat:
 
 **fmpz_poly_mat.h** -- matrices of polynomials over the integers
diff --git a/doc/source/fmpz_poly_q.rst.pp b/doc/source/fmpz_poly_q.rst.pp
index c78afce747..3d468d87ff 100644
--- a/doc/source/fmpz_poly_q.rst.pp
+++ b/doc/source/fmpz_poly_q.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-poly-q:
 
 **fmpz_poly_q.h** -- rational functions over the rational numbers
diff --git a/doc/source/fmpz_vec.rst.pp b/doc/source/fmpz_vec.rst.pp
index 093da36bf3..2a45ed76e8 100644
--- a/doc/source/fmpz_vec.rst.pp
+++ b/doc/source/fmpz_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpz-vec:
 
 **fmpz_vec.h** -- vectors of integers
diff --git a/doc/source/fmpzi.rst.pp b/doc/source/fmpzi.rst.pp
index 6d5f214397..6819a86fd9 100644
--- a/doc/source/fmpzi.rst.pp
+++ b/doc/source/fmpzi.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fmpzi:
 
 **fmpzi.h** -- Gaussian integers
diff --git a/doc/source/formulas.rst.pp b/doc/source/formulas.rst.pp
index afc0621caa..41f5712278 100644
--- a/doc/source/formulas.rst.pp
+++ b/doc/source/formulas.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _general_formulas:
 
 General formulas and bounds
diff --git a/doc/source/fq.rst.pp b/doc/source/fq.rst.pp
index 2a6ed380ba..180d0c1b37 100644
--- a/doc/source/fq.rst.pp
+++ b/doc/source/fq.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq:
 
 **fq.h** -- finite fields
diff --git a/doc/source/fq_default.rst.pp b/doc/source/fq_default.rst.pp
index ae67cd9f89..e1a085aff2 100644
--- a/doc/source/fq_default.rst.pp
+++ b/doc/source/fq_default.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq_default:
 
 **fq_default.h** -- unified finite fields
diff --git a/doc/source/fq_default_mat.rst.pp b/doc/source/fq_default_mat.rst.pp
index 2d6e501977..26256c34cd 100644
--- a/doc/source/fq_default_mat.rst.pp
+++ b/doc/source/fq_default_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq_default_mat:
 
 **fq_default_mat.h** -- matrices over finite fields
diff --git a/doc/source/fq_default_poly.rst.pp b/doc/source/fq_default_poly.rst.pp
index abd71ab007..123e184884 100644
--- a/doc/source/fq_default_poly.rst.pp
+++ b/doc/source/fq_default_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq_default_poly:
 
 **fq_default_poly.h** -- univariate polynomials over finite fields
diff --git a/doc/source/fq_default_poly_factor.rst.pp b/doc/source/fq_default_poly_factor.rst.pp
index de820cce59..ae315a71f6 100644
--- a/doc/source/fq_default_poly_factor.rst.pp
+++ b/doc/source/fq_default_poly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-poly_factor:
 
 **fq_default_poly_factor.h** -- factorisation of univariate polynomials over finite fields
diff --git a/doc/source/fq_embed.rst.pp b/doc/source/fq_embed.rst.pp
index a7ba2fb6be..e256706b2c 100644
--- a/doc/source/fq_embed.rst.pp
+++ b/doc/source/fq_embed.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-embed:
 
 **fq_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_mat.rst.pp b/doc/source/fq_mat.rst.pp
index 8556400f79..132deefb1d 100644
--- a/doc/source/fq_mat.rst.pp
+++ b/doc/source/fq_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-mat:
 
 **fq_mat.h** -- matrices over finite fields
diff --git a/doc/source/fq_nmod.rst.pp b/doc/source/fq_nmod.rst.pp
index 81e805c3a6..a6dfc8d6a2 100644
--- a/doc/source/fq_nmod.rst.pp
+++ b/doc/source/fq_nmod.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-nmod:
 
 **fq_nmod.h** -- finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_embed.rst.pp b/doc/source/fq_nmod_embed.rst.pp
index a0cf262041..13d69b6975 100644
--- a/doc/source/fq_nmod_embed.rst.pp
+++ b/doc/source/fq_nmod_embed.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-nmod-embed:
 
 **fq_nmod_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_nmod_mat.rst.pp b/doc/source/fq_nmod_mat.rst.pp
index db4850527d..3adb028e42 100644
--- a/doc/source/fq_nmod_mat.rst.pp
+++ b/doc/source/fq_nmod_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-nmod-mat:
 
 **fq_nmod_mat.h** -- matrices over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_mpoly.rst.pp b/doc/source/fq_nmod_mpoly.rst.pp
index 1c9ea82468..71c6e2e81d 100644
--- a/doc/source/fq_nmod_mpoly.rst.pp
+++ b/doc/source/fq_nmod_mpoly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq_nmod-mpoly:
 
 **fq_nmod_mpoly.h** -- multivariate polynomials over finite fields of word-sized characteristic
diff --git a/doc/source/fq_nmod_mpoly_factor.rst.pp b/doc/source/fq_nmod_mpoly_factor.rst.pp
index e1c9a132dc..df6f9c78fa 100644
--- a/doc/source/fq_nmod_mpoly_factor.rst.pp
+++ b/doc/source/fq_nmod_mpoly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq_nmod-mpoly-factor:
 
 **fq_nmod_mpoly_factor.h** -- factorisation of multivariate polynomials over finite fields of word-sized characteristic
diff --git a/doc/source/fq_nmod_poly.rst.pp b/doc/source/fq_nmod_poly.rst.pp
index 73f2db0c8d..640515593f 100644
--- a/doc/source/fq_nmod_poly.rst.pp
+++ b/doc/source/fq_nmod_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-nmod-poly:
 
 **fq_nmod_poly.h** -- univariate polynomials over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_poly_factor.rst.pp b/doc/source/fq_nmod_poly_factor.rst.pp
index 176273d8a9..7a87ce313e 100644
--- a/doc/source/fq_nmod_poly_factor.rst.pp
+++ b/doc/source/fq_nmod_poly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-nmod-poly-factor:
 
 **fq_nmod_poly_factor.h** -- factorisation of univariate polynomials over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_vec.rst.pp b/doc/source/fq_nmod_vec.rst.pp
index e5ab025863..98901166a9 100644
--- a/doc/source/fq_nmod_vec.rst.pp
+++ b/doc/source/fq_nmod_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-nmod-vec:
 
 **fq_nmod_vec.h** -- vectors over finite fields (word-size characteristic)
diff --git a/doc/source/fq_poly.rst.pp b/doc/source/fq_poly.rst.pp
index c6979ac77f..ea450f9e3d 100644
--- a/doc/source/fq_poly.rst.pp
+++ b/doc/source/fq_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-poly:
 
 **fq_poly.h** -- univariate polynomials over finite fields
diff --git a/doc/source/fq_poly_factor.rst.pp b/doc/source/fq_poly_factor.rst.pp
index 820d68660c..15b11e8bd4 100644
--- a/doc/source/fq_poly_factor.rst.pp
+++ b/doc/source/fq_poly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-poly-factor:
 
 **fq_poly_factor.h** -- factorisation of univariate polynomials over finite fields
diff --git a/doc/source/fq_vec.rst.pp b/doc/source/fq_vec.rst.pp
index 556b8cc646..dd6cd505ac 100644
--- a/doc/source/fq_vec.rst.pp
+++ b/doc/source/fq_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-vec:
 
 **fq_vec.h** -- vectors over finite fields
diff --git a/doc/source/fq_zech.rst.pp b/doc/source/fq_zech.rst.pp
index f92ee2c96e..db4ef814d9 100644
--- a/doc/source/fq_zech.rst.pp
+++ b/doc/source/fq_zech.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-zech:
 
 **fq_zech.h** -- finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_embed.rst.pp b/doc/source/fq_zech_embed.rst.pp
index 4f90b1e7a2..140b006981 100644
--- a/doc/source/fq_zech_embed.rst.pp
+++ b/doc/source/fq_zech_embed.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-zech-embed:
 
 **fq_zech_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_zech_mat.rst.pp b/doc/source/fq_zech_mat.rst.pp
index d98263c4b8..3c59acea1f 100644
--- a/doc/source/fq_zech_mat.rst.pp
+++ b/doc/source/fq_zech_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-zech-mat:
 
 **fq_zech_mat.h** -- matrices over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_poly.rst.pp b/doc/source/fq_zech_poly.rst.pp
index ef8e7d7fd7..607cb9b86e 100644
--- a/doc/source/fq_zech_poly.rst.pp
+++ b/doc/source/fq_zech_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-zech-poly:
 
 **fq_zech_poly.h** -- univariate polynomials over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_poly_factor.rst.pp b/doc/source/fq_zech_poly_factor.rst.pp
index bc28ab3cce..01fab9d822 100644
--- a/doc/source/fq_zech_poly_factor.rst.pp
+++ b/doc/source/fq_zech_poly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-zech-poly-factor:
 
 **fq_zech_poly_factor.h** -- factorisation of univariate polynomials over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_vec.rst.pp b/doc/source/fq_zech_vec.rst.pp
index 367ae3c802..a249dde9f6 100644
--- a/doc/source/fq_zech_vec.rst.pp
+++ b/doc/source/fq_zech_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _fq-zech-vec:
 
 **fq_zech_vec.h** -- vectors over finite fields (Zech logarithm representation)
diff --git a/doc/source/gamma.rst.pp b/doc/source/gamma.rst.pp
index f624b970e2..071160af08 100644
--- a/doc/source/gamma.rst.pp
+++ b/doc/source/gamma.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _algorithms_gamma:
 
 Algorithms for the gamma function
diff --git a/doc/source/gr.rst.pp b/doc/source/gr.rst.pp
index fc6011fb32..a8cd5e75a7 100644
--- a/doc/source/gr.rst.pp
+++ b/doc/source/gr.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr:
 
 **gr.h** -- generic structures and their elements
diff --git a/doc/source/gr_domains.rst.pp b/doc/source/gr_domains.rst.pp
index 5b91e0ef78..e4bee6057e 100644
--- a/doc/source/gr_domains.rst.pp
+++ b/doc/source/gr_domains.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr-domains:
 
 **gr.h (continued)** -- builtin domains and types
diff --git a/doc/source/gr_generic.rst.pp b/doc/source/gr_generic.rst.pp
index 8db609df63..53077bfa8e 100644
--- a/doc/source/gr_generic.rst.pp
+++ b/doc/source/gr_generic.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr-generic:
 
 **gr_generic.h** -- basic algorithms and fallback implementations for generic elements
diff --git a/doc/source/gr_implementing.rst.pp b/doc/source/gr_implementing.rst.pp
index aac06bfa6f..933c3f2762 100644
--- a/doc/source/gr_implementing.rst.pp
+++ b/doc/source/gr_implementing.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr-implementing:
 
 **gr.h (continued)** -- implementing rings
diff --git a/doc/source/gr_mat.rst.pp b/doc/source/gr_mat.rst.pp
index cd7605949e..da09fcd894 100644
--- a/doc/source/gr_mat.rst.pp
+++ b/doc/source/gr_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr-mat:
 
 **gr_mat.h** -- dense matrices over generic rings
diff --git a/doc/source/gr_mpoly.rst.pp b/doc/source/gr_mpoly.rst.pp
index 73480aa1fe..36fc49c9d4 100644
--- a/doc/source/gr_mpoly.rst.pp
+++ b/doc/source/gr_mpoly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr-mpoly:
 
 **gr_mpoly.h** -- sparse multivariate polynomials over generic rings
diff --git a/doc/source/gr_poly.rst.pp b/doc/source/gr_poly.rst.pp
index d088fa96e5..ca8afb558c 100644
--- a/doc/source/gr_poly.rst.pp
+++ b/doc/source/gr_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr-poly:
 
 **gr_poly.h** -- dense univariate polynomials over generic rings
diff --git a/doc/source/gr_special.rst.pp b/doc/source/gr_special.rst.pp
index 99fb109988..7b5c777592 100644
--- a/doc/source/gr_special.rst.pp
+++ b/doc/source/gr_special.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr-special:
 
 **gr_special.h** -- special arithmetic and transcendental functions
diff --git a/doc/source/gr_vec.rst.pp b/doc/source/gr_vec.rst.pp
index c97fb6ce06..e80128a4ab 100644
--- a/doc/source/gr_vec.rst.pp
+++ b/doc/source/gr_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _gr-vec:
 
 **gr_vec.h** -- vectors over generic rings
diff --git a/doc/source/history.rst.pp b/doc/source/history.rst.pp
index 338728b10d..519d107582 100644
--- a/doc/source/history.rst.pp
+++ b/doc/source/history.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _history:
 
 History and changes
diff --git a/doc/source/hurwitz.rst.pp b/doc/source/hurwitz.rst.pp
index 6b7aa663c0..b609c47767 100644
--- a/doc/source/hurwitz.rst.pp
+++ b/doc/source/hurwitz.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _algorithms_hurwitz:
 
 Algorithms for the Hurwitz zeta function
diff --git a/doc/source/hypergeometric.rst.pp b/doc/source/hypergeometric.rst.pp
index 474d6f106c..5d3c3b1eef 100644
--- a/doc/source/hypergeometric.rst.pp
+++ b/doc/source/hypergeometric.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _algorithms_hypergeometric:
 
 Algorithms for hypergeometric functions
diff --git a/doc/source/hypgeom.rst.pp b/doc/source/hypgeom.rst.pp
index c3138c9c72..26dfc55771 100644
--- a/doc/source/hypgeom.rst.pp
+++ b/doc/source/hypgeom.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _hypgeom:
 
 **hypgeom.h** -- support for hypergeometric series
diff --git a/doc/source/index.rst.pp b/doc/source/index.rst.pp
index 4f3ce561c9..4d8b8d83b3 100644
--- a/doc/source/index.rst.pp
+++ b/doc/source/index.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. FLINT documentation master file, created by
    sphinx-quickstart on Fri Nov 16 21:59:21 2018.
    You can adapt this file completely to your liking, but it should at least
diff --git a/doc/source/index_arb.rst.pp b/doc/source/index_arb.rst.pp
index 049f672498..8eb6d38e51 100644
--- a/doc/source/index_arb.rst.pp
+++ b/doc/source/index_arb.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _index-arb:
 
 **Real and complex numbers (Arb)** : *detailed table of contents*
diff --git a/doc/source/index_generic.rst.pp b/doc/source/index_generic.rst.pp
index 05c388bb2f..27d05c2b96 100644
--- a/doc/source/index_generic.rst.pp
+++ b/doc/source/index_generic.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _index-generic:
 
 **Generic rings** : *detailed table of contents*
diff --git a/doc/source/index_integers.rst.pp b/doc/source/index_integers.rst.pp
index 3e320051e5..426a663b7a 100644
--- a/doc/source/index_integers.rst.pp
+++ b/doc/source/index_integers.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _index-integers:
 
 **Integers** : *detailed table of contents*
diff --git a/doc/source/index_integers_mod.rst.pp b/doc/source/index_integers_mod.rst.pp
index 140d02d73c..2e2528f691 100644
--- a/doc/source/index_integers_mod.rst.pp
+++ b/doc/source/index_integers_mod.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _index-integers-mod:
 
 **Integers mod n** : *detailed table of contents*
diff --git a/doc/source/index_rationals.rst.pp b/doc/source/index_rationals.rst.pp
index 126f991f18..201af80cc7 100644
--- a/doc/source/index_rationals.rst.pp
+++ b/doc/source/index_rationals.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _index-rationals:
 
 **Rational numbers** : *detailed table of contents*
diff --git a/doc/source/introduction.rst.pp b/doc/source/introduction.rst.pp
index 41f49a3e7b..6a0baec75f 100644
--- a/doc/source/introduction.rst.pp
+++ b/doc/source/introduction.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _introduction:
 
 **Introduction**
diff --git a/doc/source/introduction_calcium.rst.pp b/doc/source/introduction_calcium.rst.pp
index 8edc545508..359a801c82 100644
--- a/doc/source/introduction_calcium.rst.pp
+++ b/doc/source/introduction_calcium.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _introduction-calcium:
 
 Introduction
diff --git a/doc/source/issues.rst.pp b/doc/source/issues.rst.pp
index 1df4a766b9..ce2f96e3ee 100644
--- a/doc/source/issues.rst.pp
+++ b/doc/source/issues.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _issues:
 
 Technical conventions and potential issues
diff --git a/doc/source/long_extras.rst.pp b/doc/source/long_extras.rst.pp
index 4c5ea2e6f7..740b6cfba7 100644
--- a/doc/source/long_extras.rst.pp
+++ b/doc/source/long_extras.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _long-extras:
 
 **long_extras.h** -- support functions for signed word arithmetic
diff --git a/doc/source/longlong.rst.pp b/doc/source/longlong.rst.pp
index 0e897dc0c7..9055aad53d 100644
--- a/doc/source/longlong.rst.pp
+++ b/doc/source/longlong.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _longlong:
 
 **longlong.h** -- support functions for multi-word arithmetic
diff --git a/doc/source/machine_vectors.rst.pp b/doc/source/machine_vectors.rst.pp
index 5d8dccbec9..bbb48e408a 100644
--- a/doc/source/machine_vectors.rst.pp
+++ b/doc/source/machine_vectors.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _machine-vectors:
 
 **machine_vectors.h** -- SIMD-accelerated operations on fixed-length vectors
diff --git a/doc/source/mag.rst.pp b/doc/source/mag.rst.pp
index 1c81a9ea4b..50c6315ef0 100644
--- a/doc/source/mag.rst.pp
+++ b/doc/source/mag.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _mag:
 
 **mag.h** -- fixed-precision unsigned floating-point numbers for bounds
diff --git a/doc/source/memory.rst.pp b/doc/source/memory.rst.pp
index a1d2fce068..91f0545570 100644
--- a/doc/source/memory.rst.pp
+++ b/doc/source/memory.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _memory:
 
 **Memory management**
diff --git a/doc/source/mpfr_mat.rst.pp b/doc/source/mpfr_mat.rst.pp
index 3cc641006e..596e211791 100644
--- a/doc/source/mpfr_mat.rst.pp
+++ b/doc/source/mpfr_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _mpfr-mat:
 
 **mpfr_mat.h** -- matrices of MPFR floating-point numbers
diff --git a/doc/source/mpfr_vec.rst.pp b/doc/source/mpfr_vec.rst.pp
index 30754d9d66..eddd4d1a21 100644
--- a/doc/source/mpfr_vec.rst.pp
+++ b/doc/source/mpfr_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _mpfr-vec:
 
 **mpfr_vec.h** -- vectors of MPFR floating-point numbers
diff --git a/doc/source/mpn_extras.rst.pp b/doc/source/mpn_extras.rst.pp
index 3b6ecb8f0f..ea2072c36e 100644
--- a/doc/source/mpn_extras.rst.pp
+++ b/doc/source/mpn_extras.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _mpn-extras:
 
 **mpn_extras.h** -- support functions for limb arrays
diff --git a/doc/source/mpn_mod.rst.pp b/doc/source/mpn_mod.rst.pp
index 54d6f57a3c..83ae9f7d23 100644
--- a/doc/source/mpn_mod.rst.pp
+++ b/doc/source/mpn_mod.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _mpn-mod:
 
 **mpn_mod.h** -- integers mod n (packed multi-word n)
diff --git a/doc/source/mpoly.rst.pp b/doc/source/mpoly.rst.pp
index 9c22c1da9a..452fcfa00a 100644
--- a/doc/source/mpoly.rst.pp
+++ b/doc/source/mpoly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _mpoly:
 
 **mpoly.h** -- support functions for multivariate polynomials
diff --git a/doc/source/nf.rst.pp b/doc/source/nf.rst.pp
index 0829457f70..c4e8685b78 100644
--- a/doc/source/nf.rst.pp
+++ b/doc/source/nf.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nf:
 
 **nf.h** -- number fields
diff --git a/doc/source/nf_elem.rst.pp b/doc/source/nf_elem.rst.pp
index 691ece4f69..99a7c2339d 100644
--- a/doc/source/nf_elem.rst.pp
+++ b/doc/source/nf_elem.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nf_elem:
 
 **nf_elem.h** -- number field elements
diff --git a/doc/source/nfloat.rst.pp b/doc/source/nfloat.rst.pp
index 205ebcbe5a..c21e6ee1a3 100644
--- a/doc/source/nfloat.rst.pp
+++ b/doc/source/nfloat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nfloat:
 
 **nfloat.h** -- packed floating-point numbers with n-word precision
diff --git a/doc/source/nmod.rst.pp b/doc/source/nmod.rst.pp
index 8231bd6dae..d900f54dd1 100644
--- a/doc/source/nmod.rst.pp
+++ b/doc/source/nmod.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nmod:
 
 **nmod.h** -- integers mod n (word-size n)
diff --git a/doc/source/nmod_mat.rst.pp b/doc/source/nmod_mat.rst.pp
index f30b43006f..f2582b0c58 100644
--- a/doc/source/nmod_mat.rst.pp
+++ b/doc/source/nmod_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nmod-mat:
 
 **nmod_mat.h** -- matrices over integers mod n (word-size n)
diff --git a/doc/source/nmod_mpoly.rst.pp b/doc/source/nmod_mpoly.rst.pp
index cf32cfc45c..3aec8bc877 100644
--- a/doc/source/nmod_mpoly.rst.pp
+++ b/doc/source/nmod_mpoly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nmod-mpoly:
 
 **nmod_mpoly.h** -- multivariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_mpoly_factor.rst.pp b/doc/source/nmod_mpoly_factor.rst.pp
index 6304330dbc..80b58a546f 100644
--- a/doc/source/nmod_mpoly_factor.rst.pp
+++ b/doc/source/nmod_mpoly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nmod-mpoly-factor:
 
 **nmod_mpoly_factor.h** -- factorisation of multivariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly.rst.pp b/doc/source/nmod_poly.rst.pp
index 1773697525..9975d10a60 100644
--- a/doc/source/nmod_poly.rst.pp
+++ b/doc/source/nmod_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nmod-poly:
 
 **nmod_poly.h** -- univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly_factor.rst.pp b/doc/source/nmod_poly_factor.rst.pp
index cc46093506..17c1415d84 100644
--- a/doc/source/nmod_poly_factor.rst.pp
+++ b/doc/source/nmod_poly_factor.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nmod-poly-factor:
 
 **nmod_poly_factor.h** -- factorisation of univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly_mat.rst.pp b/doc/source/nmod_poly_mat.rst.pp
index a2ae0db2fa..091a6fce54 100644
--- a/doc/source/nmod_poly_mat.rst.pp
+++ b/doc/source/nmod_poly_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nmod-poly-mat:
 
 **nmod_poly_mat.h** -- matrices of univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_vec.rst.pp b/doc/source/nmod_vec.rst.pp
index ed730aa460..ae988853dd 100644
--- a/doc/source/nmod_vec.rst.pp
+++ b/doc/source/nmod_vec.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _nmod-vec:
 
 **nmod_vec.h** -- vectors over integers mod n (word-size n)
diff --git a/doc/source/overview.rst.pp b/doc/source/overview.rst.pp
index 5c1758a2d8..6dc8022df9 100644
--- a/doc/source/overview.rst.pp
+++ b/doc/source/overview.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _overview:
 
 Feature overview
diff --git a/doc/source/padic.rst.pp b/doc/source/padic.rst.pp
index 3b836385f8..09e7cea1f1 100644
--- a/doc/source/padic.rst.pp
+++ b/doc/source/padic.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _padic:
 
 **padic.h** -- p-adic numbers
diff --git a/doc/source/padic_mat.rst.pp b/doc/source/padic_mat.rst.pp
index d424f537b3..3dbe72a908 100644
--- a/doc/source/padic_mat.rst.pp
+++ b/doc/source/padic_mat.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _padic-mat:
 
 **padic_mat.h** -- matrices over p-adic numbers
diff --git a/doc/source/padic_poly.rst.pp b/doc/source/padic_poly.rst.pp
index 4aef08bc9f..ae13acfa2b 100644
--- a/doc/source/padic_poly.rst.pp
+++ b/doc/source/padic_poly.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _padic-poly:
 
 **padic_poly.h** -- polynomials over p-adic numbers
diff --git a/doc/source/partitions.rst.pp b/doc/source/partitions.rst.pp
index 8f0d5caf1f..b95e71cdea 100644
--- a/doc/source/partitions.rst.pp
+++ b/doc/source/partitions.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _partitions:
 
 **partitions.h** -- computation of the partition function
diff --git a/doc/source/perm.rst.pp b/doc/source/perm.rst.pp
index aa1670ea52..ac4d9555e1 100644
--- a/doc/source/perm.rst.pp
+++ b/doc/source/perm.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _perm:
 
 **perm.h** -- permutations
diff --git a/doc/source/polylogarithms.rst.pp b/doc/source/polylogarithms.rst.pp
index 3f2a487d9e..1ca47cfc11 100644
--- a/doc/source/polylogarithms.rst.pp
+++ b/doc/source/polylogarithms.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _algorithms_polylogarithms:
 
 Algorithms for polylogarithms
diff --git a/doc/source/portability.rst.pp b/doc/source/portability.rst.pp
index 55370e1400..1b3cea0edc 100644
--- a/doc/source/portability.rst.pp
+++ b/doc/source/portability.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _portability:
 
 **Portability**
diff --git a/doc/source/profiler.rst.pp b/doc/source/profiler.rst.pp
index 02b16239aa..3411f0c3d7 100644
--- a/doc/source/profiler.rst.pp
+++ b/doc/source/profiler.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _profiler:
 
 **profiler.h** -- performance profiling
diff --git a/doc/source/python_flint.rst.pp b/doc/source/python_flint.rst.pp
index ac65fc0903..8f4cd1eba6 100644
--- a/doc/source/python_flint.rst.pp
+++ b/doc/source/python_flint.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _pyflint:
 
 **flint_ctypes** - Python interface
diff --git a/doc/source/qadic.rst.pp b/doc/source/qadic.rst.pp
index 3ab050d793..30cc0540eb 100644
--- a/doc/source/qadic.rst.pp
+++ b/doc/source/qadic.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _qadic:
 
 **qadic.h** -- unramified extensions over p-adic numbers
diff --git a/doc/source/qfb.rst.pp b/doc/source/qfb.rst.pp
index bd6ae158af..6aec06673a 100644
--- a/doc/source/qfb.rst.pp
+++ b/doc/source/qfb.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _qfb:
 
 **qfb.h** -- binary quadratic forms
diff --git a/doc/source/qqbar.rst.pp b/doc/source/qqbar.rst.pp
index b9395e8a08..8c09e339b9 100644
--- a/doc/source/qqbar.rst.pp
+++ b/doc/source/qqbar.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _qqbar:
 
 **qqbar.h** -- algebraic numbers represented by minimal polynomials
diff --git a/doc/source/qsieve.rst.pp b/doc/source/qsieve.rst.pp
index 3db47d2e01..c94d0e9ef1 100644
--- a/doc/source/qsieve.rst.pp
+++ b/doc/source/qsieve.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _qsieve:
 
 **qsieve.h** -- Quadratic sieve
diff --git a/doc/source/references.rst.pp b/doc/source/references.rst.pp
index b5003eda72..99563d3ec9 100644
--- a/doc/source/references.rst.pp
+++ b/doc/source/references.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 References
 ------------
 
diff --git a/doc/source/thread_pool.rst.pp b/doc/source/thread_pool.rst.pp
index 1c81f028fe..db25e5b076 100644
--- a/doc/source/thread_pool.rst.pp
+++ b/doc/source/thread_pool.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _thread-pool:
 
 **thread_pool.h** -- thread pool
diff --git a/doc/source/threading.rst.pp b/doc/source/threading.rst.pp
index bff5c4d6ef..e9c400c1d6 100644
--- a/doc/source/threading.rst.pp
+++ b/doc/source/threading.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _threading:
 
 **Threading**
diff --git a/doc/source/ulong_extras.rst.pp b/doc/source/ulong_extras.rst.pp
index 0ebbb19b0c..91c7248ddf 100644
--- a/doc/source/ulong_extras.rst.pp
+++ b/doc/source/ulong_extras.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _ulong-extras:
 
 **ulong_extras.h** -- arithmetic and number-theoretic functions for single-word integers
diff --git a/doc/source/using.rst.pp b/doc/source/using.rst.pp
index aa8daacfd4..6848829211 100644
--- a/doc/source/using.rst.pp
+++ b/doc/source/using.rst.pp
@@ -1,4 +1,4 @@
-include(`config.m4')dnl
+include(`macros.m4')dnl
 .. _using:
 
 Using ball arithmetic

From 7797759ca121e67f23154912adf6d0582ba51be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 11:24:23 +0100
Subject: [PATCH 07/20] Start on macros

---
 doc/source/macros.m4 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/source/macros.m4 b/doc/source/macros.m4
index fa390f2611..2a95af2a5f 100644
--- a/doc/source/macros.m4
+++ b/doc/source/macros.m4
@@ -1,2 +1,12 @@
 dnl Define stuff here
+define(`__function_prefix',`.. function::')dnl
+dnl
+define(`addition',dnl
+m4_assert_numargs(1)dnl
+`__function_prefix $1_add($1_t r, $1_t a, $1_t b)
+
+poopy doopy'dnl
+)dnl
+dnl
+dnl Change quotes to something that is not used anywhere
 changequote({{{,}}})dnl

From c30c54b6fa7875a51b9f8ea677978fcc8c950bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 13:12:23 +0100
Subject: [PATCH 08/20] Add sphinx-specific options to not catch everything

---
 doc/Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 618ebc2722..631608ce96 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -10,6 +10,9 @@ BUILDDIR      = build
 
 M4 := m4
 
+SPHINX_ACTIONS := html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf latexpdfja text man texinfo info gettext changes xml pseudoxml linkcheck doctest coverage clean
+
+MACROS := $(SOURCEDIR)/macros.m4
 SRCS := $(wildcard $(SOURCEDIR)/*.rst.pp)
 OBJS := $(patsubst %.pp,%,$(SRCS))
 
@@ -19,12 +22,10 @@ help:
 
 preprocess: $(OBJS)
 
-%.rst: %.rst.pp
+%.rst: %.rst.pp $(MACROS)
 	@$(M4) -I $(SOURCEDIR) $< > $@
 
-.PHONY: help Makefile preprocess
+$(SPHINX_ACTIONS): Makefile preprocess
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-# # Catch-all target: route all unknown targets to Sphinx using the new
-# # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-# %: Makefile preprocess
-# 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+.PHONY: help Makefile preprocess

From 81457f0b0e37d95f9eb51005244f89e03a503400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 13:12:36 +0100
Subject: [PATCH 09/20] More macros

---
 doc/source/fmpz.rst.pp | 16 ++++++-------
 doc/source/macros.m4   | 53 +++++++++++++++++++++++++++++++++---------
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/doc/source/fmpz.rst.pp b/doc/source/fmpz.rst.pp
index 00a48b62fd..c907d5f05c 100644
--- a/doc/source/fmpz.rst.pp
+++ b/doc/source/fmpz.rst.pp
@@ -769,17 +769,17 @@ functions such an object first has to be initialised with a call to
 
     Sets `f_1` to the absolute value of `f_2`.
 
-.. function:: void fmpz_add(fmpz_t f, const fmpz_t g, const fmpz_t h)
-              void fmpz_add_ui(fmpz_t f, const fmpz_t g, ulong h)
-              void fmpz_add_si(fmpz_t f, const fmpz_t g, slong h)
+func_add(fmpz)
+func_add_si(fmpz)
+func_add_ui(fmpz)
 
-    Sets `f` to `g + h`.
+desc_add()
 
-.. function:: void fmpz_sub(fmpz_t f, const fmpz_t g, const fmpz_t h)
-              void fmpz_sub_ui(fmpz_t f, const fmpz_t g, ulong h)
-              void fmpz_sub_si(fmpz_t f, const fmpz_t g, slong h)
+func_sub(fmpz)
+func_sub_si(fmpz)
+func_sub_ui(fmpz)
 
-    Sets `f` to `g - h`.
+desc_sub()
 
 .. function:: void fmpz_mul(fmpz_t f, const fmpz_t g, const fmpz_t h)
               void fmpz_mul_ui(fmpz_t f, const fmpz_t g, ulong h)
diff --git a/doc/source/macros.m4 b/doc/source/macros.m4
index 2a95af2a5f..51329d6013 100644
--- a/doc/source/macros.m4
+++ b/doc/source/macros.m4
@@ -1,12 +1,43 @@
-dnl Define stuff here
-define(`__function_prefix',`.. function::')dnl
-dnl
-define(`addition',dnl
-m4_assert_numargs(1)dnl
-`__function_prefix $1_add($1_t r, $1_t a, $1_t b)
-
-poopy doopy'dnl
-)dnl
-dnl
 dnl Change quotes to something that is not used anywhere
-changequote({{{,}}})dnl
+changequote({{{{,}}}})dnl
+dnl
+dnl############################################################################
+dnl function prefix
+dnl############################################################################
+define({{{__function_prefix}}},{{{.. function::}}})dnl
+dnl############################################################################
+dnl addition
+dnl############################################################################
+define({{{func_add}}},dnl
+{{{__function_prefix dnl
+void $1_add($1_t r, const $1_t a, const $1_t b)dnl
+}}})dnl
+define({{{func_add_si}}},dnl
+{{{__function_prefix dnl
+void $1_add_si($1_t r, const $1_t a, slong b)dnl
+}}})dnl
+define({{{func_add_ui}}},dnl
+{{{__function_prefix dnl
+void $1_add_ui($1_t r, const $1_t a, ulong b)dnl
+}}})dnl
+define({{{desc_add}}},{{{dnl
+    Sets `r` to `a + b`.dnl
+}}})dnl
+dnl############################################################################
+dnl subtraction
+dnl############################################################################
+define({{{func_sub}}},dnl
+{{{__function_prefix dnl
+void $1_sub($1_t r, const $1_t a, const $1_t b)dnl
+}}})dnl
+define({{{func_sub_si}}},dnl
+{{{__function_prefix dnl
+void $1_sub_si($1_t r, const $1_t a, slong b)dnl
+}}})dnl
+define({{{func_sub_ui}}},dnl
+{{{__function_prefix dnl
+void $1_sub_ui($1_t r, const $1_t a, ulong b)dnl
+}}})dnl
+define({{{desc_sub}}},{{{dnl
+    Sets `r` to `a - b`.dnl
+}}})dnl

From 7e1769f435b8a0f3d028a28e5936a18599cea4f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 15:18:11 +0100
Subject: [PATCH 10/20] Start converting to macros

---
 doc/source/fmpz.rst.pp | 128 ++++++++------------
 doc/source/macros.m4   | 257 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 286 insertions(+), 99 deletions(-)

diff --git a/doc/source/fmpz.rst.pp b/doc/source/fmpz.rst.pp
index c907d5f05c..74be53a689 100644
--- a/doc/source/fmpz.rst.pp
+++ b/doc/source/fmpz.rst.pp
@@ -375,14 +375,6 @@ functions such an object first has to be initialised with a call to
     the function.  Otherwise, it is up to the caller to ensure that
     the allocated block of memory is sufficiently large.
 
-.. function:: void fmpz_set_si(fmpz_t f, slong val)
-
-    Sets `f` to the given ``slong`` value.
-
-.. function:: void fmpz_set_ui(fmpz_t f, ulong val)
-
-    Sets `f` to the given ``ulong`` value.
-
 .. function:: void fmpz_set_d(fmpz_t f, double c)
 
     Sets `f` to the ``double`` `c`, rounding down towards zero if
@@ -659,17 +651,16 @@ functions such an object first has to be initialised with a call to
 
     Efficiently swaps `f` and `g`.  No data is copied.
 
-.. function:: void fmpz_set(fmpz_t f, const fmpz_t g)
+_prefix func_set(fmpz)
+_indent func_set_si(fmpz)
+_indent func_set_ui(fmpz)
+desc_set()
 
-    Sets `f` to the same value as `g`.
+_prefix func_zero(fmpz)
+desc_zero()
 
-.. function:: void fmpz_zero(fmpz_t f)
-
-    Sets `f` to zero.
-
-.. function:: void fmpz_one(fmpz_t f)
-
-    Sets `f` to one.
+_prefix func_one(fmpz)
+desc_one()
 
 .. function:: int fmpz_abs_fits_ui(const fmpz_t f)
 
@@ -708,15 +699,10 @@ functions such an object first has to be initialised with a call to
 Comparison
 --------------------------------------------------------------------------------
 
-
-.. function:: int fmpz_cmp(const fmpz_t f, const fmpz_t g)
-
-.. function:: int fmpz_cmp_ui(const fmpz_t f, ulong g)
-
-.. function:: int fmpz_cmp_si(const fmpz_t f, slong g)
-
-    Returns a negative value if `f < g`, positive value if `g < f`,
-    otherwise returns `0`.
+_prefix func_cmp(fmpz)
+_indent func_cmp_si(fmpz)
+_indent func_cmp_ui(fmpz)
+desc_cmp()
 
 .. function:: int fmpz_cmpabs(const fmpz_t f, const fmpz_t g)
 
@@ -728,21 +714,16 @@ functions such an object first has to be initialised with a call to
     Returns a negative value if `\lvert f\rvert < \lvert 2g\rvert`, positive value if
     `\lvert 2g\rvert < \lvert f \rvert`, otherwise returns `0`.
 
-.. function:: int fmpz_equal(const fmpz_t f, const fmpz_t g)
-
-.. function:: int fmpz_equal_ui(const fmpz_t f, ulong g)
-
-.. function:: int fmpz_equal_si(const fmpz_t f, slong g)
-
-    Returns `1` if `f` is equal to `g`, otherwise returns `0`.
-
-.. function:: int fmpz_is_zero(const fmpz_t f)
+_prefix func_equal(fmpz)
+_indent func_equal_si(fmpz)
+_indent func_equal_ui(fmpz)
+desc_equal()
 
-    Returns `1` if `f` is `0`, otherwise returns `0`.
+_prefix func_is_zero(fmpz)
+desc_is_zero()
 
-.. function:: int fmpz_is_one(const fmpz_t f)
-
-    Returns `1` if `f` is equal to one, otherwise returns `0`.
+_prefix func_is_one(fmpz)
+desc_is_one()
 
 .. function:: int fmpz_is_pm1(const fmpz_t f)
 
@@ -760,32 +741,41 @@ functions such an object first has to be initialised with a call to
 Basic arithmetic
 --------------------------------------------------------------------------------
 
+_prefix func_neg(fmpz)
+desc_neg()
 
-.. function:: void fmpz_neg(fmpz_t f1, const fmpz_t f2)
-
-    Sets `f_1` to `-f_2`.
-
-.. function:: void fmpz_abs(fmpz_t f1, const fmpz_t f2)
-
-    Sets `f_1` to the absolute value of `f_2`.
-
-func_add(fmpz)
-func_add_si(fmpz)
-func_add_ui(fmpz)
+_prefix func_abs(fmpz)
+desc_abs()
 
+_prefix func_add(fmpz)
+_indent func_add_si(fmpz)
+_indent func_add_ui(fmpz)
 desc_add()
 
-func_sub(fmpz)
-func_sub_si(fmpz)
-func_sub_ui(fmpz)
-
+_prefix func_sub(fmpz)
+_indent func_sub_si(fmpz)
+_indent func_sub_ui(fmpz)
 desc_sub()
 
-.. function:: void fmpz_mul(fmpz_t f, const fmpz_t g, const fmpz_t h)
-              void fmpz_mul_ui(fmpz_t f, const fmpz_t g, ulong h)
-              void fmpz_mul_si(fmpz_t f, const fmpz_t g, slong h)
+_prefix func_mul(fmpz)
+_indent func_mul_si(fmpz)
+_indent func_mul_ui(fmpz)
+desc_mul()
+
+_prefix func_divexact(fmpz)
+_indent func_divexact_si(fmpz)
+_indent func_divexact_ui(fmpz)
+desc_divexact()
+
+_prefix func_addmul(fmpz)
+_indent func_addmul_si(fmpz)
+_indent func_addmul_ui(fmpz)
+desc_addmul()
 
-    Sets `f` to `g \times h`.
+_prefix func_submul(fmpz)
+_indent func_submul_si(fmpz)
+_indent func_submul_ui(fmpz)
+desc_submul()
 
 .. function:: void fmpz_mul2_uiui(fmpz_t f, const fmpz_t g, ulong x, ulong y)
 
@@ -801,18 +791,6 @@ functions such an object first has to be initialised with a call to
 
     Sets `f` to `2^e`.
 
-.. function:: void fmpz_addmul(fmpz_t f, const fmpz_t g, const fmpz_t h)
-              void fmpz_addmul_ui(fmpz_t f, const fmpz_t g, ulong h)
-              void fmpz_addmul_si(fmpz_t f, const fmpz_t g, slong h)
-
-    Sets `f` to `f + g \times h`.
-
-.. function:: void fmpz_submul(fmpz_t f, const fmpz_t g, const fmpz_t h)
-              void fmpz_submul_ui(fmpz_t f, const fmpz_t g, ulong h)
-              void fmpz_submul_si(fmpz_t f, const fmpz_t g, slong h)
-
-    Sets `f` to `f - g \times h`.
-
 .. function:: void fmpz_fmma(fmpz_t f, const fmpz_t a, const fmpz_t b, const fmpz_t c, const fmpz_t d)
 
     Sets `f` to `a \times b + c \times d`.
@@ -881,16 +859,6 @@ functions such an object first has to be initialised with a call to
    Returns the absolute value remainder of `g` divided by `h`, following the
    convention of rounding as seen above. If `h` is zero an exception is raised.
 
-.. function:: void fmpz_divexact(fmpz_t f, const fmpz_t g, const fmpz_t h)
-
-.. function:: void fmpz_divexact_si(fmpz_t f, const fmpz_t g, slong h)
-
-.. function:: void fmpz_divexact_ui(fmpz_t f, const fmpz_t g, ulong h)
-
-    Sets `f` to the quotient of `g` and `h`, assuming that the
-    division is exact, i.e. `g` is a multiple of `h`.  If `h`
-    is `0` an exception is raised.
-
 .. function:: void fmpz_divexact2_uiui(fmpz_t f, const fmpz_t g, ulong x, ulong y)
 
     Sets `f` to the quotient of `g` and `h = x \times y`, assuming that
diff --git a/doc/source/macros.m4 b/doc/source/macros.m4
index 51329d6013..20720e72d2 100644
--- a/doc/source/macros.m4
+++ b/doc/source/macros.m4
@@ -1,43 +1,262 @@
 dnl Change quotes to something that is not used anywhere
-changequote({{{{,}}}})dnl
+changequote({{{,}}})dnl
 dnl
 dnl############################################################################
-dnl function prefix
+dnl helper stuff
 dnl############################################################################
-define({{{__function_prefix}}},{{{.. function::}}})dnl
+define({{{_prefix}}},{{{.. function::}}})dnl
+define({{{_indent}}},{{{             }}})dnl
+dnl
+define({{{_res_}}},{{{r}}})dnl
+define({{{_ip1_}}},{{{a}}})dnl
+define({{{_ip2_}}},{{{b}}})dnl
+dnl
+define({{{_neg_}}},{{{-$1}}})dnl
+define({{{_add_}}},{{{$1 + $2}}})dnl
+define({{{_sub_}}},{{{$1 - $2}}})dnl
+define({{{_mul_}}},{{{$1 \cdot $2}}})dnl
+define({{{_div_}}},{{{$1 / $2}}})dnl
+dnl
+define({{{_addmul_}}},{{{_add_($1, _mul_($2, $3))}}})dnl
+define({{{_submul_}}},{{{_sub_($1, _mul_($2, $3))}}})dnl
+dnl
+define({{{_lt_}}},{{{$1 < $2}}})dnl
+define({{{_gt_}}},{{{$1 < $2}}})dnl
+define({{{_equal_}}},{{{$1 = $2}}})dnl
+dnl############################################################################
+dnl set
+dnl############################################################################
+define({{{func_set}}},dnl
+{{{dnl
+void $1_set($1_t _res_, const $1_t _ip1_)dnl
+}}})dnl
+define({{{func_set_si}}},dnl
+{{{dnl
+void $1_set_si($1_t _res_, slong _ip1_)dnl
+}}})dnl
+define({{{func_set_ui}}},dnl
+{{{dnl
+void $1_set_ui($1_t _res_, ulong _ip1_)dnl
+}}})dnl
+define({{{desc_set}}},{{{
+    Sets `_res_` to `_ip1_`.dnl
+}}})dnl
+dnl############################################################################
+dnl set to common constants
+dnl############################################################################
+define({{{func_zero}}},dnl
+{{{dnl
+void $1_zero($1_t _res_)dnl
+}}})dnl
+define({{{desc_zero}}},{{{
+    Sets `_res_` to zero.dnl
+}}})dnl
+define({{{func_one}}},dnl
+{{{dnl
+void $1_one($1_t _res_)dnl
+}}})dnl
+define({{{desc_one}}},{{{
+    Sets `_res_` to one.dnl
+}}})dnl
+dnl############################################################################
+dnl negation
+dnl############################################################################
+define({{{func_neg}}},dnl
+{{{dnl
+void $1_neg($1_t _res_, const $1_t _ip1_)dnl
+}}})dnl
+define({{{desc_neg}}},{{{
+    Sets `_res_` to `_neg_(_ip1_)`.dnl
+}}})dnl
+dnl############################################################################
+dnl absolute value
+dnl############################################################################
+define({{{func_abs}}},dnl
+{{{dnl
+void $1_abs($1_t _res_, const $1_t _ip1_)dnl
+}}})dnl
+define({{{desc_abs}}},{{{
+    Sets `_res_` to the absolute value of `_ip1_`.dnl
+}}})dnl
 dnl############################################################################
 dnl addition
 dnl############################################################################
 define({{{func_add}}},dnl
-{{{__function_prefix dnl
-void $1_add($1_t r, const $1_t a, const $1_t b)dnl
+{{{dnl
+void $1_add($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
 }}})dnl
 define({{{func_add_si}}},dnl
-{{{__function_prefix dnl
-void $1_add_si($1_t r, const $1_t a, slong b)dnl
+{{{dnl
+void $1_add_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
 }}})dnl
 define({{{func_add_ui}}},dnl
-{{{__function_prefix dnl
-void $1_add_ui($1_t r, const $1_t a, ulong b)dnl
+{{{dnl
+void $1_add_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
 }}})dnl
-define({{{desc_add}}},{{{dnl
-    Sets `r` to `a + b`.dnl
+define({{{desc_add}}},{{{
+    Sets `_res_` to `_add_(_ip1_, _ip2_)`.dnl
 }}})dnl
 dnl############################################################################
 dnl subtraction
 dnl############################################################################
 define({{{func_sub}}},dnl
-{{{__function_prefix dnl
-void $1_sub($1_t r, const $1_t a, const $1_t b)dnl
+{{{dnl
+void $1_sub($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
 }}})dnl
 define({{{func_sub_si}}},dnl
-{{{__function_prefix dnl
-void $1_sub_si($1_t r, const $1_t a, slong b)dnl
+{{{dnl
+void $1_sub_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
 }}})dnl
 define({{{func_sub_ui}}},dnl
-{{{__function_prefix dnl
-void $1_sub_ui($1_t r, const $1_t a, ulong b)dnl
+{{{dnl
+void $1_sub_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
+}}})dnl
+define({{{desc_sub}}},{{{
+    Sets `_res_` to `_sub_(_ip1_, _ip2_)`.dnl
+}}})dnl
+dnl############################################################################
+dnl multiplication
+dnl############################################################################
+define({{{func_mul}}},dnl
+{{{dnl
+void $1_mul($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
+}}})dnl
+define({{{func_mul_si}}},dnl
+{{{dnl
+void $1_mul_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
+}}})dnl
+define({{{func_mul_ui}}},dnl
+{{{dnl
+void $1_mul_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
+}}})dnl
+define({{{desc_mul}}},{{{
+    Sets `_res_` to `_mul_(_ip1_, _ip2_)`.dnl
+}}})dnl
+dnl############################################################################
+dnl exact division
+dnl############################################################################
+define({{{func_divexact}}},dnl
+{{{dnl
+void $1_divexact($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
+}}})dnl
+define({{{func_divexact_si}}},dnl
+{{{dnl
+void $1_divexact_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
+}}})dnl
+define({{{func_divexact_ui}}},dnl
+{{{dnl
+void $1_divexact_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
+}}})dnl
+define({{{desc_divexact}}},{{{
+    Sets `_res_` to `_div_(_ip1_, _ip2_)` under the assumption that the
+    division is exact.  If `_ip2_` is zero, an exception is raised.dnl
+}}})dnl
+dnl############################################################################
+dnl addmul
+dnl############################################################################
+define({{{func_addmul}}},dnl
+{{{dnl
+void $1_addmul($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
+}}})dnl
+define({{{func_addmul_si}}},dnl
+{{{dnl
+void $1_addmul_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
+}}})dnl
+define({{{func_addmul_ui}}},dnl
+{{{dnl
+void $1_addmul_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
+}}})dnl
+define({{{desc_addmul}}},{{{
+    Sets `_res_` to `_addmul_(_res_, _ip1_, _ip2_)`.dnl
+}}})dnl
+dnl############################################################################
+dnl submul
+dnl############################################################################
+define({{{func_submul}}},dnl
+{{{dnl
+void $1_submul($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
+}}})dnl
+define({{{func_submul_si}}},dnl
+{{{dnl
+void $1_submul_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
+}}})dnl
+define({{{func_submul_ui}}},dnl
+{{{dnl
+void $1_submul_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
+}}})dnl
+define({{{desc_submul}}},{{{
+    Sets `_res_` to `_submul_(_res_, _ip1_, _ip2_)`.dnl
+}}})dnl
+dnl############################################################################
+dnl sqrt
+dnl############################################################################
+define({{{func_sqrt}}},dnl
+{{{dnl
+void $1_sqrt($1_t _res_, const $1_t _ip1_)dnl
+}}})dnl
+define({{{desc_sqrt_nonordered_ring}}},{{{
+    If `_ip1_` is a perfect square, sets `_res_` to a square root of `_ip1_`
+    and returns nonzero.  Otherwise returns zero.dnl
+}}})dnl
+dnl############################################################################
+dnl comparisons
+dnl############################################################################
+define({{{func_cmp}}},dnl
+{{{dnl
+int $1_cmp(const $1_t _ip1_, const $1_t _ip2_)dnl
+}}})dnl
+define({{{func_cmp_si}}},dnl
+{{{dnl
+int $1_cmp_si(const $1_t _ip1_, slong _ip2_)dnl
+}}})dnl
+define({{{func_cmp_ui}}},dnl
+{{{dnl
+int $1_cmp_ui(const $1_t _ip1_, ulong _ip2_)dnl
+}}})dnl
+define({{{func_cmp_fmpz}}},dnl
+{{{dnl
+int $1_cmp_fmpz(const $1_t _ip1_, const fmpz_t _ip2_)dnl
+}}})dnl
+define({{{desc_cmp}}},{{{
+    Returns a negative value if `_lt_(_ip1_, _ip2_)`, positive value if
+    `_gt_(_ip1_, _ip2_)`, otherwise returns zero.dnl
+}}})dnl
+dnl############################################################################
+dnl equality
+dnl############################################################################
+define({{{func_equal}}},dnl
+{{{dnl
+int $1_equal(const $1_t _ip1_, const $1_t _ip2_)dnl
+}}})dnl
+define({{{func_equal_si}}},dnl
+{{{dnl
+int $1_equal_si(const $1_t _ip1_, slong _ip2_)dnl
+}}})dnl
+define({{{func_equal_ui}}},dnl
+{{{dnl
+int $1_equal_ui(const $1_t _ip1_, ulong _ip2_)dnl
+}}})dnl
+define({{{func_equal_fmpz}}},dnl
+{{{dnl
+int $1_equal_fmpz(const $1_t _ip1_, const fmpz_t _ip2_)dnl
+}}})dnl
+define({{{desc_equal}}},{{{
+    Returns nonzero if `_equal_(_ip1_, _ip2_)`, otherwise returns zero.
+}}})dnl
+dnl############################################################################
+dnl equality to common constants
+dnl############################################################################
+define({{{func_is_zero}}},dnl
+{{{dnl
+int $1_is_zero(const $1_t _ip1_)dnl
+}}})dnl
+define({{{desc_is_zero}}},{{{
+    Returns nonzero if `_equal_(_ip1_, 0)`, otherwise returns zero.dnl
+}}})dnl
+define({{{func_is_one}}},dnl
+{{{dnl
+int $1_is_one(const $1_t _ip1_)dnl
 }}})dnl
-define({{{desc_sub}}},{{{dnl
-    Sets `r` to `a - b`.dnl
+define({{{desc_is_one}}},{{{
+    Returns nonzero if `_equal_(_ip1_, 1)`, otherwise returns zero.dnl
 }}})dnl

From 7c6c442fff5120f08c4b777e090f45af593704d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Wed, 29 Jan 2025 15:19:47 +0100
Subject: [PATCH 11/20] Ensure that M4 is installed on documentation CI

---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 817beef588..1226f61c73 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: "Setup"
         run: |
-          sudo apt-get install -y python3-sphinx texlive-full
+          sudo apt-get install -y python3-sphinx texlive-full m4
           sphinx-build --version
 
       - name: "Build documentation"

From e45bc3217492cee01fb8e463bddd121d2fc00cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Thu, 30 Jan 2025 09:56:06 +0100
Subject: [PATCH 12/20] push preprocessed stuff into build directory

---
 doc/Makefile       | 6 +++---
 doc/source/conf.py | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 631608ce96..bdb6563daa 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -13,8 +13,8 @@ M4 := m4
 SPHINX_ACTIONS := html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf latexpdfja text man texinfo info gettext changes xml pseudoxml linkcheck doctest coverage clean
 
 MACROS := $(SOURCEDIR)/macros.m4
-SRCS := $(wildcard $(SOURCEDIR)/*.rst.pp)
-OBJS := $(patsubst %.pp,%,$(SRCS))
+SRCS := $(wildcard $(SOURCEDIR)/*.rst)
+OBJS := $(patsubst $(SOURCEDIR)/%,$(BUILDDIR)/%,$(SRCS))
 
 # Put it first so that "make" without argument is like "make help".
 help:
@@ -22,7 +22,7 @@ help:
 
 preprocess: $(OBJS)
 
-%.rst: %.rst.pp $(MACROS)
+$(BUILDDIR)/%.rst: $(SOURCEDIR)/%.rst $(MACROS)
 	@$(M4) -I $(SOURCEDIR) $< > $@
 
 $(SPHINX_ACTIONS): Makefile preprocess
diff --git a/doc/source/conf.py b/doc/source/conf.py
index ddad93c724..8bbd304bc8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -17,6 +17,7 @@
 
 sys.path.insert(0, os.path.abspath('../..'))
 sys.path.append(os.path.abspath("."))
+sys.path.append(os.path.abspath("../build"))
 sys.path.append(os.path.abspath('../../src/python'))
 
 # -- Project information -----------------------------------------------------

From 06aadc4c0f883cb98080d5af18fb9f36b5115989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Thu, 30 Jan 2025 09:59:11 +0100
Subject: [PATCH 13/20] Revert back to regular rst files

---
 doc/source/{acb.rst.pp => acb.rst}            |   1 -
 doc/source/{acb_calc.rst.pp => acb_calc.rst}  |   1 -
 doc/source/{acb_dft.rst.pp => acb_dft.rst}    |   1 -
 ...acb_dirichlet.rst.pp => acb_dirichlet.rst} |   1 -
 .../{acb_elliptic.rst.pp => acb_elliptic.rst} |   1 -
 .../{acb_hypgeom.rst.pp => acb_hypgeom.rst}   |   1 -
 doc/source/{acb_mat.rst.pp => acb_mat.rst}    |   1 -
 .../{acb_modular.rst.pp => acb_modular.rst}   |   1 -
 doc/source/{acb_poly.rst.pp => acb_poly.rst}  |   1 -
 .../{acb_theta.rst.pp => acb_theta.rst}       |   1 -
 doc/source/{acf.rst.pp => acf.rst}            |   1 -
 doc/source/{agm.rst.pp => agm.rst}            |   1 -
 doc/source/{aprcl.rst.pp => aprcl.rst}        |   1 -
 doc/source/{arb.rst.pp => arb.rst}            |   1 -
 doc/source/{arb_calc.rst.pp => arb_calc.rst}  |   1 -
 ...arb_fmpz_poly.rst.pp => arb_fmpz_poly.rst} |   1 -
 .../{arb_fpwrap.rst.pp => arb_fpwrap.rst}     |   1 -
 .../{arb_hypgeom.rst.pp => arb_hypgeom.rst}   |   1 -
 doc/source/{arb_mat.rst.pp => arb_mat.rst}    |   1 -
 doc/source/{arb_poly.rst.pp => arb_poly.rst}  |   1 -
 doc/source/{arf.rst.pp => arf.rst}            |   1 -
 doc/source/{arith.rst.pp => arith.rst}        |   1 -
 .../{bernoulli.rst.pp => bernoulli.rst}       |   1 -
 doc/source/{bool_mat.rst.pp => bool_mat.rst}  |   1 -
 ...bug_reporting.rst.pp => bug_reporting.rst} |   1 -
 doc/source/{building.rst.pp => building.rst}  |   1 -
 doc/source/{ca.rst.pp => ca.rst}              |   1 -
 doc/source/{ca_ext.rst.pp => ca_ext.rst}      |   1 -
 doc/source/{ca_field.rst.pp => ca_field.rst}  |   1 -
 doc/source/{ca_mat.rst.pp => ca_mat.rst}      |   1 -
 doc/source/{ca_poly.rst.pp => ca_poly.rst}    |   1 -
 doc/source/{ca_vec.rst.pp => ca_vec.rst}      |   1 -
 doc/source/{calcium.rst.pp => calcium.rst}    |   1 -
 .../{constants.rst.pp => constants.rst}       |   1 -
 .../{contributing.rst.pp => contributing.rst} |   1 -
 .../{contributors.rst.pp => contributors.rst} |   1 -
 doc/source/{d_mat.rst.pp => d_mat.rst}        |   1 -
 doc/source/{d_vec.rst.pp => d_vec.rst}        |   1 -
 .../{dirichlet.rst.pp => dirichlet.rst}       |   1 -
 doc/source/{dlog.rst.pp => dlog.rst}          |   1 -
 ...double_extras.rst.pp => double_extras.rst} |   1 -
 ...le_interval.rst.pp => double_interval.rst} |   1 -
 doc/source/{examples.rst.pp => examples.rst}  |   1 -
 .../{examples_arb.rst.pp => examples_arb.rst} |   1 -
 ...es_calcium.rst.pp => examples_calcium.rst} |   1 -
 doc/source/{fexpr.rst.pp => fexpr.rst}        |   1 -
 ...fexpr_builtin.rst.pp => fexpr_builtin.rst} |   1 -
 doc/source/{fft.rst.pp => fft.rst}            |   1 -
 .../{fft_small.rst.pp => fft_small.rst}       |   1 -
 doc/source/{flint.rst.pp => flint.rst}        |   1 -
 doc/source/{fmpq.rst.pp => fmpq.rst}          |   1 -
 doc/source/{fmpq_mat.rst.pp => fmpq_mat.rst}  |   1 -
 .../{fmpq_mpoly.rst.pp => fmpq_mpoly.rst}     |   1 -
 ...ly_factor.rst.pp => fmpq_mpoly_factor.rst} |   1 -
 .../{fmpq_poly.rst.pp => fmpq_poly.rst}       |   1 -
 doc/source/{fmpq_vec.rst.pp => fmpq_vec.rst}  |   1 -
 doc/source/{fmpz.rst.pp => fmpz.rst}          | 129 +++++++++++-------
 .../{fmpz_extras.rst.pp => fmpz_extras.rst}   |   1 -
 .../{fmpz_factor.rst.pp => fmpz_factor.rst}   |   1 -
 doc/source/{fmpz_lll.rst.pp => fmpz_lll.rst}  |   1 -
 doc/source/{fmpz_mat.rst.pp => fmpz_mat.rst}  |   1 -
 doc/source/{fmpz_mod.rst.pp => fmpz_mod.rst}  |   1 -
 .../{fmpz_mod_mat.rst.pp => fmpz_mod_mat.rst} |   1 -
 ...pz_mod_mpoly.rst.pp => fmpz_mod_mpoly.rst} |   1 -
 ...actor.rst.pp => fmpz_mod_mpoly_factor.rst} |   1 -
 ...fmpz_mod_poly.rst.pp => fmpz_mod_poly.rst} |   1 -
 ...factor.rst.pp => fmpz_mod_poly_factor.rst} |   1 -
 .../{fmpz_mod_vec.rst.pp => fmpz_mod_vec.rst} |   1 -
 .../{fmpz_mpoly.rst.pp => fmpz_mpoly.rst}     |   1 -
 ...ly_factor.rst.pp => fmpz_mpoly_factor.rst} |   1 -
 .../{fmpz_mpoly_q.rst.pp => fmpz_mpoly_q.rst} |   1 -
 .../{fmpz_poly.rst.pp => fmpz_poly.rst}       |   1 -
 ...oly_factor.rst.pp => fmpz_poly_factor.rst} |   1 -
 ...fmpz_poly_mat.rst.pp => fmpz_poly_mat.rst} |   1 -
 .../{fmpz_poly_q.rst.pp => fmpz_poly_q.rst}   |   1 -
 doc/source/{fmpz_vec.rst.pp => fmpz_vec.rst}  |   1 -
 doc/source/{fmpzi.rst.pp => fmpzi.rst}        |   1 -
 doc/source/{formulas.rst.pp => formulas.rst}  |   1 -
 doc/source/{fq.rst.pp => fq.rst}              |   1 -
 .../{fq_default.rst.pp => fq_default.rst}     |   1 -
 ..._default_mat.rst.pp => fq_default_mat.rst} |   1 -
 ...efault_poly.rst.pp => fq_default_poly.rst} |   1 -
 ...ctor.rst.pp => fq_default_poly_factor.rst} |   1 -
 doc/source/{fq_embed.rst.pp => fq_embed.rst}  |   1 -
 doc/source/{fq_mat.rst.pp => fq_mat.rst}      |   1 -
 doc/source/{fq_nmod.rst.pp => fq_nmod.rst}    |   1 -
 ...fq_nmod_embed.rst.pp => fq_nmod_embed.rst} |   1 -
 .../{fq_nmod_mat.rst.pp => fq_nmod_mat.rst}   |   1 -
 ...fq_nmod_mpoly.rst.pp => fq_nmod_mpoly.rst} |   1 -
 ...factor.rst.pp => fq_nmod_mpoly_factor.rst} |   1 -
 .../{fq_nmod_poly.rst.pp => fq_nmod_poly.rst} |   1 -
 ..._factor.rst.pp => fq_nmod_poly_factor.rst} |   1 -
 .../{fq_nmod_vec.rst.pp => fq_nmod_vec.rst}   |   1 -
 doc/source/{fq_poly.rst.pp => fq_poly.rst}    |   1 -
 ..._poly_factor.rst.pp => fq_poly_factor.rst} |   1 -
 doc/source/{fq_vec.rst.pp => fq_vec.rst}      |   1 -
 doc/source/{fq_zech.rst.pp => fq_zech.rst}    |   1 -
 ...fq_zech_embed.rst.pp => fq_zech_embed.rst} |   1 -
 .../{fq_zech_mat.rst.pp => fq_zech_mat.rst}   |   1 -
 .../{fq_zech_poly.rst.pp => fq_zech_poly.rst} |   1 -
 ..._factor.rst.pp => fq_zech_poly_factor.rst} |   1 -
 .../{fq_zech_vec.rst.pp => fq_zech_vec.rst}   |   1 -
 doc/source/{gamma.rst.pp => gamma.rst}        |   1 -
 doc/source/{gr.rst.pp => gr.rst}              |   1 -
 .../{gr_domains.rst.pp => gr_domains.rst}     |   1 -
 .../{gr_generic.rst.pp => gr_generic.rst}     |   1 -
 ...mplementing.rst.pp => gr_implementing.rst} |   1 -
 doc/source/{gr_mat.rst.pp => gr_mat.rst}      |   1 -
 doc/source/{gr_mpoly.rst.pp => gr_mpoly.rst}  |   1 -
 doc/source/{gr_poly.rst.pp => gr_poly.rst}    |   1 -
 .../{gr_special.rst.pp => gr_special.rst}     |   1 -
 doc/source/{gr_vec.rst.pp => gr_vec.rst}      |   1 -
 doc/source/{history.rst.pp => history.rst}    |   1 -
 doc/source/{hurwitz.rst.pp => hurwitz.rst}    |   1 -
 ...pergeometric.rst.pp => hypergeometric.rst} |   1 -
 doc/source/{hypgeom.rst.pp => hypgeom.rst}    |   1 -
 doc/source/{index.rst.pp => index.rst}        |   1 -
 .../{index_arb.rst.pp => index_arb.rst}       |   1 -
 ...index_generic.rst.pp => index_generic.rst} |   1 -
 ...dex_integers.rst.pp => index_integers.rst} |   1 -
 ...gers_mod.rst.pp => index_integers_mod.rst} |   1 -
 ...x_rationals.rst.pp => index_rationals.rst} |   1 -
 .../{introduction.rst.pp => introduction.rst} |   1 -
 ...alcium.rst.pp => introduction_calcium.rst} |   1 -
 doc/source/{issues.rst.pp => issues.rst}      |   1 -
 .../{long_extras.rst.pp => long_extras.rst}   |   1 -
 doc/source/{longlong.rst.pp => longlong.rst}  |   1 -
 ...ine_vectors.rst.pp => machine_vectors.rst} |   1 -
 doc/source/{mag.rst.pp => mag.rst}            |   1 -
 doc/source/{memory.rst.pp => memory.rst}      |   1 -
 doc/source/{mpfr_mat.rst.pp => mpfr_mat.rst}  |   1 -
 doc/source/{mpfr_vec.rst.pp => mpfr_vec.rst}  |   1 -
 .../{mpn_extras.rst.pp => mpn_extras.rst}     |   1 -
 doc/source/{mpn_mod.rst.pp => mpn_mod.rst}    |   1 -
 doc/source/{mpoly.rst.pp => mpoly.rst}        |   1 -
 doc/source/{nf.rst.pp => nf.rst}              |   1 -
 doc/source/{nf_elem.rst.pp => nf_elem.rst}    |   1 -
 doc/source/{nfloat.rst.pp => nfloat.rst}      |   1 -
 doc/source/{nmod.rst.pp => nmod.rst}          |   1 -
 doc/source/{nmod_mat.rst.pp => nmod_mat.rst}  |   1 -
 .../{nmod_mpoly.rst.pp => nmod_mpoly.rst}     |   1 -
 ...ly_factor.rst.pp => nmod_mpoly_factor.rst} |   1 -
 .../{nmod_poly.rst.pp => nmod_poly.rst}       |   1 -
 ...oly_factor.rst.pp => nmod_poly_factor.rst} |   1 -
 ...nmod_poly_mat.rst.pp => nmod_poly_mat.rst} |   1 -
 doc/source/{nmod_vec.rst.pp => nmod_vec.rst}  |   1 -
 doc/source/{overview.rst.pp => overview.rst}  |   1 -
 doc/source/{padic.rst.pp => padic.rst}        |   1 -
 .../{padic_mat.rst.pp => padic_mat.rst}       |   1 -
 .../{padic_poly.rst.pp => padic_poly.rst}     |   1 -
 .../{partitions.rst.pp => partitions.rst}     |   1 -
 doc/source/{perm.rst.pp => perm.rst}          |   1 -
 ...lylogarithms.rst.pp => polylogarithms.rst} |   1 -
 .../{portability.rst.pp => portability.rst}   |   1 -
 doc/source/{profiler.rst.pp => profiler.rst}  |   1 -
 .../{python_flint.rst.pp => python_flint.rst} |   1 -
 doc/source/{qadic.rst.pp => qadic.rst}        |   1 -
 doc/source/{qfb.rst.pp => qfb.rst}            |   1 -
 doc/source/{qqbar.rst.pp => qqbar.rst}        |   1 -
 doc/source/{qsieve.rst.pp => qsieve.rst}      |   1 -
 .../{references.rst.pp => references.rst}     |   1 -
 .../{thread_pool.rst.pp => thread_pool.rst}   |   1 -
 .../{threading.rst.pp => threading.rst}       |   1 -
 .../{ulong_extras.rst.pp => ulong_extras.rst} |   1 -
 doc/source/{using.rst.pp => using.rst}        |   1 -
 165 files changed, 80 insertions(+), 213 deletions(-)
 rename doc/source/{acb.rst.pp => acb.rst} (99%)
 rename doc/source/{acb_calc.rst.pp => acb_calc.rst} (99%)
 rename doc/source/{acb_dft.rst.pp => acb_dft.rst} (99%)
 rename doc/source/{acb_dirichlet.rst.pp => acb_dirichlet.rst} (99%)
 rename doc/source/{acb_elliptic.rst.pp => acb_elliptic.rst} (99%)
 rename doc/source/{acb_hypgeom.rst.pp => acb_hypgeom.rst} (99%)
 rename doc/source/{acb_mat.rst.pp => acb_mat.rst} (99%)
 rename doc/source/{acb_modular.rst.pp => acb_modular.rst} (99%)
 rename doc/source/{acb_poly.rst.pp => acb_poly.rst} (99%)
 rename doc/source/{acb_theta.rst.pp => acb_theta.rst} (99%)
 rename doc/source/{acf.rst.pp => acf.rst} (99%)
 rename doc/source/{agm.rst.pp => agm.rst} (99%)
 rename doc/source/{aprcl.rst.pp => aprcl.rst} (99%)
 rename doc/source/{arb.rst.pp => arb.rst} (99%)
 rename doc/source/{arb_calc.rst.pp => arb_calc.rst} (99%)
 rename doc/source/{arb_fmpz_poly.rst.pp => arb_fmpz_poly.rst} (99%)
 rename doc/source/{arb_fpwrap.rst.pp => arb_fpwrap.rst} (99%)
 rename doc/source/{arb_hypgeom.rst.pp => arb_hypgeom.rst} (99%)
 rename doc/source/{arb_mat.rst.pp => arb_mat.rst} (99%)
 rename doc/source/{arb_poly.rst.pp => arb_poly.rst} (99%)
 rename doc/source/{arf.rst.pp => arf.rst} (99%)
 rename doc/source/{arith.rst.pp => arith.rst} (99%)
 rename doc/source/{bernoulli.rst.pp => bernoulli.rst} (99%)
 rename doc/source/{bool_mat.rst.pp => bool_mat.rst} (99%)
 rename doc/source/{bug_reporting.rst.pp => bug_reporting.rst} (97%)
 rename doc/source/{building.rst.pp => building.rst} (99%)
 rename doc/source/{ca.rst.pp => ca.rst} (99%)
 rename doc/source/{ca_ext.rst.pp => ca_ext.rst} (99%)
 rename doc/source/{ca_field.rst.pp => ca_field.rst} (99%)
 rename doc/source/{ca_mat.rst.pp => ca_mat.rst} (99%)
 rename doc/source/{ca_poly.rst.pp => ca_poly.rst} (99%)
 rename doc/source/{ca_vec.rst.pp => ca_vec.rst} (99%)
 rename doc/source/{calcium.rst.pp => calcium.rst} (99%)
 rename doc/source/{constants.rst.pp => constants.rst} (99%)
 rename doc/source/{contributing.rst.pp => contributing.rst} (99%)
 rename doc/source/{contributors.rst.pp => contributors.rst} (96%)
 rename doc/source/{d_mat.rst.pp => d_mat.rst} (99%)
 rename doc/source/{d_vec.rst.pp => d_vec.rst} (99%)
 rename doc/source/{dirichlet.rst.pp => dirichlet.rst} (99%)
 rename doc/source/{dlog.rst.pp => dlog.rst} (99%)
 rename doc/source/{double_extras.rst.pp => double_extras.rst} (99%)
 rename doc/source/{double_interval.rst.pp => double_interval.rst} (99%)
 rename doc/source/{examples.rst.pp => examples.rst} (98%)
 rename doc/source/{examples_arb.rst.pp => examples_arb.rst} (99%)
 rename doc/source/{examples_calcium.rst.pp => examples_calcium.rst} (99%)
 rename doc/source/{fexpr.rst.pp => fexpr.rst} (99%)
 rename doc/source/{fexpr_builtin.rst.pp => fexpr_builtin.rst} (99%)
 rename doc/source/{fft.rst.pp => fft.rst} (99%)
 rename doc/source/{fft_small.rst.pp => fft_small.rst} (99%)
 rename doc/source/{flint.rst.pp => flint.rst} (99%)
 rename doc/source/{fmpq.rst.pp => fmpq.rst} (99%)
 rename doc/source/{fmpq_mat.rst.pp => fmpq_mat.rst} (99%)
 rename doc/source/{fmpq_mpoly.rst.pp => fmpq_mpoly.rst} (99%)
 rename doc/source/{fmpq_mpoly_factor.rst.pp => fmpq_mpoly_factor.rst} (99%)
 rename doc/source/{fmpq_poly.rst.pp => fmpq_poly.rst} (99%)
 rename doc/source/{fmpq_vec.rst.pp => fmpq_vec.rst} (99%)
 rename doc/source/{fmpz.rst.pp => fmpz.rst} (95%)
 rename doc/source/{fmpz_extras.rst.pp => fmpz_extras.rst} (99%)
 rename doc/source/{fmpz_factor.rst.pp => fmpz_factor.rst} (99%)
 rename doc/source/{fmpz_lll.rst.pp => fmpz_lll.rst} (99%)
 rename doc/source/{fmpz_mat.rst.pp => fmpz_mat.rst} (99%)
 rename doc/source/{fmpz_mod.rst.pp => fmpz_mod.rst} (99%)
 rename doc/source/{fmpz_mod_mat.rst.pp => fmpz_mod_mat.rst} (99%)
 rename doc/source/{fmpz_mod_mpoly.rst.pp => fmpz_mod_mpoly.rst} (99%)
 rename doc/source/{fmpz_mod_mpoly_factor.rst.pp => fmpz_mod_mpoly_factor.rst} (99%)
 rename doc/source/{fmpz_mod_poly.rst.pp => fmpz_mod_poly.rst} (99%)
 rename doc/source/{fmpz_mod_poly_factor.rst.pp => fmpz_mod_poly_factor.rst} (99%)
 rename doc/source/{fmpz_mod_vec.rst.pp => fmpz_mod_vec.rst} (99%)
 rename doc/source/{fmpz_mpoly.rst.pp => fmpz_mpoly.rst} (99%)
 rename doc/source/{fmpz_mpoly_factor.rst.pp => fmpz_mpoly_factor.rst} (99%)
 rename doc/source/{fmpz_mpoly_q.rst.pp => fmpz_mpoly_q.rst} (99%)
 rename doc/source/{fmpz_poly.rst.pp => fmpz_poly.rst} (99%)
 rename doc/source/{fmpz_poly_factor.rst.pp => fmpz_poly_factor.rst} (99%)
 rename doc/source/{fmpz_poly_mat.rst.pp => fmpz_poly_mat.rst} (99%)
 rename doc/source/{fmpz_poly_q.rst.pp => fmpz_poly_q.rst} (99%)
 rename doc/source/{fmpz_vec.rst.pp => fmpz_vec.rst} (99%)
 rename doc/source/{fmpzi.rst.pp => fmpzi.rst} (99%)
 rename doc/source/{formulas.rst.pp => formulas.rst} (99%)
 rename doc/source/{fq.rst.pp => fq.rst} (99%)
 rename doc/source/{fq_default.rst.pp => fq_default.rst} (99%)
 rename doc/source/{fq_default_mat.rst.pp => fq_default_mat.rst} (99%)
 rename doc/source/{fq_default_poly.rst.pp => fq_default_poly.rst} (99%)
 rename doc/source/{fq_default_poly_factor.rst.pp => fq_default_poly_factor.rst} (99%)
 rename doc/source/{fq_embed.rst.pp => fq_embed.rst} (99%)
 rename doc/source/{fq_mat.rst.pp => fq_mat.rst} (99%)
 rename doc/source/{fq_nmod.rst.pp => fq_nmod.rst} (99%)
 rename doc/source/{fq_nmod_embed.rst.pp => fq_nmod_embed.rst} (99%)
 rename doc/source/{fq_nmod_mat.rst.pp => fq_nmod_mat.rst} (99%)
 rename doc/source/{fq_nmod_mpoly.rst.pp => fq_nmod_mpoly.rst} (99%)
 rename doc/source/{fq_nmod_mpoly_factor.rst.pp => fq_nmod_mpoly_factor.rst} (99%)
 rename doc/source/{fq_nmod_poly.rst.pp => fq_nmod_poly.rst} (99%)
 rename doc/source/{fq_nmod_poly_factor.rst.pp => fq_nmod_poly_factor.rst} (99%)
 rename doc/source/{fq_nmod_vec.rst.pp => fq_nmod_vec.rst} (99%)
 rename doc/source/{fq_poly.rst.pp => fq_poly.rst} (99%)
 rename doc/source/{fq_poly_factor.rst.pp => fq_poly_factor.rst} (99%)
 rename doc/source/{fq_vec.rst.pp => fq_vec.rst} (99%)
 rename doc/source/{fq_zech.rst.pp => fq_zech.rst} (99%)
 rename doc/source/{fq_zech_embed.rst.pp => fq_zech_embed.rst} (99%)
 rename doc/source/{fq_zech_mat.rst.pp => fq_zech_mat.rst} (99%)
 rename doc/source/{fq_zech_poly.rst.pp => fq_zech_poly.rst} (99%)
 rename doc/source/{fq_zech_poly_factor.rst.pp => fq_zech_poly_factor.rst} (99%)
 rename doc/source/{fq_zech_vec.rst.pp => fq_zech_vec.rst} (99%)
 rename doc/source/{gamma.rst.pp => gamma.rst} (99%)
 rename doc/source/{gr.rst.pp => gr.rst} (99%)
 rename doc/source/{gr_domains.rst.pp => gr_domains.rst} (99%)
 rename doc/source/{gr_generic.rst.pp => gr_generic.rst} (99%)
 rename doc/source/{gr_implementing.rst.pp => gr_implementing.rst} (99%)
 rename doc/source/{gr_mat.rst.pp => gr_mat.rst} (99%)
 rename doc/source/{gr_mpoly.rst.pp => gr_mpoly.rst} (99%)
 rename doc/source/{gr_poly.rst.pp => gr_poly.rst} (99%)
 rename doc/source/{gr_special.rst.pp => gr_special.rst} (99%)
 rename doc/source/{gr_vec.rst.pp => gr_vec.rst} (99%)
 rename doc/source/{history.rst.pp => history.rst} (99%)
 rename doc/source/{hurwitz.rst.pp => hurwitz.rst} (98%)
 rename doc/source/{hypergeometric.rst.pp => hypergeometric.rst} (99%)
 rename doc/source/{hypgeom.rst.pp => hypgeom.rst} (99%)
 rename doc/source/{index.rst.pp => index.rst} (99%)
 rename doc/source/{index_arb.rst.pp => index_arb.rst} (99%)
 rename doc/source/{index_generic.rst.pp => index_generic.rst} (93%)
 rename doc/source/{index_integers.rst.pp => index_integers.rst} (95%)
 rename doc/source/{index_integers_mod.rst.pp => index_integers_mod.rst} (95%)
 rename doc/source/{index_rationals.rst.pp => index_rationals.rst} (93%)
 rename doc/source/{introduction.rst.pp => introduction.rst} (99%)
 rename doc/source/{introduction_calcium.rst.pp => introduction_calcium.rst} (99%)
 rename doc/source/{issues.rst.pp => issues.rst} (99%)
 rename doc/source/{long_extras.rst.pp => long_extras.rst} (98%)
 rename doc/source/{longlong.rst.pp => longlong.rst} (99%)
 rename doc/source/{machine_vectors.rst.pp => machine_vectors.rst} (99%)
 rename doc/source/{mag.rst.pp => mag.rst} (99%)
 rename doc/source/{memory.rst.pp => memory.rst} (99%)
 rename doc/source/{mpfr_mat.rst.pp => mpfr_mat.rst} (98%)
 rename doc/source/{mpfr_vec.rst.pp => mpfr_vec.rst} (97%)
 rename doc/source/{mpn_extras.rst.pp => mpn_extras.rst} (99%)
 rename doc/source/{mpn_mod.rst.pp => mpn_mod.rst} (99%)
 rename doc/source/{mpoly.rst.pp => mpoly.rst} (99%)
 rename doc/source/{nf.rst.pp => nf.rst} (95%)
 rename doc/source/{nf_elem.rst.pp => nf_elem.rst} (99%)
 rename doc/source/{nfloat.rst.pp => nfloat.rst} (99%)
 rename doc/source/{nmod.rst.pp => nmod.rst} (99%)
 rename doc/source/{nmod_mat.rst.pp => nmod_mat.rst} (99%)
 rename doc/source/{nmod_mpoly.rst.pp => nmod_mpoly.rst} (99%)
 rename doc/source/{nmod_mpoly_factor.rst.pp => nmod_mpoly_factor.rst} (99%)
 rename doc/source/{nmod_poly.rst.pp => nmod_poly.rst} (99%)
 rename doc/source/{nmod_poly_factor.rst.pp => nmod_poly_factor.rst} (99%)
 rename doc/source/{nmod_poly_mat.rst.pp => nmod_poly_mat.rst} (99%)
 rename doc/source/{nmod_vec.rst.pp => nmod_vec.rst} (99%)
 rename doc/source/{overview.rst.pp => overview.rst} (99%)
 rename doc/source/{padic.rst.pp => padic.rst} (99%)
 rename doc/source/{padic_mat.rst.pp => padic_mat.rst} (99%)
 rename doc/source/{padic_poly.rst.pp => padic_poly.rst} (99%)
 rename doc/source/{partitions.rst.pp => partitions.rst} (99%)
 rename doc/source/{perm.rst.pp => perm.rst} (98%)
 rename doc/source/{polylogarithms.rst.pp => polylogarithms.rst} (99%)
 rename doc/source/{portability.rst.pp => portability.rst} (98%)
 rename doc/source/{profiler.rst.pp => profiler.rst} (99%)
 rename doc/source/{python_flint.rst.pp => python_flint.rst} (98%)
 rename doc/source/{qadic.rst.pp => qadic.rst} (99%)
 rename doc/source/{qfb.rst.pp => qfb.rst} (99%)
 rename doc/source/{qqbar.rst.pp => qqbar.rst} (99%)
 rename doc/source/{qsieve.rst.pp => qsieve.rst} (99%)
 rename doc/source/{references.rst.pp => references.rst} (99%)
 rename doc/source/{thread_pool.rst.pp => thread_pool.rst} (98%)
 rename doc/source/{threading.rst.pp => threading.rst} (99%)
 rename doc/source/{ulong_extras.rst.pp => ulong_extras.rst} (99%)
 rename doc/source/{using.rst.pp => using.rst} (99%)

diff --git a/doc/source/acb.rst.pp b/doc/source/acb.rst
similarity index 99%
rename from doc/source/acb.rst.pp
rename to doc/source/acb.rst
index d0e29cb178..a4d0f54136 100644
--- a/doc/source/acb.rst.pp
+++ b/doc/source/acb.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb:
 
 **acb.h** -- complex numbers
diff --git a/doc/source/acb_calc.rst.pp b/doc/source/acb_calc.rst
similarity index 99%
rename from doc/source/acb_calc.rst.pp
rename to doc/source/acb_calc.rst
index 1bc21a1fdc..de67707534 100644
--- a/doc/source/acb_calc.rst.pp
+++ b/doc/source/acb_calc.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-calc:
 
 **acb_calc.h** -- calculus with complex-valued functions
diff --git a/doc/source/acb_dft.rst.pp b/doc/source/acb_dft.rst
similarity index 99%
rename from doc/source/acb_dft.rst.pp
rename to doc/source/acb_dft.rst
index 2e683963b6..b4d8ff9fb5 100644
--- a/doc/source/acb_dft.rst.pp
+++ b/doc/source/acb_dft.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-dft:
 
 **acb_dft.h** -- Discrete Fourier transform
diff --git a/doc/source/acb_dirichlet.rst.pp b/doc/source/acb_dirichlet.rst
similarity index 99%
rename from doc/source/acb_dirichlet.rst.pp
rename to doc/source/acb_dirichlet.rst
index 33200505b7..44b812543e 100644
--- a/doc/source/acb_dirichlet.rst.pp
+++ b/doc/source/acb_dirichlet.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-dirichlet:
 
 **acb_dirichlet.h** -- Dirichlet L-functions, Riemann zeta and related functions
diff --git a/doc/source/acb_elliptic.rst.pp b/doc/source/acb_elliptic.rst
similarity index 99%
rename from doc/source/acb_elliptic.rst.pp
rename to doc/source/acb_elliptic.rst
index 237b4239d7..d74ecafba3 100644
--- a/doc/source/acb_elliptic.rst.pp
+++ b/doc/source/acb_elliptic.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-elliptic:
 
 **acb_elliptic.h** -- elliptic integrals and functions of complex variables
diff --git a/doc/source/acb_hypgeom.rst.pp b/doc/source/acb_hypgeom.rst
similarity index 99%
rename from doc/source/acb_hypgeom.rst.pp
rename to doc/source/acb_hypgeom.rst
index f1775f6a75..13299b7114 100644
--- a/doc/source/acb_hypgeom.rst.pp
+++ b/doc/source/acb_hypgeom.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-hypgeom:
 
 **acb_hypgeom.h** -- hypergeometric functions of complex variables
diff --git a/doc/source/acb_mat.rst.pp b/doc/source/acb_mat.rst
similarity index 99%
rename from doc/source/acb_mat.rst.pp
rename to doc/source/acb_mat.rst
index 9a10beb2fb..b3b5eddb8f 100644
--- a/doc/source/acb_mat.rst.pp
+++ b/doc/source/acb_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-mat:
 
 **acb_mat.h** -- matrices over the complex numbers
diff --git a/doc/source/acb_modular.rst.pp b/doc/source/acb_modular.rst
similarity index 99%
rename from doc/source/acb_modular.rst.pp
rename to doc/source/acb_modular.rst
index 898885a2e3..ca05f2dd17 100644
--- a/doc/source/acb_modular.rst.pp
+++ b/doc/source/acb_modular.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-modular:
 
 **acb_modular.h** -- modular forms of complex variables
diff --git a/doc/source/acb_poly.rst.pp b/doc/source/acb_poly.rst
similarity index 99%
rename from doc/source/acb_poly.rst.pp
rename to doc/source/acb_poly.rst
index ae0f8d9c7f..66148a38a0 100644
--- a/doc/source/acb_poly.rst.pp
+++ b/doc/source/acb_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-poly:
 
 **acb_poly.h** -- polynomials over the complex numbers
diff --git a/doc/source/acb_theta.rst.pp b/doc/source/acb_theta.rst
similarity index 99%
rename from doc/source/acb_theta.rst.pp
rename to doc/source/acb_theta.rst
index d08320ab21..1f4700352e 100644
--- a/doc/source/acb_theta.rst.pp
+++ b/doc/source/acb_theta.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acb-theta:
 
 **acb_theta.h** -- Riemann theta functions
diff --git a/doc/source/acf.rst.pp b/doc/source/acf.rst
similarity index 99%
rename from doc/source/acf.rst.pp
rename to doc/source/acf.rst
index 3cf542cc2f..0d06433a49 100644
--- a/doc/source/acf.rst.pp
+++ b/doc/source/acf.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _acf:
 
 **acf.h** -- complex floating-point numbers
diff --git a/doc/source/agm.rst.pp b/doc/source/agm.rst
similarity index 99%
rename from doc/source/agm.rst.pp
rename to doc/source/agm.rst
index 4096224fcc..fc846267d9 100644
--- a/doc/source/agm.rst.pp
+++ b/doc/source/agm.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _algorithms_agm:
 
 Algorithms for the arithmetic-geometric mean
diff --git a/doc/source/aprcl.rst.pp b/doc/source/aprcl.rst
similarity index 99%
rename from doc/source/aprcl.rst.pp
rename to doc/source/aprcl.rst
index dbb4d85d46..1d593f0ba7 100644
--- a/doc/source/aprcl.rst.pp
+++ b/doc/source/aprcl.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _aprcl:
 
 **aprcl.h** -- APRCL primality testing
diff --git a/doc/source/arb.rst.pp b/doc/source/arb.rst
similarity index 99%
rename from doc/source/arb.rst.pp
rename to doc/source/arb.rst
index d24d0a4f15..0dd829f8d9 100644
--- a/doc/source/arb.rst.pp
+++ b/doc/source/arb.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arb:
 
 **arb.h** -- real numbers
diff --git a/doc/source/arb_calc.rst.pp b/doc/source/arb_calc.rst
similarity index 99%
rename from doc/source/arb_calc.rst.pp
rename to doc/source/arb_calc.rst
index cbd8a9c837..33b45abf37 100644
--- a/doc/source/arb_calc.rst.pp
+++ b/doc/source/arb_calc.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arb-calc:
 
 **arb_calc.h** -- calculus with real-valued functions
diff --git a/doc/source/arb_fmpz_poly.rst.pp b/doc/source/arb_fmpz_poly.rst
similarity index 99%
rename from doc/source/arb_fmpz_poly.rst.pp
rename to doc/source/arb_fmpz_poly.rst
index 4db0914e44..baebf8521e 100644
--- a/doc/source/arb_fmpz_poly.rst.pp
+++ b/doc/source/arb_fmpz_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arb_fmpz_poly:
 
 **arb_fmpz_poly.h** -- extra methods for integer polynomials
diff --git a/doc/source/arb_fpwrap.rst.pp b/doc/source/arb_fpwrap.rst
similarity index 99%
rename from doc/source/arb_fpwrap.rst.pp
rename to doc/source/arb_fpwrap.rst
index 2c37f52d6f..ac494a79e1 100644
--- a/doc/source/arb_fpwrap.rst.pp
+++ b/doc/source/arb_fpwrap.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arb_fpwrap:
 
 **arb_fpwrap.h** -- floating-point wrappers of Arb mathematical functions
diff --git a/doc/source/arb_hypgeom.rst.pp b/doc/source/arb_hypgeom.rst
similarity index 99%
rename from doc/source/arb_hypgeom.rst.pp
rename to doc/source/arb_hypgeom.rst
index 59f2d5966c..c31fdaed56 100644
--- a/doc/source/arb_hypgeom.rst.pp
+++ b/doc/source/arb_hypgeom.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arb-hypgeom:
 
 **arb_hypgeom.h** -- hypergeometric functions of real variables
diff --git a/doc/source/arb_mat.rst.pp b/doc/source/arb_mat.rst
similarity index 99%
rename from doc/source/arb_mat.rst.pp
rename to doc/source/arb_mat.rst
index ea775a6284..3c56495354 100644
--- a/doc/source/arb_mat.rst.pp
+++ b/doc/source/arb_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arb-mat:
 
 **arb_mat.h** -- matrices over the real numbers
diff --git a/doc/source/arb_poly.rst.pp b/doc/source/arb_poly.rst
similarity index 99%
rename from doc/source/arb_poly.rst.pp
rename to doc/source/arb_poly.rst
index 5e30631c12..14d330b2bd 100644
--- a/doc/source/arb_poly.rst.pp
+++ b/doc/source/arb_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arb-poly:
 
 **arb_poly.h** -- polynomials over the real numbers
diff --git a/doc/source/arf.rst.pp b/doc/source/arf.rst
similarity index 99%
rename from doc/source/arf.rst.pp
rename to doc/source/arf.rst
index ccee5e8bf5..e35b3d23d2 100644
--- a/doc/source/arf.rst.pp
+++ b/doc/source/arf.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arf:
 
 **arf.h** -- arbitrary-precision floating-point numbers
diff --git a/doc/source/arith.rst.pp b/doc/source/arith.rst
similarity index 99%
rename from doc/source/arith.rst.pp
rename to doc/source/arith.rst
index db7d7991c1..e311f69ecc 100644
--- a/doc/source/arith.rst.pp
+++ b/doc/source/arith.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _arith:
 
 **arith.h** -- arithmetic and special functions
diff --git a/doc/source/bernoulli.rst.pp b/doc/source/bernoulli.rst
similarity index 99%
rename from doc/source/bernoulli.rst.pp
rename to doc/source/bernoulli.rst
index 59b7e5d272..7cc7deee24 100644
--- a/doc/source/bernoulli.rst.pp
+++ b/doc/source/bernoulli.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _bernoulli:
 
 **bernoulli.h** -- support for Bernoulli numbers
diff --git a/doc/source/bool_mat.rst.pp b/doc/source/bool_mat.rst
similarity index 99%
rename from doc/source/bool_mat.rst.pp
rename to doc/source/bool_mat.rst
index 78c2a21abf..c97ee95b81 100644
--- a/doc/source/bool_mat.rst.pp
+++ b/doc/source/bool_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _bool-mat:
 
 **bool_mat.h** -- matrices over booleans
diff --git a/doc/source/bug_reporting.rst.pp b/doc/source/bug_reporting.rst
similarity index 97%
rename from doc/source/bug_reporting.rst.pp
rename to doc/source/bug_reporting.rst
index 337fac8b66..4a15f37d7c 100644
--- a/doc/source/bug_reporting.rst.pp
+++ b/doc/source/bug_reporting.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _bug_reporting:
 
 **Bug reporting**
diff --git a/doc/source/building.rst.pp b/doc/source/building.rst
similarity index 99%
rename from doc/source/building.rst.pp
rename to doc/source/building.rst
index b63b1e307a..37fbcd01a9 100644
--- a/doc/source/building.rst.pp
+++ b/doc/source/building.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _building:
 
 **Building, testing and installing**
diff --git a/doc/source/ca.rst.pp b/doc/source/ca.rst
similarity index 99%
rename from doc/source/ca.rst.pp
rename to doc/source/ca.rst
index aeeb4a9754..891b511b4a 100644
--- a/doc/source/ca.rst.pp
+++ b/doc/source/ca.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _ca:
 
 **ca.h** -- exact real and complex numbers
diff --git a/doc/source/ca_ext.rst.pp b/doc/source/ca_ext.rst
similarity index 99%
rename from doc/source/ca_ext.rst.pp
rename to doc/source/ca_ext.rst
index 353668907d..a39390ab16 100644
--- a/doc/source/ca_ext.rst.pp
+++ b/doc/source/ca_ext.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _ca-ext:
 
 **ca_ext.h** -- real and complex extension numbers
diff --git a/doc/source/ca_field.rst.pp b/doc/source/ca_field.rst
similarity index 99%
rename from doc/source/ca_field.rst.pp
rename to doc/source/ca_field.rst
index bd8e0e5c53..37a4792a02 100644
--- a/doc/source/ca_field.rst.pp
+++ b/doc/source/ca_field.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _ca-field:
 
 **ca_field.h** -- extension fields
diff --git a/doc/source/ca_mat.rst.pp b/doc/source/ca_mat.rst
similarity index 99%
rename from doc/source/ca_mat.rst.pp
rename to doc/source/ca_mat.rst
index 1161f2fa8c..4d38fef58a 100644
--- a/doc/source/ca_mat.rst.pp
+++ b/doc/source/ca_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _ca-mat:
 
 **ca_mat.h** -- matrices over the real and complex numbers
diff --git a/doc/source/ca_poly.rst.pp b/doc/source/ca_poly.rst
similarity index 99%
rename from doc/source/ca_poly.rst.pp
rename to doc/source/ca_poly.rst
index a6a3022cba..982bba34ff 100644
--- a/doc/source/ca_poly.rst.pp
+++ b/doc/source/ca_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _ca-poly:
 
 **ca_poly.h** -- dense univariate polynomials over the real and complex numbers
diff --git a/doc/source/ca_vec.rst.pp b/doc/source/ca_vec.rst
similarity index 99%
rename from doc/source/ca_vec.rst.pp
rename to doc/source/ca_vec.rst
index f8fc6df8c2..ac4ce9960c 100644
--- a/doc/source/ca_vec.rst.pp
+++ b/doc/source/ca_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _ca-vec:
 
 **ca_vec.h** -- vectors of real and complex numbers
diff --git a/doc/source/calcium.rst.pp b/doc/source/calcium.rst
similarity index 99%
rename from doc/source/calcium.rst.pp
rename to doc/source/calcium.rst
index 6b480f3086..cc4bbbe542 100644
--- a/doc/source/calcium.rst.pp
+++ b/doc/source/calcium.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _calcium:
 
 **calcium.h** -- global definitions
diff --git a/doc/source/constants.rst.pp b/doc/source/constants.rst
similarity index 99%
rename from doc/source/constants.rst.pp
rename to doc/source/constants.rst
index 09e17e4aae..11b1392cce 100644
--- a/doc/source/constants.rst.pp
+++ b/doc/source/constants.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _algorithms_constants:
 
 Algorithms for mathematical constants
diff --git a/doc/source/contributing.rst.pp b/doc/source/contributing.rst
similarity index 99%
rename from doc/source/contributing.rst.pp
rename to doc/source/contributing.rst
index 404ae4198b..464a70f920 100644
--- a/doc/source/contributing.rst.pp
+++ b/doc/source/contributing.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _contributing:
 
 **Contributing to FLINT**
diff --git a/doc/source/contributors.rst.pp b/doc/source/contributors.rst
similarity index 96%
rename from doc/source/contributors.rst.pp
rename to doc/source/contributors.rst
index f0bf610471..11af33c890 100644
--- a/doc/source/contributors.rst.pp
+++ b/doc/source/contributors.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _contributors:
 
 **Contributors**
diff --git a/doc/source/d_mat.rst.pp b/doc/source/d_mat.rst
similarity index 99%
rename from doc/source/d_mat.rst.pp
rename to doc/source/d_mat.rst
index 0abff86631..76aa25c756 100644
--- a/doc/source/d_mat.rst.pp
+++ b/doc/source/d_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _d-mat:
 
 **d_mat.h** -- double precision matrices
diff --git a/doc/source/d_vec.rst.pp b/doc/source/d_vec.rst
similarity index 99%
rename from doc/source/d_vec.rst.pp
rename to doc/source/d_vec.rst
index 0b757356e7..cad3446898 100644
--- a/doc/source/d_vec.rst.pp
+++ b/doc/source/d_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _d-vec:
 
 **d_vec.h** -- double precision vectors
diff --git a/doc/source/dirichlet.rst.pp b/doc/source/dirichlet.rst
similarity index 99%
rename from doc/source/dirichlet.rst.pp
rename to doc/source/dirichlet.rst
index 3bd74afad2..15e564614b 100644
--- a/doc/source/dirichlet.rst.pp
+++ b/doc/source/dirichlet.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _dirichlet:
 
 **dirichlet.h** -- Dirichlet characters
diff --git a/doc/source/dlog.rst.pp b/doc/source/dlog.rst
similarity index 99%
rename from doc/source/dlog.rst.pp
rename to doc/source/dlog.rst
index 7d10bdec16..2ca95eb451 100644
--- a/doc/source/dlog.rst.pp
+++ b/doc/source/dlog.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _dlog:
 
 **dlog.h** -- discrete logarithms mod ulong primes
diff --git a/doc/source/double_extras.rst.pp b/doc/source/double_extras.rst
similarity index 99%
rename from doc/source/double_extras.rst.pp
rename to doc/source/double_extras.rst
index ff9a31a55b..725892e011 100644
--- a/doc/source/double_extras.rst.pp
+++ b/doc/source/double_extras.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _double-extras:
 
 **double_extras.h** -- support functions for double arithmetic
diff --git a/doc/source/double_interval.rst.pp b/doc/source/double_interval.rst
similarity index 99%
rename from doc/source/double_interval.rst.pp
rename to doc/source/double_interval.rst
index 4a9774e752..c53e5724fd 100644
--- a/doc/source/double_interval.rst.pp
+++ b/doc/source/double_interval.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _double_interval:
 
 **double_interval.h** -- double-precision interval arithmetic and helpers
diff --git a/doc/source/examples.rst.pp b/doc/source/examples.rst
similarity index 98%
rename from doc/source/examples.rst.pp
rename to doc/source/examples.rst
index 42f0da8f28..dc76d5237b 100644
--- a/doc/source/examples.rst.pp
+++ b/doc/source/examples.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _examples:
 
 **Examples**
diff --git a/doc/source/examples_arb.rst.pp b/doc/source/examples_arb.rst
similarity index 99%
rename from doc/source/examples_arb.rst.pp
rename to doc/source/examples_arb.rst
index 727513f3f1..0a9901c6aa 100644
--- a/doc/source/examples_arb.rst.pp
+++ b/doc/source/examples_arb.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _examples-arb:
 
 Arb example programs
diff --git a/doc/source/examples_calcium.rst.pp b/doc/source/examples_calcium.rst
similarity index 99%
rename from doc/source/examples_calcium.rst.pp
rename to doc/source/examples_calcium.rst
index e5c0ea85b3..5a36132844 100644
--- a/doc/source/examples_calcium.rst.pp
+++ b/doc/source/examples_calcium.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _examples-calcium:
 
 Calcium example programs
diff --git a/doc/source/fexpr.rst.pp b/doc/source/fexpr.rst
similarity index 99%
rename from doc/source/fexpr.rst.pp
rename to doc/source/fexpr.rst
index 16eedddcc7..8633d53f5d 100644
--- a/doc/source/fexpr.rst.pp
+++ b/doc/source/fexpr.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fexpr:
 
 **fexpr.h** -- flat-packed symbolic expressions
diff --git a/doc/source/fexpr_builtin.rst.pp b/doc/source/fexpr_builtin.rst
similarity index 99%
rename from doc/source/fexpr_builtin.rst.pp
rename to doc/source/fexpr_builtin.rst
index 3275c06f38..38c7900ca3 100644
--- a/doc/source/fexpr_builtin.rst.pp
+++ b/doc/source/fexpr_builtin.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fexpr-builtin:
 
 **fexpr_builtin.h** -- builtin symbols
diff --git a/doc/source/fft.rst.pp b/doc/source/fft.rst
similarity index 99%
rename from doc/source/fft.rst.pp
rename to doc/source/fft.rst
index ea67f6c731..fcda6a9ba9 100644
--- a/doc/source/fft.rst.pp
+++ b/doc/source/fft.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fft:
 
 **fft.h** -- Schoenhage-Strassen FFT
diff --git a/doc/source/fft_small.rst.pp b/doc/source/fft_small.rst
similarity index 99%
rename from doc/source/fft_small.rst.pp
rename to doc/source/fft_small.rst
index edf4f208db..2bfda79400 100644
--- a/doc/source/fft_small.rst.pp
+++ b/doc/source/fft_small.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fft-small:
 
 **fft_small.h** -- FFT modulo word-size primes
diff --git a/doc/source/flint.rst.pp b/doc/source/flint.rst
similarity index 99%
rename from doc/source/flint.rst.pp
rename to doc/source/flint.rst
index e9f9468260..f8790d1482 100644
--- a/doc/source/flint.rst.pp
+++ b/doc/source/flint.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _flint:
 
 **flint.h** -- global definitions
diff --git a/doc/source/fmpq.rst.pp b/doc/source/fmpq.rst
similarity index 99%
rename from doc/source/fmpq.rst.pp
rename to doc/source/fmpq.rst
index 667a3b760d..7e6e28bf69 100644
--- a/doc/source/fmpq.rst.pp
+++ b/doc/source/fmpq.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpq:
 
 **fmpq.h** -- rational numbers
diff --git a/doc/source/fmpq_mat.rst.pp b/doc/source/fmpq_mat.rst
similarity index 99%
rename from doc/source/fmpq_mat.rst.pp
rename to doc/source/fmpq_mat.rst
index 93aa3c3376..0db4365fd7 100644
--- a/doc/source/fmpq_mat.rst.pp
+++ b/doc/source/fmpq_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpq-mat:
 
 **fmpq_mat.h** -- matrices over the rational numbers
diff --git a/doc/source/fmpq_mpoly.rst.pp b/doc/source/fmpq_mpoly.rst
similarity index 99%
rename from doc/source/fmpq_mpoly.rst.pp
rename to doc/source/fmpq_mpoly.rst
index ba81b9f494..dd6fa7d4de 100644
--- a/doc/source/fmpq_mpoly.rst.pp
+++ b/doc/source/fmpq_mpoly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpq-mpoly:
 
 **fmpq_mpoly.h** -- multivariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_mpoly_factor.rst.pp b/doc/source/fmpq_mpoly_factor.rst
similarity index 99%
rename from doc/source/fmpq_mpoly_factor.rst.pp
rename to doc/source/fmpq_mpoly_factor.rst
index 721bb4784d..5812a4daaa 100644
--- a/doc/source/fmpq_mpoly_factor.rst.pp
+++ b/doc/source/fmpq_mpoly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpq-mpoly-factor:
 
 **fmpq_mpoly_factor.h** -- factorisation of multivariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_poly.rst.pp b/doc/source/fmpq_poly.rst
similarity index 99%
rename from doc/source/fmpq_poly.rst.pp
rename to doc/source/fmpq_poly.rst
index 36b7d8934d..b678b6fbbf 100644
--- a/doc/source/fmpq_poly.rst.pp
+++ b/doc/source/fmpq_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpq-poly:
 
 **fmpq_poly.h** -- univariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_vec.rst.pp b/doc/source/fmpq_vec.rst
similarity index 99%
rename from doc/source/fmpq_vec.rst.pp
rename to doc/source/fmpq_vec.rst
index 8230d16014..d177c86803 100644
--- a/doc/source/fmpq_vec.rst.pp
+++ b/doc/source/fmpq_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpq-vec:
 
 **fmpq_vec.h** -- vectors over rational numbers
diff --git a/doc/source/fmpz.rst.pp b/doc/source/fmpz.rst
similarity index 95%
rename from doc/source/fmpz.rst.pp
rename to doc/source/fmpz.rst
index 74be53a689..4f71a9da28 100644
--- a/doc/source/fmpz.rst.pp
+++ b/doc/source/fmpz.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz:
 
 **fmpz.h** -- integers
@@ -375,6 +374,14 @@ functions such an object first has to be initialised with a call to
     the function.  Otherwise, it is up to the caller to ensure that
     the allocated block of memory is sufficiently large.
 
+.. function:: void fmpz_set_si(fmpz_t f, slong val)
+
+    Sets `f` to the given ``slong`` value.
+
+.. function:: void fmpz_set_ui(fmpz_t f, ulong val)
+
+    Sets `f` to the given ``ulong`` value.
+
 .. function:: void fmpz_set_d(fmpz_t f, double c)
 
     Sets `f` to the ``double`` `c`, rounding down towards zero if
@@ -651,16 +658,17 @@ functions such an object first has to be initialised with a call to
 
     Efficiently swaps `f` and `g`.  No data is copied.
 
-_prefix func_set(fmpz)
-_indent func_set_si(fmpz)
-_indent func_set_ui(fmpz)
-desc_set()
+.. function:: void fmpz_set(fmpz_t f, const fmpz_t g)
+
+    Sets `f` to the same value as `g`.
+
+.. function:: void fmpz_zero(fmpz_t f)
+
+    Sets `f` to zero.
 
-_prefix func_zero(fmpz)
-desc_zero()
+.. function:: void fmpz_one(fmpz_t f)
 
-_prefix func_one(fmpz)
-desc_one()
+    Sets `f` to one.
 
 .. function:: int fmpz_abs_fits_ui(const fmpz_t f)
 
@@ -699,10 +707,15 @@ functions such an object first has to be initialised with a call to
 Comparison
 --------------------------------------------------------------------------------
 
-_prefix func_cmp(fmpz)
-_indent func_cmp_si(fmpz)
-_indent func_cmp_ui(fmpz)
-desc_cmp()
+
+.. function:: int fmpz_cmp(const fmpz_t f, const fmpz_t g)
+
+.. function:: int fmpz_cmp_ui(const fmpz_t f, ulong g)
+
+.. function:: int fmpz_cmp_si(const fmpz_t f, slong g)
+
+    Returns a negative value if `f < g`, positive value if `g < f`,
+    otherwise returns `0`.
 
 .. function:: int fmpz_cmpabs(const fmpz_t f, const fmpz_t g)
 
@@ -714,16 +727,21 @@ functions such an object first has to be initialised with a call to
     Returns a negative value if `\lvert f\rvert < \lvert 2g\rvert`, positive value if
     `\lvert 2g\rvert < \lvert f \rvert`, otherwise returns `0`.
 
-_prefix func_equal(fmpz)
-_indent func_equal_si(fmpz)
-_indent func_equal_ui(fmpz)
-desc_equal()
+.. function:: int fmpz_equal(const fmpz_t f, const fmpz_t g)
+
+.. function:: int fmpz_equal_ui(const fmpz_t f, ulong g)
+
+.. function:: int fmpz_equal_si(const fmpz_t f, slong g)
 
-_prefix func_is_zero(fmpz)
-desc_is_zero()
+    Returns `1` if `f` is equal to `g`, otherwise returns `0`.
 
-_prefix func_is_one(fmpz)
-desc_is_one()
+.. function:: int fmpz_is_zero(const fmpz_t f)
+
+    Returns `1` if `f` is `0`, otherwise returns `0`.
+
+.. function:: int fmpz_is_one(const fmpz_t f)
+
+    Returns `1` if `f` is equal to one, otherwise returns `0`.
 
 .. function:: int fmpz_is_pm1(const fmpz_t f)
 
@@ -741,41 +759,32 @@ functions such an object first has to be initialised with a call to
 Basic arithmetic
 --------------------------------------------------------------------------------
 
-_prefix func_neg(fmpz)
-desc_neg()
 
-_prefix func_abs(fmpz)
-desc_abs()
+.. function:: void fmpz_neg(fmpz_t f1, const fmpz_t f2)
+
+    Sets `f_1` to `-f_2`.
 
-_prefix func_add(fmpz)
-_indent func_add_si(fmpz)
-_indent func_add_ui(fmpz)
-desc_add()
+.. function:: void fmpz_abs(fmpz_t f1, const fmpz_t f2)
 
-_prefix func_sub(fmpz)
-_indent func_sub_si(fmpz)
-_indent func_sub_ui(fmpz)
-desc_sub()
+    Sets `f_1` to the absolute value of `f_2`.
 
-_prefix func_mul(fmpz)
-_indent func_mul_si(fmpz)
-_indent func_mul_ui(fmpz)
-desc_mul()
+.. function:: void fmpz_add(fmpz_t f, const fmpz_t g, const fmpz_t h)
+              void fmpz_add_ui(fmpz_t f, const fmpz_t g, ulong h)
+              void fmpz_add_si(fmpz_t f, const fmpz_t g, slong h)
 
-_prefix func_divexact(fmpz)
-_indent func_divexact_si(fmpz)
-_indent func_divexact_ui(fmpz)
-desc_divexact()
+    Sets `f` to `g + h`.
 
-_prefix func_addmul(fmpz)
-_indent func_addmul_si(fmpz)
-_indent func_addmul_ui(fmpz)
-desc_addmul()
+.. function:: void fmpz_sub(fmpz_t f, const fmpz_t g, const fmpz_t h)
+              void fmpz_sub_ui(fmpz_t f, const fmpz_t g, ulong h)
+              void fmpz_sub_si(fmpz_t f, const fmpz_t g, slong h)
 
-_prefix func_submul(fmpz)
-_indent func_submul_si(fmpz)
-_indent func_submul_ui(fmpz)
-desc_submul()
+    Sets `f` to `g - h`.
+
+.. function:: void fmpz_mul(fmpz_t f, const fmpz_t g, const fmpz_t h)
+              void fmpz_mul_ui(fmpz_t f, const fmpz_t g, ulong h)
+              void fmpz_mul_si(fmpz_t f, const fmpz_t g, slong h)
+
+    Sets `f` to `g \times h`.
 
 .. function:: void fmpz_mul2_uiui(fmpz_t f, const fmpz_t g, ulong x, ulong y)
 
@@ -791,6 +800,18 @@ functions such an object first has to be initialised with a call to
 
     Sets `f` to `2^e`.
 
+.. function:: void fmpz_addmul(fmpz_t f, const fmpz_t g, const fmpz_t h)
+              void fmpz_addmul_ui(fmpz_t f, const fmpz_t g, ulong h)
+              void fmpz_addmul_si(fmpz_t f, const fmpz_t g, slong h)
+
+    Sets `f` to `f + g \times h`.
+
+.. function:: void fmpz_submul(fmpz_t f, const fmpz_t g, const fmpz_t h)
+              void fmpz_submul_ui(fmpz_t f, const fmpz_t g, ulong h)
+              void fmpz_submul_si(fmpz_t f, const fmpz_t g, slong h)
+
+    Sets `f` to `f - g \times h`.
+
 .. function:: void fmpz_fmma(fmpz_t f, const fmpz_t a, const fmpz_t b, const fmpz_t c, const fmpz_t d)
 
     Sets `f` to `a \times b + c \times d`.
@@ -859,6 +880,16 @@ functions such an object first has to be initialised with a call to
    Returns the absolute value remainder of `g` divided by `h`, following the
    convention of rounding as seen above. If `h` is zero an exception is raised.
 
+.. function:: void fmpz_divexact(fmpz_t f, const fmpz_t g, const fmpz_t h)
+
+.. function:: void fmpz_divexact_si(fmpz_t f, const fmpz_t g, slong h)
+
+.. function:: void fmpz_divexact_ui(fmpz_t f, const fmpz_t g, ulong h)
+
+    Sets `f` to the quotient of `g` and `h`, assuming that the
+    division is exact, i.e. `g` is a multiple of `h`.  If `h`
+    is `0` an exception is raised.
+
 .. function:: void fmpz_divexact2_uiui(fmpz_t f, const fmpz_t g, ulong x, ulong y)
 
     Sets `f` to the quotient of `g` and `h = x \times y`, assuming that
diff --git a/doc/source/fmpz_extras.rst.pp b/doc/source/fmpz_extras.rst
similarity index 99%
rename from doc/source/fmpz_extras.rst.pp
rename to doc/source/fmpz_extras.rst
index 00cb7aa7bc..bbcad16a5c 100644
--- a/doc/source/fmpz_extras.rst.pp
+++ b/doc/source/fmpz_extras.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz_extras:
 
 **fmpz_extras.h** -- extra methods for FLINT integers
diff --git a/doc/source/fmpz_factor.rst.pp b/doc/source/fmpz_factor.rst
similarity index 99%
rename from doc/source/fmpz_factor.rst.pp
rename to doc/source/fmpz_factor.rst
index bde954996e..b8bca58aa2 100644
--- a/doc/source/fmpz_factor.rst.pp
+++ b/doc/source/fmpz_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-factor:
 
 **fmpz_factor.h** -- integer factorisation
diff --git a/doc/source/fmpz_lll.rst.pp b/doc/source/fmpz_lll.rst
similarity index 99%
rename from doc/source/fmpz_lll.rst.pp
rename to doc/source/fmpz_lll.rst
index 52d16fd4bf..d2601d2938 100644
--- a/doc/source/fmpz_lll.rst.pp
+++ b/doc/source/fmpz_lll.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-lll:
 
 **fmpz_lll.h** -- LLL reduction
diff --git a/doc/source/fmpz_mat.rst.pp b/doc/source/fmpz_mat.rst
similarity index 99%
rename from doc/source/fmpz_mat.rst.pp
rename to doc/source/fmpz_mat.rst
index 0fdde78cf8..684ae2bdbc 100644
--- a/doc/source/fmpz_mat.rst.pp
+++ b/doc/source/fmpz_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mat:
 
 **fmpz_mat.h** -- matrices over the integers
diff --git a/doc/source/fmpz_mod.rst.pp b/doc/source/fmpz_mod.rst
similarity index 99%
rename from doc/source/fmpz_mod.rst.pp
rename to doc/source/fmpz_mod.rst
index 71be997433..eca14a0394 100644
--- a/doc/source/fmpz_mod.rst.pp
+++ b/doc/source/fmpz_mod.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mod:
 
 **fmpz_mod.h** -- arithmetic modulo integers
diff --git a/doc/source/fmpz_mod_mat.rst.pp b/doc/source/fmpz_mod_mat.rst
similarity index 99%
rename from doc/source/fmpz_mod_mat.rst.pp
rename to doc/source/fmpz_mod_mat.rst
index 0f802a64e4..e667b240b0 100644
--- a/doc/source/fmpz_mod_mat.rst.pp
+++ b/doc/source/fmpz_mod_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz_mod_mat:
 
 **fmpz_mod_mat.h** -- matrices over integers mod n
diff --git a/doc/source/fmpz_mod_mpoly.rst.pp b/doc/source/fmpz_mod_mpoly.rst
similarity index 99%
rename from doc/source/fmpz_mod_mpoly.rst.pp
rename to doc/source/fmpz_mod_mpoly.rst
index f2cc9f55d3..7a40c58829 100644
--- a/doc/source/fmpz_mod_mpoly.rst.pp
+++ b/doc/source/fmpz_mod_mpoly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mod-mpoly:
 
 **fmpz_mod_mpoly.h** -- polynomials over the integers mod n
diff --git a/doc/source/fmpz_mod_mpoly_factor.rst.pp b/doc/source/fmpz_mod_mpoly_factor.rst
similarity index 99%
rename from doc/source/fmpz_mod_mpoly_factor.rst.pp
rename to doc/source/fmpz_mod_mpoly_factor.rst
index 057fe90dd5..eebe1677b1 100644
--- a/doc/source/fmpz_mod_mpoly_factor.rst.pp
+++ b/doc/source/fmpz_mod_mpoly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mod-mpoly-factor:
 
 **fmpz_mod_mpoly_factor.h** -- factorisation of multivariate polynomials over the integers mod n
diff --git a/doc/source/fmpz_mod_poly.rst.pp b/doc/source/fmpz_mod_poly.rst
similarity index 99%
rename from doc/source/fmpz_mod_poly.rst.pp
rename to doc/source/fmpz_mod_poly.rst
index ee6ebbb28f..566ade3258 100644
--- a/doc/source/fmpz_mod_poly.rst.pp
+++ b/doc/source/fmpz_mod_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mod-poly:
 
 **fmpz_mod_poly.h** -- polynomials over integers mod n
diff --git a/doc/source/fmpz_mod_poly_factor.rst.pp b/doc/source/fmpz_mod_poly_factor.rst
similarity index 99%
rename from doc/source/fmpz_mod_poly_factor.rst.pp
rename to doc/source/fmpz_mod_poly_factor.rst
index 8882e1026a..94f43b9bb7 100644
--- a/doc/source/fmpz_mod_poly_factor.rst.pp
+++ b/doc/source/fmpz_mod_poly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mod-poly-factor:
 
 **fmpz_mod_poly_factor.h** -- factorisation of polynomials over integers mod n
diff --git a/doc/source/fmpz_mod_vec.rst.pp b/doc/source/fmpz_mod_vec.rst
similarity index 99%
rename from doc/source/fmpz_mod_vec.rst.pp
rename to doc/source/fmpz_mod_vec.rst
index f5d0994509..dd6902b76e 100644
--- a/doc/source/fmpz_mod_vec.rst.pp
+++ b/doc/source/fmpz_mod_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mod-vec:
 
 **fmpz_mod_vec.h** -- vectors over integers mod n
diff --git a/doc/source/fmpz_mpoly.rst.pp b/doc/source/fmpz_mpoly.rst
similarity index 99%
rename from doc/source/fmpz_mpoly.rst.pp
rename to doc/source/fmpz_mpoly.rst
index 5312cbaf1d..c8ad7e0e1d 100644
--- a/doc/source/fmpz_mpoly.rst.pp
+++ b/doc/source/fmpz_mpoly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mpoly:
 
 **fmpz_mpoly.h** -- multivariate polynomials over the integers
diff --git a/doc/source/fmpz_mpoly_factor.rst.pp b/doc/source/fmpz_mpoly_factor.rst
similarity index 99%
rename from doc/source/fmpz_mpoly_factor.rst.pp
rename to doc/source/fmpz_mpoly_factor.rst
index b534f538d9..84d33bb4d6 100644
--- a/doc/source/fmpz_mpoly_factor.rst.pp
+++ b/doc/source/fmpz_mpoly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mpoly-factor:
 
 **fmpz_mpoly_factor.h** -- factorisation of multivariate polynomials over the integers
diff --git a/doc/source/fmpz_mpoly_q.rst.pp b/doc/source/fmpz_mpoly_q.rst
similarity index 99%
rename from doc/source/fmpz_mpoly_q.rst.pp
rename to doc/source/fmpz_mpoly_q.rst
index 135e75c62d..42baa26a88 100644
--- a/doc/source/fmpz_mpoly_q.rst.pp
+++ b/doc/source/fmpz_mpoly_q.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-mpoly-q:
 
 **fmpz_mpoly_q.h** -- multivariate rational functions over Q
diff --git a/doc/source/fmpz_poly.rst.pp b/doc/source/fmpz_poly.rst
similarity index 99%
rename from doc/source/fmpz_poly.rst.pp
rename to doc/source/fmpz_poly.rst
index 8ad2c2b8e8..a2df9dea5f 100644
--- a/doc/source/fmpz_poly.rst.pp
+++ b/doc/source/fmpz_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-poly:
 
 **fmpz_poly.h** -- univariate polynomials over the integers
diff --git a/doc/source/fmpz_poly_factor.rst.pp b/doc/source/fmpz_poly_factor.rst
similarity index 99%
rename from doc/source/fmpz_poly_factor.rst.pp
rename to doc/source/fmpz_poly_factor.rst
index 6299cc8e9b..df6d93e9d8 100644
--- a/doc/source/fmpz_poly_factor.rst.pp
+++ b/doc/source/fmpz_poly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-poly-factor:
 
 **fmpz_poly_factor.h** -- factorisation of polynomials over the integers
diff --git a/doc/source/fmpz_poly_mat.rst.pp b/doc/source/fmpz_poly_mat.rst
similarity index 99%
rename from doc/source/fmpz_poly_mat.rst.pp
rename to doc/source/fmpz_poly_mat.rst
index d2e09b8920..985f5589d7 100644
--- a/doc/source/fmpz_poly_mat.rst.pp
+++ b/doc/source/fmpz_poly_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-poly-mat:
 
 **fmpz_poly_mat.h** -- matrices of polynomials over the integers
diff --git a/doc/source/fmpz_poly_q.rst.pp b/doc/source/fmpz_poly_q.rst
similarity index 99%
rename from doc/source/fmpz_poly_q.rst.pp
rename to doc/source/fmpz_poly_q.rst
index 3d468d87ff..98dc654652 100644
--- a/doc/source/fmpz_poly_q.rst.pp
+++ b/doc/source/fmpz_poly_q.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-poly-q:
 
 **fmpz_poly_q.h** -- rational functions over the rational numbers
diff --git a/doc/source/fmpz_vec.rst.pp b/doc/source/fmpz_vec.rst
similarity index 99%
rename from doc/source/fmpz_vec.rst.pp
rename to doc/source/fmpz_vec.rst
index 2a45ed76e8..04f4e2437e 100644
--- a/doc/source/fmpz_vec.rst.pp
+++ b/doc/source/fmpz_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpz-vec:
 
 **fmpz_vec.h** -- vectors of integers
diff --git a/doc/source/fmpzi.rst.pp b/doc/source/fmpzi.rst
similarity index 99%
rename from doc/source/fmpzi.rst.pp
rename to doc/source/fmpzi.rst
index 6819a86fd9..ebe9fd3c16 100644
--- a/doc/source/fmpzi.rst.pp
+++ b/doc/source/fmpzi.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fmpzi:
 
 **fmpzi.h** -- Gaussian integers
diff --git a/doc/source/formulas.rst.pp b/doc/source/formulas.rst
similarity index 99%
rename from doc/source/formulas.rst.pp
rename to doc/source/formulas.rst
index 41f5712278..5815d18390 100644
--- a/doc/source/formulas.rst.pp
+++ b/doc/source/formulas.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _general_formulas:
 
 General formulas and bounds
diff --git a/doc/source/fq.rst.pp b/doc/source/fq.rst
similarity index 99%
rename from doc/source/fq.rst.pp
rename to doc/source/fq.rst
index 180d0c1b37..f97caf31fd 100644
--- a/doc/source/fq.rst.pp
+++ b/doc/source/fq.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq:
 
 **fq.h** -- finite fields
diff --git a/doc/source/fq_default.rst.pp b/doc/source/fq_default.rst
similarity index 99%
rename from doc/source/fq_default.rst.pp
rename to doc/source/fq_default.rst
index e1a085aff2..190da0c868 100644
--- a/doc/source/fq_default.rst.pp
+++ b/doc/source/fq_default.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq_default:
 
 **fq_default.h** -- unified finite fields
diff --git a/doc/source/fq_default_mat.rst.pp b/doc/source/fq_default_mat.rst
similarity index 99%
rename from doc/source/fq_default_mat.rst.pp
rename to doc/source/fq_default_mat.rst
index 26256c34cd..88e8573ecc 100644
--- a/doc/source/fq_default_mat.rst.pp
+++ b/doc/source/fq_default_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq_default_mat:
 
 **fq_default_mat.h** -- matrices over finite fields
diff --git a/doc/source/fq_default_poly.rst.pp b/doc/source/fq_default_poly.rst
similarity index 99%
rename from doc/source/fq_default_poly.rst.pp
rename to doc/source/fq_default_poly.rst
index 123e184884..213fb0474a 100644
--- a/doc/source/fq_default_poly.rst.pp
+++ b/doc/source/fq_default_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq_default_poly:
 
 **fq_default_poly.h** -- univariate polynomials over finite fields
diff --git a/doc/source/fq_default_poly_factor.rst.pp b/doc/source/fq_default_poly_factor.rst
similarity index 99%
rename from doc/source/fq_default_poly_factor.rst.pp
rename to doc/source/fq_default_poly_factor.rst
index ae315a71f6..842897c602 100644
--- a/doc/source/fq_default_poly_factor.rst.pp
+++ b/doc/source/fq_default_poly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-poly_factor:
 
 **fq_default_poly_factor.h** -- factorisation of univariate polynomials over finite fields
diff --git a/doc/source/fq_embed.rst.pp b/doc/source/fq_embed.rst
similarity index 99%
rename from doc/source/fq_embed.rst.pp
rename to doc/source/fq_embed.rst
index e256706b2c..6d4c84daf4 100644
--- a/doc/source/fq_embed.rst.pp
+++ b/doc/source/fq_embed.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-embed:
 
 **fq_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_mat.rst.pp b/doc/source/fq_mat.rst
similarity index 99%
rename from doc/source/fq_mat.rst.pp
rename to doc/source/fq_mat.rst
index 132deefb1d..9814c80dd1 100644
--- a/doc/source/fq_mat.rst.pp
+++ b/doc/source/fq_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-mat:
 
 **fq_mat.h** -- matrices over finite fields
diff --git a/doc/source/fq_nmod.rst.pp b/doc/source/fq_nmod.rst
similarity index 99%
rename from doc/source/fq_nmod.rst.pp
rename to doc/source/fq_nmod.rst
index a6dfc8d6a2..0e34f03f23 100644
--- a/doc/source/fq_nmod.rst.pp
+++ b/doc/source/fq_nmod.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-nmod:
 
 **fq_nmod.h** -- finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_embed.rst.pp b/doc/source/fq_nmod_embed.rst
similarity index 99%
rename from doc/source/fq_nmod_embed.rst.pp
rename to doc/source/fq_nmod_embed.rst
index 13d69b6975..876d9c0ec5 100644
--- a/doc/source/fq_nmod_embed.rst.pp
+++ b/doc/source/fq_nmod_embed.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-nmod-embed:
 
 **fq_nmod_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_nmod_mat.rst.pp b/doc/source/fq_nmod_mat.rst
similarity index 99%
rename from doc/source/fq_nmod_mat.rst.pp
rename to doc/source/fq_nmod_mat.rst
index 3adb028e42..9ca80b7435 100644
--- a/doc/source/fq_nmod_mat.rst.pp
+++ b/doc/source/fq_nmod_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-nmod-mat:
 
 **fq_nmod_mat.h** -- matrices over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_mpoly.rst.pp b/doc/source/fq_nmod_mpoly.rst
similarity index 99%
rename from doc/source/fq_nmod_mpoly.rst.pp
rename to doc/source/fq_nmod_mpoly.rst
index 71c6e2e81d..567e93491d 100644
--- a/doc/source/fq_nmod_mpoly.rst.pp
+++ b/doc/source/fq_nmod_mpoly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq_nmod-mpoly:
 
 **fq_nmod_mpoly.h** -- multivariate polynomials over finite fields of word-sized characteristic
diff --git a/doc/source/fq_nmod_mpoly_factor.rst.pp b/doc/source/fq_nmod_mpoly_factor.rst
similarity index 99%
rename from doc/source/fq_nmod_mpoly_factor.rst.pp
rename to doc/source/fq_nmod_mpoly_factor.rst
index df6f9c78fa..7281ae792d 100644
--- a/doc/source/fq_nmod_mpoly_factor.rst.pp
+++ b/doc/source/fq_nmod_mpoly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq_nmod-mpoly-factor:
 
 **fq_nmod_mpoly_factor.h** -- factorisation of multivariate polynomials over finite fields of word-sized characteristic
diff --git a/doc/source/fq_nmod_poly.rst.pp b/doc/source/fq_nmod_poly.rst
similarity index 99%
rename from doc/source/fq_nmod_poly.rst.pp
rename to doc/source/fq_nmod_poly.rst
index 640515593f..a38a702f99 100644
--- a/doc/source/fq_nmod_poly.rst.pp
+++ b/doc/source/fq_nmod_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-nmod-poly:
 
 **fq_nmod_poly.h** -- univariate polynomials over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_poly_factor.rst.pp b/doc/source/fq_nmod_poly_factor.rst
similarity index 99%
rename from doc/source/fq_nmod_poly_factor.rst.pp
rename to doc/source/fq_nmod_poly_factor.rst
index 7a87ce313e..10350b97f7 100644
--- a/doc/source/fq_nmod_poly_factor.rst.pp
+++ b/doc/source/fq_nmod_poly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-nmod-poly-factor:
 
 **fq_nmod_poly_factor.h** -- factorisation of univariate polynomials over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_vec.rst.pp b/doc/source/fq_nmod_vec.rst
similarity index 99%
rename from doc/source/fq_nmod_vec.rst.pp
rename to doc/source/fq_nmod_vec.rst
index 98901166a9..e3d9f87706 100644
--- a/doc/source/fq_nmod_vec.rst.pp
+++ b/doc/source/fq_nmod_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-nmod-vec:
 
 **fq_nmod_vec.h** -- vectors over finite fields (word-size characteristic)
diff --git a/doc/source/fq_poly.rst.pp b/doc/source/fq_poly.rst
similarity index 99%
rename from doc/source/fq_poly.rst.pp
rename to doc/source/fq_poly.rst
index ea450f9e3d..6a047bfba3 100644
--- a/doc/source/fq_poly.rst.pp
+++ b/doc/source/fq_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-poly:
 
 **fq_poly.h** -- univariate polynomials over finite fields
diff --git a/doc/source/fq_poly_factor.rst.pp b/doc/source/fq_poly_factor.rst
similarity index 99%
rename from doc/source/fq_poly_factor.rst.pp
rename to doc/source/fq_poly_factor.rst
index 15b11e8bd4..b1e98c0438 100644
--- a/doc/source/fq_poly_factor.rst.pp
+++ b/doc/source/fq_poly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-poly-factor:
 
 **fq_poly_factor.h** -- factorisation of univariate polynomials over finite fields
diff --git a/doc/source/fq_vec.rst.pp b/doc/source/fq_vec.rst
similarity index 99%
rename from doc/source/fq_vec.rst.pp
rename to doc/source/fq_vec.rst
index dd6cd505ac..8e7e78267b 100644
--- a/doc/source/fq_vec.rst.pp
+++ b/doc/source/fq_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-vec:
 
 **fq_vec.h** -- vectors over finite fields
diff --git a/doc/source/fq_zech.rst.pp b/doc/source/fq_zech.rst
similarity index 99%
rename from doc/source/fq_zech.rst.pp
rename to doc/source/fq_zech.rst
index db4ef814d9..efc1e6f17c 100644
--- a/doc/source/fq_zech.rst.pp
+++ b/doc/source/fq_zech.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-zech:
 
 **fq_zech.h** -- finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_embed.rst.pp b/doc/source/fq_zech_embed.rst
similarity index 99%
rename from doc/source/fq_zech_embed.rst.pp
rename to doc/source/fq_zech_embed.rst
index 140b006981..2511f5d57b 100644
--- a/doc/source/fq_zech_embed.rst.pp
+++ b/doc/source/fq_zech_embed.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-zech-embed:
 
 **fq_zech_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_zech_mat.rst.pp b/doc/source/fq_zech_mat.rst
similarity index 99%
rename from doc/source/fq_zech_mat.rst.pp
rename to doc/source/fq_zech_mat.rst
index 3c59acea1f..dda2515d6c 100644
--- a/doc/source/fq_zech_mat.rst.pp
+++ b/doc/source/fq_zech_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-zech-mat:
 
 **fq_zech_mat.h** -- matrices over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_poly.rst.pp b/doc/source/fq_zech_poly.rst
similarity index 99%
rename from doc/source/fq_zech_poly.rst.pp
rename to doc/source/fq_zech_poly.rst
index 607cb9b86e..6d76c9fac7 100644
--- a/doc/source/fq_zech_poly.rst.pp
+++ b/doc/source/fq_zech_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-zech-poly:
 
 **fq_zech_poly.h** -- univariate polynomials over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_poly_factor.rst.pp b/doc/source/fq_zech_poly_factor.rst
similarity index 99%
rename from doc/source/fq_zech_poly_factor.rst.pp
rename to doc/source/fq_zech_poly_factor.rst
index 01fab9d822..256b437bea 100644
--- a/doc/source/fq_zech_poly_factor.rst.pp
+++ b/doc/source/fq_zech_poly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-zech-poly-factor:
 
 **fq_zech_poly_factor.h** -- factorisation of univariate polynomials over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_vec.rst.pp b/doc/source/fq_zech_vec.rst
similarity index 99%
rename from doc/source/fq_zech_vec.rst.pp
rename to doc/source/fq_zech_vec.rst
index a249dde9f6..a4d383ec8b 100644
--- a/doc/source/fq_zech_vec.rst.pp
+++ b/doc/source/fq_zech_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _fq-zech-vec:
 
 **fq_zech_vec.h** -- vectors over finite fields (Zech logarithm representation)
diff --git a/doc/source/gamma.rst.pp b/doc/source/gamma.rst
similarity index 99%
rename from doc/source/gamma.rst.pp
rename to doc/source/gamma.rst
index 071160af08..c2ea71cd81 100644
--- a/doc/source/gamma.rst.pp
+++ b/doc/source/gamma.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _algorithms_gamma:
 
 Algorithms for the gamma function
diff --git a/doc/source/gr.rst.pp b/doc/source/gr.rst
similarity index 99%
rename from doc/source/gr.rst.pp
rename to doc/source/gr.rst
index a8cd5e75a7..79992c8a4d 100644
--- a/doc/source/gr.rst.pp
+++ b/doc/source/gr.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr:
 
 **gr.h** -- generic structures and their elements
diff --git a/doc/source/gr_domains.rst.pp b/doc/source/gr_domains.rst
similarity index 99%
rename from doc/source/gr_domains.rst.pp
rename to doc/source/gr_domains.rst
index e4bee6057e..67658cfc8b 100644
--- a/doc/source/gr_domains.rst.pp
+++ b/doc/source/gr_domains.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr-domains:
 
 **gr.h (continued)** -- builtin domains and types
diff --git a/doc/source/gr_generic.rst.pp b/doc/source/gr_generic.rst
similarity index 99%
rename from doc/source/gr_generic.rst.pp
rename to doc/source/gr_generic.rst
index 53077bfa8e..4defbb6c36 100644
--- a/doc/source/gr_generic.rst.pp
+++ b/doc/source/gr_generic.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr-generic:
 
 **gr_generic.h** -- basic algorithms and fallback implementations for generic elements
diff --git a/doc/source/gr_implementing.rst.pp b/doc/source/gr_implementing.rst
similarity index 99%
rename from doc/source/gr_implementing.rst.pp
rename to doc/source/gr_implementing.rst
index 933c3f2762..281a91fc53 100644
--- a/doc/source/gr_implementing.rst.pp
+++ b/doc/source/gr_implementing.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr-implementing:
 
 **gr.h (continued)** -- implementing rings
diff --git a/doc/source/gr_mat.rst.pp b/doc/source/gr_mat.rst
similarity index 99%
rename from doc/source/gr_mat.rst.pp
rename to doc/source/gr_mat.rst
index da09fcd894..9ea85cddc8 100644
--- a/doc/source/gr_mat.rst.pp
+++ b/doc/source/gr_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr-mat:
 
 **gr_mat.h** -- dense matrices over generic rings
diff --git a/doc/source/gr_mpoly.rst.pp b/doc/source/gr_mpoly.rst
similarity index 99%
rename from doc/source/gr_mpoly.rst.pp
rename to doc/source/gr_mpoly.rst
index 36fc49c9d4..1a8c8a08f1 100644
--- a/doc/source/gr_mpoly.rst.pp
+++ b/doc/source/gr_mpoly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr-mpoly:
 
 **gr_mpoly.h** -- sparse multivariate polynomials over generic rings
diff --git a/doc/source/gr_poly.rst.pp b/doc/source/gr_poly.rst
similarity index 99%
rename from doc/source/gr_poly.rst.pp
rename to doc/source/gr_poly.rst
index ca8afb558c..810f914087 100644
--- a/doc/source/gr_poly.rst.pp
+++ b/doc/source/gr_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr-poly:
 
 **gr_poly.h** -- dense univariate polynomials over generic rings
diff --git a/doc/source/gr_special.rst.pp b/doc/source/gr_special.rst
similarity index 99%
rename from doc/source/gr_special.rst.pp
rename to doc/source/gr_special.rst
index 7b5c777592..68c68793be 100644
--- a/doc/source/gr_special.rst.pp
+++ b/doc/source/gr_special.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr-special:
 
 **gr_special.h** -- special arithmetic and transcendental functions
diff --git a/doc/source/gr_vec.rst.pp b/doc/source/gr_vec.rst
similarity index 99%
rename from doc/source/gr_vec.rst.pp
rename to doc/source/gr_vec.rst
index e80128a4ab..db158b380a 100644
--- a/doc/source/gr_vec.rst.pp
+++ b/doc/source/gr_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _gr-vec:
 
 **gr_vec.h** -- vectors over generic rings
diff --git a/doc/source/history.rst.pp b/doc/source/history.rst
similarity index 99%
rename from doc/source/history.rst.pp
rename to doc/source/history.rst
index 519d107582..aefb1a19b9 100644
--- a/doc/source/history.rst.pp
+++ b/doc/source/history.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _history:
 
 History and changes
diff --git a/doc/source/hurwitz.rst.pp b/doc/source/hurwitz.rst
similarity index 98%
rename from doc/source/hurwitz.rst.pp
rename to doc/source/hurwitz.rst
index b609c47767..50ac135823 100644
--- a/doc/source/hurwitz.rst.pp
+++ b/doc/source/hurwitz.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _algorithms_hurwitz:
 
 Algorithms for the Hurwitz zeta function
diff --git a/doc/source/hypergeometric.rst.pp b/doc/source/hypergeometric.rst
similarity index 99%
rename from doc/source/hypergeometric.rst.pp
rename to doc/source/hypergeometric.rst
index 5d3c3b1eef..e602d9c2bf 100644
--- a/doc/source/hypergeometric.rst.pp
+++ b/doc/source/hypergeometric.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _algorithms_hypergeometric:
 
 Algorithms for hypergeometric functions
diff --git a/doc/source/hypgeom.rst.pp b/doc/source/hypgeom.rst
similarity index 99%
rename from doc/source/hypgeom.rst.pp
rename to doc/source/hypgeom.rst
index 26dfc55771..dc25d800db 100644
--- a/doc/source/hypgeom.rst.pp
+++ b/doc/source/hypgeom.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _hypgeom:
 
 **hypgeom.h** -- support for hypergeometric series
diff --git a/doc/source/index.rst.pp b/doc/source/index.rst
similarity index 99%
rename from doc/source/index.rst.pp
rename to doc/source/index.rst
index 4d8b8d83b3..a2012745a9 100644
--- a/doc/source/index.rst.pp
+++ b/doc/source/index.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. FLINT documentation master file, created by
    sphinx-quickstart on Fri Nov 16 21:59:21 2018.
    You can adapt this file completely to your liking, but it should at least
diff --git a/doc/source/index_arb.rst.pp b/doc/source/index_arb.rst
similarity index 99%
rename from doc/source/index_arb.rst.pp
rename to doc/source/index_arb.rst
index 8eb6d38e51..1505571700 100644
--- a/doc/source/index_arb.rst.pp
+++ b/doc/source/index_arb.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _index-arb:
 
 **Real and complex numbers (Arb)** : *detailed table of contents*
diff --git a/doc/source/index_generic.rst.pp b/doc/source/index_generic.rst
similarity index 93%
rename from doc/source/index_generic.rst.pp
rename to doc/source/index_generic.rst
index 27d05c2b96..e435030fdf 100644
--- a/doc/source/index_generic.rst.pp
+++ b/doc/source/index_generic.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _index-generic:
 
 **Generic rings** : *detailed table of contents*
diff --git a/doc/source/index_integers.rst.pp b/doc/source/index_integers.rst
similarity index 95%
rename from doc/source/index_integers.rst.pp
rename to doc/source/index_integers.rst
index 426a663b7a..4b7853ac79 100644
--- a/doc/source/index_integers.rst.pp
+++ b/doc/source/index_integers.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _index-integers:
 
 **Integers** : *detailed table of contents*
diff --git a/doc/source/index_integers_mod.rst.pp b/doc/source/index_integers_mod.rst
similarity index 95%
rename from doc/source/index_integers_mod.rst.pp
rename to doc/source/index_integers_mod.rst
index 2e2528f691..719a7babf6 100644
--- a/doc/source/index_integers_mod.rst.pp
+++ b/doc/source/index_integers_mod.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _index-integers-mod:
 
 **Integers mod n** : *detailed table of contents*
diff --git a/doc/source/index_rationals.rst.pp b/doc/source/index_rationals.rst
similarity index 93%
rename from doc/source/index_rationals.rst.pp
rename to doc/source/index_rationals.rst
index 201af80cc7..7d75c5f6ef 100644
--- a/doc/source/index_rationals.rst.pp
+++ b/doc/source/index_rationals.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _index-rationals:
 
 **Rational numbers** : *detailed table of contents*
diff --git a/doc/source/introduction.rst.pp b/doc/source/introduction.rst
similarity index 99%
rename from doc/source/introduction.rst.pp
rename to doc/source/introduction.rst
index 6a0baec75f..01575b5816 100644
--- a/doc/source/introduction.rst.pp
+++ b/doc/source/introduction.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _introduction:
 
 **Introduction**
diff --git a/doc/source/introduction_calcium.rst.pp b/doc/source/introduction_calcium.rst
similarity index 99%
rename from doc/source/introduction_calcium.rst.pp
rename to doc/source/introduction_calcium.rst
index 359a801c82..899fc5af7a 100644
--- a/doc/source/introduction_calcium.rst.pp
+++ b/doc/source/introduction_calcium.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _introduction-calcium:
 
 Introduction
diff --git a/doc/source/issues.rst.pp b/doc/source/issues.rst
similarity index 99%
rename from doc/source/issues.rst.pp
rename to doc/source/issues.rst
index ce2f96e3ee..3e9827b176 100644
--- a/doc/source/issues.rst.pp
+++ b/doc/source/issues.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _issues:
 
 Technical conventions and potential issues
diff --git a/doc/source/long_extras.rst.pp b/doc/source/long_extras.rst
similarity index 98%
rename from doc/source/long_extras.rst.pp
rename to doc/source/long_extras.rst
index 740b6cfba7..a9f90d511c 100644
--- a/doc/source/long_extras.rst.pp
+++ b/doc/source/long_extras.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _long-extras:
 
 **long_extras.h** -- support functions for signed word arithmetic
diff --git a/doc/source/longlong.rst.pp b/doc/source/longlong.rst
similarity index 99%
rename from doc/source/longlong.rst.pp
rename to doc/source/longlong.rst
index 9055aad53d..bcfdd6cf67 100644
--- a/doc/source/longlong.rst.pp
+++ b/doc/source/longlong.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _longlong:
 
 **longlong.h** -- support functions for multi-word arithmetic
diff --git a/doc/source/machine_vectors.rst.pp b/doc/source/machine_vectors.rst
similarity index 99%
rename from doc/source/machine_vectors.rst.pp
rename to doc/source/machine_vectors.rst
index bbb48e408a..e10c79a53e 100644
--- a/doc/source/machine_vectors.rst.pp
+++ b/doc/source/machine_vectors.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _machine-vectors:
 
 **machine_vectors.h** -- SIMD-accelerated operations on fixed-length vectors
diff --git a/doc/source/mag.rst.pp b/doc/source/mag.rst
similarity index 99%
rename from doc/source/mag.rst.pp
rename to doc/source/mag.rst
index 50c6315ef0..4a18c5b986 100644
--- a/doc/source/mag.rst.pp
+++ b/doc/source/mag.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _mag:
 
 **mag.h** -- fixed-precision unsigned floating-point numbers for bounds
diff --git a/doc/source/memory.rst.pp b/doc/source/memory.rst
similarity index 99%
rename from doc/source/memory.rst.pp
rename to doc/source/memory.rst
index 91f0545570..44f0aab9a6 100644
--- a/doc/source/memory.rst.pp
+++ b/doc/source/memory.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _memory:
 
 **Memory management**
diff --git a/doc/source/mpfr_mat.rst.pp b/doc/source/mpfr_mat.rst
similarity index 98%
rename from doc/source/mpfr_mat.rst.pp
rename to doc/source/mpfr_mat.rst
index 596e211791..cc3ad6eee6 100644
--- a/doc/source/mpfr_mat.rst.pp
+++ b/doc/source/mpfr_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _mpfr-mat:
 
 **mpfr_mat.h** -- matrices of MPFR floating-point numbers
diff --git a/doc/source/mpfr_vec.rst.pp b/doc/source/mpfr_vec.rst
similarity index 97%
rename from doc/source/mpfr_vec.rst.pp
rename to doc/source/mpfr_vec.rst
index eddd4d1a21..84631ebdf7 100644
--- a/doc/source/mpfr_vec.rst.pp
+++ b/doc/source/mpfr_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _mpfr-vec:
 
 **mpfr_vec.h** -- vectors of MPFR floating-point numbers
diff --git a/doc/source/mpn_extras.rst.pp b/doc/source/mpn_extras.rst
similarity index 99%
rename from doc/source/mpn_extras.rst.pp
rename to doc/source/mpn_extras.rst
index ea2072c36e..9921451b22 100644
--- a/doc/source/mpn_extras.rst.pp
+++ b/doc/source/mpn_extras.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _mpn-extras:
 
 **mpn_extras.h** -- support functions for limb arrays
diff --git a/doc/source/mpn_mod.rst.pp b/doc/source/mpn_mod.rst
similarity index 99%
rename from doc/source/mpn_mod.rst.pp
rename to doc/source/mpn_mod.rst
index 83ae9f7d23..3ce0598566 100644
--- a/doc/source/mpn_mod.rst.pp
+++ b/doc/source/mpn_mod.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _mpn-mod:
 
 **mpn_mod.h** -- integers mod n (packed multi-word n)
diff --git a/doc/source/mpoly.rst.pp b/doc/source/mpoly.rst
similarity index 99%
rename from doc/source/mpoly.rst.pp
rename to doc/source/mpoly.rst
index 452fcfa00a..55f2cce507 100644
--- a/doc/source/mpoly.rst.pp
+++ b/doc/source/mpoly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _mpoly:
 
 **mpoly.h** -- support functions for multivariate polynomials
diff --git a/doc/source/nf.rst.pp b/doc/source/nf.rst
similarity index 95%
rename from doc/source/nf.rst.pp
rename to doc/source/nf.rst
index c4e8685b78..ce5825e775 100644
--- a/doc/source/nf.rst.pp
+++ b/doc/source/nf.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nf:
 
 **nf.h** -- number fields
diff --git a/doc/source/nf_elem.rst.pp b/doc/source/nf_elem.rst
similarity index 99%
rename from doc/source/nf_elem.rst.pp
rename to doc/source/nf_elem.rst
index 99a7c2339d..f95ca1de6b 100644
--- a/doc/source/nf_elem.rst.pp
+++ b/doc/source/nf_elem.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nf_elem:
 
 **nf_elem.h** -- number field elements
diff --git a/doc/source/nfloat.rst.pp b/doc/source/nfloat.rst
similarity index 99%
rename from doc/source/nfloat.rst.pp
rename to doc/source/nfloat.rst
index c21e6ee1a3..9ac02883cd 100644
--- a/doc/source/nfloat.rst.pp
+++ b/doc/source/nfloat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nfloat:
 
 **nfloat.h** -- packed floating-point numbers with n-word precision
diff --git a/doc/source/nmod.rst.pp b/doc/source/nmod.rst
similarity index 99%
rename from doc/source/nmod.rst.pp
rename to doc/source/nmod.rst
index d900f54dd1..fcb5921812 100644
--- a/doc/source/nmod.rst.pp
+++ b/doc/source/nmod.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nmod:
 
 **nmod.h** -- integers mod n (word-size n)
diff --git a/doc/source/nmod_mat.rst.pp b/doc/source/nmod_mat.rst
similarity index 99%
rename from doc/source/nmod_mat.rst.pp
rename to doc/source/nmod_mat.rst
index f2582b0c58..b1da8f22ca 100644
--- a/doc/source/nmod_mat.rst.pp
+++ b/doc/source/nmod_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nmod-mat:
 
 **nmod_mat.h** -- matrices over integers mod n (word-size n)
diff --git a/doc/source/nmod_mpoly.rst.pp b/doc/source/nmod_mpoly.rst
similarity index 99%
rename from doc/source/nmod_mpoly.rst.pp
rename to doc/source/nmod_mpoly.rst
index 3aec8bc877..7553315112 100644
--- a/doc/source/nmod_mpoly.rst.pp
+++ b/doc/source/nmod_mpoly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nmod-mpoly:
 
 **nmod_mpoly.h** -- multivariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_mpoly_factor.rst.pp b/doc/source/nmod_mpoly_factor.rst
similarity index 99%
rename from doc/source/nmod_mpoly_factor.rst.pp
rename to doc/source/nmod_mpoly_factor.rst
index 80b58a546f..c6d39ddf00 100644
--- a/doc/source/nmod_mpoly_factor.rst.pp
+++ b/doc/source/nmod_mpoly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nmod-mpoly-factor:
 
 **nmod_mpoly_factor.h** -- factorisation of multivariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly.rst.pp b/doc/source/nmod_poly.rst
similarity index 99%
rename from doc/source/nmod_poly.rst.pp
rename to doc/source/nmod_poly.rst
index 9975d10a60..6bb0e4d6ee 100644
--- a/doc/source/nmod_poly.rst.pp
+++ b/doc/source/nmod_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nmod-poly:
 
 **nmod_poly.h** -- univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly_factor.rst.pp b/doc/source/nmod_poly_factor.rst
similarity index 99%
rename from doc/source/nmod_poly_factor.rst.pp
rename to doc/source/nmod_poly_factor.rst
index 17c1415d84..a9b9a6bf4e 100644
--- a/doc/source/nmod_poly_factor.rst.pp
+++ b/doc/source/nmod_poly_factor.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nmod-poly-factor:
 
 **nmod_poly_factor.h** -- factorisation of univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly_mat.rst.pp b/doc/source/nmod_poly_mat.rst
similarity index 99%
rename from doc/source/nmod_poly_mat.rst.pp
rename to doc/source/nmod_poly_mat.rst
index 091a6fce54..1979f2243b 100644
--- a/doc/source/nmod_poly_mat.rst.pp
+++ b/doc/source/nmod_poly_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nmod-poly-mat:
 
 **nmod_poly_mat.h** -- matrices of univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_vec.rst.pp b/doc/source/nmod_vec.rst
similarity index 99%
rename from doc/source/nmod_vec.rst.pp
rename to doc/source/nmod_vec.rst
index ae988853dd..55c4e6c14d 100644
--- a/doc/source/nmod_vec.rst.pp
+++ b/doc/source/nmod_vec.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _nmod-vec:
 
 **nmod_vec.h** -- vectors over integers mod n (word-size n)
diff --git a/doc/source/overview.rst.pp b/doc/source/overview.rst
similarity index 99%
rename from doc/source/overview.rst.pp
rename to doc/source/overview.rst
index 6dc8022df9..9f797c43ed 100644
--- a/doc/source/overview.rst.pp
+++ b/doc/source/overview.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _overview:
 
 Feature overview
diff --git a/doc/source/padic.rst.pp b/doc/source/padic.rst
similarity index 99%
rename from doc/source/padic.rst.pp
rename to doc/source/padic.rst
index 09e7cea1f1..f7ac874b4b 100644
--- a/doc/source/padic.rst.pp
+++ b/doc/source/padic.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _padic:
 
 **padic.h** -- p-adic numbers
diff --git a/doc/source/padic_mat.rst.pp b/doc/source/padic_mat.rst
similarity index 99%
rename from doc/source/padic_mat.rst.pp
rename to doc/source/padic_mat.rst
index 3dbe72a908..da8d19a3f9 100644
--- a/doc/source/padic_mat.rst.pp
+++ b/doc/source/padic_mat.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _padic-mat:
 
 **padic_mat.h** -- matrices over p-adic numbers
diff --git a/doc/source/padic_poly.rst.pp b/doc/source/padic_poly.rst
similarity index 99%
rename from doc/source/padic_poly.rst.pp
rename to doc/source/padic_poly.rst
index ae13acfa2b..9d7c8c657b 100644
--- a/doc/source/padic_poly.rst.pp
+++ b/doc/source/padic_poly.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _padic-poly:
 
 **padic_poly.h** -- polynomials over p-adic numbers
diff --git a/doc/source/partitions.rst.pp b/doc/source/partitions.rst
similarity index 99%
rename from doc/source/partitions.rst.pp
rename to doc/source/partitions.rst
index b95e71cdea..3b2aca6ed4 100644
--- a/doc/source/partitions.rst.pp
+++ b/doc/source/partitions.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _partitions:
 
 **partitions.h** -- computation of the partition function
diff --git a/doc/source/perm.rst.pp b/doc/source/perm.rst
similarity index 98%
rename from doc/source/perm.rst.pp
rename to doc/source/perm.rst
index ac4d9555e1..9dfde7fe80 100644
--- a/doc/source/perm.rst.pp
+++ b/doc/source/perm.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _perm:
 
 **perm.h** -- permutations
diff --git a/doc/source/polylogarithms.rst.pp b/doc/source/polylogarithms.rst
similarity index 99%
rename from doc/source/polylogarithms.rst.pp
rename to doc/source/polylogarithms.rst
index 1ca47cfc11..b26c32cddf 100644
--- a/doc/source/polylogarithms.rst.pp
+++ b/doc/source/polylogarithms.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _algorithms_polylogarithms:
 
 Algorithms for polylogarithms
diff --git a/doc/source/portability.rst.pp b/doc/source/portability.rst
similarity index 98%
rename from doc/source/portability.rst.pp
rename to doc/source/portability.rst
index 1b3cea0edc..96531d2a66 100644
--- a/doc/source/portability.rst.pp
+++ b/doc/source/portability.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _portability:
 
 **Portability**
diff --git a/doc/source/profiler.rst.pp b/doc/source/profiler.rst
similarity index 99%
rename from doc/source/profiler.rst.pp
rename to doc/source/profiler.rst
index 3411f0c3d7..abb5c613a6 100644
--- a/doc/source/profiler.rst.pp
+++ b/doc/source/profiler.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _profiler:
 
 **profiler.h** -- performance profiling
diff --git a/doc/source/python_flint.rst.pp b/doc/source/python_flint.rst
similarity index 98%
rename from doc/source/python_flint.rst.pp
rename to doc/source/python_flint.rst
index 8f4cd1eba6..499cdd5a99 100644
--- a/doc/source/python_flint.rst.pp
+++ b/doc/source/python_flint.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _pyflint:
 
 **flint_ctypes** - Python interface
diff --git a/doc/source/qadic.rst.pp b/doc/source/qadic.rst
similarity index 99%
rename from doc/source/qadic.rst.pp
rename to doc/source/qadic.rst
index 30cc0540eb..22d48d0434 100644
--- a/doc/source/qadic.rst.pp
+++ b/doc/source/qadic.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _qadic:
 
 **qadic.h** -- unramified extensions over p-adic numbers
diff --git a/doc/source/qfb.rst.pp b/doc/source/qfb.rst
similarity index 99%
rename from doc/source/qfb.rst.pp
rename to doc/source/qfb.rst
index 6aec06673a..cc6290bc95 100644
--- a/doc/source/qfb.rst.pp
+++ b/doc/source/qfb.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _qfb:
 
 **qfb.h** -- binary quadratic forms
diff --git a/doc/source/qqbar.rst.pp b/doc/source/qqbar.rst
similarity index 99%
rename from doc/source/qqbar.rst.pp
rename to doc/source/qqbar.rst
index 8c09e339b9..45ecb00a2e 100644
--- a/doc/source/qqbar.rst.pp
+++ b/doc/source/qqbar.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _qqbar:
 
 **qqbar.h** -- algebraic numbers represented by minimal polynomials
diff --git a/doc/source/qsieve.rst.pp b/doc/source/qsieve.rst
similarity index 99%
rename from doc/source/qsieve.rst.pp
rename to doc/source/qsieve.rst
index c94d0e9ef1..cd497140a3 100644
--- a/doc/source/qsieve.rst.pp
+++ b/doc/source/qsieve.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _qsieve:
 
 **qsieve.h** -- Quadratic sieve
diff --git a/doc/source/references.rst.pp b/doc/source/references.rst
similarity index 99%
rename from doc/source/references.rst.pp
rename to doc/source/references.rst
index 99563d3ec9..83ed474d26 100644
--- a/doc/source/references.rst.pp
+++ b/doc/source/references.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 References
 ------------
 
diff --git a/doc/source/thread_pool.rst.pp b/doc/source/thread_pool.rst
similarity index 98%
rename from doc/source/thread_pool.rst.pp
rename to doc/source/thread_pool.rst
index db25e5b076..028f8e0104 100644
--- a/doc/source/thread_pool.rst.pp
+++ b/doc/source/thread_pool.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _thread-pool:
 
 **thread_pool.h** -- thread pool
diff --git a/doc/source/threading.rst.pp b/doc/source/threading.rst
similarity index 99%
rename from doc/source/threading.rst.pp
rename to doc/source/threading.rst
index e9c400c1d6..815544fe19 100644
--- a/doc/source/threading.rst.pp
+++ b/doc/source/threading.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _threading:
 
 **Threading**
diff --git a/doc/source/ulong_extras.rst.pp b/doc/source/ulong_extras.rst
similarity index 99%
rename from doc/source/ulong_extras.rst.pp
rename to doc/source/ulong_extras.rst
index 91c7248ddf..9e3e30f244 100644
--- a/doc/source/ulong_extras.rst.pp
+++ b/doc/source/ulong_extras.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _ulong-extras:
 
 **ulong_extras.h** -- arithmetic and number-theoretic functions for single-word integers
diff --git a/doc/source/using.rst.pp b/doc/source/using.rst
similarity index 99%
rename from doc/source/using.rst.pp
rename to doc/source/using.rst
index 6848829211..04ec07a033 100644
--- a/doc/source/using.rst.pp
+++ b/doc/source/using.rst
@@ -1,4 +1,3 @@
-include(`macros.m4')dnl
 .. _using:
 
 Using ball arithmetic

From 64704bd7345728abe67cf92f90a15336819a9714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Thu, 30 Jan 2025 10:02:11 +0100
Subject: [PATCH 14/20] macros.m4 into files again

---
 doc/source/acb.rst                    | 1 +
 doc/source/acb_calc.rst               | 1 +
 doc/source/acb_dft.rst                | 1 +
 doc/source/acb_dirichlet.rst          | 1 +
 doc/source/acb_elliptic.rst           | 1 +
 doc/source/acb_hypgeom.rst            | 1 +
 doc/source/acb_mat.rst                | 1 +
 doc/source/acb_modular.rst            | 1 +
 doc/source/acb_poly.rst               | 1 +
 doc/source/acb_theta.rst              | 1 +
 doc/source/acf.rst                    | 1 +
 doc/source/agm.rst                    | 1 +
 doc/source/aprcl.rst                  | 1 +
 doc/source/arb.rst                    | 1 +
 doc/source/arb_calc.rst               | 1 +
 doc/source/arb_fmpz_poly.rst          | 1 +
 doc/source/arb_fpwrap.rst             | 1 +
 doc/source/arb_hypgeom.rst            | 1 +
 doc/source/arb_mat.rst                | 1 +
 doc/source/arb_poly.rst               | 1 +
 doc/source/arf.rst                    | 1 +
 doc/source/arith.rst                  | 1 +
 doc/source/bernoulli.rst              | 1 +
 doc/source/bool_mat.rst               | 1 +
 doc/source/bug_reporting.rst          | 1 +
 doc/source/building.rst               | 1 +
 doc/source/ca.rst                     | 1 +
 doc/source/ca_ext.rst                 | 1 +
 doc/source/ca_field.rst               | 1 +
 doc/source/ca_mat.rst                 | 1 +
 doc/source/ca_poly.rst                | 1 +
 doc/source/ca_vec.rst                 | 1 +
 doc/source/calcium.rst                | 1 +
 doc/source/constants.rst              | 1 +
 doc/source/contributing.rst           | 1 +
 doc/source/contributors.rst           | 1 +
 doc/source/d_mat.rst                  | 1 +
 doc/source/d_vec.rst                  | 1 +
 doc/source/dirichlet.rst              | 1 +
 doc/source/dlog.rst                   | 1 +
 doc/source/double_extras.rst          | 1 +
 doc/source/double_interval.rst        | 1 +
 doc/source/examples.rst               | 1 +
 doc/source/examples_arb.rst           | 1 +
 doc/source/examples_calcium.rst       | 1 +
 doc/source/fexpr.rst                  | 1 +
 doc/source/fexpr_builtin.rst          | 1 +
 doc/source/fft.rst                    | 1 +
 doc/source/fft_small.rst              | 1 +
 doc/source/flint.rst                  | 1 +
 doc/source/fmpq.rst                   | 1 +
 doc/source/fmpq_mat.rst               | 1 +
 doc/source/fmpq_mpoly.rst             | 1 +
 doc/source/fmpq_mpoly_factor.rst      | 1 +
 doc/source/fmpq_poly.rst              | 1 +
 doc/source/fmpq_vec.rst               | 1 +
 doc/source/fmpz.rst                   | 1 +
 doc/source/fmpz_extras.rst            | 1 +
 doc/source/fmpz_factor.rst            | 1 +
 doc/source/fmpz_lll.rst               | 1 +
 doc/source/fmpz_mat.rst               | 1 +
 doc/source/fmpz_mod.rst               | 1 +
 doc/source/fmpz_mod_mat.rst           | 1 +
 doc/source/fmpz_mod_mpoly.rst         | 1 +
 doc/source/fmpz_mod_mpoly_factor.rst  | 1 +
 doc/source/fmpz_mod_poly.rst          | 1 +
 doc/source/fmpz_mod_poly_factor.rst   | 1 +
 doc/source/fmpz_mod_vec.rst           | 1 +
 doc/source/fmpz_mpoly.rst             | 1 +
 doc/source/fmpz_mpoly_factor.rst      | 1 +
 doc/source/fmpz_mpoly_q.rst           | 1 +
 doc/source/fmpz_poly.rst              | 1 +
 doc/source/fmpz_poly_factor.rst       | 1 +
 doc/source/fmpz_poly_mat.rst          | 1 +
 doc/source/fmpz_poly_q.rst            | 1 +
 doc/source/fmpz_vec.rst               | 1 +
 doc/source/fmpzi.rst                  | 1 +
 doc/source/formulas.rst               | 1 +
 doc/source/fq.rst                     | 1 +
 doc/source/fq_default.rst             | 1 +
 doc/source/fq_default_mat.rst         | 1 +
 doc/source/fq_default_poly.rst        | 1 +
 doc/source/fq_default_poly_factor.rst | 1 +
 doc/source/fq_embed.rst               | 1 +
 doc/source/fq_mat.rst                 | 1 +
 doc/source/fq_nmod.rst                | 1 +
 doc/source/fq_nmod_embed.rst          | 1 +
 doc/source/fq_nmod_mat.rst            | 1 +
 doc/source/fq_nmod_mpoly.rst          | 1 +
 doc/source/fq_nmod_mpoly_factor.rst   | 1 +
 doc/source/fq_nmod_poly.rst           | 1 +
 doc/source/fq_nmod_poly_factor.rst    | 1 +
 doc/source/fq_nmod_vec.rst            | 1 +
 doc/source/fq_poly.rst                | 1 +
 doc/source/fq_poly_factor.rst         | 1 +
 doc/source/fq_vec.rst                 | 1 +
 doc/source/fq_zech.rst                | 1 +
 doc/source/fq_zech_embed.rst          | 1 +
 doc/source/fq_zech_mat.rst            | 1 +
 doc/source/fq_zech_poly.rst           | 1 +
 doc/source/fq_zech_poly_factor.rst    | 1 +
 doc/source/fq_zech_vec.rst            | 1 +
 doc/source/gamma.rst                  | 1 +
 doc/source/gr.rst                     | 1 +
 doc/source/gr_domains.rst             | 1 +
 doc/source/gr_generic.rst             | 1 +
 doc/source/gr_implementing.rst        | 1 +
 doc/source/gr_mat.rst                 | 1 +
 doc/source/gr_mpoly.rst               | 1 +
 doc/source/gr_poly.rst                | 1 +
 doc/source/gr_special.rst             | 1 +
 doc/source/gr_vec.rst                 | 1 +
 doc/source/history.rst                | 1 +
 doc/source/hurwitz.rst                | 1 +
 doc/source/hypergeometric.rst         | 1 +
 doc/source/hypgeom.rst                | 1 +
 doc/source/index.rst                  | 1 +
 doc/source/index_arb.rst              | 1 +
 doc/source/index_generic.rst          | 1 +
 doc/source/index_integers.rst         | 1 +
 doc/source/index_integers_mod.rst     | 1 +
 doc/source/index_rationals.rst        | 1 +
 doc/source/introduction.rst           | 1 +
 doc/source/introduction_calcium.rst   | 1 +
 doc/source/issues.rst                 | 1 +
 doc/source/long_extras.rst            | 1 +
 doc/source/longlong.rst               | 1 +
 doc/source/machine_vectors.rst        | 1 +
 doc/source/mag.rst                    | 1 +
 doc/source/memory.rst                 | 1 +
 doc/source/mpfr_mat.rst               | 1 +
 doc/source/mpfr_vec.rst               | 1 +
 doc/source/mpn_extras.rst             | 1 +
 doc/source/mpn_mod.rst                | 1 +
 doc/source/mpoly.rst                  | 1 +
 doc/source/nf.rst                     | 1 +
 doc/source/nf_elem.rst                | 1 +
 doc/source/nfloat.rst                 | 1 +
 doc/source/nmod.rst                   | 1 +
 doc/source/nmod_mat.rst               | 1 +
 doc/source/nmod_mpoly.rst             | 1 +
 doc/source/nmod_mpoly_factor.rst      | 1 +
 doc/source/nmod_poly.rst              | 1 +
 doc/source/nmod_poly_factor.rst       | 1 +
 doc/source/nmod_poly_mat.rst          | 1 +
 doc/source/nmod_vec.rst               | 1 +
 doc/source/overview.rst               | 1 +
 doc/source/padic.rst                  | 1 +
 doc/source/padic_mat.rst              | 1 +
 doc/source/padic_poly.rst             | 1 +
 doc/source/partitions.rst             | 1 +
 doc/source/perm.rst                   | 1 +
 doc/source/polylogarithms.rst         | 1 +
 doc/source/portability.rst            | 1 +
 doc/source/profiler.rst               | 1 +
 doc/source/python_flint.rst           | 1 +
 doc/source/qadic.rst                  | 1 +
 doc/source/qfb.rst                    | 1 +
 doc/source/qqbar.rst                  | 1 +
 doc/source/qsieve.rst                 | 1 +
 doc/source/references.rst             | 1 +
 doc/source/thread_pool.rst            | 1 +
 doc/source/threading.rst              | 1 +
 doc/source/ulong_extras.rst           | 1 +
 doc/source/using.rst                  | 1 +
 165 files changed, 165 insertions(+)

diff --git a/doc/source/acb.rst b/doc/source/acb.rst
index a4d0f54136..d0e29cb178 100644
--- a/doc/source/acb.rst
+++ b/doc/source/acb.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb:
 
 **acb.h** -- complex numbers
diff --git a/doc/source/acb_calc.rst b/doc/source/acb_calc.rst
index de67707534..1bc21a1fdc 100644
--- a/doc/source/acb_calc.rst
+++ b/doc/source/acb_calc.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-calc:
 
 **acb_calc.h** -- calculus with complex-valued functions
diff --git a/doc/source/acb_dft.rst b/doc/source/acb_dft.rst
index b4d8ff9fb5..2e683963b6 100644
--- a/doc/source/acb_dft.rst
+++ b/doc/source/acb_dft.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-dft:
 
 **acb_dft.h** -- Discrete Fourier transform
diff --git a/doc/source/acb_dirichlet.rst b/doc/source/acb_dirichlet.rst
index 44b812543e..33200505b7 100644
--- a/doc/source/acb_dirichlet.rst
+++ b/doc/source/acb_dirichlet.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-dirichlet:
 
 **acb_dirichlet.h** -- Dirichlet L-functions, Riemann zeta and related functions
diff --git a/doc/source/acb_elliptic.rst b/doc/source/acb_elliptic.rst
index d74ecafba3..237b4239d7 100644
--- a/doc/source/acb_elliptic.rst
+++ b/doc/source/acb_elliptic.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-elliptic:
 
 **acb_elliptic.h** -- elliptic integrals and functions of complex variables
diff --git a/doc/source/acb_hypgeom.rst b/doc/source/acb_hypgeom.rst
index 13299b7114..f1775f6a75 100644
--- a/doc/source/acb_hypgeom.rst
+++ b/doc/source/acb_hypgeom.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-hypgeom:
 
 **acb_hypgeom.h** -- hypergeometric functions of complex variables
diff --git a/doc/source/acb_mat.rst b/doc/source/acb_mat.rst
index b3b5eddb8f..9a10beb2fb 100644
--- a/doc/source/acb_mat.rst
+++ b/doc/source/acb_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-mat:
 
 **acb_mat.h** -- matrices over the complex numbers
diff --git a/doc/source/acb_modular.rst b/doc/source/acb_modular.rst
index ca05f2dd17..898885a2e3 100644
--- a/doc/source/acb_modular.rst
+++ b/doc/source/acb_modular.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-modular:
 
 **acb_modular.h** -- modular forms of complex variables
diff --git a/doc/source/acb_poly.rst b/doc/source/acb_poly.rst
index 66148a38a0..ae0f8d9c7f 100644
--- a/doc/source/acb_poly.rst
+++ b/doc/source/acb_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-poly:
 
 **acb_poly.h** -- polynomials over the complex numbers
diff --git a/doc/source/acb_theta.rst b/doc/source/acb_theta.rst
index 1f4700352e..d08320ab21 100644
--- a/doc/source/acb_theta.rst
+++ b/doc/source/acb_theta.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acb-theta:
 
 **acb_theta.h** -- Riemann theta functions
diff --git a/doc/source/acf.rst b/doc/source/acf.rst
index 0d06433a49..3cf542cc2f 100644
--- a/doc/source/acf.rst
+++ b/doc/source/acf.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _acf:
 
 **acf.h** -- complex floating-point numbers
diff --git a/doc/source/agm.rst b/doc/source/agm.rst
index fc846267d9..4096224fcc 100644
--- a/doc/source/agm.rst
+++ b/doc/source/agm.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _algorithms_agm:
 
 Algorithms for the arithmetic-geometric mean
diff --git a/doc/source/aprcl.rst b/doc/source/aprcl.rst
index 1d593f0ba7..dbb4d85d46 100644
--- a/doc/source/aprcl.rst
+++ b/doc/source/aprcl.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _aprcl:
 
 **aprcl.h** -- APRCL primality testing
diff --git a/doc/source/arb.rst b/doc/source/arb.rst
index 0dd829f8d9..d24d0a4f15 100644
--- a/doc/source/arb.rst
+++ b/doc/source/arb.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arb:
 
 **arb.h** -- real numbers
diff --git a/doc/source/arb_calc.rst b/doc/source/arb_calc.rst
index 33b45abf37..cbd8a9c837 100644
--- a/doc/source/arb_calc.rst
+++ b/doc/source/arb_calc.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arb-calc:
 
 **arb_calc.h** -- calculus with real-valued functions
diff --git a/doc/source/arb_fmpz_poly.rst b/doc/source/arb_fmpz_poly.rst
index baebf8521e..4db0914e44 100644
--- a/doc/source/arb_fmpz_poly.rst
+++ b/doc/source/arb_fmpz_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arb_fmpz_poly:
 
 **arb_fmpz_poly.h** -- extra methods for integer polynomials
diff --git a/doc/source/arb_fpwrap.rst b/doc/source/arb_fpwrap.rst
index ac494a79e1..2c37f52d6f 100644
--- a/doc/source/arb_fpwrap.rst
+++ b/doc/source/arb_fpwrap.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arb_fpwrap:
 
 **arb_fpwrap.h** -- floating-point wrappers of Arb mathematical functions
diff --git a/doc/source/arb_hypgeom.rst b/doc/source/arb_hypgeom.rst
index c31fdaed56..59f2d5966c 100644
--- a/doc/source/arb_hypgeom.rst
+++ b/doc/source/arb_hypgeom.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arb-hypgeom:
 
 **arb_hypgeom.h** -- hypergeometric functions of real variables
diff --git a/doc/source/arb_mat.rst b/doc/source/arb_mat.rst
index 3c56495354..ea775a6284 100644
--- a/doc/source/arb_mat.rst
+++ b/doc/source/arb_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arb-mat:
 
 **arb_mat.h** -- matrices over the real numbers
diff --git a/doc/source/arb_poly.rst b/doc/source/arb_poly.rst
index 14d330b2bd..5e30631c12 100644
--- a/doc/source/arb_poly.rst
+++ b/doc/source/arb_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arb-poly:
 
 **arb_poly.h** -- polynomials over the real numbers
diff --git a/doc/source/arf.rst b/doc/source/arf.rst
index e35b3d23d2..ccee5e8bf5 100644
--- a/doc/source/arf.rst
+++ b/doc/source/arf.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arf:
 
 **arf.h** -- arbitrary-precision floating-point numbers
diff --git a/doc/source/arith.rst b/doc/source/arith.rst
index e311f69ecc..db7d7991c1 100644
--- a/doc/source/arith.rst
+++ b/doc/source/arith.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _arith:
 
 **arith.h** -- arithmetic and special functions
diff --git a/doc/source/bernoulli.rst b/doc/source/bernoulli.rst
index 7cc7deee24..59b7e5d272 100644
--- a/doc/source/bernoulli.rst
+++ b/doc/source/bernoulli.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _bernoulli:
 
 **bernoulli.h** -- support for Bernoulli numbers
diff --git a/doc/source/bool_mat.rst b/doc/source/bool_mat.rst
index c97ee95b81..78c2a21abf 100644
--- a/doc/source/bool_mat.rst
+++ b/doc/source/bool_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _bool-mat:
 
 **bool_mat.h** -- matrices over booleans
diff --git a/doc/source/bug_reporting.rst b/doc/source/bug_reporting.rst
index 4a15f37d7c..337fac8b66 100644
--- a/doc/source/bug_reporting.rst
+++ b/doc/source/bug_reporting.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _bug_reporting:
 
 **Bug reporting**
diff --git a/doc/source/building.rst b/doc/source/building.rst
index 37fbcd01a9..b63b1e307a 100644
--- a/doc/source/building.rst
+++ b/doc/source/building.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _building:
 
 **Building, testing and installing**
diff --git a/doc/source/ca.rst b/doc/source/ca.rst
index 891b511b4a..aeeb4a9754 100644
--- a/doc/source/ca.rst
+++ b/doc/source/ca.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _ca:
 
 **ca.h** -- exact real and complex numbers
diff --git a/doc/source/ca_ext.rst b/doc/source/ca_ext.rst
index a39390ab16..353668907d 100644
--- a/doc/source/ca_ext.rst
+++ b/doc/source/ca_ext.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _ca-ext:
 
 **ca_ext.h** -- real and complex extension numbers
diff --git a/doc/source/ca_field.rst b/doc/source/ca_field.rst
index 37a4792a02..bd8e0e5c53 100644
--- a/doc/source/ca_field.rst
+++ b/doc/source/ca_field.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _ca-field:
 
 **ca_field.h** -- extension fields
diff --git a/doc/source/ca_mat.rst b/doc/source/ca_mat.rst
index 4d38fef58a..1161f2fa8c 100644
--- a/doc/source/ca_mat.rst
+++ b/doc/source/ca_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _ca-mat:
 
 **ca_mat.h** -- matrices over the real and complex numbers
diff --git a/doc/source/ca_poly.rst b/doc/source/ca_poly.rst
index 982bba34ff..a6a3022cba 100644
--- a/doc/source/ca_poly.rst
+++ b/doc/source/ca_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _ca-poly:
 
 **ca_poly.h** -- dense univariate polynomials over the real and complex numbers
diff --git a/doc/source/ca_vec.rst b/doc/source/ca_vec.rst
index ac4ce9960c..f8fc6df8c2 100644
--- a/doc/source/ca_vec.rst
+++ b/doc/source/ca_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _ca-vec:
 
 **ca_vec.h** -- vectors of real and complex numbers
diff --git a/doc/source/calcium.rst b/doc/source/calcium.rst
index cc4bbbe542..6b480f3086 100644
--- a/doc/source/calcium.rst
+++ b/doc/source/calcium.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _calcium:
 
 **calcium.h** -- global definitions
diff --git a/doc/source/constants.rst b/doc/source/constants.rst
index 11b1392cce..09e17e4aae 100644
--- a/doc/source/constants.rst
+++ b/doc/source/constants.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _algorithms_constants:
 
 Algorithms for mathematical constants
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
index 464a70f920..404ae4198b 100644
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _contributing:
 
 **Contributing to FLINT**
diff --git a/doc/source/contributors.rst b/doc/source/contributors.rst
index 11af33c890..f0bf610471 100644
--- a/doc/source/contributors.rst
+++ b/doc/source/contributors.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _contributors:
 
 **Contributors**
diff --git a/doc/source/d_mat.rst b/doc/source/d_mat.rst
index 76aa25c756..0abff86631 100644
--- a/doc/source/d_mat.rst
+++ b/doc/source/d_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _d-mat:
 
 **d_mat.h** -- double precision matrices
diff --git a/doc/source/d_vec.rst b/doc/source/d_vec.rst
index cad3446898..0b757356e7 100644
--- a/doc/source/d_vec.rst
+++ b/doc/source/d_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _d-vec:
 
 **d_vec.h** -- double precision vectors
diff --git a/doc/source/dirichlet.rst b/doc/source/dirichlet.rst
index 15e564614b..3bd74afad2 100644
--- a/doc/source/dirichlet.rst
+++ b/doc/source/dirichlet.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _dirichlet:
 
 **dirichlet.h** -- Dirichlet characters
diff --git a/doc/source/dlog.rst b/doc/source/dlog.rst
index 2ca95eb451..7d10bdec16 100644
--- a/doc/source/dlog.rst
+++ b/doc/source/dlog.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _dlog:
 
 **dlog.h** -- discrete logarithms mod ulong primes
diff --git a/doc/source/double_extras.rst b/doc/source/double_extras.rst
index 725892e011..ff9a31a55b 100644
--- a/doc/source/double_extras.rst
+++ b/doc/source/double_extras.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _double-extras:
 
 **double_extras.h** -- support functions for double arithmetic
diff --git a/doc/source/double_interval.rst b/doc/source/double_interval.rst
index c53e5724fd..4a9774e752 100644
--- a/doc/source/double_interval.rst
+++ b/doc/source/double_interval.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _double_interval:
 
 **double_interval.h** -- double-precision interval arithmetic and helpers
diff --git a/doc/source/examples.rst b/doc/source/examples.rst
index dc76d5237b..42f0da8f28 100644
--- a/doc/source/examples.rst
+++ b/doc/source/examples.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _examples:
 
 **Examples**
diff --git a/doc/source/examples_arb.rst b/doc/source/examples_arb.rst
index 0a9901c6aa..727513f3f1 100644
--- a/doc/source/examples_arb.rst
+++ b/doc/source/examples_arb.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _examples-arb:
 
 Arb example programs
diff --git a/doc/source/examples_calcium.rst b/doc/source/examples_calcium.rst
index 5a36132844..e5c0ea85b3 100644
--- a/doc/source/examples_calcium.rst
+++ b/doc/source/examples_calcium.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _examples-calcium:
 
 Calcium example programs
diff --git a/doc/source/fexpr.rst b/doc/source/fexpr.rst
index 8633d53f5d..16eedddcc7 100644
--- a/doc/source/fexpr.rst
+++ b/doc/source/fexpr.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fexpr:
 
 **fexpr.h** -- flat-packed symbolic expressions
diff --git a/doc/source/fexpr_builtin.rst b/doc/source/fexpr_builtin.rst
index 38c7900ca3..3275c06f38 100644
--- a/doc/source/fexpr_builtin.rst
+++ b/doc/source/fexpr_builtin.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fexpr-builtin:
 
 **fexpr_builtin.h** -- builtin symbols
diff --git a/doc/source/fft.rst b/doc/source/fft.rst
index fcda6a9ba9..ea67f6c731 100644
--- a/doc/source/fft.rst
+++ b/doc/source/fft.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fft:
 
 **fft.h** -- Schoenhage-Strassen FFT
diff --git a/doc/source/fft_small.rst b/doc/source/fft_small.rst
index 2bfda79400..edf4f208db 100644
--- a/doc/source/fft_small.rst
+++ b/doc/source/fft_small.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fft-small:
 
 **fft_small.h** -- FFT modulo word-size primes
diff --git a/doc/source/flint.rst b/doc/source/flint.rst
index f8790d1482..e9f9468260 100644
--- a/doc/source/flint.rst
+++ b/doc/source/flint.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _flint:
 
 **flint.h** -- global definitions
diff --git a/doc/source/fmpq.rst b/doc/source/fmpq.rst
index 7e6e28bf69..667a3b760d 100644
--- a/doc/source/fmpq.rst
+++ b/doc/source/fmpq.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpq:
 
 **fmpq.h** -- rational numbers
diff --git a/doc/source/fmpq_mat.rst b/doc/source/fmpq_mat.rst
index 0db4365fd7..93aa3c3376 100644
--- a/doc/source/fmpq_mat.rst
+++ b/doc/source/fmpq_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpq-mat:
 
 **fmpq_mat.h** -- matrices over the rational numbers
diff --git a/doc/source/fmpq_mpoly.rst b/doc/source/fmpq_mpoly.rst
index dd6fa7d4de..ba81b9f494 100644
--- a/doc/source/fmpq_mpoly.rst
+++ b/doc/source/fmpq_mpoly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpq-mpoly:
 
 **fmpq_mpoly.h** -- multivariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_mpoly_factor.rst b/doc/source/fmpq_mpoly_factor.rst
index 5812a4daaa..721bb4784d 100644
--- a/doc/source/fmpq_mpoly_factor.rst
+++ b/doc/source/fmpq_mpoly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpq-mpoly-factor:
 
 **fmpq_mpoly_factor.h** -- factorisation of multivariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_poly.rst b/doc/source/fmpq_poly.rst
index b678b6fbbf..36b7d8934d 100644
--- a/doc/source/fmpq_poly.rst
+++ b/doc/source/fmpq_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpq-poly:
 
 **fmpq_poly.h** -- univariate polynomials over the rational numbers
diff --git a/doc/source/fmpq_vec.rst b/doc/source/fmpq_vec.rst
index d177c86803..8230d16014 100644
--- a/doc/source/fmpq_vec.rst
+++ b/doc/source/fmpq_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpq-vec:
 
 **fmpq_vec.h** -- vectors over rational numbers
diff --git a/doc/source/fmpz.rst b/doc/source/fmpz.rst
index 4f71a9da28..00a48b62fd 100644
--- a/doc/source/fmpz.rst
+++ b/doc/source/fmpz.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz:
 
 **fmpz.h** -- integers
diff --git a/doc/source/fmpz_extras.rst b/doc/source/fmpz_extras.rst
index bbcad16a5c..00cb7aa7bc 100644
--- a/doc/source/fmpz_extras.rst
+++ b/doc/source/fmpz_extras.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz_extras:
 
 **fmpz_extras.h** -- extra methods for FLINT integers
diff --git a/doc/source/fmpz_factor.rst b/doc/source/fmpz_factor.rst
index b8bca58aa2..bde954996e 100644
--- a/doc/source/fmpz_factor.rst
+++ b/doc/source/fmpz_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-factor:
 
 **fmpz_factor.h** -- integer factorisation
diff --git a/doc/source/fmpz_lll.rst b/doc/source/fmpz_lll.rst
index d2601d2938..52d16fd4bf 100644
--- a/doc/source/fmpz_lll.rst
+++ b/doc/source/fmpz_lll.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-lll:
 
 **fmpz_lll.h** -- LLL reduction
diff --git a/doc/source/fmpz_mat.rst b/doc/source/fmpz_mat.rst
index 684ae2bdbc..0fdde78cf8 100644
--- a/doc/source/fmpz_mat.rst
+++ b/doc/source/fmpz_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mat:
 
 **fmpz_mat.h** -- matrices over the integers
diff --git a/doc/source/fmpz_mod.rst b/doc/source/fmpz_mod.rst
index eca14a0394..71be997433 100644
--- a/doc/source/fmpz_mod.rst
+++ b/doc/source/fmpz_mod.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mod:
 
 **fmpz_mod.h** -- arithmetic modulo integers
diff --git a/doc/source/fmpz_mod_mat.rst b/doc/source/fmpz_mod_mat.rst
index e667b240b0..0f802a64e4 100644
--- a/doc/source/fmpz_mod_mat.rst
+++ b/doc/source/fmpz_mod_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz_mod_mat:
 
 **fmpz_mod_mat.h** -- matrices over integers mod n
diff --git a/doc/source/fmpz_mod_mpoly.rst b/doc/source/fmpz_mod_mpoly.rst
index 7a40c58829..f2cc9f55d3 100644
--- a/doc/source/fmpz_mod_mpoly.rst
+++ b/doc/source/fmpz_mod_mpoly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mod-mpoly:
 
 **fmpz_mod_mpoly.h** -- polynomials over the integers mod n
diff --git a/doc/source/fmpz_mod_mpoly_factor.rst b/doc/source/fmpz_mod_mpoly_factor.rst
index eebe1677b1..057fe90dd5 100644
--- a/doc/source/fmpz_mod_mpoly_factor.rst
+++ b/doc/source/fmpz_mod_mpoly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mod-mpoly-factor:
 
 **fmpz_mod_mpoly_factor.h** -- factorisation of multivariate polynomials over the integers mod n
diff --git a/doc/source/fmpz_mod_poly.rst b/doc/source/fmpz_mod_poly.rst
index 566ade3258..ee6ebbb28f 100644
--- a/doc/source/fmpz_mod_poly.rst
+++ b/doc/source/fmpz_mod_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mod-poly:
 
 **fmpz_mod_poly.h** -- polynomials over integers mod n
diff --git a/doc/source/fmpz_mod_poly_factor.rst b/doc/source/fmpz_mod_poly_factor.rst
index 94f43b9bb7..8882e1026a 100644
--- a/doc/source/fmpz_mod_poly_factor.rst
+++ b/doc/source/fmpz_mod_poly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mod-poly-factor:
 
 **fmpz_mod_poly_factor.h** -- factorisation of polynomials over integers mod n
diff --git a/doc/source/fmpz_mod_vec.rst b/doc/source/fmpz_mod_vec.rst
index dd6902b76e..f5d0994509 100644
--- a/doc/source/fmpz_mod_vec.rst
+++ b/doc/source/fmpz_mod_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mod-vec:
 
 **fmpz_mod_vec.h** -- vectors over integers mod n
diff --git a/doc/source/fmpz_mpoly.rst b/doc/source/fmpz_mpoly.rst
index c8ad7e0e1d..5312cbaf1d 100644
--- a/doc/source/fmpz_mpoly.rst
+++ b/doc/source/fmpz_mpoly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mpoly:
 
 **fmpz_mpoly.h** -- multivariate polynomials over the integers
diff --git a/doc/source/fmpz_mpoly_factor.rst b/doc/source/fmpz_mpoly_factor.rst
index 84d33bb4d6..b534f538d9 100644
--- a/doc/source/fmpz_mpoly_factor.rst
+++ b/doc/source/fmpz_mpoly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mpoly-factor:
 
 **fmpz_mpoly_factor.h** -- factorisation of multivariate polynomials over the integers
diff --git a/doc/source/fmpz_mpoly_q.rst b/doc/source/fmpz_mpoly_q.rst
index 42baa26a88..135e75c62d 100644
--- a/doc/source/fmpz_mpoly_q.rst
+++ b/doc/source/fmpz_mpoly_q.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-mpoly-q:
 
 **fmpz_mpoly_q.h** -- multivariate rational functions over Q
diff --git a/doc/source/fmpz_poly.rst b/doc/source/fmpz_poly.rst
index a2df9dea5f..8ad2c2b8e8 100644
--- a/doc/source/fmpz_poly.rst
+++ b/doc/source/fmpz_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-poly:
 
 **fmpz_poly.h** -- univariate polynomials over the integers
diff --git a/doc/source/fmpz_poly_factor.rst b/doc/source/fmpz_poly_factor.rst
index df6d93e9d8..6299cc8e9b 100644
--- a/doc/source/fmpz_poly_factor.rst
+++ b/doc/source/fmpz_poly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-poly-factor:
 
 **fmpz_poly_factor.h** -- factorisation of polynomials over the integers
diff --git a/doc/source/fmpz_poly_mat.rst b/doc/source/fmpz_poly_mat.rst
index 985f5589d7..d2e09b8920 100644
--- a/doc/source/fmpz_poly_mat.rst
+++ b/doc/source/fmpz_poly_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-poly-mat:
 
 **fmpz_poly_mat.h** -- matrices of polynomials over the integers
diff --git a/doc/source/fmpz_poly_q.rst b/doc/source/fmpz_poly_q.rst
index 98dc654652..3d468d87ff 100644
--- a/doc/source/fmpz_poly_q.rst
+++ b/doc/source/fmpz_poly_q.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-poly-q:
 
 **fmpz_poly_q.h** -- rational functions over the rational numbers
diff --git a/doc/source/fmpz_vec.rst b/doc/source/fmpz_vec.rst
index 04f4e2437e..2a45ed76e8 100644
--- a/doc/source/fmpz_vec.rst
+++ b/doc/source/fmpz_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpz-vec:
 
 **fmpz_vec.h** -- vectors of integers
diff --git a/doc/source/fmpzi.rst b/doc/source/fmpzi.rst
index ebe9fd3c16..6819a86fd9 100644
--- a/doc/source/fmpzi.rst
+++ b/doc/source/fmpzi.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fmpzi:
 
 **fmpzi.h** -- Gaussian integers
diff --git a/doc/source/formulas.rst b/doc/source/formulas.rst
index 5815d18390..41f5712278 100644
--- a/doc/source/formulas.rst
+++ b/doc/source/formulas.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _general_formulas:
 
 General formulas and bounds
diff --git a/doc/source/fq.rst b/doc/source/fq.rst
index f97caf31fd..180d0c1b37 100644
--- a/doc/source/fq.rst
+++ b/doc/source/fq.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq:
 
 **fq.h** -- finite fields
diff --git a/doc/source/fq_default.rst b/doc/source/fq_default.rst
index 190da0c868..e1a085aff2 100644
--- a/doc/source/fq_default.rst
+++ b/doc/source/fq_default.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq_default:
 
 **fq_default.h** -- unified finite fields
diff --git a/doc/source/fq_default_mat.rst b/doc/source/fq_default_mat.rst
index 88e8573ecc..26256c34cd 100644
--- a/doc/source/fq_default_mat.rst
+++ b/doc/source/fq_default_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq_default_mat:
 
 **fq_default_mat.h** -- matrices over finite fields
diff --git a/doc/source/fq_default_poly.rst b/doc/source/fq_default_poly.rst
index 213fb0474a..123e184884 100644
--- a/doc/source/fq_default_poly.rst
+++ b/doc/source/fq_default_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq_default_poly:
 
 **fq_default_poly.h** -- univariate polynomials over finite fields
diff --git a/doc/source/fq_default_poly_factor.rst b/doc/source/fq_default_poly_factor.rst
index 842897c602..ae315a71f6 100644
--- a/doc/source/fq_default_poly_factor.rst
+++ b/doc/source/fq_default_poly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-poly_factor:
 
 **fq_default_poly_factor.h** -- factorisation of univariate polynomials over finite fields
diff --git a/doc/source/fq_embed.rst b/doc/source/fq_embed.rst
index 6d4c84daf4..e256706b2c 100644
--- a/doc/source/fq_embed.rst
+++ b/doc/source/fq_embed.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-embed:
 
 **fq_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_mat.rst b/doc/source/fq_mat.rst
index 9814c80dd1..132deefb1d 100644
--- a/doc/source/fq_mat.rst
+++ b/doc/source/fq_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-mat:
 
 **fq_mat.h** -- matrices over finite fields
diff --git a/doc/source/fq_nmod.rst b/doc/source/fq_nmod.rst
index 0e34f03f23..a6dfc8d6a2 100644
--- a/doc/source/fq_nmod.rst
+++ b/doc/source/fq_nmod.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-nmod:
 
 **fq_nmod.h** -- finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_embed.rst b/doc/source/fq_nmod_embed.rst
index 876d9c0ec5..13d69b6975 100644
--- a/doc/source/fq_nmod_embed.rst
+++ b/doc/source/fq_nmod_embed.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-nmod-embed:
 
 **fq_nmod_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_nmod_mat.rst b/doc/source/fq_nmod_mat.rst
index 9ca80b7435..3adb028e42 100644
--- a/doc/source/fq_nmod_mat.rst
+++ b/doc/source/fq_nmod_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-nmod-mat:
 
 **fq_nmod_mat.h** -- matrices over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_mpoly.rst b/doc/source/fq_nmod_mpoly.rst
index 567e93491d..71c6e2e81d 100644
--- a/doc/source/fq_nmod_mpoly.rst
+++ b/doc/source/fq_nmod_mpoly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq_nmod-mpoly:
 
 **fq_nmod_mpoly.h** -- multivariate polynomials over finite fields of word-sized characteristic
diff --git a/doc/source/fq_nmod_mpoly_factor.rst b/doc/source/fq_nmod_mpoly_factor.rst
index 7281ae792d..df6f9c78fa 100644
--- a/doc/source/fq_nmod_mpoly_factor.rst
+++ b/doc/source/fq_nmod_mpoly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq_nmod-mpoly-factor:
 
 **fq_nmod_mpoly_factor.h** -- factorisation of multivariate polynomials over finite fields of word-sized characteristic
diff --git a/doc/source/fq_nmod_poly.rst b/doc/source/fq_nmod_poly.rst
index a38a702f99..640515593f 100644
--- a/doc/source/fq_nmod_poly.rst
+++ b/doc/source/fq_nmod_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-nmod-poly:
 
 **fq_nmod_poly.h** -- univariate polynomials over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_poly_factor.rst b/doc/source/fq_nmod_poly_factor.rst
index 10350b97f7..7a87ce313e 100644
--- a/doc/source/fq_nmod_poly_factor.rst
+++ b/doc/source/fq_nmod_poly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-nmod-poly-factor:
 
 **fq_nmod_poly_factor.h** -- factorisation of univariate polynomials over finite fields (word-size characteristic)
diff --git a/doc/source/fq_nmod_vec.rst b/doc/source/fq_nmod_vec.rst
index e3d9f87706..98901166a9 100644
--- a/doc/source/fq_nmod_vec.rst
+++ b/doc/source/fq_nmod_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-nmod-vec:
 
 **fq_nmod_vec.h** -- vectors over finite fields (word-size characteristic)
diff --git a/doc/source/fq_poly.rst b/doc/source/fq_poly.rst
index 6a047bfba3..ea450f9e3d 100644
--- a/doc/source/fq_poly.rst
+++ b/doc/source/fq_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-poly:
 
 **fq_poly.h** -- univariate polynomials over finite fields
diff --git a/doc/source/fq_poly_factor.rst b/doc/source/fq_poly_factor.rst
index b1e98c0438..15b11e8bd4 100644
--- a/doc/source/fq_poly_factor.rst
+++ b/doc/source/fq_poly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-poly-factor:
 
 **fq_poly_factor.h** -- factorisation of univariate polynomials over finite fields
diff --git a/doc/source/fq_vec.rst b/doc/source/fq_vec.rst
index 8e7e78267b..dd6cd505ac 100644
--- a/doc/source/fq_vec.rst
+++ b/doc/source/fq_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-vec:
 
 **fq_vec.h** -- vectors over finite fields
diff --git a/doc/source/fq_zech.rst b/doc/source/fq_zech.rst
index efc1e6f17c..db4ef814d9 100644
--- a/doc/source/fq_zech.rst
+++ b/doc/source/fq_zech.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-zech:
 
 **fq_zech.h** -- finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_embed.rst b/doc/source/fq_zech_embed.rst
index 2511f5d57b..140b006981 100644
--- a/doc/source/fq_zech_embed.rst
+++ b/doc/source/fq_zech_embed.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-zech-embed:
 
 **fq_zech_embed.h** -- Computing isomorphisms and embeddings of finite fields
diff --git a/doc/source/fq_zech_mat.rst b/doc/source/fq_zech_mat.rst
index dda2515d6c..3c59acea1f 100644
--- a/doc/source/fq_zech_mat.rst
+++ b/doc/source/fq_zech_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-zech-mat:
 
 **fq_zech_mat.h** -- matrices over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_poly.rst b/doc/source/fq_zech_poly.rst
index 6d76c9fac7..607cb9b86e 100644
--- a/doc/source/fq_zech_poly.rst
+++ b/doc/source/fq_zech_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-zech-poly:
 
 **fq_zech_poly.h** -- univariate polynomials over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_poly_factor.rst b/doc/source/fq_zech_poly_factor.rst
index 256b437bea..01fab9d822 100644
--- a/doc/source/fq_zech_poly_factor.rst
+++ b/doc/source/fq_zech_poly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-zech-poly-factor:
 
 **fq_zech_poly_factor.h** -- factorisation of univariate polynomials over finite fields (Zech logarithm representation)
diff --git a/doc/source/fq_zech_vec.rst b/doc/source/fq_zech_vec.rst
index a4d383ec8b..a249dde9f6 100644
--- a/doc/source/fq_zech_vec.rst
+++ b/doc/source/fq_zech_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _fq-zech-vec:
 
 **fq_zech_vec.h** -- vectors over finite fields (Zech logarithm representation)
diff --git a/doc/source/gamma.rst b/doc/source/gamma.rst
index c2ea71cd81..071160af08 100644
--- a/doc/source/gamma.rst
+++ b/doc/source/gamma.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _algorithms_gamma:
 
 Algorithms for the gamma function
diff --git a/doc/source/gr.rst b/doc/source/gr.rst
index 79992c8a4d..a8cd5e75a7 100644
--- a/doc/source/gr.rst
+++ b/doc/source/gr.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr:
 
 **gr.h** -- generic structures and their elements
diff --git a/doc/source/gr_domains.rst b/doc/source/gr_domains.rst
index 67658cfc8b..e4bee6057e 100644
--- a/doc/source/gr_domains.rst
+++ b/doc/source/gr_domains.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr-domains:
 
 **gr.h (continued)** -- builtin domains and types
diff --git a/doc/source/gr_generic.rst b/doc/source/gr_generic.rst
index 4defbb6c36..53077bfa8e 100644
--- a/doc/source/gr_generic.rst
+++ b/doc/source/gr_generic.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr-generic:
 
 **gr_generic.h** -- basic algorithms and fallback implementations for generic elements
diff --git a/doc/source/gr_implementing.rst b/doc/source/gr_implementing.rst
index 281a91fc53..933c3f2762 100644
--- a/doc/source/gr_implementing.rst
+++ b/doc/source/gr_implementing.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr-implementing:
 
 **gr.h (continued)** -- implementing rings
diff --git a/doc/source/gr_mat.rst b/doc/source/gr_mat.rst
index 9ea85cddc8..da09fcd894 100644
--- a/doc/source/gr_mat.rst
+++ b/doc/source/gr_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr-mat:
 
 **gr_mat.h** -- dense matrices over generic rings
diff --git a/doc/source/gr_mpoly.rst b/doc/source/gr_mpoly.rst
index 1a8c8a08f1..36fc49c9d4 100644
--- a/doc/source/gr_mpoly.rst
+++ b/doc/source/gr_mpoly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr-mpoly:
 
 **gr_mpoly.h** -- sparse multivariate polynomials over generic rings
diff --git a/doc/source/gr_poly.rst b/doc/source/gr_poly.rst
index 810f914087..ca8afb558c 100644
--- a/doc/source/gr_poly.rst
+++ b/doc/source/gr_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr-poly:
 
 **gr_poly.h** -- dense univariate polynomials over generic rings
diff --git a/doc/source/gr_special.rst b/doc/source/gr_special.rst
index 68c68793be..7b5c777592 100644
--- a/doc/source/gr_special.rst
+++ b/doc/source/gr_special.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr-special:
 
 **gr_special.h** -- special arithmetic and transcendental functions
diff --git a/doc/source/gr_vec.rst b/doc/source/gr_vec.rst
index db158b380a..e80128a4ab 100644
--- a/doc/source/gr_vec.rst
+++ b/doc/source/gr_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _gr-vec:
 
 **gr_vec.h** -- vectors over generic rings
diff --git a/doc/source/history.rst b/doc/source/history.rst
index aefb1a19b9..519d107582 100644
--- a/doc/source/history.rst
+++ b/doc/source/history.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _history:
 
 History and changes
diff --git a/doc/source/hurwitz.rst b/doc/source/hurwitz.rst
index 50ac135823..b609c47767 100644
--- a/doc/source/hurwitz.rst
+++ b/doc/source/hurwitz.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _algorithms_hurwitz:
 
 Algorithms for the Hurwitz zeta function
diff --git a/doc/source/hypergeometric.rst b/doc/source/hypergeometric.rst
index e602d9c2bf..5d3c3b1eef 100644
--- a/doc/source/hypergeometric.rst
+++ b/doc/source/hypergeometric.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _algorithms_hypergeometric:
 
 Algorithms for hypergeometric functions
diff --git a/doc/source/hypgeom.rst b/doc/source/hypgeom.rst
index dc25d800db..26dfc55771 100644
--- a/doc/source/hypgeom.rst
+++ b/doc/source/hypgeom.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _hypgeom:
 
 **hypgeom.h** -- support for hypergeometric series
diff --git a/doc/source/index.rst b/doc/source/index.rst
index a2012745a9..4d8b8d83b3 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. FLINT documentation master file, created by
    sphinx-quickstart on Fri Nov 16 21:59:21 2018.
    You can adapt this file completely to your liking, but it should at least
diff --git a/doc/source/index_arb.rst b/doc/source/index_arb.rst
index 1505571700..8eb6d38e51 100644
--- a/doc/source/index_arb.rst
+++ b/doc/source/index_arb.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _index-arb:
 
 **Real and complex numbers (Arb)** : *detailed table of contents*
diff --git a/doc/source/index_generic.rst b/doc/source/index_generic.rst
index e435030fdf..27d05c2b96 100644
--- a/doc/source/index_generic.rst
+++ b/doc/source/index_generic.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _index-generic:
 
 **Generic rings** : *detailed table of contents*
diff --git a/doc/source/index_integers.rst b/doc/source/index_integers.rst
index 4b7853ac79..426a663b7a 100644
--- a/doc/source/index_integers.rst
+++ b/doc/source/index_integers.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _index-integers:
 
 **Integers** : *detailed table of contents*
diff --git a/doc/source/index_integers_mod.rst b/doc/source/index_integers_mod.rst
index 719a7babf6..2e2528f691 100644
--- a/doc/source/index_integers_mod.rst
+++ b/doc/source/index_integers_mod.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _index-integers-mod:
 
 **Integers mod n** : *detailed table of contents*
diff --git a/doc/source/index_rationals.rst b/doc/source/index_rationals.rst
index 7d75c5f6ef..201af80cc7 100644
--- a/doc/source/index_rationals.rst
+++ b/doc/source/index_rationals.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _index-rationals:
 
 **Rational numbers** : *detailed table of contents*
diff --git a/doc/source/introduction.rst b/doc/source/introduction.rst
index 01575b5816..6a0baec75f 100644
--- a/doc/source/introduction.rst
+++ b/doc/source/introduction.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _introduction:
 
 **Introduction**
diff --git a/doc/source/introduction_calcium.rst b/doc/source/introduction_calcium.rst
index 899fc5af7a..359a801c82 100644
--- a/doc/source/introduction_calcium.rst
+++ b/doc/source/introduction_calcium.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _introduction-calcium:
 
 Introduction
diff --git a/doc/source/issues.rst b/doc/source/issues.rst
index 3e9827b176..ce2f96e3ee 100644
--- a/doc/source/issues.rst
+++ b/doc/source/issues.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _issues:
 
 Technical conventions and potential issues
diff --git a/doc/source/long_extras.rst b/doc/source/long_extras.rst
index a9f90d511c..740b6cfba7 100644
--- a/doc/source/long_extras.rst
+++ b/doc/source/long_extras.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _long-extras:
 
 **long_extras.h** -- support functions for signed word arithmetic
diff --git a/doc/source/longlong.rst b/doc/source/longlong.rst
index bcfdd6cf67..9055aad53d 100644
--- a/doc/source/longlong.rst
+++ b/doc/source/longlong.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _longlong:
 
 **longlong.h** -- support functions for multi-word arithmetic
diff --git a/doc/source/machine_vectors.rst b/doc/source/machine_vectors.rst
index e10c79a53e..bbb48e408a 100644
--- a/doc/source/machine_vectors.rst
+++ b/doc/source/machine_vectors.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _machine-vectors:
 
 **machine_vectors.h** -- SIMD-accelerated operations on fixed-length vectors
diff --git a/doc/source/mag.rst b/doc/source/mag.rst
index 4a18c5b986..50c6315ef0 100644
--- a/doc/source/mag.rst
+++ b/doc/source/mag.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _mag:
 
 **mag.h** -- fixed-precision unsigned floating-point numbers for bounds
diff --git a/doc/source/memory.rst b/doc/source/memory.rst
index 44f0aab9a6..91f0545570 100644
--- a/doc/source/memory.rst
+++ b/doc/source/memory.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _memory:
 
 **Memory management**
diff --git a/doc/source/mpfr_mat.rst b/doc/source/mpfr_mat.rst
index cc3ad6eee6..596e211791 100644
--- a/doc/source/mpfr_mat.rst
+++ b/doc/source/mpfr_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _mpfr-mat:
 
 **mpfr_mat.h** -- matrices of MPFR floating-point numbers
diff --git a/doc/source/mpfr_vec.rst b/doc/source/mpfr_vec.rst
index 84631ebdf7..eddd4d1a21 100644
--- a/doc/source/mpfr_vec.rst
+++ b/doc/source/mpfr_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _mpfr-vec:
 
 **mpfr_vec.h** -- vectors of MPFR floating-point numbers
diff --git a/doc/source/mpn_extras.rst b/doc/source/mpn_extras.rst
index 9921451b22..ea2072c36e 100644
--- a/doc/source/mpn_extras.rst
+++ b/doc/source/mpn_extras.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _mpn-extras:
 
 **mpn_extras.h** -- support functions for limb arrays
diff --git a/doc/source/mpn_mod.rst b/doc/source/mpn_mod.rst
index 3ce0598566..83ae9f7d23 100644
--- a/doc/source/mpn_mod.rst
+++ b/doc/source/mpn_mod.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _mpn-mod:
 
 **mpn_mod.h** -- integers mod n (packed multi-word n)
diff --git a/doc/source/mpoly.rst b/doc/source/mpoly.rst
index 55f2cce507..452fcfa00a 100644
--- a/doc/source/mpoly.rst
+++ b/doc/source/mpoly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _mpoly:
 
 **mpoly.h** -- support functions for multivariate polynomials
diff --git a/doc/source/nf.rst b/doc/source/nf.rst
index ce5825e775..c4e8685b78 100644
--- a/doc/source/nf.rst
+++ b/doc/source/nf.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nf:
 
 **nf.h** -- number fields
diff --git a/doc/source/nf_elem.rst b/doc/source/nf_elem.rst
index f95ca1de6b..99a7c2339d 100644
--- a/doc/source/nf_elem.rst
+++ b/doc/source/nf_elem.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nf_elem:
 
 **nf_elem.h** -- number field elements
diff --git a/doc/source/nfloat.rst b/doc/source/nfloat.rst
index 9ac02883cd..c21e6ee1a3 100644
--- a/doc/source/nfloat.rst
+++ b/doc/source/nfloat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nfloat:
 
 **nfloat.h** -- packed floating-point numbers with n-word precision
diff --git a/doc/source/nmod.rst b/doc/source/nmod.rst
index fcb5921812..d900f54dd1 100644
--- a/doc/source/nmod.rst
+++ b/doc/source/nmod.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nmod:
 
 **nmod.h** -- integers mod n (word-size n)
diff --git a/doc/source/nmod_mat.rst b/doc/source/nmod_mat.rst
index b1da8f22ca..f2582b0c58 100644
--- a/doc/source/nmod_mat.rst
+++ b/doc/source/nmod_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nmod-mat:
 
 **nmod_mat.h** -- matrices over integers mod n (word-size n)
diff --git a/doc/source/nmod_mpoly.rst b/doc/source/nmod_mpoly.rst
index 7553315112..3aec8bc877 100644
--- a/doc/source/nmod_mpoly.rst
+++ b/doc/source/nmod_mpoly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nmod-mpoly:
 
 **nmod_mpoly.h** -- multivariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_mpoly_factor.rst b/doc/source/nmod_mpoly_factor.rst
index c6d39ddf00..80b58a546f 100644
--- a/doc/source/nmod_mpoly_factor.rst
+++ b/doc/source/nmod_mpoly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nmod-mpoly-factor:
 
 **nmod_mpoly_factor.h** -- factorisation of multivariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly.rst b/doc/source/nmod_poly.rst
index 6bb0e4d6ee..9975d10a60 100644
--- a/doc/source/nmod_poly.rst
+++ b/doc/source/nmod_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nmod-poly:
 
 **nmod_poly.h** -- univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly_factor.rst b/doc/source/nmod_poly_factor.rst
index a9b9a6bf4e..17c1415d84 100644
--- a/doc/source/nmod_poly_factor.rst
+++ b/doc/source/nmod_poly_factor.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nmod-poly-factor:
 
 **nmod_poly_factor.h** -- factorisation of univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_poly_mat.rst b/doc/source/nmod_poly_mat.rst
index 1979f2243b..091a6fce54 100644
--- a/doc/source/nmod_poly_mat.rst
+++ b/doc/source/nmod_poly_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nmod-poly-mat:
 
 **nmod_poly_mat.h** -- matrices of univariate polynomials over integers mod n (word-size n)
diff --git a/doc/source/nmod_vec.rst b/doc/source/nmod_vec.rst
index 55c4e6c14d..ae988853dd 100644
--- a/doc/source/nmod_vec.rst
+++ b/doc/source/nmod_vec.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _nmod-vec:
 
 **nmod_vec.h** -- vectors over integers mod n (word-size n)
diff --git a/doc/source/overview.rst b/doc/source/overview.rst
index 9f797c43ed..6dc8022df9 100644
--- a/doc/source/overview.rst
+++ b/doc/source/overview.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _overview:
 
 Feature overview
diff --git a/doc/source/padic.rst b/doc/source/padic.rst
index f7ac874b4b..09e7cea1f1 100644
--- a/doc/source/padic.rst
+++ b/doc/source/padic.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _padic:
 
 **padic.h** -- p-adic numbers
diff --git a/doc/source/padic_mat.rst b/doc/source/padic_mat.rst
index da8d19a3f9..3dbe72a908 100644
--- a/doc/source/padic_mat.rst
+++ b/doc/source/padic_mat.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _padic-mat:
 
 **padic_mat.h** -- matrices over p-adic numbers
diff --git a/doc/source/padic_poly.rst b/doc/source/padic_poly.rst
index 9d7c8c657b..ae13acfa2b 100644
--- a/doc/source/padic_poly.rst
+++ b/doc/source/padic_poly.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _padic-poly:
 
 **padic_poly.h** -- polynomials over p-adic numbers
diff --git a/doc/source/partitions.rst b/doc/source/partitions.rst
index 3b2aca6ed4..b95e71cdea 100644
--- a/doc/source/partitions.rst
+++ b/doc/source/partitions.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _partitions:
 
 **partitions.h** -- computation of the partition function
diff --git a/doc/source/perm.rst b/doc/source/perm.rst
index 9dfde7fe80..ac4d9555e1 100644
--- a/doc/source/perm.rst
+++ b/doc/source/perm.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _perm:
 
 **perm.h** -- permutations
diff --git a/doc/source/polylogarithms.rst b/doc/source/polylogarithms.rst
index b26c32cddf..1ca47cfc11 100644
--- a/doc/source/polylogarithms.rst
+++ b/doc/source/polylogarithms.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _algorithms_polylogarithms:
 
 Algorithms for polylogarithms
diff --git a/doc/source/portability.rst b/doc/source/portability.rst
index 96531d2a66..1b3cea0edc 100644
--- a/doc/source/portability.rst
+++ b/doc/source/portability.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _portability:
 
 **Portability**
diff --git a/doc/source/profiler.rst b/doc/source/profiler.rst
index abb5c613a6..3411f0c3d7 100644
--- a/doc/source/profiler.rst
+++ b/doc/source/profiler.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _profiler:
 
 **profiler.h** -- performance profiling
diff --git a/doc/source/python_flint.rst b/doc/source/python_flint.rst
index 499cdd5a99..8f4cd1eba6 100644
--- a/doc/source/python_flint.rst
+++ b/doc/source/python_flint.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _pyflint:
 
 **flint_ctypes** - Python interface
diff --git a/doc/source/qadic.rst b/doc/source/qadic.rst
index 22d48d0434..30cc0540eb 100644
--- a/doc/source/qadic.rst
+++ b/doc/source/qadic.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _qadic:
 
 **qadic.h** -- unramified extensions over p-adic numbers
diff --git a/doc/source/qfb.rst b/doc/source/qfb.rst
index cc6290bc95..6aec06673a 100644
--- a/doc/source/qfb.rst
+++ b/doc/source/qfb.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _qfb:
 
 **qfb.h** -- binary quadratic forms
diff --git a/doc/source/qqbar.rst b/doc/source/qqbar.rst
index 45ecb00a2e..8c09e339b9 100644
--- a/doc/source/qqbar.rst
+++ b/doc/source/qqbar.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _qqbar:
 
 **qqbar.h** -- algebraic numbers represented by minimal polynomials
diff --git a/doc/source/qsieve.rst b/doc/source/qsieve.rst
index cd497140a3..c94d0e9ef1 100644
--- a/doc/source/qsieve.rst
+++ b/doc/source/qsieve.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _qsieve:
 
 **qsieve.h** -- Quadratic sieve
diff --git a/doc/source/references.rst b/doc/source/references.rst
index 83ed474d26..99563d3ec9 100644
--- a/doc/source/references.rst
+++ b/doc/source/references.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 References
 ------------
 
diff --git a/doc/source/thread_pool.rst b/doc/source/thread_pool.rst
index 028f8e0104..db25e5b076 100644
--- a/doc/source/thread_pool.rst
+++ b/doc/source/thread_pool.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _thread-pool:
 
 **thread_pool.h** -- thread pool
diff --git a/doc/source/threading.rst b/doc/source/threading.rst
index 815544fe19..e9c400c1d6 100644
--- a/doc/source/threading.rst
+++ b/doc/source/threading.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _threading:
 
 **Threading**
diff --git a/doc/source/ulong_extras.rst b/doc/source/ulong_extras.rst
index 9e3e30f244..91c7248ddf 100644
--- a/doc/source/ulong_extras.rst
+++ b/doc/source/ulong_extras.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _ulong-extras:
 
 **ulong_extras.h** -- arithmetic and number-theoretic functions for single-word integers
diff --git a/doc/source/using.rst b/doc/source/using.rst
index 04ec07a033..6848829211 100644
--- a/doc/source/using.rst
+++ b/doc/source/using.rst
@@ -1,3 +1,4 @@
+include(`macros.m4')dnl
 .. _using:
 
 Using ball arithmetic

From 5262d9dcef4ec0541aff0cc8efff2ac723add7c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Thu, 30 Jan 2025 11:43:52 +0100
Subject: [PATCH 15/20] Streamline m4 for documentation

---
 .gitignore           |   1 +
 doc/Makefile         |   4 +-
 doc/source/config.m4 | 186 ++++++++++++++++++++++++++++
 doc/source/macros.m4 | 288 ++++++++++---------------------------------
 4 files changed, 255 insertions(+), 224 deletions(-)
 create mode 100644 doc/source/config.m4

diff --git a/.gitignore b/.gitignore
index 4eff07daf8..f6ccc85f1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@ libtool
 flint.pc
 autom4te.cache/
 config.m4
+!doc/source/config.m4
 src/flint-mparam.h
 .gdb_history
 vgcore.*
diff --git a/doc/Makefile b/doc/Makefile
index bdb6563daa..33a17183b4 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,7 +12,7 @@ M4 := m4
 
 SPHINX_ACTIONS := html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf latexpdfja text man texinfo info gettext changes xml pseudoxml linkcheck doctest coverage clean
 
-MACROS := $(SOURCEDIR)/macros.m4
+CONFIG := $(SOURCEDIR)/config.m4 $(SOURCEDIR)/macros.m4
 SRCS := $(wildcard $(SOURCEDIR)/*.rst)
 OBJS := $(patsubst $(SOURCEDIR)/%,$(BUILDDIR)/%,$(SRCS))
 
@@ -22,7 +22,7 @@ help:
 
 preprocess: $(OBJS)
 
-$(BUILDDIR)/%.rst: $(SOURCEDIR)/%.rst $(MACROS)
+$(BUILDDIR)/%.rst: $(SOURCEDIR)/%.rst $(CONFIG)
 	@$(M4) -I $(SOURCEDIR) $< > $@
 
 $(SPHINX_ACTIONS): Makefile preprocess
diff --git a/doc/source/config.m4 b/doc/source/config.m4
new file mode 100644
index 0000000000..7844860b73
--- /dev/null
+++ b/doc/source/config.m4
@@ -0,0 +1,186 @@
+dnl  Copyright (C) 1999-2006, 2011 Free Software Foundation, Inc.
+dnl  Copyright (C) 2025 Albin Ahlbäck
+dnl
+dnl  This file is part of FLINT.
+dnl
+dnl  FLINT is free software: you can redistribute it and/or modify it under
+dnl  the terms of the GNU Lesser General Public License (LGPL) as published
+dnl  by the Free Software Foundation; either version 3 of the License, or
+dnl  (at your option) any later version.  See <https://www.gnu.org/licenses/>.
+dnl
+dnl  --------------------------------------------------------------------------
+dnl  Basic error handling things.
+dnl
+dnl  Usage: m4_dollarhash_1_if_noparen_p
+dnl
+dnl  Expand to 1 if a call "foo" gives $# set to 1 (as opposed to 0 like GNU
+dnl  and SysV m4 give).
+define(m4_dollarhash_1_if_noparen_test,`$#')dnl
+define(m4_dollarhash_1_if_noparen_p,
+eval(m4_dollarhash_1_if_noparen_test==1))dnl
+undefine(`m4_dollarhash_1_if_noparen_test')dnl
+dnl  Usage: m4wrap_prepend(string)
+dnl
+dnl  Prepend the given string to what will be expanded under m4wrap at the
+dnl  end of input.
+dnl
+dnl  This macro exists to work around variations in m4wrap() behaviour in
+dnl  the various m4s (notes at the start of this file).  Don't use m4wrap()
+dnl  directly since it will interfere with this scheme.
+define(m4wrap_prepend,dnl
+m4_assert_numargs(1)dnl
+`define(`m4wrap_string',`$1'defn(`m4wrap_string'))')dnl
+define(m4wrap_string,`')dnl
+define(m4wrap_works_p,dnl
+`ifelse(M4WRAP_SPURIOUS,yes,0,1)')dnl
+ifelse(m4wrap_works_p,1,dnl
+`m4wrap(`m4wrap_string')')dnl
+dnl  Usage: m4_file_and_line
+dnl
+dnl  Expand to the current file and line number, if the GNU m4 extensions
+dnl  __file__ and __line__ are available.
+dnl
+dnl  In GNU m4 1.4 at the end of input when m4wrap text is expanded,
+dnl  __file__ is NONE and __line__ is 0, which is not a helpful thing to
+dnl  print.  If m4_file_seen() has been called to note the last file seen,
+dnl  then that file at a big line number is used, otherwise "end of input"
+dnl  is used (although "end of input" won't parse as an error message).
+define(m4_file_and_line,dnl
+`ifdef(`__file__',dnl
+`ifelse(__file__`'__line__,`NONE0',dnl
+`ifdef(`m4_file_seen_last',`m4_file_seen_last: 999999: ',`end of input: ')',dnl
+`__file__: __line__: ')')')dnl
+dnl  Usage: m4_errprint_commas(arg,...)
+dnl
+dnl  The same as errprint(), but commas are printed between arguments
+dnl  instead of spaces.
+define(m4_errprint_commas,dnl
+`errprint(`$1')dnl
+ifelse(eval($#>1),1,`errprint(`,')m4_errprint_commas(shift($@))')')dnl
+dnl  Usage: m4_error(args...)
+dnl         m4_warning(args...)
+dnl
+dnl  Print an error message, using m4_errprint_commas, prefixed with the
+dnl  current filename and line number (if available).  m4_error sets up to
+dnl  give an error exit at the end of processing, m4_warning just prints.
+dnl  These macros are the recommended way to print errors.
+dnl
+dnl  The arguments here should be quoted in the usual way to prevent them
+dnl  being expanded when the macro call is read.  (m4_error takes care not
+dnl  to do any further expansion.)
+dnl
+dnl  For example,
+dnl
+dnl         m4_error(`some error message
+dnl         ')
+dnl
+dnl  which prints
+dnl
+dnl         foo.asm:123: some error message
+dnl
+dnl  or if __file__ and __line__ aren't available
+dnl
+dnl         some error message
+dnl
+dnl  The "file:line:" format is a basic style, used by gcc and GNU m4, so
+dnl  emacs and other editors will recognise it in their normal error message
+dnl  parsing.
+define(m4_warning,dnl
+`m4_errprint_commas(m4_file_and_line`'$@)')dnl
+dnl
+define(m4_error,dnl
+`define(`m4_error_occurred',1)m4_warning($@)dnl
+ifelse(m4wrap_works_p,0,`m4exit(1)')')dnl
+dnl
+define(`m4_error_occurred',0)dnl
+dnl
+dnl  This m4wrap_prepend() is first, so it'll be executed last.
+m4wrap_prepend(dnl
+`ifelse(m4_error_occurred,1,dnl
+`m4_error(`Errors occurred during m4 processing
+')m4exit(1)')')dnl
+dnl
+dnl  Usage: m4_assert_numargs(num)
+dnl
+dnl  Put this unquoted on a line on its own at the start of a macro
+dnl  definition to add some code to check that num many arguments get passed
+dnl  to the macro.  For example,
+dnl
+dnl         define(foo,
+dnl         m4_assert_numargs(2)
+dnl         `something `$1' and `$2' blah blah')
+dnl
+dnl  Then a call like foo(one,two,three) will provoke an error like
+dnl
+dnl         file:10: foo expected 2 arguments, got 3 arguments
+dnl
+dnl  Here are some calls and how many arguments they're interpreted as passing.
+dnl
+dnl         foo(abc,def)  2
+dnl         foo(xyz)      1
+dnl         foo()         0
+dnl         foo          -1
+dnl
+dnl  The -1 for no parentheses at all means a macro that's meant to be used
+dnl  that way can be checked with m4_assert_numargs(-1).  For example,
+dnl
+dnl         define(SPECIAL_SUFFIX,
+dnl         m4_assert_numargs(-1)
+dnl         `ifdef(`FOO',`_foo',`_bar')')
+dnl
+dnl  But as an alternative see also deflit() below where parenthesized
+dnl  expressions following a macro are passed through to the output.
+dnl
+dnl  Note that in BSD m4 there's no way to differentiate calls "foo" and
+dnl  "foo()", so in BSD m4 the distinction between the two isn't enforced.
+dnl  (In GNU and SysV m4 it can be checked, and is.)
+dnl
+dnl
+dnl  m4_assert_numargs is able to check its own arguments by calling
+dnl  assert_numargs_internal directly.
+dnl
+dnl  m4_doublequote($`'0) expands to ``$0'', whereas ``$`'0'' would expand
+dnl  to `$`'0' and do the wrong thing, and likewise for $1.  The same is
+dnl  done in other assert macros.
+dnl
+dnl  $`#' leaves $# in the new macro being defined, and stops # being
+dnl  interpreted as a comment character.
+dnl
+dnl  `dnl ' means an explicit dnl isn't necessary when m4_assert_numargs is
+dnl  used.  The space means that if there is a dnl it'll still work.
+dnl
+dnl  Usage: m4_doublequote(x) expands to ``x''
+define(m4_doublequote,dnl
+`m4_assert_numargs_internal(`$0',1,$#,len(`$1'))``$1''')dnl
+dnl
+define(m4_assert_numargs,dnl
+`m4_assert_numargs_internal(`$0',1,$#,len(`$1'))dnl
+`m4_assert_numargs_internal'(m4_doublequote($`'0),$1,$`#',`len'(m4_doublequote($`'1)))`dnl '')dnl
+dnl
+dnl  Called: m4_assert_numargs_internal(`macroname',wantargs,$#,len(`$1'))
+define(m4_assert_numargs_internal,dnl
+`m4_assert_numargs_internal_check(`$1',`$2',m4_numargs_count(`$3',`$4'))')dnl
+dnl
+dnl  Called: m4_assert_numargs_internal_check(`macroname',wantargs,gotargs)
+dnl
+dnl  If m4_dollarhash_1_if_noparen_p (BSD m4) then gotargs can be 0 when it
+dnl  should be -1.  If wantargs is -1 but gotargs is 0 and the two can't be
+dnl  distinguished then it's allowed to pass.
+dnl
+define(m4_assert_numargs_internal_check,dnl
+`ifelse(eval($2 == $3
+             || ($2==-1 && $3==0 && m4_dollarhash_1_if_noparen_p)),0,dnl
+`m4_error(`$1 expected 'm4_Narguments(`$2')`, got 'm4_Narguments(`$3')dnl
+)')')dnl
+dnl
+dnl  Called: m4_numargs_count($#,len(`$1'))
+dnl  If $#==0 then -1 args, if $#==1 but len(`$1')==0 then 0 args, otherwise
+dnl  $# args.
+define(m4_numargs_count,dnl
+`ifelse($1,0, -1,dnl
+`ifelse(eval($1==1 && $2-0==0),1, 0, $1)')')dnl
+dnl
+dnl  Usage: m4_Narguments(N)
+dnl  "$1 argument" or "$1 arguments" with the plural according to $1.
+define(m4_Narguments,dnl
+`$1 argument`'ifelse(`$1',1,,s)')dnl
diff --git a/doc/source/macros.m4 b/doc/source/macros.m4
index 20720e72d2..b080faee05 100644
--- a/doc/source/macros.m4
+++ b/doc/source/macros.m4
@@ -1,262 +1,106 @@
-dnl Change quotes to something that is not used anywhere
+include(`config.m4')dnl
+dnl############################################################################
+dnl Change quotation marks to avoid conflicts
+dnl############################################################################
 changequote({{{,}}})dnl
-dnl
 dnl############################################################################
 dnl helper stuff
 dnl############################################################################
-define({{{_prefix}}},{{{.. function::}}})dnl
-define({{{_indent}}},{{{             }}})dnl
+define({{{_neg_}}},{{{m4_assert_numargs(1)dnl
+-$1}}})dnl
+dnl
+define({{{_add_}}},{{{m4_assert_numargs(2)dnl
+$1 + $2}}})dnl
+dnl
+define({{{_sub_}}},{{{m4_assert_numargs(2)dnl
+$1 - $2}}})dnl
+dnl
+define({{{_mul_}}},{{{m4_assert_numargs(2)dnl
+$1 \cdot $2}}})dnl
+dnl
+define({{{_div_}}},{{{m4_assert_numargs(2)dnl
+$1 / $2}}})dnl
+dnl
+define({{{_addmul_}}},{{{m4_assert_numargs(3)dnl
+_add_($1, _mul_($2, $3))}}})dnl
 dnl
-define({{{_res_}}},{{{r}}})dnl
-define({{{_ip1_}}},{{{a}}})dnl
-define({{{_ip2_}}},{{{b}}})dnl
+define({{{_submul_}}},{{{m4_assert_numargs(3)dnl
+_sub_($1, _mul_($2, $3))}}})dnl
 dnl
-define({{{_neg_}}},{{{-$1}}})dnl
-define({{{_add_}}},{{{$1 + $2}}})dnl
-define({{{_sub_}}},{{{$1 - $2}}})dnl
-define({{{_mul_}}},{{{$1 \cdot $2}}})dnl
-define({{{_div_}}},{{{$1 / $2}}})dnl
+define({{{_lt_}}},{{{m4_assert_numargs(2)dnl
+$1 < $2}}})dnl
 dnl
-define({{{_addmul_}}},{{{_add_($1, _mul_($2, $3))}}})dnl
-define({{{_submul_}}},{{{_sub_($1, _mul_($2, $3))}}})dnl
+define({{{_gt_}}},{{{m4_assert_numargs(2)dnl
+$1 > $2}}})dnl
 dnl
-define({{{_lt_}}},{{{$1 < $2}}})dnl
-define({{{_gt_}}},{{{$1 < $2}}})dnl
-define({{{_equal_}}},{{{$1 = $2}}})dnl
+define({{{_equal_}}},{{{m4_assert_numargs(2)dnl
+$1 = $2}}})dnl
 dnl############################################################################
 dnl set
 dnl############################################################################
-define({{{func_set}}},dnl
-{{{dnl
-void $1_set($1_t _res_, const $1_t _ip1_)dnl
-}}})dnl
-define({{{func_set_si}}},dnl
-{{{dnl
-void $1_set_si($1_t _res_, slong _ip1_)dnl
-}}})dnl
-define({{{func_set_ui}}},dnl
-{{{dnl
-void $1_set_ui($1_t _res_, ulong _ip1_)dnl
-}}})dnl
-define({{{desc_set}}},{{{
-    Sets `_res_` to `_ip1_`.dnl
-}}})dnl
-dnl############################################################################
-dnl set to common constants
-dnl############################################################################
-define({{{func_zero}}},dnl
-{{{dnl
-void $1_zero($1_t _res_)dnl
-}}})dnl
-define({{{desc_zero}}},{{{
-    Sets `_res_` to zero.dnl
-}}})dnl
-define({{{func_one}}},dnl
-{{{dnl
-void $1_one($1_t _res_)dnl
-}}})dnl
-define({{{desc_one}}},{{{
-    Sets `_res_` to one.dnl
-}}})dnl
-dnl############################################################################
-dnl negation
-dnl############################################################################
-define({{{func_neg}}},dnl
-{{{dnl
-void $1_neg($1_t _res_, const $1_t _ip1_)dnl
-}}})dnl
-define({{{desc_neg}}},{{{
-    Sets `_res_` to `_neg_(_ip1_)`.dnl
-}}})dnl
-dnl############################################################################
-dnl absolute value
-dnl############################################################################
-define({{{func_abs}}},dnl
-{{{dnl
-void $1_abs($1_t _res_, const $1_t _ip1_)dnl
-}}})dnl
-define({{{desc_abs}}},{{{
-    Sets `_res_` to the absolute value of `_ip1_`.dnl
-}}})dnl
-dnl############################################################################
-dnl addition
-dnl############################################################################
-define({{{func_add}}},dnl
-{{{dnl
-void $1_add($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
-}}})dnl
-define({{{func_add_si}}},dnl
-{{{dnl
-void $1_add_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
-}}})dnl
-define({{{func_add_ui}}},dnl
-{{{dnl
-void $1_add_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
-}}})dnl
-define({{{desc_add}}},{{{
-    Sets `_res_` to `_add_(_ip1_, _ip2_)`.dnl
-}}})dnl
-dnl############################################################################
-dnl subtraction
-dnl############################################################################
-define({{{func_sub}}},dnl
-{{{dnl
-void $1_sub($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
+define({{{desc_set}}},{{{m4_assert_numargs(2)
+    Sets `$1` to `$2`.dnl
 }}})dnl
-define({{{func_sub_si}}},dnl
-{{{dnl
-void $1_sub_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
+define({{{desc_zero}}},{{{m4_assert_numargs(1)
+    Sets `$1` to zero.dnl
 }}})dnl
-define({{{func_sub_ui}}},dnl
-{{{dnl
-void $1_sub_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
-}}})dnl
-define({{{desc_sub}}},{{{
-    Sets `_res_` to `_sub_(_ip1_, _ip2_)`.dnl
+define({{{desc_one}}},{{{m4_assert_numargs(1)
+    Sets `$1` to one.dnl
 }}})dnl
 dnl############################################################################
-dnl multiplication
+dnl negation, absolute value etc.
 dnl############################################################################
-define({{{func_mul}}},dnl
-{{{dnl
-void $1_mul($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
-}}})dnl
-define({{{func_mul_si}}},dnl
-{{{dnl
-void $1_mul_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
+define({{{desc_neg}}},{{{m4_assert_numargs(2)
+    Sets `$1` to `_neg_($2)`.dnl
 }}})dnl
-define({{{func_mul_ui}}},dnl
-{{{dnl
-void $1_mul_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
-}}})dnl
-define({{{desc_mul}}},{{{
-    Sets `_res_` to `_mul_(_ip1_, _ip2_)`.dnl
+define({{{desc_abs}}},{{{m4_assert_numargs(2)
+    Sets `$1` to the absolute value of `$2`.dnl
 }}})dnl
 dnl############################################################################
-dnl exact division
+dnl basic arithmetic operations
 dnl############################################################################
-define({{{func_divexact}}},dnl
-{{{dnl
-void $1_divexact($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
+define({{{desc_add}}},{{{m4_assert_numargs(3)
+    Sets `$1` to `_add_($2, $3)`.dnl
 }}})dnl
-define({{{func_divexact_si}}},dnl
-{{{dnl
-void $1_divexact_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
+define({{{desc_sub}}},{{{m4_assert_numargs(3)
+    Sets `$1` to `_sub_($2, $3)`.dnl
 }}})dnl
-define({{{func_divexact_ui}}},dnl
-{{{dnl
-void $1_divexact_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
+define({{{desc_mul}}},{{{m4_assert_numargs(3)
+    Sets `$1` to `_mul_($2, $3)`.dnl
 }}})dnl
-define({{{desc_divexact}}},{{{
-    Sets `_res_` to `_div_(_ip1_, _ip2_)` under the assumption that the
-    division is exact.  If `_ip2_` is zero, an exception is raised.dnl
+define({{{desc_divexact}}},{{{m4_assert_numargs(3)
+    Sets `$1` to `_div_($2, $3)` under the assumption that the division is
+    exact.  If `$3` is zero, an exception is raised.dnl
 }}})dnl
 dnl############################################################################
-dnl addmul
+dnl extended basic arithmetic operations
 dnl############################################################################
-define({{{func_addmul}}},dnl
-{{{dnl
-void $1_addmul($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
-}}})dnl
-define({{{func_addmul_si}}},dnl
-{{{dnl
-void $1_addmul_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
-}}})dnl
-define({{{func_addmul_ui}}},dnl
-{{{dnl
-void $1_addmul_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
-}}})dnl
-define({{{desc_addmul}}},{{{
-    Sets `_res_` to `_addmul_(_res_, _ip1_, _ip2_)`.dnl
-}}})dnl
-dnl############################################################################
-dnl submul
-dnl############################################################################
-define({{{func_submul}}},dnl
-{{{dnl
-void $1_submul($1_t _res_, const $1_t _ip1_, const $1_t _ip2_)dnl
-}}})dnl
-define({{{func_submul_si}}},dnl
-{{{dnl
-void $1_submul_si($1_t _res_, const $1_t _ip1_, slong _ip2_)dnl
-}}})dnl
-define({{{func_submul_ui}}},dnl
-{{{dnl
-void $1_submul_ui($1_t _res_, const $1_t _ip1_, ulong _ip2_)dnl
+define({{{desc_addmul}}},{{{m4_assert_numargs(3)
+    Sets `$1` to `_addmul_($1, $2, $3)`.dnl
 }}})dnl
-define({{{desc_submul}}},{{{
-    Sets `_res_` to `_submul_(_res_, _ip1_, _ip2_)`.dnl
+define({{{desc_submul}}},{{{m4_assert_numargs(3)
+    Sets `$1` to `_submul_($1, $2, $3)`.dnl
 }}})dnl
 dnl############################################################################
 dnl sqrt
 dnl############################################################################
-define({{{func_sqrt}}},dnl
-{{{dnl
-void $1_sqrt($1_t _res_, const $1_t _ip1_)dnl
-}}})dnl
-define({{{desc_sqrt_nonordered_ring}}},{{{
-    If `_ip1_` is a perfect square, sets `_res_` to a square root of `_ip1_`
+define({{{desc_sqrt_nonordered_ring}}},{{{m4_assert_numargs(2)
+    If `$2` is a perfect square, sets `$1` to a square root of `$2`
     and returns nonzero.  Otherwise returns zero.dnl
 }}})dnl
 dnl############################################################################
 dnl comparisons
 dnl############################################################################
-define({{{func_cmp}}},dnl
-{{{dnl
-int $1_cmp(const $1_t _ip1_, const $1_t _ip2_)dnl
-}}})dnl
-define({{{func_cmp_si}}},dnl
-{{{dnl
-int $1_cmp_si(const $1_t _ip1_, slong _ip2_)dnl
-}}})dnl
-define({{{func_cmp_ui}}},dnl
-{{{dnl
-int $1_cmp_ui(const $1_t _ip1_, ulong _ip2_)dnl
-}}})dnl
-define({{{func_cmp_fmpz}}},dnl
-{{{dnl
-int $1_cmp_fmpz(const $1_t _ip1_, const fmpz_t _ip2_)dnl
-}}})dnl
-define({{{desc_cmp}}},{{{
-    Returns a negative value if `_lt_(_ip1_, _ip2_)`, positive value if
-    `_gt_(_ip1_, _ip2_)`, otherwise returns zero.dnl
-}}})dnl
-dnl############################################################################
-dnl equality
-dnl############################################################################
-define({{{func_equal}}},dnl
-{{{dnl
-int $1_equal(const $1_t _ip1_, const $1_t _ip2_)dnl
-}}})dnl
-define({{{func_equal_si}}},dnl
-{{{dnl
-int $1_equal_si(const $1_t _ip1_, slong _ip2_)dnl
-}}})dnl
-define({{{func_equal_ui}}},dnl
-{{{dnl
-int $1_equal_ui(const $1_t _ip1_, ulong _ip2_)dnl
-}}})dnl
-define({{{func_equal_fmpz}}},dnl
-{{{dnl
-int $1_equal_fmpz(const $1_t _ip1_, const fmpz_t _ip2_)dnl
-}}})dnl
-define({{{desc_equal}}},{{{
-    Returns nonzero if `_equal_(_ip1_, _ip2_)`, otherwise returns zero.
-}}})dnl
-dnl############################################################################
-dnl equality to common constants
-dnl############################################################################
-define({{{func_is_zero}}},dnl
-{{{dnl
-int $1_is_zero(const $1_t _ip1_)dnl
+define({{{desc_cmp}}},{{{m4_assert_numargs(2)
+    Returns a negative value if `_lt_($1, $2)`, positive value if
+    `_gt_($1, $2)`, otherwise returns zero.dnl
 }}})dnl
-define({{{desc_is_zero}}},{{{
-    Returns nonzero if `_equal_(_ip1_, 0)`, otherwise returns zero.dnl
+define({{{desc_equal}}},{{{m4_assert_numargs(2)
+    Returns nonzero if `_equal_($1, $2)`, otherwise returns zero.
 }}})dnl
-define({{{func_is_one}}},dnl
-{{{dnl
-int $1_is_one(const $1_t _ip1_)dnl
+define({{{desc_is_zero}}},{{{m4_assert_numargs(1)
+    Returns nonzero if `_equal_($1, 0)`, otherwise returns zero.dnl
 }}})dnl
-define({{{desc_is_one}}},{{{
-    Returns nonzero if `_equal_(_ip1_, 1)`, otherwise returns zero.dnl
+define({{{desc_is_one}}},{{{m4_assert_numargs(1)
+    Returns nonzero if `_equal_($1, 1)`, otherwise returns zero.dnl
 }}})dnl

From 20cded873d808c54d619014ee58009b981d1011d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Thu, 30 Jan 2025 16:08:49 +0100
Subject: [PATCH 16/20] Blaaaa

---
 doc/Makefile         |  12 ++-
 doc/source/config.m4 | 186 -------------------------------------------
 doc/source/fmpz.rst  | 107 +++++++++----------------
 doc/source/macros.m4 |  93 +++++++++++++---------
 4 files changed, 101 insertions(+), 297 deletions(-)
 delete mode 100644 doc/source/config.m4

diff --git a/doc/Makefile b/doc/Makefile
index 33a17183b4..b3263c7f1e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,7 +12,7 @@ M4 := m4
 
 SPHINX_ACTIONS := html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf latexpdfja text man texinfo info gettext changes xml pseudoxml linkcheck doctest coverage clean
 
-CONFIG := $(SOURCEDIR)/config.m4 $(SOURCEDIR)/macros.m4
+CONFIG := $(SOURCEDIR)/macros.m4
 SRCS := $(wildcard $(SOURCEDIR)/*.rst)
 OBJS := $(patsubst $(SOURCEDIR)/%,$(BUILDDIR)/%,$(SRCS))
 
@@ -20,12 +20,18 @@ OBJS := $(patsubst $(SOURCEDIR)/%,$(BUILDDIR)/%,$(SRCS))
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-preprocess: $(OBJS)
+$(BUILDDIR):
+	mkdir $(BUILDDIR)
 
-$(BUILDDIR)/%.rst: $(SOURCEDIR)/%.rst $(CONFIG)
+$(BUILDDIR)/%.rst: $(SOURCEDIR)/%.rst $(CONFIG) | $(BUILDDIR)
 	@$(M4) -I $(SOURCEDIR) $< > $@
 
+preprocess: $(OBJS)
+
 $(SPHINX_ACTIONS): Makefile preprocess
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
+print-%:
+	@echo "$*=$($*)"
+
 .PHONY: help Makefile preprocess
diff --git a/doc/source/config.m4 b/doc/source/config.m4
deleted file mode 100644
index 7844860b73..0000000000
--- a/doc/source/config.m4
+++ /dev/null
@@ -1,186 +0,0 @@
-dnl  Copyright (C) 1999-2006, 2011 Free Software Foundation, Inc.
-dnl  Copyright (C) 2025 Albin Ahlbäck
-dnl
-dnl  This file is part of FLINT.
-dnl
-dnl  FLINT is free software: you can redistribute it and/or modify it under
-dnl  the terms of the GNU Lesser General Public License (LGPL) as published
-dnl  by the Free Software Foundation; either version 3 of the License, or
-dnl  (at your option) any later version.  See <https://www.gnu.org/licenses/>.
-dnl
-dnl  --------------------------------------------------------------------------
-dnl  Basic error handling things.
-dnl
-dnl  Usage: m4_dollarhash_1_if_noparen_p
-dnl
-dnl  Expand to 1 if a call "foo" gives $# set to 1 (as opposed to 0 like GNU
-dnl  and SysV m4 give).
-define(m4_dollarhash_1_if_noparen_test,`$#')dnl
-define(m4_dollarhash_1_if_noparen_p,
-eval(m4_dollarhash_1_if_noparen_test==1))dnl
-undefine(`m4_dollarhash_1_if_noparen_test')dnl
-dnl  Usage: m4wrap_prepend(string)
-dnl
-dnl  Prepend the given string to what will be expanded under m4wrap at the
-dnl  end of input.
-dnl
-dnl  This macro exists to work around variations in m4wrap() behaviour in
-dnl  the various m4s (notes at the start of this file).  Don't use m4wrap()
-dnl  directly since it will interfere with this scheme.
-define(m4wrap_prepend,dnl
-m4_assert_numargs(1)dnl
-`define(`m4wrap_string',`$1'defn(`m4wrap_string'))')dnl
-define(m4wrap_string,`')dnl
-define(m4wrap_works_p,dnl
-`ifelse(M4WRAP_SPURIOUS,yes,0,1)')dnl
-ifelse(m4wrap_works_p,1,dnl
-`m4wrap(`m4wrap_string')')dnl
-dnl  Usage: m4_file_and_line
-dnl
-dnl  Expand to the current file and line number, if the GNU m4 extensions
-dnl  __file__ and __line__ are available.
-dnl
-dnl  In GNU m4 1.4 at the end of input when m4wrap text is expanded,
-dnl  __file__ is NONE and __line__ is 0, which is not a helpful thing to
-dnl  print.  If m4_file_seen() has been called to note the last file seen,
-dnl  then that file at a big line number is used, otherwise "end of input"
-dnl  is used (although "end of input" won't parse as an error message).
-define(m4_file_and_line,dnl
-`ifdef(`__file__',dnl
-`ifelse(__file__`'__line__,`NONE0',dnl
-`ifdef(`m4_file_seen_last',`m4_file_seen_last: 999999: ',`end of input: ')',dnl
-`__file__: __line__: ')')')dnl
-dnl  Usage: m4_errprint_commas(arg,...)
-dnl
-dnl  The same as errprint(), but commas are printed between arguments
-dnl  instead of spaces.
-define(m4_errprint_commas,dnl
-`errprint(`$1')dnl
-ifelse(eval($#>1),1,`errprint(`,')m4_errprint_commas(shift($@))')')dnl
-dnl  Usage: m4_error(args...)
-dnl         m4_warning(args...)
-dnl
-dnl  Print an error message, using m4_errprint_commas, prefixed with the
-dnl  current filename and line number (if available).  m4_error sets up to
-dnl  give an error exit at the end of processing, m4_warning just prints.
-dnl  These macros are the recommended way to print errors.
-dnl
-dnl  The arguments here should be quoted in the usual way to prevent them
-dnl  being expanded when the macro call is read.  (m4_error takes care not
-dnl  to do any further expansion.)
-dnl
-dnl  For example,
-dnl
-dnl         m4_error(`some error message
-dnl         ')
-dnl
-dnl  which prints
-dnl
-dnl         foo.asm:123: some error message
-dnl
-dnl  or if __file__ and __line__ aren't available
-dnl
-dnl         some error message
-dnl
-dnl  The "file:line:" format is a basic style, used by gcc and GNU m4, so
-dnl  emacs and other editors will recognise it in their normal error message
-dnl  parsing.
-define(m4_warning,dnl
-`m4_errprint_commas(m4_file_and_line`'$@)')dnl
-dnl
-define(m4_error,dnl
-`define(`m4_error_occurred',1)m4_warning($@)dnl
-ifelse(m4wrap_works_p,0,`m4exit(1)')')dnl
-dnl
-define(`m4_error_occurred',0)dnl
-dnl
-dnl  This m4wrap_prepend() is first, so it'll be executed last.
-m4wrap_prepend(dnl
-`ifelse(m4_error_occurred,1,dnl
-`m4_error(`Errors occurred during m4 processing
-')m4exit(1)')')dnl
-dnl
-dnl  Usage: m4_assert_numargs(num)
-dnl
-dnl  Put this unquoted on a line on its own at the start of a macro
-dnl  definition to add some code to check that num many arguments get passed
-dnl  to the macro.  For example,
-dnl
-dnl         define(foo,
-dnl         m4_assert_numargs(2)
-dnl         `something `$1' and `$2' blah blah')
-dnl
-dnl  Then a call like foo(one,two,three) will provoke an error like
-dnl
-dnl         file:10: foo expected 2 arguments, got 3 arguments
-dnl
-dnl  Here are some calls and how many arguments they're interpreted as passing.
-dnl
-dnl         foo(abc,def)  2
-dnl         foo(xyz)      1
-dnl         foo()         0
-dnl         foo          -1
-dnl
-dnl  The -1 for no parentheses at all means a macro that's meant to be used
-dnl  that way can be checked with m4_assert_numargs(-1).  For example,
-dnl
-dnl         define(SPECIAL_SUFFIX,
-dnl         m4_assert_numargs(-1)
-dnl         `ifdef(`FOO',`_foo',`_bar')')
-dnl
-dnl  But as an alternative see also deflit() below where parenthesized
-dnl  expressions following a macro are passed through to the output.
-dnl
-dnl  Note that in BSD m4 there's no way to differentiate calls "foo" and
-dnl  "foo()", so in BSD m4 the distinction between the two isn't enforced.
-dnl  (In GNU and SysV m4 it can be checked, and is.)
-dnl
-dnl
-dnl  m4_assert_numargs is able to check its own arguments by calling
-dnl  assert_numargs_internal directly.
-dnl
-dnl  m4_doublequote($`'0) expands to ``$0'', whereas ``$`'0'' would expand
-dnl  to `$`'0' and do the wrong thing, and likewise for $1.  The same is
-dnl  done in other assert macros.
-dnl
-dnl  $`#' leaves $# in the new macro being defined, and stops # being
-dnl  interpreted as a comment character.
-dnl
-dnl  `dnl ' means an explicit dnl isn't necessary when m4_assert_numargs is
-dnl  used.  The space means that if there is a dnl it'll still work.
-dnl
-dnl  Usage: m4_doublequote(x) expands to ``x''
-define(m4_doublequote,dnl
-`m4_assert_numargs_internal(`$0',1,$#,len(`$1'))``$1''')dnl
-dnl
-define(m4_assert_numargs,dnl
-`m4_assert_numargs_internal(`$0',1,$#,len(`$1'))dnl
-`m4_assert_numargs_internal'(m4_doublequote($`'0),$1,$`#',`len'(m4_doublequote($`'1)))`dnl '')dnl
-dnl
-dnl  Called: m4_assert_numargs_internal(`macroname',wantargs,$#,len(`$1'))
-define(m4_assert_numargs_internal,dnl
-`m4_assert_numargs_internal_check(`$1',`$2',m4_numargs_count(`$3',`$4'))')dnl
-dnl
-dnl  Called: m4_assert_numargs_internal_check(`macroname',wantargs,gotargs)
-dnl
-dnl  If m4_dollarhash_1_if_noparen_p (BSD m4) then gotargs can be 0 when it
-dnl  should be -1.  If wantargs is -1 but gotargs is 0 and the two can't be
-dnl  distinguished then it's allowed to pass.
-dnl
-define(m4_assert_numargs_internal_check,dnl
-`ifelse(eval($2 == $3
-             || ($2==-1 && $3==0 && m4_dollarhash_1_if_noparen_p)),0,dnl
-`m4_error(`$1 expected 'm4_Narguments(`$2')`, got 'm4_Narguments(`$3')dnl
-)')')dnl
-dnl
-dnl  Called: m4_numargs_count($#,len(`$1'))
-dnl  If $#==0 then -1 args, if $#==1 but len(`$1')==0 then 0 args, otherwise
-dnl  $# args.
-define(m4_numargs_count,dnl
-`ifelse($1,0, -1,dnl
-`ifelse(eval($1==1 && $2-0==0),1, 0, $1)')')dnl
-dnl
-dnl  Usage: m4_Narguments(N)
-dnl  "$1 argument" or "$1 arguments" with the plural according to $1.
-define(m4_Narguments,dnl
-`$1 argument`'ifelse(`$1',1,,s)')dnl
diff --git a/doc/source/fmpz.rst b/doc/source/fmpz.rst
index 00a48b62fd..9a3e71a9cd 100644
--- a/doc/source/fmpz.rst
+++ b/doc/source/fmpz.rst
@@ -230,12 +230,9 @@ Memory management
     whether the reentrant or non-reentrant version of FLINT is built.
 
 .. function:: void fmpz_init_set(fmpz_t f, const fmpz_t g)
-
-.. function:: void fmpz_init_set_ui(fmpz_t f, ulong g)
-
-.. function:: void fmpz_init_set_si(fmpz_t f, slong g)
-
-    Initialises `f` and sets it to the value of `g`.
+              void fmpz_init_set_ui(fmpz_t f, ulong g)
+              void fmpz_init_set_si(fmpz_t f, slong g)
+desc_init_set(f, g)
 
 
 Random generation
@@ -375,14 +372,6 @@ Conversion
     the function.  Otherwise, it is up to the caller to ensure that
     the allocated block of memory is sufficiently large.
 
-.. function:: void fmpz_set_si(fmpz_t f, slong val)
-
-    Sets `f` to the given ``slong`` value.
-
-.. function:: void fmpz_set_ui(fmpz_t f, ulong val)
-
-    Sets `f` to the given ``ulong`` value.
-
 .. function:: void fmpz_set_d(fmpz_t f, double c)
 
     Sets `f` to the ``double`` `c`, rounding down towards zero if
@@ -459,13 +448,6 @@ Conversion
     Retrieves the value of `in` modulo `2^{2 * FLINT\_BITS}` and puts the high
     and low words into ``*hi`` and ``*lo`` respectively.
 
-.. function:: void fmpz_set_mpz(fmpz_t f, const mpz_t x)
-
-    Sets `f` to the given ``mpz_t`` value.
-
-    **Note:** Requires that ``gmp.h`` has been included before any FLINT
-    header is included.
-
 .. function:: int fmpz_set_str(fmpz_t f, const char * str, int b)
 
     Sets `f` to the value given in the null-terminated string ``str``,
@@ -660,16 +642,19 @@ Basic properties and manipulation
     Efficiently swaps `f` and `g`.  No data is copied.
 
 .. function:: void fmpz_set(fmpz_t f, const fmpz_t g)
+              void fmpz_set_ui(fmpz_t f, ulong g)
+              void fmpz_set_si(fmpz_t f, slong g)
+              void fmpz_set_mpz(fmpz_t f, const mpz_t g)
+desc_set(f, g)
 
-    Sets `f` to the same value as `g`.
+    **Note:** Requires that ``gmp.h`` has been included before any FLINT
+    header is included.
 
 .. function:: void fmpz_zero(fmpz_t f)
-
-    Sets `f` to zero.
+desc_zero(f)
 
 .. function:: void fmpz_one(fmpz_t f)
-
-    Sets `f` to one.
+desc_one(f)
 
 .. function:: int fmpz_abs_fits_ui(const fmpz_t f)
 
@@ -710,13 +695,9 @@ Comparison
 
 
 .. function:: int fmpz_cmp(const fmpz_t f, const fmpz_t g)
-
-.. function:: int fmpz_cmp_ui(const fmpz_t f, ulong g)
-
-.. function:: int fmpz_cmp_si(const fmpz_t f, slong g)
-
-    Returns a negative value if `f < g`, positive value if `g < f`,
-    otherwise returns `0`.
+              int fmpz_cmp_ui(const fmpz_t f, ulong g)
+              int fmpz_cmp_si(const fmpz_t f, slong g)
+desc_cmp(f, g)
 
 .. function:: int fmpz_cmpabs(const fmpz_t f, const fmpz_t g)
 
@@ -729,20 +710,15 @@ Comparison
     `\lvert 2g\rvert < \lvert f \rvert`, otherwise returns `0`.
 
 .. function:: int fmpz_equal(const fmpz_t f, const fmpz_t g)
-
-.. function:: int fmpz_equal_ui(const fmpz_t f, ulong g)
-
-.. function:: int fmpz_equal_si(const fmpz_t f, slong g)
-
-    Returns `1` if `f` is equal to `g`, otherwise returns `0`.
+              int fmpz_equal_ui(const fmpz_t f, ulong g)
+              int fmpz_equal_si(const fmpz_t f, slong g)
+desc_equal(f, g)
 
 .. function:: int fmpz_is_zero(const fmpz_t f)
-
-    Returns `1` if `f` is `0`, otherwise returns `0`.
+desc_is_zero(f)
 
 .. function:: int fmpz_is_one(const fmpz_t f)
-
-    Returns `1` if `f` is equal to one, otherwise returns `0`.
+desc_is_one(f)
 
 .. function:: int fmpz_is_pm1(const fmpz_t f)
 
@@ -761,31 +737,36 @@ Basic arithmetic
 --------------------------------------------------------------------------------
 
 
-.. function:: void fmpz_neg(fmpz_t f1, const fmpz_t f2)
-
-    Sets `f_1` to `-f_2`.
-
-.. function:: void fmpz_abs(fmpz_t f1, const fmpz_t f2)
+.. function:: void fmpz_neg(fmpz_t f, const fmpz_t g)
+desc_neg(f, g)
 
-    Sets `f_1` to the absolute value of `f_2`.
+.. function:: void fmpz_abs(fmpz_t f, const fmpz_t g)
+desc_abs(f, g)
 
 .. function:: void fmpz_add(fmpz_t f, const fmpz_t g, const fmpz_t h)
               void fmpz_add_ui(fmpz_t f, const fmpz_t g, ulong h)
               void fmpz_add_si(fmpz_t f, const fmpz_t g, slong h)
-
-    Sets `f` to `g + h`.
+desc_add(f, g, h)
 
 .. function:: void fmpz_sub(fmpz_t f, const fmpz_t g, const fmpz_t h)
               void fmpz_sub_ui(fmpz_t f, const fmpz_t g, ulong h)
               void fmpz_sub_si(fmpz_t f, const fmpz_t g, slong h)
-
-    Sets `f` to `g - h`.
+desc_sub(f, g, h)
 
 .. function:: void fmpz_mul(fmpz_t f, const fmpz_t g, const fmpz_t h)
               void fmpz_mul_ui(fmpz_t f, const fmpz_t g, ulong h)
               void fmpz_mul_si(fmpz_t f, const fmpz_t g, slong h)
+desc_mul(f, g, h)
+
+.. function:: void fmpz_addmul(fmpz_t f, const fmpz_t g, const fmpz_t h)
+              void fmpz_addmul_ui(fmpz_t f, const fmpz_t g, ulong h)
+              void fmpz_addmul_si(fmpz_t f, const fmpz_t g, slong h)
+desc_addmul(f, g, h)
 
-    Sets `f` to `g \times h`.
+.. function:: void fmpz_submul(fmpz_t f, const fmpz_t g, const fmpz_t h)
+              void fmpz_submul_ui(fmpz_t f, const fmpz_t g, ulong h)
+              void fmpz_submul_si(fmpz_t f, const fmpz_t g, slong h)
+desc_submul(f, g, h)
 
 .. function:: void fmpz_mul2_uiui(fmpz_t f, const fmpz_t g, ulong x, ulong y)
 
@@ -801,25 +782,11 @@ Basic arithmetic
 
     Sets `f` to `2^e`.
 
-.. function:: void fmpz_addmul(fmpz_t f, const fmpz_t g, const fmpz_t h)
-              void fmpz_addmul_ui(fmpz_t f, const fmpz_t g, ulong h)
-              void fmpz_addmul_si(fmpz_t f, const fmpz_t g, slong h)
-
-    Sets `f` to `f + g \times h`.
-
-.. function:: void fmpz_submul(fmpz_t f, const fmpz_t g, const fmpz_t h)
-              void fmpz_submul_ui(fmpz_t f, const fmpz_t g, ulong h)
-              void fmpz_submul_si(fmpz_t f, const fmpz_t g, slong h)
-
-    Sets `f` to `f - g \times h`.
-
 .. function:: void fmpz_fmma(fmpz_t f, const fmpz_t a, const fmpz_t b, const fmpz_t c, const fmpz_t d)
-
-    Sets `f` to `a \times b + c \times d`.
+desc_fmma(f, a, b, c, d)
 
 .. function:: void fmpz_fmms(fmpz_t f, const fmpz_t a, const fmpz_t b, const fmpz_t c, const fmpz_t d)
-
-    Sets `f` to `a \times b - c \times d`.
+desc_fmms(f, a, b, c, d)
 
 .. function:: void fmpz_cdiv_qr(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h)
 
diff --git a/doc/source/macros.m4 b/doc/source/macros.m4
index b080faee05..4603f70525 100644
--- a/doc/source/macros.m4
+++ b/doc/source/macros.m4
@@ -1,4 +1,3 @@
-include(`config.m4')dnl
 dnl############################################################################
 dnl Change quotation marks to avoid conflicts
 dnl############################################################################
@@ -6,101 +5,119 @@ changequote({{{,}}})dnl
 dnl############################################################################
 dnl helper stuff
 dnl############################################################################
-define({{{_neg_}}},{{{m4_assert_numargs(1)dnl
--$1}}})dnl
+define({{{_neg_}}},dnl
+{{{-$1}}})dnl
 dnl
-define({{{_add_}}},{{{m4_assert_numargs(2)dnl
-$1 + $2}}})dnl
+define({{{_add_}}},dnl
+{{{$1 + $2}}})dnl
 dnl
-define({{{_sub_}}},{{{m4_assert_numargs(2)dnl
-$1 - $2}}})dnl
+define({{{_sub_}}},dnl
+{{{$1 - $2}}})dnl
 dnl
-define({{{_mul_}}},{{{m4_assert_numargs(2)dnl
-$1 \cdot $2}}})dnl
+define({{{_mul_}}},dnl
+{{{$1 \cdot $2}}})dnl
 dnl
-define({{{_div_}}},{{{m4_assert_numargs(2)dnl
-$1 / $2}}})dnl
+define({{{_div_}}},dnl
+{{{$1 / $2}}})dnl
 dnl
-define({{{_addmul_}}},{{{m4_assert_numargs(3)dnl
-_add_($1, _mul_($2, $3))}}})dnl
+define({{{_addmul_}}},dnl
+{{{_add_($1, _mul_($2, $3))}}})dnl
 dnl
-define({{{_submul_}}},{{{m4_assert_numargs(3)dnl
-_sub_($1, _mul_($2, $3))}}})dnl
+define({{{_submul_}}},dnl
+{{{_sub_($1, _mul_($2, $3))}}})dnl
 dnl
-define({{{_lt_}}},{{{m4_assert_numargs(2)dnl
-$1 < $2}}})dnl
+define({{{_fmma_}}},dnl
+{{{_add_(_mul_($1, $2), _mul_($3, $4))}}})dnl
 dnl
-define({{{_gt_}}},{{{m4_assert_numargs(2)dnl
-$1 > $2}}})dnl
+define({{{_fmms_}}},dnl
+{{{_sub_(_mul_($1, $2), _mul_($3, $4))}}})dnl
 dnl
-define({{{_equal_}}},{{{m4_assert_numargs(2)dnl
-$1 = $2}}})dnl
+define({{{_lt_}}},dnl
+{{{$1 < $2}}})dnl
+dnl
+define({{{_gt_}}},dnl
+{{{$1 > $2}}})dnl
+dnl
+define({{{_equal_}}},dnl
+{{{$1 = $2}}})dnl
+dnl############################################################################
+dnl memory management
+dnl############################################################################
+define({{{desc_init_set}}},{{{
+    Initialises `$1` and sets it to `$2`.dnl
+}}})dnl
 dnl############################################################################
 dnl set
 dnl############################################################################
-define({{{desc_set}}},{{{m4_assert_numargs(2)
+define({{{desc_set}}},{{{
     Sets `$1` to `$2`.dnl
 }}})dnl
-define({{{desc_zero}}},{{{m4_assert_numargs(1)
+define({{{desc_zero}}},{{{
     Sets `$1` to zero.dnl
 }}})dnl
-define({{{desc_one}}},{{{m4_assert_numargs(1)
+define({{{desc_one}}},{{{
     Sets `$1` to one.dnl
 }}})dnl
 dnl############################################################################
 dnl negation, absolute value etc.
 dnl############################################################################
-define({{{desc_neg}}},{{{m4_assert_numargs(2)
+define({{{desc_neg}}},{{{
     Sets `$1` to `_neg_($2)`.dnl
 }}})dnl
-define({{{desc_abs}}},{{{m4_assert_numargs(2)
+define({{{desc_abs}}},{{{
     Sets `$1` to the absolute value of `$2`.dnl
 }}})dnl
 dnl############################################################################
 dnl basic arithmetic operations
 dnl############################################################################
-define({{{desc_add}}},{{{m4_assert_numargs(3)
+define({{{desc_add}}},{{{
     Sets `$1` to `_add_($2, $3)`.dnl
 }}})dnl
-define({{{desc_sub}}},{{{m4_assert_numargs(3)
+define({{{desc_sub}}},{{{
     Sets `$1` to `_sub_($2, $3)`.dnl
 }}})dnl
-define({{{desc_mul}}},{{{m4_assert_numargs(3)
+define({{{desc_mul}}},{{{
     Sets `$1` to `_mul_($2, $3)`.dnl
 }}})dnl
-define({{{desc_divexact}}},{{{m4_assert_numargs(3)
+define({{{desc_divexact}}},{{{
     Sets `$1` to `_div_($2, $3)` under the assumption that the division is
     exact.  If `$3` is zero, an exception is raised.dnl
 }}})dnl
 dnl############################################################################
 dnl extended basic arithmetic operations
 dnl############################################################################
-define({{{desc_addmul}}},{{{m4_assert_numargs(3)
+define({{{desc_addmul}}},{{{
     Sets `$1` to `_addmul_($1, $2, $3)`.dnl
 }}})dnl
-define({{{desc_submul}}},{{{m4_assert_numargs(3)
+define({{{desc_submul}}},{{{
     Sets `$1` to `_submul_($1, $2, $3)`.dnl
 }}})dnl
+define({{{desc_fmma}}},{{{
+    Sets `$1` to `_fmma_($2, $3, $4, $5)`.dnl
+}}})dnl
+define({{{desc_fmms}}},{{{
+    Sets `$1` to `_fmms_($2, $3, $4, $5)`.dnl
+}}})dnl
 dnl############################################################################
 dnl sqrt
 dnl############################################################################
-define({{{desc_sqrt_nonordered_ring}}},{{{m4_assert_numargs(2)
+define({{{desc_sqrt_nonordered_ring}}},{{{
     If `$2` is a perfect square, sets `$1` to a square root of `$2`
     and returns nonzero.  Otherwise returns zero.dnl
 }}})dnl
 dnl############################################################################
 dnl comparisons
 dnl############################################################################
-define({{{desc_cmp}}},{{{m4_assert_numargs(2)
+define({{{desc_cmp}}},{{{
     Returns a negative value if `_lt_($1, $2)`, positive value if
     `_gt_($1, $2)`, otherwise returns zero.dnl
 }}})dnl
-define({{{desc_equal}}},{{{m4_assert_numargs(2)
-    Returns nonzero if `_equal_($1, $2)`, otherwise returns zero.
+define({{{desc_equal}}},{{{
+    Returns nonzero if `_equal_($1, $2)`, otherwise returns zero.dnl
 }}})dnl
-define({{{desc_is_zero}}},{{{m4_assert_numargs(1)
+define({{{desc_is_zero}}},{{{
     Returns nonzero if `_equal_($1, 0)`, otherwise returns zero.dnl
 }}})dnl
-define({{{desc_is_one}}},{{{m4_assert_numargs(1)
+define({{{desc_is_one}}},{{{
     Returns nonzero if `_equal_($1, 1)`, otherwise returns zero.dnl
 }}})dnl

From b9d692d90688242981fb7ec44ae552592842fd23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Thu, 30 Jan 2025 16:39:22 +0100
Subject: [PATCH 17/20] Bla

---
 doc/Makefile                                       | 14 ++++++--------
 doc/{source => }/macros.m4                         |  0
 doc/{source => origsrc}/acb.rst                    |  0
 doc/{source => origsrc}/acb_calc.rst               |  0
 doc/{source => origsrc}/acb_dft.rst                |  0
 doc/{source => origsrc}/acb_dirichlet.rst          |  0
 doc/{source => origsrc}/acb_elliptic.rst           |  0
 doc/{source => origsrc}/acb_hypgeom.rst            |  0
 doc/{source => origsrc}/acb_mat.rst                |  0
 doc/{source => origsrc}/acb_modular.rst            |  0
 doc/{source => origsrc}/acb_poly.rst               |  0
 doc/{source => origsrc}/acb_theta.rst              |  0
 doc/{source => origsrc}/acf.rst                    |  0
 doc/{source => origsrc}/agm.rst                    |  0
 doc/{source => origsrc}/aprcl.rst                  |  0
 doc/{source => origsrc}/arb.rst                    |  0
 doc/{source => origsrc}/arb_calc.rst               |  0
 doc/{source => origsrc}/arb_fmpz_poly.rst          |  0
 doc/{source => origsrc}/arb_fpwrap.rst             |  0
 doc/{source => origsrc}/arb_hypgeom.rst            |  0
 doc/{source => origsrc}/arb_mat.rst                |  0
 doc/{source => origsrc}/arb_poly.rst               |  0
 doc/{source => origsrc}/arf.rst                    |  0
 doc/{source => origsrc}/arith.rst                  |  0
 doc/{source => origsrc}/bernoulli.rst              |  0
 doc/{source => origsrc}/bool_mat.rst               |  0
 doc/{source => origsrc}/bug_reporting.rst          |  0
 doc/{source => origsrc}/building.rst               |  0
 doc/{source => origsrc}/ca.rst                     |  0
 doc/{source => origsrc}/ca_ext.rst                 |  0
 doc/{source => origsrc}/ca_field.rst               |  0
 doc/{source => origsrc}/ca_mat.rst                 |  0
 doc/{source => origsrc}/ca_poly.rst                |  0
 doc/{source => origsrc}/ca_vec.rst                 |  0
 doc/{source => origsrc}/calcium.rst                |  0
 doc/{source => origsrc}/constants.rst              |  0
 doc/{source => origsrc}/contributing.rst           |  0
 doc/{source => origsrc}/contributors.rst           |  0
 doc/{source => origsrc}/d_mat.rst                  |  0
 doc/{source => origsrc}/d_vec.rst                  |  0
 doc/{source => origsrc}/dirichlet.rst              |  0
 doc/{source => origsrc}/dlog.rst                   |  0
 doc/{source => origsrc}/double_extras.rst          |  0
 doc/{source => origsrc}/double_interval.rst        |  0
 doc/{source => origsrc}/examples.rst               |  0
 doc/{source => origsrc}/examples_arb.rst           |  0
 doc/{source => origsrc}/examples_calcium.rst       |  0
 doc/{source => origsrc}/fexpr.rst                  |  0
 doc/{source => origsrc}/fexpr_builtin.rst          |  0
 doc/{source => origsrc}/fft.rst                    |  0
 doc/{source => origsrc}/fft_small.rst              |  0
 doc/{source => origsrc}/flint.rst                  |  0
 doc/{source => origsrc}/fmpq.rst                   |  0
 doc/{source => origsrc}/fmpq_mat.rst               |  0
 doc/{source => origsrc}/fmpq_mpoly.rst             |  0
 doc/{source => origsrc}/fmpq_mpoly_factor.rst      |  0
 doc/{source => origsrc}/fmpq_poly.rst              |  0
 doc/{source => origsrc}/fmpq_vec.rst               |  0
 doc/{source => origsrc}/fmpz.rst                   |  0
 doc/{source => origsrc}/fmpz_extras.rst            |  0
 doc/{source => origsrc}/fmpz_factor.rst            |  0
 doc/{source => origsrc}/fmpz_lll.rst               |  0
 doc/{source => origsrc}/fmpz_mat.rst               |  0
 doc/{source => origsrc}/fmpz_mod.rst               |  0
 doc/{source => origsrc}/fmpz_mod_mat.rst           |  0
 doc/{source => origsrc}/fmpz_mod_mpoly.rst         |  0
 doc/{source => origsrc}/fmpz_mod_mpoly_factor.rst  |  0
 doc/{source => origsrc}/fmpz_mod_poly.rst          |  0
 doc/{source => origsrc}/fmpz_mod_poly_factor.rst   |  0
 doc/{source => origsrc}/fmpz_mod_vec.rst           |  0
 doc/{source => origsrc}/fmpz_mpoly.rst             |  0
 doc/{source => origsrc}/fmpz_mpoly_factor.rst      |  0
 doc/{source => origsrc}/fmpz_mpoly_q.rst           |  0
 doc/{source => origsrc}/fmpz_poly.rst              |  0
 doc/{source => origsrc}/fmpz_poly_factor.rst       |  0
 doc/{source => origsrc}/fmpz_poly_mat.rst          |  0
 doc/{source => origsrc}/fmpz_poly_q.rst            |  0
 doc/{source => origsrc}/fmpz_vec.rst               |  0
 doc/{source => origsrc}/fmpzi.rst                  |  0
 doc/{source => origsrc}/formulas.rst               |  0
 doc/{source => origsrc}/fq.rst                     |  0
 doc/{source => origsrc}/fq_default.rst             |  0
 doc/{source => origsrc}/fq_default_mat.rst         |  0
 doc/{source => origsrc}/fq_default_poly.rst        |  0
 doc/{source => origsrc}/fq_default_poly_factor.rst |  0
 doc/{source => origsrc}/fq_embed.rst               |  0
 doc/{source => origsrc}/fq_mat.rst                 |  0
 doc/{source => origsrc}/fq_nmod.rst                |  0
 doc/{source => origsrc}/fq_nmod_embed.rst          |  0
 doc/{source => origsrc}/fq_nmod_mat.rst            |  0
 doc/{source => origsrc}/fq_nmod_mpoly.rst          |  0
 doc/{source => origsrc}/fq_nmod_mpoly_factor.rst   |  0
 doc/{source => origsrc}/fq_nmod_poly.rst           |  0
 doc/{source => origsrc}/fq_nmod_poly_factor.rst    |  0
 doc/{source => origsrc}/fq_nmod_vec.rst            |  0
 doc/{source => origsrc}/fq_poly.rst                |  0
 doc/{source => origsrc}/fq_poly_factor.rst         |  0
 doc/{source => origsrc}/fq_vec.rst                 |  0
 doc/{source => origsrc}/fq_zech.rst                |  0
 doc/{source => origsrc}/fq_zech_embed.rst          |  0
 doc/{source => origsrc}/fq_zech_mat.rst            |  0
 doc/{source => origsrc}/fq_zech_poly.rst           |  0
 doc/{source => origsrc}/fq_zech_poly_factor.rst    |  0
 doc/{source => origsrc}/fq_zech_vec.rst            |  0
 doc/{source => origsrc}/gamma.rst                  |  0
 doc/{source => origsrc}/gr.rst                     |  0
 doc/{source => origsrc}/gr_domains.rst             |  0
 doc/{source => origsrc}/gr_generic.rst             |  0
 doc/{source => origsrc}/gr_implementing.rst        |  0
 doc/{source => origsrc}/gr_mat.rst                 |  0
 doc/{source => origsrc}/gr_mpoly.rst               |  0
 doc/{source => origsrc}/gr_poly.rst                |  0
 doc/{source => origsrc}/gr_special.rst             |  0
 doc/{source => origsrc}/gr_vec.rst                 |  0
 doc/{source => origsrc}/history.rst                |  0
 doc/{source => origsrc}/hurwitz.rst                |  0
 doc/{source => origsrc}/hypergeometric.rst         |  0
 doc/{source => origsrc}/hypgeom.rst                |  0
 doc/{source => origsrc}/index.rst                  |  0
 doc/{source => origsrc}/index_arb.rst              |  0
 doc/{source => origsrc}/index_generic.rst          |  0
 doc/{source => origsrc}/index_integers.rst         |  0
 doc/{source => origsrc}/index_integers_mod.rst     |  0
 doc/{source => origsrc}/index_rationals.rst        |  0
 doc/{source => origsrc}/introduction.rst           |  0
 doc/{source => origsrc}/introduction_calcium.rst   |  0
 doc/{source => origsrc}/issues.rst                 |  0
 doc/{source => origsrc}/long_extras.rst            |  0
 doc/{source => origsrc}/longlong.rst               |  0
 doc/{source => origsrc}/machine_vectors.rst        |  0
 doc/{source => origsrc}/mag.rst                    |  0
 doc/{source => origsrc}/memory.rst                 |  0
 doc/{source => origsrc}/mpfr_mat.rst               |  0
 doc/{source => origsrc}/mpfr_vec.rst               |  0
 doc/{source => origsrc}/mpn_extras.rst             |  0
 doc/{source => origsrc}/mpn_mod.rst                |  0
 doc/{source => origsrc}/mpoly.rst                  |  0
 doc/{source => origsrc}/nf.rst                     |  0
 doc/{source => origsrc}/nf_elem.rst                |  0
 doc/{source => origsrc}/nfloat.rst                 |  0
 doc/{source => origsrc}/nmod.rst                   |  0
 doc/{source => origsrc}/nmod_mat.rst               |  0
 doc/{source => origsrc}/nmod_mpoly.rst             |  0
 doc/{source => origsrc}/nmod_mpoly_factor.rst      |  0
 doc/{source => origsrc}/nmod_poly.rst              |  0
 doc/{source => origsrc}/nmod_poly_factor.rst       |  0
 doc/{source => origsrc}/nmod_poly_mat.rst          |  0
 doc/{source => origsrc}/nmod_vec.rst               |  0
 doc/{source => origsrc}/overview.rst               |  0
 doc/{source => origsrc}/padic.rst                  |  0
 doc/{source => origsrc}/padic_mat.rst              |  0
 doc/{source => origsrc}/padic_poly.rst             |  0
 doc/{source => origsrc}/partitions.rst             |  0
 doc/{source => origsrc}/perm.rst                   |  0
 doc/{source => origsrc}/polylogarithms.rst         |  0
 doc/{source => origsrc}/portability.rst            |  0
 doc/{source => origsrc}/profiler.rst               |  0
 doc/{source => origsrc}/python_flint.rst           |  0
 doc/{source => origsrc}/qadic.rst                  |  0
 doc/{source => origsrc}/qfb.rst                    |  0
 doc/{source => origsrc}/qqbar.rst                  |  0
 doc/{source => origsrc}/qsieve.rst                 |  0
 doc/{source => origsrc}/references.rst             |  0
 doc/{source => origsrc}/thread_pool.rst            |  0
 doc/{source => origsrc}/threading.rst              |  0
 doc/{source => origsrc}/ulong_extras.rst           |  0
 doc/{source => origsrc}/using.rst                  |  0
 doc/source/conf.py                                 |  2 +-
 168 files changed, 7 insertions(+), 9 deletions(-)
 rename doc/{source => }/macros.m4 (100%)
 rename doc/{source => origsrc}/acb.rst (100%)
 rename doc/{source => origsrc}/acb_calc.rst (100%)
 rename doc/{source => origsrc}/acb_dft.rst (100%)
 rename doc/{source => origsrc}/acb_dirichlet.rst (100%)
 rename doc/{source => origsrc}/acb_elliptic.rst (100%)
 rename doc/{source => origsrc}/acb_hypgeom.rst (100%)
 rename doc/{source => origsrc}/acb_mat.rst (100%)
 rename doc/{source => origsrc}/acb_modular.rst (100%)
 rename doc/{source => origsrc}/acb_poly.rst (100%)
 rename doc/{source => origsrc}/acb_theta.rst (100%)
 rename doc/{source => origsrc}/acf.rst (100%)
 rename doc/{source => origsrc}/agm.rst (100%)
 rename doc/{source => origsrc}/aprcl.rst (100%)
 rename doc/{source => origsrc}/arb.rst (100%)
 rename doc/{source => origsrc}/arb_calc.rst (100%)
 rename doc/{source => origsrc}/arb_fmpz_poly.rst (100%)
 rename doc/{source => origsrc}/arb_fpwrap.rst (100%)
 rename doc/{source => origsrc}/arb_hypgeom.rst (100%)
 rename doc/{source => origsrc}/arb_mat.rst (100%)
 rename doc/{source => origsrc}/arb_poly.rst (100%)
 rename doc/{source => origsrc}/arf.rst (100%)
 rename doc/{source => origsrc}/arith.rst (100%)
 rename doc/{source => origsrc}/bernoulli.rst (100%)
 rename doc/{source => origsrc}/bool_mat.rst (100%)
 rename doc/{source => origsrc}/bug_reporting.rst (100%)
 rename doc/{source => origsrc}/building.rst (100%)
 rename doc/{source => origsrc}/ca.rst (100%)
 rename doc/{source => origsrc}/ca_ext.rst (100%)
 rename doc/{source => origsrc}/ca_field.rst (100%)
 rename doc/{source => origsrc}/ca_mat.rst (100%)
 rename doc/{source => origsrc}/ca_poly.rst (100%)
 rename doc/{source => origsrc}/ca_vec.rst (100%)
 rename doc/{source => origsrc}/calcium.rst (100%)
 rename doc/{source => origsrc}/constants.rst (100%)
 rename doc/{source => origsrc}/contributing.rst (100%)
 rename doc/{source => origsrc}/contributors.rst (100%)
 rename doc/{source => origsrc}/d_mat.rst (100%)
 rename doc/{source => origsrc}/d_vec.rst (100%)
 rename doc/{source => origsrc}/dirichlet.rst (100%)
 rename doc/{source => origsrc}/dlog.rst (100%)
 rename doc/{source => origsrc}/double_extras.rst (100%)
 rename doc/{source => origsrc}/double_interval.rst (100%)
 rename doc/{source => origsrc}/examples.rst (100%)
 rename doc/{source => origsrc}/examples_arb.rst (100%)
 rename doc/{source => origsrc}/examples_calcium.rst (100%)
 rename doc/{source => origsrc}/fexpr.rst (100%)
 rename doc/{source => origsrc}/fexpr_builtin.rst (100%)
 rename doc/{source => origsrc}/fft.rst (100%)
 rename doc/{source => origsrc}/fft_small.rst (100%)
 rename doc/{source => origsrc}/flint.rst (100%)
 rename doc/{source => origsrc}/fmpq.rst (100%)
 rename doc/{source => origsrc}/fmpq_mat.rst (100%)
 rename doc/{source => origsrc}/fmpq_mpoly.rst (100%)
 rename doc/{source => origsrc}/fmpq_mpoly_factor.rst (100%)
 rename doc/{source => origsrc}/fmpq_poly.rst (100%)
 rename doc/{source => origsrc}/fmpq_vec.rst (100%)
 rename doc/{source => origsrc}/fmpz.rst (100%)
 rename doc/{source => origsrc}/fmpz_extras.rst (100%)
 rename doc/{source => origsrc}/fmpz_factor.rst (100%)
 rename doc/{source => origsrc}/fmpz_lll.rst (100%)
 rename doc/{source => origsrc}/fmpz_mat.rst (100%)
 rename doc/{source => origsrc}/fmpz_mod.rst (100%)
 rename doc/{source => origsrc}/fmpz_mod_mat.rst (100%)
 rename doc/{source => origsrc}/fmpz_mod_mpoly.rst (100%)
 rename doc/{source => origsrc}/fmpz_mod_mpoly_factor.rst (100%)
 rename doc/{source => origsrc}/fmpz_mod_poly.rst (100%)
 rename doc/{source => origsrc}/fmpz_mod_poly_factor.rst (100%)
 rename doc/{source => origsrc}/fmpz_mod_vec.rst (100%)
 rename doc/{source => origsrc}/fmpz_mpoly.rst (100%)
 rename doc/{source => origsrc}/fmpz_mpoly_factor.rst (100%)
 rename doc/{source => origsrc}/fmpz_mpoly_q.rst (100%)
 rename doc/{source => origsrc}/fmpz_poly.rst (100%)
 rename doc/{source => origsrc}/fmpz_poly_factor.rst (100%)
 rename doc/{source => origsrc}/fmpz_poly_mat.rst (100%)
 rename doc/{source => origsrc}/fmpz_poly_q.rst (100%)
 rename doc/{source => origsrc}/fmpz_vec.rst (100%)
 rename doc/{source => origsrc}/fmpzi.rst (100%)
 rename doc/{source => origsrc}/formulas.rst (100%)
 rename doc/{source => origsrc}/fq.rst (100%)
 rename doc/{source => origsrc}/fq_default.rst (100%)
 rename doc/{source => origsrc}/fq_default_mat.rst (100%)
 rename doc/{source => origsrc}/fq_default_poly.rst (100%)
 rename doc/{source => origsrc}/fq_default_poly_factor.rst (100%)
 rename doc/{source => origsrc}/fq_embed.rst (100%)
 rename doc/{source => origsrc}/fq_mat.rst (100%)
 rename doc/{source => origsrc}/fq_nmod.rst (100%)
 rename doc/{source => origsrc}/fq_nmod_embed.rst (100%)
 rename doc/{source => origsrc}/fq_nmod_mat.rst (100%)
 rename doc/{source => origsrc}/fq_nmod_mpoly.rst (100%)
 rename doc/{source => origsrc}/fq_nmod_mpoly_factor.rst (100%)
 rename doc/{source => origsrc}/fq_nmod_poly.rst (100%)
 rename doc/{source => origsrc}/fq_nmod_poly_factor.rst (100%)
 rename doc/{source => origsrc}/fq_nmod_vec.rst (100%)
 rename doc/{source => origsrc}/fq_poly.rst (100%)
 rename doc/{source => origsrc}/fq_poly_factor.rst (100%)
 rename doc/{source => origsrc}/fq_vec.rst (100%)
 rename doc/{source => origsrc}/fq_zech.rst (100%)
 rename doc/{source => origsrc}/fq_zech_embed.rst (100%)
 rename doc/{source => origsrc}/fq_zech_mat.rst (100%)
 rename doc/{source => origsrc}/fq_zech_poly.rst (100%)
 rename doc/{source => origsrc}/fq_zech_poly_factor.rst (100%)
 rename doc/{source => origsrc}/fq_zech_vec.rst (100%)
 rename doc/{source => origsrc}/gamma.rst (100%)
 rename doc/{source => origsrc}/gr.rst (100%)
 rename doc/{source => origsrc}/gr_domains.rst (100%)
 rename doc/{source => origsrc}/gr_generic.rst (100%)
 rename doc/{source => origsrc}/gr_implementing.rst (100%)
 rename doc/{source => origsrc}/gr_mat.rst (100%)
 rename doc/{source => origsrc}/gr_mpoly.rst (100%)
 rename doc/{source => origsrc}/gr_poly.rst (100%)
 rename doc/{source => origsrc}/gr_special.rst (100%)
 rename doc/{source => origsrc}/gr_vec.rst (100%)
 rename doc/{source => origsrc}/history.rst (100%)
 rename doc/{source => origsrc}/hurwitz.rst (100%)
 rename doc/{source => origsrc}/hypergeometric.rst (100%)
 rename doc/{source => origsrc}/hypgeom.rst (100%)
 rename doc/{source => origsrc}/index.rst (100%)
 rename doc/{source => origsrc}/index_arb.rst (100%)
 rename doc/{source => origsrc}/index_generic.rst (100%)
 rename doc/{source => origsrc}/index_integers.rst (100%)
 rename doc/{source => origsrc}/index_integers_mod.rst (100%)
 rename doc/{source => origsrc}/index_rationals.rst (100%)
 rename doc/{source => origsrc}/introduction.rst (100%)
 rename doc/{source => origsrc}/introduction_calcium.rst (100%)
 rename doc/{source => origsrc}/issues.rst (100%)
 rename doc/{source => origsrc}/long_extras.rst (100%)
 rename doc/{source => origsrc}/longlong.rst (100%)
 rename doc/{source => origsrc}/machine_vectors.rst (100%)
 rename doc/{source => origsrc}/mag.rst (100%)
 rename doc/{source => origsrc}/memory.rst (100%)
 rename doc/{source => origsrc}/mpfr_mat.rst (100%)
 rename doc/{source => origsrc}/mpfr_vec.rst (100%)
 rename doc/{source => origsrc}/mpn_extras.rst (100%)
 rename doc/{source => origsrc}/mpn_mod.rst (100%)
 rename doc/{source => origsrc}/mpoly.rst (100%)
 rename doc/{source => origsrc}/nf.rst (100%)
 rename doc/{source => origsrc}/nf_elem.rst (100%)
 rename doc/{source => origsrc}/nfloat.rst (100%)
 rename doc/{source => origsrc}/nmod.rst (100%)
 rename doc/{source => origsrc}/nmod_mat.rst (100%)
 rename doc/{source => origsrc}/nmod_mpoly.rst (100%)
 rename doc/{source => origsrc}/nmod_mpoly_factor.rst (100%)
 rename doc/{source => origsrc}/nmod_poly.rst (100%)
 rename doc/{source => origsrc}/nmod_poly_factor.rst (100%)
 rename doc/{source => origsrc}/nmod_poly_mat.rst (100%)
 rename doc/{source => origsrc}/nmod_vec.rst (100%)
 rename doc/{source => origsrc}/overview.rst (100%)
 rename doc/{source => origsrc}/padic.rst (100%)
 rename doc/{source => origsrc}/padic_mat.rst (100%)
 rename doc/{source => origsrc}/padic_poly.rst (100%)
 rename doc/{source => origsrc}/partitions.rst (100%)
 rename doc/{source => origsrc}/perm.rst (100%)
 rename doc/{source => origsrc}/polylogarithms.rst (100%)
 rename doc/{source => origsrc}/portability.rst (100%)
 rename doc/{source => origsrc}/profiler.rst (100%)
 rename doc/{source => origsrc}/python_flint.rst (100%)
 rename doc/{source => origsrc}/qadic.rst (100%)
 rename doc/{source => origsrc}/qfb.rst (100%)
 rename doc/{source => origsrc}/qqbar.rst (100%)
 rename doc/{source => origsrc}/qsieve.rst (100%)
 rename doc/{source => origsrc}/references.rst (100%)
 rename doc/{source => origsrc}/thread_pool.rst (100%)
 rename doc/{source => origsrc}/threading.rst (100%)
 rename doc/{source => origsrc}/ulong_extras.rst (100%)
 rename doc/{source => origsrc}/using.rst (100%)

diff --git a/doc/Makefile b/doc/Makefile
index b3263c7f1e..0143e3fa85 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,25 +6,23 @@ SPHINXOPTS    = -j=auto
 SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = flint
 SOURCEDIR     = source
+ORIGSRCDIR    = origsrc
 BUILDDIR      = build
 
 M4 := m4
 
 SPHINX_ACTIONS := html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf latexpdfja text man texinfo info gettext changes xml pseudoxml linkcheck doctest coverage clean
 
-CONFIG := $(SOURCEDIR)/macros.m4
-SRCS := $(wildcard $(SOURCEDIR)/*.rst)
-OBJS := $(patsubst $(SOURCEDIR)/%,$(BUILDDIR)/%,$(SRCS))
+CONFIG := macros.m4
+SRCS := $(wildcard $(ORIGSRCDIR)/*.rst)
+OBJS := $(patsubst $(ORIGSRCDIR)/%,$(SOURCEDIR)/%,$(SRCS))
 
 # Put it first so that "make" without argument is like "make help".
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-$(BUILDDIR):
-	mkdir $(BUILDDIR)
-
-$(BUILDDIR)/%.rst: $(SOURCEDIR)/%.rst $(CONFIG) | $(BUILDDIR)
-	@$(M4) -I $(SOURCEDIR) $< > $@
+$(SOURCEDIR)/%.rst: $(ORIGSRCDIR)/%.rst $(CONFIG)
+	@$(M4) $< > $@
 
 preprocess: $(OBJS)
 
diff --git a/doc/source/macros.m4 b/doc/macros.m4
similarity index 100%
rename from doc/source/macros.m4
rename to doc/macros.m4
diff --git a/doc/source/acb.rst b/doc/origsrc/acb.rst
similarity index 100%
rename from doc/source/acb.rst
rename to doc/origsrc/acb.rst
diff --git a/doc/source/acb_calc.rst b/doc/origsrc/acb_calc.rst
similarity index 100%
rename from doc/source/acb_calc.rst
rename to doc/origsrc/acb_calc.rst
diff --git a/doc/source/acb_dft.rst b/doc/origsrc/acb_dft.rst
similarity index 100%
rename from doc/source/acb_dft.rst
rename to doc/origsrc/acb_dft.rst
diff --git a/doc/source/acb_dirichlet.rst b/doc/origsrc/acb_dirichlet.rst
similarity index 100%
rename from doc/source/acb_dirichlet.rst
rename to doc/origsrc/acb_dirichlet.rst
diff --git a/doc/source/acb_elliptic.rst b/doc/origsrc/acb_elliptic.rst
similarity index 100%
rename from doc/source/acb_elliptic.rst
rename to doc/origsrc/acb_elliptic.rst
diff --git a/doc/source/acb_hypgeom.rst b/doc/origsrc/acb_hypgeom.rst
similarity index 100%
rename from doc/source/acb_hypgeom.rst
rename to doc/origsrc/acb_hypgeom.rst
diff --git a/doc/source/acb_mat.rst b/doc/origsrc/acb_mat.rst
similarity index 100%
rename from doc/source/acb_mat.rst
rename to doc/origsrc/acb_mat.rst
diff --git a/doc/source/acb_modular.rst b/doc/origsrc/acb_modular.rst
similarity index 100%
rename from doc/source/acb_modular.rst
rename to doc/origsrc/acb_modular.rst
diff --git a/doc/source/acb_poly.rst b/doc/origsrc/acb_poly.rst
similarity index 100%
rename from doc/source/acb_poly.rst
rename to doc/origsrc/acb_poly.rst
diff --git a/doc/source/acb_theta.rst b/doc/origsrc/acb_theta.rst
similarity index 100%
rename from doc/source/acb_theta.rst
rename to doc/origsrc/acb_theta.rst
diff --git a/doc/source/acf.rst b/doc/origsrc/acf.rst
similarity index 100%
rename from doc/source/acf.rst
rename to doc/origsrc/acf.rst
diff --git a/doc/source/agm.rst b/doc/origsrc/agm.rst
similarity index 100%
rename from doc/source/agm.rst
rename to doc/origsrc/agm.rst
diff --git a/doc/source/aprcl.rst b/doc/origsrc/aprcl.rst
similarity index 100%
rename from doc/source/aprcl.rst
rename to doc/origsrc/aprcl.rst
diff --git a/doc/source/arb.rst b/doc/origsrc/arb.rst
similarity index 100%
rename from doc/source/arb.rst
rename to doc/origsrc/arb.rst
diff --git a/doc/source/arb_calc.rst b/doc/origsrc/arb_calc.rst
similarity index 100%
rename from doc/source/arb_calc.rst
rename to doc/origsrc/arb_calc.rst
diff --git a/doc/source/arb_fmpz_poly.rst b/doc/origsrc/arb_fmpz_poly.rst
similarity index 100%
rename from doc/source/arb_fmpz_poly.rst
rename to doc/origsrc/arb_fmpz_poly.rst
diff --git a/doc/source/arb_fpwrap.rst b/doc/origsrc/arb_fpwrap.rst
similarity index 100%
rename from doc/source/arb_fpwrap.rst
rename to doc/origsrc/arb_fpwrap.rst
diff --git a/doc/source/arb_hypgeom.rst b/doc/origsrc/arb_hypgeom.rst
similarity index 100%
rename from doc/source/arb_hypgeom.rst
rename to doc/origsrc/arb_hypgeom.rst
diff --git a/doc/source/arb_mat.rst b/doc/origsrc/arb_mat.rst
similarity index 100%
rename from doc/source/arb_mat.rst
rename to doc/origsrc/arb_mat.rst
diff --git a/doc/source/arb_poly.rst b/doc/origsrc/arb_poly.rst
similarity index 100%
rename from doc/source/arb_poly.rst
rename to doc/origsrc/arb_poly.rst
diff --git a/doc/source/arf.rst b/doc/origsrc/arf.rst
similarity index 100%
rename from doc/source/arf.rst
rename to doc/origsrc/arf.rst
diff --git a/doc/source/arith.rst b/doc/origsrc/arith.rst
similarity index 100%
rename from doc/source/arith.rst
rename to doc/origsrc/arith.rst
diff --git a/doc/source/bernoulli.rst b/doc/origsrc/bernoulli.rst
similarity index 100%
rename from doc/source/bernoulli.rst
rename to doc/origsrc/bernoulli.rst
diff --git a/doc/source/bool_mat.rst b/doc/origsrc/bool_mat.rst
similarity index 100%
rename from doc/source/bool_mat.rst
rename to doc/origsrc/bool_mat.rst
diff --git a/doc/source/bug_reporting.rst b/doc/origsrc/bug_reporting.rst
similarity index 100%
rename from doc/source/bug_reporting.rst
rename to doc/origsrc/bug_reporting.rst
diff --git a/doc/source/building.rst b/doc/origsrc/building.rst
similarity index 100%
rename from doc/source/building.rst
rename to doc/origsrc/building.rst
diff --git a/doc/source/ca.rst b/doc/origsrc/ca.rst
similarity index 100%
rename from doc/source/ca.rst
rename to doc/origsrc/ca.rst
diff --git a/doc/source/ca_ext.rst b/doc/origsrc/ca_ext.rst
similarity index 100%
rename from doc/source/ca_ext.rst
rename to doc/origsrc/ca_ext.rst
diff --git a/doc/source/ca_field.rst b/doc/origsrc/ca_field.rst
similarity index 100%
rename from doc/source/ca_field.rst
rename to doc/origsrc/ca_field.rst
diff --git a/doc/source/ca_mat.rst b/doc/origsrc/ca_mat.rst
similarity index 100%
rename from doc/source/ca_mat.rst
rename to doc/origsrc/ca_mat.rst
diff --git a/doc/source/ca_poly.rst b/doc/origsrc/ca_poly.rst
similarity index 100%
rename from doc/source/ca_poly.rst
rename to doc/origsrc/ca_poly.rst
diff --git a/doc/source/ca_vec.rst b/doc/origsrc/ca_vec.rst
similarity index 100%
rename from doc/source/ca_vec.rst
rename to doc/origsrc/ca_vec.rst
diff --git a/doc/source/calcium.rst b/doc/origsrc/calcium.rst
similarity index 100%
rename from doc/source/calcium.rst
rename to doc/origsrc/calcium.rst
diff --git a/doc/source/constants.rst b/doc/origsrc/constants.rst
similarity index 100%
rename from doc/source/constants.rst
rename to doc/origsrc/constants.rst
diff --git a/doc/source/contributing.rst b/doc/origsrc/contributing.rst
similarity index 100%
rename from doc/source/contributing.rst
rename to doc/origsrc/contributing.rst
diff --git a/doc/source/contributors.rst b/doc/origsrc/contributors.rst
similarity index 100%
rename from doc/source/contributors.rst
rename to doc/origsrc/contributors.rst
diff --git a/doc/source/d_mat.rst b/doc/origsrc/d_mat.rst
similarity index 100%
rename from doc/source/d_mat.rst
rename to doc/origsrc/d_mat.rst
diff --git a/doc/source/d_vec.rst b/doc/origsrc/d_vec.rst
similarity index 100%
rename from doc/source/d_vec.rst
rename to doc/origsrc/d_vec.rst
diff --git a/doc/source/dirichlet.rst b/doc/origsrc/dirichlet.rst
similarity index 100%
rename from doc/source/dirichlet.rst
rename to doc/origsrc/dirichlet.rst
diff --git a/doc/source/dlog.rst b/doc/origsrc/dlog.rst
similarity index 100%
rename from doc/source/dlog.rst
rename to doc/origsrc/dlog.rst
diff --git a/doc/source/double_extras.rst b/doc/origsrc/double_extras.rst
similarity index 100%
rename from doc/source/double_extras.rst
rename to doc/origsrc/double_extras.rst
diff --git a/doc/source/double_interval.rst b/doc/origsrc/double_interval.rst
similarity index 100%
rename from doc/source/double_interval.rst
rename to doc/origsrc/double_interval.rst
diff --git a/doc/source/examples.rst b/doc/origsrc/examples.rst
similarity index 100%
rename from doc/source/examples.rst
rename to doc/origsrc/examples.rst
diff --git a/doc/source/examples_arb.rst b/doc/origsrc/examples_arb.rst
similarity index 100%
rename from doc/source/examples_arb.rst
rename to doc/origsrc/examples_arb.rst
diff --git a/doc/source/examples_calcium.rst b/doc/origsrc/examples_calcium.rst
similarity index 100%
rename from doc/source/examples_calcium.rst
rename to doc/origsrc/examples_calcium.rst
diff --git a/doc/source/fexpr.rst b/doc/origsrc/fexpr.rst
similarity index 100%
rename from doc/source/fexpr.rst
rename to doc/origsrc/fexpr.rst
diff --git a/doc/source/fexpr_builtin.rst b/doc/origsrc/fexpr_builtin.rst
similarity index 100%
rename from doc/source/fexpr_builtin.rst
rename to doc/origsrc/fexpr_builtin.rst
diff --git a/doc/source/fft.rst b/doc/origsrc/fft.rst
similarity index 100%
rename from doc/source/fft.rst
rename to doc/origsrc/fft.rst
diff --git a/doc/source/fft_small.rst b/doc/origsrc/fft_small.rst
similarity index 100%
rename from doc/source/fft_small.rst
rename to doc/origsrc/fft_small.rst
diff --git a/doc/source/flint.rst b/doc/origsrc/flint.rst
similarity index 100%
rename from doc/source/flint.rst
rename to doc/origsrc/flint.rst
diff --git a/doc/source/fmpq.rst b/doc/origsrc/fmpq.rst
similarity index 100%
rename from doc/source/fmpq.rst
rename to doc/origsrc/fmpq.rst
diff --git a/doc/source/fmpq_mat.rst b/doc/origsrc/fmpq_mat.rst
similarity index 100%
rename from doc/source/fmpq_mat.rst
rename to doc/origsrc/fmpq_mat.rst
diff --git a/doc/source/fmpq_mpoly.rst b/doc/origsrc/fmpq_mpoly.rst
similarity index 100%
rename from doc/source/fmpq_mpoly.rst
rename to doc/origsrc/fmpq_mpoly.rst
diff --git a/doc/source/fmpq_mpoly_factor.rst b/doc/origsrc/fmpq_mpoly_factor.rst
similarity index 100%
rename from doc/source/fmpq_mpoly_factor.rst
rename to doc/origsrc/fmpq_mpoly_factor.rst
diff --git a/doc/source/fmpq_poly.rst b/doc/origsrc/fmpq_poly.rst
similarity index 100%
rename from doc/source/fmpq_poly.rst
rename to doc/origsrc/fmpq_poly.rst
diff --git a/doc/source/fmpq_vec.rst b/doc/origsrc/fmpq_vec.rst
similarity index 100%
rename from doc/source/fmpq_vec.rst
rename to doc/origsrc/fmpq_vec.rst
diff --git a/doc/source/fmpz.rst b/doc/origsrc/fmpz.rst
similarity index 100%
rename from doc/source/fmpz.rst
rename to doc/origsrc/fmpz.rst
diff --git a/doc/source/fmpz_extras.rst b/doc/origsrc/fmpz_extras.rst
similarity index 100%
rename from doc/source/fmpz_extras.rst
rename to doc/origsrc/fmpz_extras.rst
diff --git a/doc/source/fmpz_factor.rst b/doc/origsrc/fmpz_factor.rst
similarity index 100%
rename from doc/source/fmpz_factor.rst
rename to doc/origsrc/fmpz_factor.rst
diff --git a/doc/source/fmpz_lll.rst b/doc/origsrc/fmpz_lll.rst
similarity index 100%
rename from doc/source/fmpz_lll.rst
rename to doc/origsrc/fmpz_lll.rst
diff --git a/doc/source/fmpz_mat.rst b/doc/origsrc/fmpz_mat.rst
similarity index 100%
rename from doc/source/fmpz_mat.rst
rename to doc/origsrc/fmpz_mat.rst
diff --git a/doc/source/fmpz_mod.rst b/doc/origsrc/fmpz_mod.rst
similarity index 100%
rename from doc/source/fmpz_mod.rst
rename to doc/origsrc/fmpz_mod.rst
diff --git a/doc/source/fmpz_mod_mat.rst b/doc/origsrc/fmpz_mod_mat.rst
similarity index 100%
rename from doc/source/fmpz_mod_mat.rst
rename to doc/origsrc/fmpz_mod_mat.rst
diff --git a/doc/source/fmpz_mod_mpoly.rst b/doc/origsrc/fmpz_mod_mpoly.rst
similarity index 100%
rename from doc/source/fmpz_mod_mpoly.rst
rename to doc/origsrc/fmpz_mod_mpoly.rst
diff --git a/doc/source/fmpz_mod_mpoly_factor.rst b/doc/origsrc/fmpz_mod_mpoly_factor.rst
similarity index 100%
rename from doc/source/fmpz_mod_mpoly_factor.rst
rename to doc/origsrc/fmpz_mod_mpoly_factor.rst
diff --git a/doc/source/fmpz_mod_poly.rst b/doc/origsrc/fmpz_mod_poly.rst
similarity index 100%
rename from doc/source/fmpz_mod_poly.rst
rename to doc/origsrc/fmpz_mod_poly.rst
diff --git a/doc/source/fmpz_mod_poly_factor.rst b/doc/origsrc/fmpz_mod_poly_factor.rst
similarity index 100%
rename from doc/source/fmpz_mod_poly_factor.rst
rename to doc/origsrc/fmpz_mod_poly_factor.rst
diff --git a/doc/source/fmpz_mod_vec.rst b/doc/origsrc/fmpz_mod_vec.rst
similarity index 100%
rename from doc/source/fmpz_mod_vec.rst
rename to doc/origsrc/fmpz_mod_vec.rst
diff --git a/doc/source/fmpz_mpoly.rst b/doc/origsrc/fmpz_mpoly.rst
similarity index 100%
rename from doc/source/fmpz_mpoly.rst
rename to doc/origsrc/fmpz_mpoly.rst
diff --git a/doc/source/fmpz_mpoly_factor.rst b/doc/origsrc/fmpz_mpoly_factor.rst
similarity index 100%
rename from doc/source/fmpz_mpoly_factor.rst
rename to doc/origsrc/fmpz_mpoly_factor.rst
diff --git a/doc/source/fmpz_mpoly_q.rst b/doc/origsrc/fmpz_mpoly_q.rst
similarity index 100%
rename from doc/source/fmpz_mpoly_q.rst
rename to doc/origsrc/fmpz_mpoly_q.rst
diff --git a/doc/source/fmpz_poly.rst b/doc/origsrc/fmpz_poly.rst
similarity index 100%
rename from doc/source/fmpz_poly.rst
rename to doc/origsrc/fmpz_poly.rst
diff --git a/doc/source/fmpz_poly_factor.rst b/doc/origsrc/fmpz_poly_factor.rst
similarity index 100%
rename from doc/source/fmpz_poly_factor.rst
rename to doc/origsrc/fmpz_poly_factor.rst
diff --git a/doc/source/fmpz_poly_mat.rst b/doc/origsrc/fmpz_poly_mat.rst
similarity index 100%
rename from doc/source/fmpz_poly_mat.rst
rename to doc/origsrc/fmpz_poly_mat.rst
diff --git a/doc/source/fmpz_poly_q.rst b/doc/origsrc/fmpz_poly_q.rst
similarity index 100%
rename from doc/source/fmpz_poly_q.rst
rename to doc/origsrc/fmpz_poly_q.rst
diff --git a/doc/source/fmpz_vec.rst b/doc/origsrc/fmpz_vec.rst
similarity index 100%
rename from doc/source/fmpz_vec.rst
rename to doc/origsrc/fmpz_vec.rst
diff --git a/doc/source/fmpzi.rst b/doc/origsrc/fmpzi.rst
similarity index 100%
rename from doc/source/fmpzi.rst
rename to doc/origsrc/fmpzi.rst
diff --git a/doc/source/formulas.rst b/doc/origsrc/formulas.rst
similarity index 100%
rename from doc/source/formulas.rst
rename to doc/origsrc/formulas.rst
diff --git a/doc/source/fq.rst b/doc/origsrc/fq.rst
similarity index 100%
rename from doc/source/fq.rst
rename to doc/origsrc/fq.rst
diff --git a/doc/source/fq_default.rst b/doc/origsrc/fq_default.rst
similarity index 100%
rename from doc/source/fq_default.rst
rename to doc/origsrc/fq_default.rst
diff --git a/doc/source/fq_default_mat.rst b/doc/origsrc/fq_default_mat.rst
similarity index 100%
rename from doc/source/fq_default_mat.rst
rename to doc/origsrc/fq_default_mat.rst
diff --git a/doc/source/fq_default_poly.rst b/doc/origsrc/fq_default_poly.rst
similarity index 100%
rename from doc/source/fq_default_poly.rst
rename to doc/origsrc/fq_default_poly.rst
diff --git a/doc/source/fq_default_poly_factor.rst b/doc/origsrc/fq_default_poly_factor.rst
similarity index 100%
rename from doc/source/fq_default_poly_factor.rst
rename to doc/origsrc/fq_default_poly_factor.rst
diff --git a/doc/source/fq_embed.rst b/doc/origsrc/fq_embed.rst
similarity index 100%
rename from doc/source/fq_embed.rst
rename to doc/origsrc/fq_embed.rst
diff --git a/doc/source/fq_mat.rst b/doc/origsrc/fq_mat.rst
similarity index 100%
rename from doc/source/fq_mat.rst
rename to doc/origsrc/fq_mat.rst
diff --git a/doc/source/fq_nmod.rst b/doc/origsrc/fq_nmod.rst
similarity index 100%
rename from doc/source/fq_nmod.rst
rename to doc/origsrc/fq_nmod.rst
diff --git a/doc/source/fq_nmod_embed.rst b/doc/origsrc/fq_nmod_embed.rst
similarity index 100%
rename from doc/source/fq_nmod_embed.rst
rename to doc/origsrc/fq_nmod_embed.rst
diff --git a/doc/source/fq_nmod_mat.rst b/doc/origsrc/fq_nmod_mat.rst
similarity index 100%
rename from doc/source/fq_nmod_mat.rst
rename to doc/origsrc/fq_nmod_mat.rst
diff --git a/doc/source/fq_nmod_mpoly.rst b/doc/origsrc/fq_nmod_mpoly.rst
similarity index 100%
rename from doc/source/fq_nmod_mpoly.rst
rename to doc/origsrc/fq_nmod_mpoly.rst
diff --git a/doc/source/fq_nmod_mpoly_factor.rst b/doc/origsrc/fq_nmod_mpoly_factor.rst
similarity index 100%
rename from doc/source/fq_nmod_mpoly_factor.rst
rename to doc/origsrc/fq_nmod_mpoly_factor.rst
diff --git a/doc/source/fq_nmod_poly.rst b/doc/origsrc/fq_nmod_poly.rst
similarity index 100%
rename from doc/source/fq_nmod_poly.rst
rename to doc/origsrc/fq_nmod_poly.rst
diff --git a/doc/source/fq_nmod_poly_factor.rst b/doc/origsrc/fq_nmod_poly_factor.rst
similarity index 100%
rename from doc/source/fq_nmod_poly_factor.rst
rename to doc/origsrc/fq_nmod_poly_factor.rst
diff --git a/doc/source/fq_nmod_vec.rst b/doc/origsrc/fq_nmod_vec.rst
similarity index 100%
rename from doc/source/fq_nmod_vec.rst
rename to doc/origsrc/fq_nmod_vec.rst
diff --git a/doc/source/fq_poly.rst b/doc/origsrc/fq_poly.rst
similarity index 100%
rename from doc/source/fq_poly.rst
rename to doc/origsrc/fq_poly.rst
diff --git a/doc/source/fq_poly_factor.rst b/doc/origsrc/fq_poly_factor.rst
similarity index 100%
rename from doc/source/fq_poly_factor.rst
rename to doc/origsrc/fq_poly_factor.rst
diff --git a/doc/source/fq_vec.rst b/doc/origsrc/fq_vec.rst
similarity index 100%
rename from doc/source/fq_vec.rst
rename to doc/origsrc/fq_vec.rst
diff --git a/doc/source/fq_zech.rst b/doc/origsrc/fq_zech.rst
similarity index 100%
rename from doc/source/fq_zech.rst
rename to doc/origsrc/fq_zech.rst
diff --git a/doc/source/fq_zech_embed.rst b/doc/origsrc/fq_zech_embed.rst
similarity index 100%
rename from doc/source/fq_zech_embed.rst
rename to doc/origsrc/fq_zech_embed.rst
diff --git a/doc/source/fq_zech_mat.rst b/doc/origsrc/fq_zech_mat.rst
similarity index 100%
rename from doc/source/fq_zech_mat.rst
rename to doc/origsrc/fq_zech_mat.rst
diff --git a/doc/source/fq_zech_poly.rst b/doc/origsrc/fq_zech_poly.rst
similarity index 100%
rename from doc/source/fq_zech_poly.rst
rename to doc/origsrc/fq_zech_poly.rst
diff --git a/doc/source/fq_zech_poly_factor.rst b/doc/origsrc/fq_zech_poly_factor.rst
similarity index 100%
rename from doc/source/fq_zech_poly_factor.rst
rename to doc/origsrc/fq_zech_poly_factor.rst
diff --git a/doc/source/fq_zech_vec.rst b/doc/origsrc/fq_zech_vec.rst
similarity index 100%
rename from doc/source/fq_zech_vec.rst
rename to doc/origsrc/fq_zech_vec.rst
diff --git a/doc/source/gamma.rst b/doc/origsrc/gamma.rst
similarity index 100%
rename from doc/source/gamma.rst
rename to doc/origsrc/gamma.rst
diff --git a/doc/source/gr.rst b/doc/origsrc/gr.rst
similarity index 100%
rename from doc/source/gr.rst
rename to doc/origsrc/gr.rst
diff --git a/doc/source/gr_domains.rst b/doc/origsrc/gr_domains.rst
similarity index 100%
rename from doc/source/gr_domains.rst
rename to doc/origsrc/gr_domains.rst
diff --git a/doc/source/gr_generic.rst b/doc/origsrc/gr_generic.rst
similarity index 100%
rename from doc/source/gr_generic.rst
rename to doc/origsrc/gr_generic.rst
diff --git a/doc/source/gr_implementing.rst b/doc/origsrc/gr_implementing.rst
similarity index 100%
rename from doc/source/gr_implementing.rst
rename to doc/origsrc/gr_implementing.rst
diff --git a/doc/source/gr_mat.rst b/doc/origsrc/gr_mat.rst
similarity index 100%
rename from doc/source/gr_mat.rst
rename to doc/origsrc/gr_mat.rst
diff --git a/doc/source/gr_mpoly.rst b/doc/origsrc/gr_mpoly.rst
similarity index 100%
rename from doc/source/gr_mpoly.rst
rename to doc/origsrc/gr_mpoly.rst
diff --git a/doc/source/gr_poly.rst b/doc/origsrc/gr_poly.rst
similarity index 100%
rename from doc/source/gr_poly.rst
rename to doc/origsrc/gr_poly.rst
diff --git a/doc/source/gr_special.rst b/doc/origsrc/gr_special.rst
similarity index 100%
rename from doc/source/gr_special.rst
rename to doc/origsrc/gr_special.rst
diff --git a/doc/source/gr_vec.rst b/doc/origsrc/gr_vec.rst
similarity index 100%
rename from doc/source/gr_vec.rst
rename to doc/origsrc/gr_vec.rst
diff --git a/doc/source/history.rst b/doc/origsrc/history.rst
similarity index 100%
rename from doc/source/history.rst
rename to doc/origsrc/history.rst
diff --git a/doc/source/hurwitz.rst b/doc/origsrc/hurwitz.rst
similarity index 100%
rename from doc/source/hurwitz.rst
rename to doc/origsrc/hurwitz.rst
diff --git a/doc/source/hypergeometric.rst b/doc/origsrc/hypergeometric.rst
similarity index 100%
rename from doc/source/hypergeometric.rst
rename to doc/origsrc/hypergeometric.rst
diff --git a/doc/source/hypgeom.rst b/doc/origsrc/hypgeom.rst
similarity index 100%
rename from doc/source/hypgeom.rst
rename to doc/origsrc/hypgeom.rst
diff --git a/doc/source/index.rst b/doc/origsrc/index.rst
similarity index 100%
rename from doc/source/index.rst
rename to doc/origsrc/index.rst
diff --git a/doc/source/index_arb.rst b/doc/origsrc/index_arb.rst
similarity index 100%
rename from doc/source/index_arb.rst
rename to doc/origsrc/index_arb.rst
diff --git a/doc/source/index_generic.rst b/doc/origsrc/index_generic.rst
similarity index 100%
rename from doc/source/index_generic.rst
rename to doc/origsrc/index_generic.rst
diff --git a/doc/source/index_integers.rst b/doc/origsrc/index_integers.rst
similarity index 100%
rename from doc/source/index_integers.rst
rename to doc/origsrc/index_integers.rst
diff --git a/doc/source/index_integers_mod.rst b/doc/origsrc/index_integers_mod.rst
similarity index 100%
rename from doc/source/index_integers_mod.rst
rename to doc/origsrc/index_integers_mod.rst
diff --git a/doc/source/index_rationals.rst b/doc/origsrc/index_rationals.rst
similarity index 100%
rename from doc/source/index_rationals.rst
rename to doc/origsrc/index_rationals.rst
diff --git a/doc/source/introduction.rst b/doc/origsrc/introduction.rst
similarity index 100%
rename from doc/source/introduction.rst
rename to doc/origsrc/introduction.rst
diff --git a/doc/source/introduction_calcium.rst b/doc/origsrc/introduction_calcium.rst
similarity index 100%
rename from doc/source/introduction_calcium.rst
rename to doc/origsrc/introduction_calcium.rst
diff --git a/doc/source/issues.rst b/doc/origsrc/issues.rst
similarity index 100%
rename from doc/source/issues.rst
rename to doc/origsrc/issues.rst
diff --git a/doc/source/long_extras.rst b/doc/origsrc/long_extras.rst
similarity index 100%
rename from doc/source/long_extras.rst
rename to doc/origsrc/long_extras.rst
diff --git a/doc/source/longlong.rst b/doc/origsrc/longlong.rst
similarity index 100%
rename from doc/source/longlong.rst
rename to doc/origsrc/longlong.rst
diff --git a/doc/source/machine_vectors.rst b/doc/origsrc/machine_vectors.rst
similarity index 100%
rename from doc/source/machine_vectors.rst
rename to doc/origsrc/machine_vectors.rst
diff --git a/doc/source/mag.rst b/doc/origsrc/mag.rst
similarity index 100%
rename from doc/source/mag.rst
rename to doc/origsrc/mag.rst
diff --git a/doc/source/memory.rst b/doc/origsrc/memory.rst
similarity index 100%
rename from doc/source/memory.rst
rename to doc/origsrc/memory.rst
diff --git a/doc/source/mpfr_mat.rst b/doc/origsrc/mpfr_mat.rst
similarity index 100%
rename from doc/source/mpfr_mat.rst
rename to doc/origsrc/mpfr_mat.rst
diff --git a/doc/source/mpfr_vec.rst b/doc/origsrc/mpfr_vec.rst
similarity index 100%
rename from doc/source/mpfr_vec.rst
rename to doc/origsrc/mpfr_vec.rst
diff --git a/doc/source/mpn_extras.rst b/doc/origsrc/mpn_extras.rst
similarity index 100%
rename from doc/source/mpn_extras.rst
rename to doc/origsrc/mpn_extras.rst
diff --git a/doc/source/mpn_mod.rst b/doc/origsrc/mpn_mod.rst
similarity index 100%
rename from doc/source/mpn_mod.rst
rename to doc/origsrc/mpn_mod.rst
diff --git a/doc/source/mpoly.rst b/doc/origsrc/mpoly.rst
similarity index 100%
rename from doc/source/mpoly.rst
rename to doc/origsrc/mpoly.rst
diff --git a/doc/source/nf.rst b/doc/origsrc/nf.rst
similarity index 100%
rename from doc/source/nf.rst
rename to doc/origsrc/nf.rst
diff --git a/doc/source/nf_elem.rst b/doc/origsrc/nf_elem.rst
similarity index 100%
rename from doc/source/nf_elem.rst
rename to doc/origsrc/nf_elem.rst
diff --git a/doc/source/nfloat.rst b/doc/origsrc/nfloat.rst
similarity index 100%
rename from doc/source/nfloat.rst
rename to doc/origsrc/nfloat.rst
diff --git a/doc/source/nmod.rst b/doc/origsrc/nmod.rst
similarity index 100%
rename from doc/source/nmod.rst
rename to doc/origsrc/nmod.rst
diff --git a/doc/source/nmod_mat.rst b/doc/origsrc/nmod_mat.rst
similarity index 100%
rename from doc/source/nmod_mat.rst
rename to doc/origsrc/nmod_mat.rst
diff --git a/doc/source/nmod_mpoly.rst b/doc/origsrc/nmod_mpoly.rst
similarity index 100%
rename from doc/source/nmod_mpoly.rst
rename to doc/origsrc/nmod_mpoly.rst
diff --git a/doc/source/nmod_mpoly_factor.rst b/doc/origsrc/nmod_mpoly_factor.rst
similarity index 100%
rename from doc/source/nmod_mpoly_factor.rst
rename to doc/origsrc/nmod_mpoly_factor.rst
diff --git a/doc/source/nmod_poly.rst b/doc/origsrc/nmod_poly.rst
similarity index 100%
rename from doc/source/nmod_poly.rst
rename to doc/origsrc/nmod_poly.rst
diff --git a/doc/source/nmod_poly_factor.rst b/doc/origsrc/nmod_poly_factor.rst
similarity index 100%
rename from doc/source/nmod_poly_factor.rst
rename to doc/origsrc/nmod_poly_factor.rst
diff --git a/doc/source/nmod_poly_mat.rst b/doc/origsrc/nmod_poly_mat.rst
similarity index 100%
rename from doc/source/nmod_poly_mat.rst
rename to doc/origsrc/nmod_poly_mat.rst
diff --git a/doc/source/nmod_vec.rst b/doc/origsrc/nmod_vec.rst
similarity index 100%
rename from doc/source/nmod_vec.rst
rename to doc/origsrc/nmod_vec.rst
diff --git a/doc/source/overview.rst b/doc/origsrc/overview.rst
similarity index 100%
rename from doc/source/overview.rst
rename to doc/origsrc/overview.rst
diff --git a/doc/source/padic.rst b/doc/origsrc/padic.rst
similarity index 100%
rename from doc/source/padic.rst
rename to doc/origsrc/padic.rst
diff --git a/doc/source/padic_mat.rst b/doc/origsrc/padic_mat.rst
similarity index 100%
rename from doc/source/padic_mat.rst
rename to doc/origsrc/padic_mat.rst
diff --git a/doc/source/padic_poly.rst b/doc/origsrc/padic_poly.rst
similarity index 100%
rename from doc/source/padic_poly.rst
rename to doc/origsrc/padic_poly.rst
diff --git a/doc/source/partitions.rst b/doc/origsrc/partitions.rst
similarity index 100%
rename from doc/source/partitions.rst
rename to doc/origsrc/partitions.rst
diff --git a/doc/source/perm.rst b/doc/origsrc/perm.rst
similarity index 100%
rename from doc/source/perm.rst
rename to doc/origsrc/perm.rst
diff --git a/doc/source/polylogarithms.rst b/doc/origsrc/polylogarithms.rst
similarity index 100%
rename from doc/source/polylogarithms.rst
rename to doc/origsrc/polylogarithms.rst
diff --git a/doc/source/portability.rst b/doc/origsrc/portability.rst
similarity index 100%
rename from doc/source/portability.rst
rename to doc/origsrc/portability.rst
diff --git a/doc/source/profiler.rst b/doc/origsrc/profiler.rst
similarity index 100%
rename from doc/source/profiler.rst
rename to doc/origsrc/profiler.rst
diff --git a/doc/source/python_flint.rst b/doc/origsrc/python_flint.rst
similarity index 100%
rename from doc/source/python_flint.rst
rename to doc/origsrc/python_flint.rst
diff --git a/doc/source/qadic.rst b/doc/origsrc/qadic.rst
similarity index 100%
rename from doc/source/qadic.rst
rename to doc/origsrc/qadic.rst
diff --git a/doc/source/qfb.rst b/doc/origsrc/qfb.rst
similarity index 100%
rename from doc/source/qfb.rst
rename to doc/origsrc/qfb.rst
diff --git a/doc/source/qqbar.rst b/doc/origsrc/qqbar.rst
similarity index 100%
rename from doc/source/qqbar.rst
rename to doc/origsrc/qqbar.rst
diff --git a/doc/source/qsieve.rst b/doc/origsrc/qsieve.rst
similarity index 100%
rename from doc/source/qsieve.rst
rename to doc/origsrc/qsieve.rst
diff --git a/doc/source/references.rst b/doc/origsrc/references.rst
similarity index 100%
rename from doc/source/references.rst
rename to doc/origsrc/references.rst
diff --git a/doc/source/thread_pool.rst b/doc/origsrc/thread_pool.rst
similarity index 100%
rename from doc/source/thread_pool.rst
rename to doc/origsrc/thread_pool.rst
diff --git a/doc/source/threading.rst b/doc/origsrc/threading.rst
similarity index 100%
rename from doc/source/threading.rst
rename to doc/origsrc/threading.rst
diff --git a/doc/source/ulong_extras.rst b/doc/origsrc/ulong_extras.rst
similarity index 100%
rename from doc/source/ulong_extras.rst
rename to doc/origsrc/ulong_extras.rst
diff --git a/doc/source/using.rst b/doc/origsrc/using.rst
similarity index 100%
rename from doc/source/using.rst
rename to doc/origsrc/using.rst
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8bbd304bc8..5d4f53bdd3 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -69,7 +69,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
-exclude_patterns = []
+exclude_patterns = ['*.rst']
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'

From 5a0bcd26a75cb8ab9eda8834ff0e63c639b08954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Thu, 30 Jan 2025 16:39:40 +0100
Subject: [PATCH 18/20] Bla

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f6ccc85f1c..4eff07daf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,7 +64,6 @@ libtool
 flint.pc
 autom4te.cache/
 config.m4
-!doc/source/config.m4
 src/flint-mparam.h
 .gdb_history
 vgcore.*

From ee706730c094ff5825d91aef726610d8d8754132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Thu, 30 Jan 2025 16:43:47 +0100
Subject: [PATCH 19/20] Make

---
 doc/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/Makefile b/doc/Makefile
index 0143e3fa85..2f0b400c6f 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -11,7 +11,7 @@ BUILDDIR      = build
 
 M4 := m4
 
-SPHINX_ACTIONS := html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf latexpdfja text man texinfo info gettext changes xml pseudoxml linkcheck doctest coverage clean
+SPHINX_ACTIONS := html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf latexpdfja text man texinfo info gettext changes xml pseudoxml linkcheck doctest coverage
 
 CONFIG := macros.m4
 SRCS := $(wildcard $(ORIGSRCDIR)/*.rst)
@@ -29,6 +29,10 @@ preprocess: $(OBJS)
 $(SPHINX_ACTIONS): Makefile preprocess
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
+clean:
+	rm -f $(OBJS)
+	rm -rf $(BUILDDIR)
+
 print-%:
 	@echo "$*=$($*)"
 

From 7c42e9e20016c73202978ab6c9428015cf49bb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= <albin.ahlback@gmail.com>
Date: Fri, 31 Jan 2025 13:51:22 +0100
Subject: [PATCH 20/20] bla

---
 doc/macros.m4        | 75 +++++++++++++++++++++++++++++---------------
 doc/origsrc/fmpz.rst | 52 ++++++++++--------------------
 doc/source/conf.py   |  3 +-
 3 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/doc/macros.m4 b/doc/macros.m4
index 4603f70525..b3748ffbf0 100644
--- a/doc/macros.m4
+++ b/doc/macros.m4
@@ -3,43 +3,45 @@ dnl Change quotation marks to avoid conflicts
 dnl############################################################################
 changequote({{{,}}})dnl
 dnl############################################################################
-dnl helper stuff
+dnl notation
 dnl############################################################################
 define({{{_neg_}}},dnl
 {{{-$1}}})dnl
-dnl
 define({{{_add_}}},dnl
 {{{$1 + $2}}})dnl
-dnl
 define({{{_sub_}}},dnl
 {{{$1 - $2}}})dnl
-dnl
 define({{{_mul_}}},dnl
 {{{$1 \cdot $2}}})dnl
-dnl
 define({{{_div_}}},dnl
 {{{$1 / $2}}})dnl
-dnl
+define({{{_pow_}}},dnl
+{{{{$1}^{$2}}}})dnl
 define({{{_addmul_}}},dnl
 {{{_add_($1, _mul_($2, $3))}}})dnl
-dnl
 define({{{_submul_}}},dnl
 {{{_sub_($1, _mul_($2, $3))}}})dnl
-dnl
 define({{{_fmma_}}},dnl
 {{{_add_(_mul_($1, $2), _mul_($3, $4))}}})dnl
-dnl
 define({{{_fmms_}}},dnl
 {{{_sub_(_mul_($1, $2), _mul_($3, $4))}}})dnl
-dnl
 define({{{_lt_}}},dnl
 {{{$1 < $2}}})dnl
-dnl
 define({{{_gt_}}},dnl
 {{{$1 > $2}}})dnl
-dnl
-define({{{_equal_}}},dnl
+define({{{_eq_}}},dnl
 {{{$1 = $2}}})dnl
+dnl
+define({{{_boolzero_}}},dnl
+{{{`0`}}})dnl
+define({{{_boolpos_}}},dnl
+{{{`1`}}})dnl
+define({{{_boolneg}}},dnl
+{{{`-1`}}})dnl
+define({{{_zero_}}},dnl
+{{{`0`}}})dnl
+define({{{_one_}}},dnl
+{{{`1`}}})dnl
 dnl############################################################################
 dnl memory management
 dnl############################################################################
@@ -53,10 +55,10 @@ define({{{desc_set}}},{{{
     Sets `$1` to `$2`.dnl
 }}})dnl
 define({{{desc_zero}}},{{{
-    Sets `$1` to zero.dnl
+    Sets `$1` to _zero_.dnl
 }}})dnl
 define({{{desc_one}}},{{{
-    Sets `$1` to one.dnl
+    Sets `$1` to _one_.dnl
 }}})dnl
 dnl############################################################################
 dnl negation, absolute value etc.
@@ -81,7 +83,7 @@ define({{{desc_mul}}},{{{
 }}})dnl
 define({{{desc_divexact}}},{{{
     Sets `$1` to `_div_($2, $3)` under the assumption that the division is
-    exact.  If `$3` is zero, an exception is raised.dnl
+    exact.  If `$3` is _zero_, an exception is raised.dnl
 }}})dnl
 dnl############################################################################
 dnl extended basic arithmetic operations
@@ -99,25 +101,48 @@ define({{{desc_fmms}}},{{{
     Sets `$1` to `_fmms_($2, $3, $4, $5)`.dnl
 }}})dnl
 dnl############################################################################
-dnl sqrt
+dnl powering
 dnl############################################################################
-define({{{desc_sqrt_nonordered_ring}}},{{{
-    If `$2` is a perfect square, sets `$1` to a square root of `$2`
-    and returns nonzero.  Otherwise returns zero.dnl
+define({{{desc_pow}}},{{{
+    Sets `$1` to `_pow_($2, $3)`.  Defines `_eq_(_pow_(0, 0), 1)`.dnl
 }}})dnl
 dnl############################################################################
 dnl comparisons
 dnl############################################################################
 define({{{desc_cmp}}},{{{
-    Returns a negative value if `_lt_($1, $2)`, positive value if
-    `_gt_($1, $2)`, otherwise returns zero.dnl
+    Returns _boolneg_ if `_lt_($1, $2)`, _boolpos_ if `_gt_($1, $2)`, otherwise
+    returns zero.dnl
 }}})dnl
 define({{{desc_equal}}},{{{
-    Returns nonzero if `_equal_($1, $2)`, otherwise returns zero.dnl
+    Returns _boolpos_ if `_eq_($1, $2)`, otherwise returns _boolzero_.dnl
 }}})dnl
 define({{{desc_is_zero}}},{{{
-    Returns nonzero if `_equal_($1, 0)`, otherwise returns zero.dnl
+    Returns _boolpos_ if `_eq_($1, 0)`, otherwise returns _boolzero_.dnl
 }}})dnl
 define({{{desc_is_one}}},{{{
-    Returns nonzero if `_equal_($1, 1)`, otherwise returns zero.dnl
+    Returns _boolpos_ if `_eq_($1, 1)`, otherwise returns _boolzero_.dnl
+}}})dnl
+define({{{desc_sgn}}},{{{
+    Returns the sign of `$1`.  That is, returns `-1` if `_lt_($1, 0)`, `1` if
+    `_gt_($1, 0)` and `0` if `_eq_($1, 0)`.dnl
+}}})dnl
+dnl############################################################################
+dnl factoring
+dnl############################################################################
+define({{{desc_sqrt_nonordered_ring}}},{{{
+    If `$2` is a perfect square, sets `$1` to a square root of `$2`
+    and returns _boolpos_.  Otherwise returns _boolzero_.dnl
+}}})dnl
+define({{{desc_gcd_int}}},{{{
+    Sets `$1` to the greatest common divisor of `$2` and `$3`.  The result is
+    always non-negative.dnl
+}}})dnl
+define({{{desc_divisible}}},{{{
+    Returns _boolpos_ if there is an `x` such that `_eq_($1, _mul_(x, $2))`,
+    and returns _boolzero_ if there is none.dnl
+}}})dnl
+define({{{desc_divides}}},{{{
+    Returns _boolpos_ if there is an `x` such that `_eq_($2, _mul_(x, $3))` and
+    sets `_eq_($1, x)`, and returns _boolzero_ if there is none and sets
+    `_eq_($1, 0)`.dnl
 }}})dnl
diff --git a/doc/origsrc/fmpz.rst b/doc/origsrc/fmpz.rst
index 9a3e71a9cd..624e6b5716 100644
--- a/doc/origsrc/fmpz.rst
+++ b/doc/origsrc/fmpz.rst
@@ -321,14 +321,6 @@ Conversion
     `f` cannot be represented exactly. The outcome is undefined
     if `f` is too large to fit in the normal range of a double.
 
-.. function:: void fmpz_set_mpf(fmpz_t f, const mpf_t x)
-
-    Sets `f` to the ``mpf_t`` `x`, rounding down towards zero if
-    the value of `x` is fractional.
-
-    **Note:** Requires that ``gmp.h`` has been included before any FLINT
-    header is included.
-
 .. function:: void fmpz_get_mpf(mpf_t x, const fmpz_t f)
 
     Sets the value of the ``mpf_t`` `x` to the value of `f`.
@@ -372,12 +364,6 @@ Conversion
     the function.  Otherwise, it is up to the caller to ensure that
     the allocated block of memory is sufficiently large.
 
-.. function:: void fmpz_set_d(fmpz_t f, double c)
-
-    Sets `f` to the ``double`` `c`, rounding down towards zero if
-    the value of `c` is fractional. The outcome is undefined if `c` is
-    infinite, not-a-number, or subnormal.
-
 .. function:: void fmpz_set_d_2exp(fmpz_t f, double d, slong exp)
 
     Sets `f` to the nearest integer to `d 2^{exp}`.
@@ -627,9 +613,7 @@ Basic properties and manipulation
     value of `f`.  If `f` is zero then `0` is returned.
 
 .. function:: int fmpz_sgn(const fmpz_t f)
-
-    Returns `-1` if the sign of `f` is negative, `+1` if it is positive,
-    otherwise returns `0`.
+desc_sgn(f)
 
 .. function:: flint_bitcnt_t fmpz_val2(const fmpz_t f)
 
@@ -645,10 +629,16 @@ Basic properties and manipulation
               void fmpz_set_ui(fmpz_t f, ulong g)
               void fmpz_set_si(fmpz_t f, slong g)
               void fmpz_set_mpz(fmpz_t f, const mpz_t g)
+              void fmpz_set_d(fmpz_t f, double g)
+              void fmpz_set_mpf(fmpz_t f, const mpf_t g)
 desc_set(f, g)
 
-    **Note:** Requires that ``gmp.h`` has been included before any FLINT
-    header is included.
+    For floating-points, the outcome is undefined if `g` is infinite, NaN or
+    subnormal.  Moreover, if `g` is fractional, the value is rounded down
+    towards zero.
+
+    **Note:** ``fmpz_set_mpz`` and ``fmpz_set_mpf`` requires that ``gmp.h`` has
+    been included before any FLINT header is included.
 
 .. function:: void fmpz_zero(fmpz_t f)
 desc_zero(f)
@@ -865,16 +855,11 @@ desc_fmms(f, a, b, c, d)
     If `x` or `y` is `0` an exception is raised.
 
 .. function:: int fmpz_divisible(const fmpz_t f, const fmpz_t g)
+              int fmpz_divisible_si(const fmpz_t f, slong g)
+desc_divisible(f, g)
 
-.. function:: int fmpz_divisible_si(const fmpz_t f, slong g)
-
-    Returns `1` if there is an integer `q` with `f = q g` and `0` if there is
-    none.
-
-.. function:: int fmpz_divides(fmpz_t q, const fmpz_t g, const fmpz_t h)
-
-    Returns `1` if there is an integer `q` with `f = q g` and sets `q` to the
-    quotient. Otherwise returns `0` and sets `q` to `0`.
+.. function:: int fmpz_divides(fmpz_t f, const fmpz_t g, const fmpz_t h)
+desc_divides(f, g, h)
 
 .. function:: void fmpz_mod(fmpz_t f, const fmpz_t g, const fmpz_t h)
 
@@ -911,8 +896,7 @@ desc_fmms(f, a, b, c, d)
 
 .. function:: void fmpz_pow_ui(fmpz_t f, const fmpz_t g, ulong x)
               void fmpz_ui_pow_ui(fmpz_t f, ulong g, ulong x)
-
-    Sets `f` to `g^x`.  Defines `0^0 = 1`.
+desc_pow(f, g, x)
 
 .. function:: int fmpz_pow_fmpz(fmpz_t f, const fmpz_t g, const fmpz_t x)
 
@@ -1034,13 +1018,9 @@ desc_fmms(f, a, b, c, d)
 Greatest common divisor
 --------------------------------------------------------------------------------
 
-.. function:: void fmpz_gcd_ui(fmpz_t f, const fmpz_t g, ulong h)
-
 .. function:: void fmpz_gcd(fmpz_t f, const fmpz_t g, const fmpz_t h)
-
-    Sets `f` to the greatest common divisor of `g` and `h`.  The
-    result is always non-negative, even if one of `g` and `h` is
-    negative.
+              void fmpz_gcd_ui(fmpz_t f, const fmpz_t g, ulong h)
+desc_gcd_int(f, g, h)
 
 .. function:: void fmpz_gcd3(fmpz_t f, const fmpz_t a, const fmpz_t b, const fmpz_t c)
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5d4f53bdd3..ddad93c724 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -17,7 +17,6 @@
 
 sys.path.insert(0, os.path.abspath('../..'))
 sys.path.append(os.path.abspath("."))
-sys.path.append(os.path.abspath("../build"))
 sys.path.append(os.path.abspath('../../src/python'))
 
 # -- Project information -----------------------------------------------------
@@ -69,7 +68,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path .
-exclude_patterns = ['*.rst']
+exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'