From 5c0ecb52890f92d43cf70519cd5491b8415b3710 Mon Sep 17 00:00:00 2001
From: Rohit Goswami <rog32@hi.is>
Date: Sun, 5 Jun 2022 19:45:04 +0000
Subject: [PATCH] MAINT,DOC: Fix doc fragments and tests

---
 doc/source/f2py/advanced.rst                         | 12 ++++++------
 doc/source/f2py/{ => code}/asterisk1.f90             |  0
 doc/source/f2py/{ => code}/asterisk2.f90             |  0
 .../f2py/{ => code/results}/asterisk1_session.dat    |  0
 .../f2py/{ => code/results}/asterisk2_session.dat    |  0
 numpy/f2py/tests/test_docs.py                        |  2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename doc/source/f2py/{ => code}/asterisk1.f90 (100%)
 rename doc/source/f2py/{ => code}/asterisk2.f90 (100%)
 rename doc/source/f2py/{ => code/results}/asterisk1_session.dat (100%)
 rename doc/source/f2py/{ => code/results}/asterisk2_session.dat (100%)

diff --git a/doc/source/f2py/advanced.rst b/doc/source/f2py/advanced.rst
index b310172e2cdb..3ba913c83d95 100644
--- a/doc/source/f2py/advanced.rst
+++ b/doc/source/f2py/advanced.rst
@@ -103,7 +103,7 @@ For more information, see F2Py source code ``numpy/f2py/capi_maps.py``.
 Character strings
 =================
 
-Assumed length chararacter strings
+Assumed length character strings
 -----------------------------------
 
 In Fortran, assumed length character string arguments are declared as
@@ -125,12 +125,12 @@ extra declaration for the corresponding argument that specifies the
 length in character selector part. For example, consider a Fortran
 file ``asterisk1.f90``:
 
-.. include:: asterisk1.f90
+.. include:: ./code/asterisk1.f90
   :literal:
 
 Compile it with ``f2py -c asterisk1.f90 -m asterisk1`` and then in Python:
 
-.. include:: asterisk1_session.dat
+.. include:: ./code/results/asterisk1_session.dat
   :literal:
 
 Notice that the extra declaration ``character(f2py_len=12) s`` is
@@ -139,11 +139,11 @@ can use C-expressions as a length value.
 
 In the following example:
 
-.. include:: asterisk2.f90
+.. include:: ./code/asterisk2.f90
   :literal:
 
-the lenght of output assumed length string depends on an input
+the length of the output assumed length string depends on an input
 argument ``n``, after wrapping with F2PY, in Python:
 
-.. include:: asterisk2_session.dat
+.. include:: ./code/results/asterisk2_session.dat
   :literal:
diff --git a/doc/source/f2py/asterisk1.f90 b/doc/source/f2py/code/asterisk1.f90
similarity index 100%
rename from doc/source/f2py/asterisk1.f90
rename to doc/source/f2py/code/asterisk1.f90
diff --git a/doc/source/f2py/asterisk2.f90 b/doc/source/f2py/code/asterisk2.f90
similarity index 100%
rename from doc/source/f2py/asterisk2.f90
rename to doc/source/f2py/code/asterisk2.f90
diff --git a/doc/source/f2py/asterisk1_session.dat b/doc/source/f2py/code/results/asterisk1_session.dat
similarity index 100%
rename from doc/source/f2py/asterisk1_session.dat
rename to doc/source/f2py/code/results/asterisk1_session.dat
diff --git a/doc/source/f2py/asterisk2_session.dat b/doc/source/f2py/code/results/asterisk2_session.dat
similarity index 100%
rename from doc/source/f2py/asterisk2_session.dat
rename to doc/source/f2py/code/results/asterisk2_session.dat
diff --git a/numpy/f2py/tests/test_docs.py b/numpy/f2py/tests/test_docs.py
index 4aa5f5f5c8cf..6631dd82c9c7 100644
--- a/numpy/f2py/tests/test_docs.py
+++ b/numpy/f2py/tests/test_docs.py
@@ -11,7 +11,7 @@ def get_docdir():
     return os.path.abspath(os.path.join(
         os.path.dirname(__file__),
         '..', '..', '..',
-        'doc', 'source', 'f2py'))
+        'doc', 'source', 'f2py', 'code'))
 
 
 pytestmark = pytest.mark.skipif(