Merge branch 'u/jpflori/ticket/15148' into raise-plus

Conflicts:
	src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py
resolve merge conflict with #15148

Author: wluebbe

src/sage/schemes/generic/scheme.py

@@ -712,9 +712,7 @@ def count_points(self, n):
             sage: C.count_points(4)
             [6, 12, 18, 96]
             sage: C.base_extend(GF(9,'a')).count_points(2)
-            Traceback (most recent call last):
-            ...
-            NotImplementedError: Point counting only implemented for schemes over prime fields
+            [12, 96]
         """
         F = self.base_ring()
         if not F.is_finite():
@@ -760,12 +758,12 @@ def zeta_series(self, n, t):
             1 + 6*t + 24*t^2 + 78*t^3 + 240*t^4 + O(t^5)
 
         Note that this function depends on count_points, which is only
-        defined for prime order fields::
+        defined for prime order fields for general schemes.
+        Nonetheless, since :trac:`15108` and :trac:`15148`, it supports
+        hyperelliptic curves over non-prime fields::
 
             sage: C.base_extend(GF(9,'a')).zeta_series(4,t)
-            Traceback (most recent call last):
-            ...
-            NotImplementedError: Point counting only implemented for schemes over prime fields
+            1 + 12*t + 120*t^2 + 1092*t^3 + 9840*t^4 + O(t^5)
         """
 
         F = self.base_ring()