See also rigid geometry, analytic space.
Wahle good refs for adic and analytic spaces.
nLab page on Adic spaces