From Trac patches: trac_12555.patch.
From Trac patches: trac_12555_review.patch.
From Trac patches: 12555_rebase_6223.patch.
From Trac patches: trac_12555_doc_improvements.patch​.
From Trac patches: trac_12555-pdf_fix-ts.patch.
Fixes for some missing/duplicated chunks.
Merge branch 'master' into public/padics/templates-12555

Conflicts:
	src/sage/rings/padics/padic_base_generic_element.pyx
	src/sage/rings/padics/padic_extension_leaves.py
Fixed failing doctest (likely due to #15422).
Merge remote-tracking branch 'origin/develop' into ticket/12555

Conflicts:
	src/sage/rings/padics/padic_capped_absolute_element.pyx
	src/sage/rings/padics/padic_capped_relative_element.pxd
	src/sage/rings/padics/padic_capped_relative_element.pyx
	src/sage/rings/padics/padic_fixed_mod_element.pyx
	src/sage/rings/padics/padic_generic_element.pyx
Fixes for "sage not defined".
Fix for comparison of padics.
Trac #12555: Reimplement elements of Zp and Qp using templates

The goal of this ticket is to reimplement elements of Zp and Qp using
the ideas from sage/rings/polynomial/polynomial_template.pxi.  This
should make p-adics in Sage both easier to maintain and easier to add
new classes.

The final patch should not affect the external interface to Zp and Qp.

-----

Apply

* [attachment:trac_12555.patch]
* [attachment:trac_12555_review.patch]
* [attachment:12555_rebase_6223.patch]
* [attachment:trac_12555_doc_improvements.patch]
* [attachment:trac_12555-pdf_fix-ts.patch]

URL: http://trac.sagemath.org/12555
Reported by: roed
Ticket author(s): David Roe, Julian Rueth
Reviewer(s): William Stein, Soroosh Yazdani, Julian Rueth, Travis
Scrimshaw