added "docs/en" directory and moved

106 files changed, 1 insertions, 1 deletions

diff --git a/.hgignore b/.hgignore
index 0e2e8e3b7..bc8cce8a3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -15,7 +15,7 @@ syntax:glob
 *.orig
 *~
 
-doc/_build
+doc/*/_build
 build/
 dist/
 *.egg-info
diff --git a/doc/Makefile b/doc/en/Makefile
index 4223b770e..4223b770e 100644
--- a/doc/Makefile
+++ b/doc/en/Makefile
diff --git a/doc/_static/sphinxdoc.css b/doc/en/_static/sphinxdoc.css
index ab8ab5dce..ab8ab5dce 100644
--- a/doc/_static/sphinxdoc.css
+++ b/doc/en/_static/sphinxdoc.css
diff --git a/doc/_templates/indexsidebar.html b/doc/en/_templates/indexsidebar.html
index 13d69cbd5..13d69cbd5 100644
--- a/doc/_templates/indexsidebar.html
+++ b/doc/en/_templates/indexsidebar.html
diff --git a/doc/_templates/layout.html b/doc/en/_templates/layout.html
index 51d72c389..51d72c389 100644
--- a/doc/_templates/layout.html
+++ b/doc/en/_templates/layout.html
diff --git a/doc/_templates/localtoc.html b/doc/en/_templates/localtoc.html
index 916ea4149..916ea4149 100644
--- a/doc/_templates/localtoc.html
+++ b/doc/en/_templates/localtoc.html
diff --git a/doc/_templates/searchbox.html b/doc/en/_templates/searchbox.html
index e69de29bb..e69de29bb 100644
--- a/doc/_templates/searchbox.html
+++ b/doc/en/_templates/searchbox.html
diff --git a/doc/announce/index.txt b/doc/en/announce/index.txt
index 7e217dd67..7e217dd67 100644
--- a/doc/announce/index.txt
+++ b/doc/en/announce/index.txt
diff --git a/doc/announce/release-2.0.0.txt b/doc/en/announce/release-2.0.0.txt
index af745fc59..af745fc59 100644
--- a/doc/announce/release-2.0.0.txt
+++ b/doc/en/announce/release-2.0.0.txt
diff --git a/doc/announce/release-2.0.1.txt b/doc/en/announce/release-2.0.1.txt
index 4a2a2b2a3..4a2a2b2a3 100644
--- a/doc/announce/release-2.0.1.txt
+++ b/doc/en/announce/release-2.0.1.txt
diff --git a/doc/announce/release-2.0.2.txt b/doc/en/announce/release-2.0.2.txt
index 733a9f7bd..733a9f7bd 100644
--- a/doc/announce/release-2.0.2.txt
+++ b/doc/en/announce/release-2.0.2.txt
diff --git a/doc/announce/release-2.0.3.txt b/doc/en/announce/release-2.0.3.txt
index ed746e851..ed746e851 100644
--- a/doc/announce/release-2.0.3.txt
+++ b/doc/en/announce/release-2.0.3.txt
diff --git a/doc/announce/release-2.1.0.txt b/doc/en/announce/release-2.1.0.txt
index 831548ac2..831548ac2 100644
--- a/doc/announce/release-2.1.0.txt
+++ b/doc/en/announce/release-2.1.0.txt
diff --git a/doc/announce/release-2.1.1.txt b/doc/en/announce/release-2.1.1.txt
index ecdd69f4d..ecdd69f4d 100644
--- a/doc/announce/release-2.1.1.txt
+++ b/doc/en/announce/release-2.1.1.txt
diff --git a/doc/announce/release-2.1.2.txt b/doc/en/announce/release-2.1.2.txt
index 51b7591d3..51b7591d3 100644
--- a/doc/announce/release-2.1.2.txt
+++ b/doc/en/announce/release-2.1.2.txt
diff --git a/doc/announce/release-2.1.3.txt b/doc/en/announce/release-2.1.3.txt
index f4da60b8b..f4da60b8b 100644
--- a/doc/announce/release-2.1.3.txt
+++ b/doc/en/announce/release-2.1.3.txt
diff --git a/doc/announce/release-2.2.0.txt b/doc/en/announce/release-2.2.0.txt
index 20bfe0a19..20bfe0a19 100644
--- a/doc/announce/release-2.2.0.txt
+++ b/doc/en/announce/release-2.2.0.txt
diff --git a/doc/announce/release-2.2.1.txt b/doc/en/announce/release-2.2.1.txt
index f9764634c..f9764634c 100644
--- a/doc/announce/release-2.2.1.txt
+++ b/doc/en/announce/release-2.2.1.txt
diff --git a/doc/announce/release-2.2.2.txt b/doc/en/announce/release-2.2.2.txt
index 733aedec4..733aedec4 100644
--- a/doc/announce/release-2.2.2.txt
+++ b/doc/en/announce/release-2.2.2.txt
diff --git a/doc/announce/release-2.2.4.txt b/doc/en/announce/release-2.2.4.txt
index 8720bdb28..8720bdb28 100644
--- a/doc/announce/release-2.2.4.txt
+++ b/doc/en/announce/release-2.2.4.txt
diff --git a/doc/apiref.txt b/doc/en/apiref.txt
index 1add0221f..1add0221f 100644
--- a/doc/apiref.txt
+++ b/doc/en/apiref.txt
diff --git a/doc/assert.txt b/doc/en/assert.txt
index 519a712a2..519a712a2 100644
--- a/doc/assert.txt
+++ b/doc/en/assert.txt
diff --git a/doc/builtin.txt b/doc/en/builtin.txt
index 398fde914..398fde914 100644
--- a/doc/builtin.txt
+++ b/doc/en/builtin.txt
diff --git a/doc/capture.txt b/doc/en/capture.txt
index 247d34b96..247d34b96 100644
--- a/doc/capture.txt
+++ b/doc/en/capture.txt
diff --git a/doc/changelog.txt b/doc/en/changelog.txt
index 504f36c1a..504f36c1a 100644
--- a/doc/changelog.txt
+++ b/doc/en/changelog.txt
diff --git a/doc/check_sphinx.py b/doc/en/check_sphinx.py
index 0f536ffa6..0f536ffa6 100644
--- a/doc/check_sphinx.py
+++ b/doc/en/check_sphinx.py
diff --git a/doc/conf.py b/doc/en/conf.py
index fd49a2921..fd49a2921 100644
--- a/doc/conf.py
+++ b/doc/en/conf.py
diff --git a/doc/conftest.py b/doc/en/conftest.py
index 1a62e1b5d..1a62e1b5d 100644
--- a/doc/conftest.py
+++ b/doc/en/conftest.py
diff --git a/doc/contact.txt b/doc/en/contact.txt
index 0a8796b01..0a8796b01 100644
--- a/doc/contact.txt
+++ b/doc/en/contact.txt
diff --git a/doc/contents.txt b/doc/en/contents.txt
index 5114e177b..5114e177b 100644
--- a/doc/contents.txt
+++ b/doc/en/contents.txt
diff --git a/doc/customize.txt b/doc/en/customize.txt
index 7fee9b851..7fee9b851 100644
--- a/doc/customize.txt
+++ b/doc/en/customize.txt
diff --git a/doc/develop.txt b/doc/en/develop.txt
index 3ee9380e8..3ee9380e8 100644
--- a/doc/develop.txt
+++ b/doc/en/develop.txt
diff --git a/doc/doctest.txt b/doc/en/doctest.txt
index 37242d41e..37242d41e 100644
--- a/doc/doctest.txt
+++ b/doc/en/doctest.txt
diff --git a/doc/example/assertion/failure_demo.py b/doc/en/example/assertion/failure_demo.py
index c29323bc7..c29323bc7 100644
--- a/doc/example/assertion/failure_demo.py
+++ b/doc/en/example/assertion/failure_demo.py
diff --git a/doc/example/assertion/global_testmodule_config/conftest.py b/doc/en/example/assertion/global_testmodule_config/conftest.py
index 71e8c54be..71e8c54be 100644
--- a/doc/example/assertion/global_testmodule_config/conftest.py
+++ b/doc/en/example/assertion/global_testmodule_config/conftest.py
diff --git a/doc/example/assertion/global_testmodule_config/test_hello.py b/doc/en/example/assertion/global_testmodule_config/test_hello.py
index 828e6b9fd..828e6b9fd 100644
--- a/doc/example/assertion/global_testmodule_config/test_hello.py
+++ b/doc/en/example/assertion/global_testmodule_config/test_hello.py
diff --git a/doc/example/assertion/test_failures.py b/doc/en/example/assertion/test_failures.py
index a9075065e..a9075065e 100644
--- a/doc/example/assertion/test_failures.py
+++ b/doc/en/example/assertion/test_failures.py
diff --git a/doc/example/assertion/test_setup_flow_example.py b/doc/en/example/assertion/test_setup_flow_example.py
index 512330cb4..512330cb4 100644
--- a/doc/example/assertion/test_setup_flow_example.py
+++ b/doc/en/example/assertion/test_setup_flow_example.py
diff --git a/doc/example/attic.txt b/doc/en/example/attic.txt
index e63a8d413..e63a8d413 100644
--- a/doc/example/attic.txt
+++ b/doc/en/example/attic.txt
diff --git a/doc/example/conftest.py b/doc/en/example/conftest.py
index f905738c4..f905738c4 100644
--- a/doc/example/conftest.py
+++ b/doc/en/example/conftest.py
diff --git a/doc/example/costlysetup/conftest.py b/doc/en/example/costlysetup/conftest.py
index 0b83d42e8..0b83d42e8 100644
--- a/doc/example/costlysetup/conftest.py
+++ b/doc/en/example/costlysetup/conftest.py
diff --git a/doc/example/costlysetup/sub1/__init__.py b/doc/en/example/costlysetup/sub1/__init__.py
index 792d60054..792d60054 100644
--- a/doc/example/costlysetup/sub1/__init__.py
+++ b/doc/en/example/costlysetup/sub1/__init__.py
diff --git a/doc/example/costlysetup/sub1/test_quick.py b/doc/en/example/costlysetup/sub1/test_quick.py
index d97657867..d97657867 100644
--- a/doc/example/costlysetup/sub1/test_quick.py
+++ b/doc/en/example/costlysetup/sub1/test_quick.py
diff --git a/doc/example/costlysetup/sub2/__init__.py b/doc/en/example/costlysetup/sub2/__init__.py
index 792d60054..792d60054 100644
--- a/doc/example/costlysetup/sub2/__init__.py
+++ b/doc/en/example/costlysetup/sub2/__init__.py
diff --git a/doc/example/costlysetup/sub2/test_two.py b/doc/en/example/costlysetup/sub2/test_two.py
index 6ed6ee4d8..6ed6ee4d8 100644
--- a/doc/example/costlysetup/sub2/test_two.py
+++ b/doc/en/example/costlysetup/sub2/test_two.py
diff --git a/doc/example/index.txt b/doc/en/example/index.txt
index e0b628316..e0b628316 100644
--- a/doc/example/index.txt
+++ b/doc/en/example/index.txt
diff --git a/doc/example/layout1/setup.cfg b/doc/en/example/layout1/setup.cfg
index 02d3750ee..02d3750ee 100644
--- a/doc/example/layout1/setup.cfg
+++ b/doc/en/example/layout1/setup.cfg
diff --git a/doc/example/markers.txt b/doc/en/example/markers.txt
index 1f1e11c31..1f1e11c31 100644
--- a/doc/example/markers.txt
+++ b/doc/en/example/markers.txt
diff --git a/doc/example/multipython.py b/doc/en/example/multipython.py
index c0d58aec5..c0d58aec5 100644
--- a/doc/example/multipython.py
+++ b/doc/en/example/multipython.py
diff --git a/doc/example/mysetup.txt b/doc/en/example/mysetup.txt
index a7682c5f9..a7682c5f9 100644
--- a/doc/example/mysetup.txt
+++ b/doc/en/example/mysetup.txt
diff --git a/doc/example/nonpython.txt b/doc/en/example/nonpython.txt
index 6f93db130..6f93db130 100644
--- a/doc/example/nonpython.txt
+++ b/doc/en/example/nonpython.txt
diff --git a/doc/example/nonpython/__init__.py b/doc/en/example/nonpython/__init__.py
index e69de29bb..e69de29bb 100644
--- a/doc/example/nonpython/__init__.py
+++ b/doc/en/example/nonpython/__init__.py
diff --git a/doc/example/nonpython/conftest.py b/doc/en/example/nonpython/conftest.py
index dad316b75..dad316b75 100644
--- a/doc/example/nonpython/conftest.py
+++ b/doc/en/example/nonpython/conftest.py
diff --git a/doc/example/nonpython/test_simple.yml b/doc/en/example/nonpython/test_simple.yml
index f0d8d11fc..f0d8d11fc 100644
--- a/doc/example/nonpython/test_simple.yml
+++ b/doc/en/example/nonpython/test_simple.yml
diff --git a/doc/example/parametrize.txt b/doc/en/example/parametrize.txt
index 914497ec4..914497ec4 100644
--- a/doc/example/parametrize.txt
+++ b/doc/en/example/parametrize.txt
diff --git a/doc/example/py2py3/conftest.py b/doc/en/example/py2py3/conftest.py
index 81cd1fb11..81cd1fb11 100644
--- a/doc/example/py2py3/conftest.py
+++ b/doc/en/example/py2py3/conftest.py
diff --git a/doc/example/py2py3/test_py2.py b/doc/en/example/py2py3/test_py2.py
index e09ed9466..e09ed9466 100644
--- a/doc/example/py2py3/test_py2.py
+++ b/doc/en/example/py2py3/test_py2.py
diff --git a/doc/example/py2py3/test_py3.py b/doc/en/example/py2py3/test_py3.py
index a811f2bbc..a811f2bbc 100644
--- a/doc/example/py2py3/test_py3.py
+++ b/doc/en/example/py2py3/test_py3.py
diff --git a/doc/example/pythoncollection.py b/doc/en/example/pythoncollection.py
index 5296b8b99..5296b8b99 100644
--- a/doc/example/pythoncollection.py
+++ b/doc/en/example/pythoncollection.py
diff --git a/doc/example/pythoncollection.txt b/doc/en/example/pythoncollection.txt
index 9f81208c4..9f81208c4 100644
--- a/doc/example/pythoncollection.txt
+++ b/doc/en/example/pythoncollection.txt
diff --git a/doc/example/reportingdemo.txt b/doc/en/example/reportingdemo.txt
index 908765da3..908765da3 100644
--- a/doc/example/reportingdemo.txt
+++ b/doc/en/example/reportingdemo.txt
diff --git a/doc/example/simple.txt b/doc/en/example/simple.txt
index f6bfc84a2..f6bfc84a2 100644
--- a/doc/example/simple.txt
+++ b/doc/en/example/simple.txt
diff --git a/doc/example/xfail_demo.py b/doc/en/example/xfail_demo.py
index 75cb7bea1..75cb7bea1 100644
--- a/doc/example/xfail_demo.py
+++ b/doc/en/example/xfail_demo.py
diff --git a/doc/faq.txt b/doc/en/faq.txt
index b27f3764a..b27f3764a 100644
--- a/doc/faq.txt
+++ b/doc/en/faq.txt
diff --git a/doc/feedback.rst b/doc/en/feedback.rst
index 9c63b7640..9c63b7640 100644
--- a/doc/feedback.rst
+++ b/doc/en/feedback.rst
diff --git a/doc/funcargs.txt b/doc/en/funcargs.txt
index 1103e9402..1103e9402 100644
--- a/doc/funcargs.txt
+++ b/doc/en/funcargs.txt
diff --git a/doc/getting-started.txt b/doc/en/getting-started.txt
index c5219729c..c5219729c 100644
--- a/doc/getting-started.txt
+++ b/doc/en/getting-started.txt
diff --git a/doc/goodpractises.txt b/doc/en/goodpractises.txt
index 89836b659..89836b659 100644
--- a/doc/goodpractises.txt
+++ b/doc/en/goodpractises.txt
diff --git a/doc/img/pylib.png b/doc/en/img/pylib.png
index 2e10d4388..2e10d4388 100644
--- a/doc/img/pylib.png
+++ b/doc/en/img/pylib.png
diff --git a/doc/index.txt b/doc/en/index.txt
index 85c7c74aa..85c7c74aa 100644
--- a/doc/index.txt
+++ b/doc/en/index.txt
diff --git a/doc/links.inc b/doc/en/links.inc
index e627f780d..e627f780d 100644
--- a/doc/links.inc
+++ b/doc/en/links.inc
diff --git a/doc/mark.txt b/doc/en/mark.txt
index 62f77726e..62f77726e 100644
--- a/doc/mark.txt
+++ b/doc/en/mark.txt
diff --git a/doc/monkeypatch.txt b/doc/en/monkeypatch.txt
index 74c63b850..74c63b850 100644
--- a/doc/monkeypatch.txt
+++ b/doc/en/monkeypatch.txt
diff --git a/doc/naming20.txt b/doc/en/naming20.txt
index 5a81df269..5a81df269 100644
--- a/doc/naming20.txt
+++ b/doc/en/naming20.txt
diff --git a/doc/nose.txt b/doc/en/nose.txt
index 7680c4cad..7680c4cad 100644
--- a/doc/nose.txt
+++ b/doc/en/nose.txt
diff --git a/doc/overview.txt b/doc/en/overview.txt
index 321d79d8c..321d79d8c 100644
--- a/doc/overview.txt
+++ b/doc/en/overview.txt
diff --git a/doc/plugins.txt b/doc/en/plugins.txt
index 1425edfc3..1425edfc3 100644
--- a/doc/plugins.txt
+++ b/doc/en/plugins.txt
diff --git a/doc/projects.txt b/doc/en/projects.txt
index 95e577d35..95e577d35 100644
--- a/doc/projects.txt
+++ b/doc/en/projects.txt
diff --git a/doc/pytest.ini b/doc/en/pytest.ini
index 760436056..760436056 100644
--- a/doc/pytest.ini
+++ b/doc/en/pytest.ini
diff --git a/doc/recwarn.txt b/doc/en/recwarn.txt
index 743e41018..743e41018 100644
--- a/doc/recwarn.txt
+++ b/doc/en/recwarn.txt
diff --git a/doc/skipping.txt b/doc/en/skipping.txt
index f78e31335..f78e31335 100644
--- a/doc/skipping.txt
+++ b/doc/en/skipping.txt
diff --git a/doc/talks.txt b/doc/en/talks.txt
index e458a3409..e458a3409 100644
--- a/doc/talks.txt
+++ b/doc/en/talks.txt
diff --git a/doc/test/attic.txt b/doc/en/test/attic.txt
index b90ab4be9..b90ab4be9 100644
--- a/doc/test/attic.txt
+++ b/doc/en/test/attic.txt
diff --git a/doc/test/config.html b/doc/en/test/config.html
index cba5a46f9..cba5a46f9 100644
--- a/doc/test/config.html
+++ b/doc/en/test/config.html
diff --git a/doc/test/dist.html b/doc/en/test/dist.html
index e328550a8..e328550a8 100644
--- a/doc/test/dist.html
+++ b/doc/en/test/dist.html
diff --git a/doc/test/extend.html b/doc/en/test/extend.html
index cba5a46f9..cba5a46f9 100644
--- a/doc/test/extend.html
+++ b/doc/en/test/extend.html
diff --git a/doc/test/index.txt b/doc/en/test/index.txt
index 475870d5e..475870d5e 100644
--- a/doc/test/index.txt
+++ b/doc/en/test/index.txt
diff --git a/doc/test/mission.txt b/doc/en/test/mission.txt
index 469e50597..469e50597 100644
--- a/doc/test/mission.txt
+++ b/doc/en/test/mission.txt
diff --git a/doc/test/plugin/cov.txt b/doc/en/test/plugin/cov.txt
index 355093f25..355093f25 100644
--- a/doc/test/plugin/cov.txt
+++ b/doc/en/test/plugin/cov.txt
diff --git a/doc/test/plugin/coverage.txt b/doc/en/test/plugin/coverage.txt
index 965b4a4ee..965b4a4ee 100644
--- a/doc/test/plugin/coverage.txt
+++ b/doc/en/test/plugin/coverage.txt
diff --git a/doc/test/plugin/django.txt b/doc/en/test/plugin/django.txt
index 9d513af81..9d513af81 100644
--- a/doc/test/plugin/django.txt
+++ b/doc/en/test/plugin/django.txt
diff --git a/doc/test/plugin/figleaf.txt b/doc/en/test/plugin/figleaf.txt
index 86e0da65b..86e0da65b 100644
--- a/doc/test/plugin/figleaf.txt
+++ b/doc/en/test/plugin/figleaf.txt
diff --git a/doc/test/plugin/genscript.txt b/doc/en/test/plugin/genscript.txt
index f102afe39..f102afe39 100644
--- a/doc/test/plugin/genscript.txt
+++ b/doc/en/test/plugin/genscript.txt
diff --git a/doc/test/plugin/helpconfig.txt b/doc/en/test/plugin/helpconfig.txt
index 966bbc988..966bbc988 100644
--- a/doc/test/plugin/helpconfig.txt
+++ b/doc/en/test/plugin/helpconfig.txt
diff --git a/doc/test/plugin/index.txt b/doc/en/test/plugin/index.txt
index 853a4dce6..853a4dce6 100644
--- a/doc/test/plugin/index.txt
+++ b/doc/en/test/plugin/index.txt
diff --git a/doc/test/plugin/links.txt b/doc/en/test/plugin/links.txt
index b7d427856..b7d427856 100644
--- a/doc/test/plugin/links.txt
+++ b/doc/en/test/plugin/links.txt
diff --git a/doc/test/plugin/nose.txt b/doc/en/test/plugin/nose.txt
index a0294207b..a0294207b 100644
--- a/doc/test/plugin/nose.txt
+++ b/doc/en/test/plugin/nose.txt
diff --git a/doc/test/plugin/oejskit.txt b/doc/en/test/plugin/oejskit.txt
index f664fd03f..f664fd03f 100644
--- a/doc/test/plugin/oejskit.txt
+++ b/doc/en/test/plugin/oejskit.txt
diff --git a/doc/test/plugin/terminal.txt b/doc/en/test/plugin/terminal.txt
index e60188ccf..e60188ccf 100644
--- a/doc/test/plugin/terminal.txt
+++ b/doc/en/test/plugin/terminal.txt
diff --git a/doc/test/plugin/xdist.txt b/doc/en/test/plugin/xdist.txt
index 3116658c4..3116658c4 100644
--- a/doc/test/plugin/xdist.txt
+++ b/doc/en/test/plugin/xdist.txt
diff --git a/doc/test/test.html b/doc/en/test/test.html
index 7d00f718a..7d00f718a 100644
--- a/doc/test/test.html
+++ b/doc/en/test/test.html
diff --git a/doc/tmpdir.txt b/doc/en/tmpdir.txt
index 9a031b1c8..9a031b1c8 100644
--- a/doc/tmpdir.txt
+++ b/doc/en/tmpdir.txt
diff --git a/doc/unittest.txt b/doc/en/unittest.txt
index 72c78aac7..72c78aac7 100644
--- a/doc/unittest.txt
+++ b/doc/en/unittest.txt
diff --git a/doc/usage.txt b/doc/en/usage.txt
index 04cbd7b4a..04cbd7b4a 100644
--- a/doc/usage.txt
+++ b/doc/en/usage.txt
diff --git a/doc/xdist.txt b/doc/en/xdist.txt
index 6aa4be117..6aa4be117 100644
--- a/doc/xdist.txt
+++ b/doc/en/xdist.txt
diff --git a/doc/xunit_setup.txt b/doc/en/xunit_setup.txt
index 4b19c91d8..4b19c91d8 100644
--- a/doc/xunit_setup.txt
+++ b/doc/en/xunit_setup.txt