Rename "docs" to "website"

"website" is a more accurate term for the majority of the content that has been under ``docs``, with the exception of the tool manpages, so: - The website source now lives in the ``website`` subdirectory (was ``docs``) - The CMake option is now ``BUILD_WEBSITE`` (was ``BUILD_DOCS``) - The new CMake target ``website`` now builds the website source (via doxygen, sphinx, etc) - The CI job is called "Website" (was ``Docs``) - The CMake target ``Docs`` now installs just the tool manpages - The CMake option ``OPENEXR_INSTALL_DOCS`` controls whether to install the manpages, and defaults to OFF Signed-off-by: Cary Phillips <[email protected]>
cary-ilm · Jul 30, 2023 · f5f4155 · f5f4155
1 parent cfd1c76
commit f5f4155
Show file tree

Hide file tree

Showing 114 changed files with 115 additions and 98 deletions.
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -221,6 +221,8 @@ jobs:
           mkdir _install
           mkdir _build
           mkdir _examples
+      - name: Install help2man
+        run: sudo apt-get install -y help2man
       - name: Configure
         run: |
           cmake .. \
@@ -230,7 +232,8 @@ jobs:
                 -DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-                -DOPENEXR_BUILD_TOOLS='ON' \
+                -DOPENEXR_INSTALL_TOOLS='ON' \
+                -DOPENEXR_INSTALL_DOCS='ON' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF' \
                 -DOPENEXR_ENABLE_THREADING=${{ matrix.threads-enabled }}
         working-directory: _build
@@ -363,7 +366,8 @@ jobs:
                 -DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-                -DOPENEXR_BUILD_TOOLS='ON' \
+                -DOPENEXR_INSTALL_TOOLS='ON' \
+                -DOPENEXR_INSTALL_DOCS='OFF' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF'
         working-directory: _build
       - name: Build
@@ -497,7 +501,8 @@ jobs:
                 -DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-                -DOPENEXR_BUILD_TOOLS='ON' \
+                -DOPENEXR_INSTALL_TOOLS='ON' \
+                -DOPENEXR_INSTALL_DOCS='OFF' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF' 
         shell: bash
         working-directory: _build
@@ -534,16 +539,16 @@ jobs:
         shell: bash
         working-directory: _build
 
-  Docs:
+  Website:
 
-    # Build the documentation, using a process that mimics the readthedoc build.
+    # Build the website, using a process that mimics the readthedoc build.
     #
     # Note that this job does not actually build OpenEXR libraries or
     # programs, it just runs doxygen, sphinx, and the
-    # docs/script/test_images.py script to generate the "Test Images"
+    # website/script/test_images.py script to generate the "Test Images"
     # page.
 
-    name: 'Docs'
+    name: 'Website'
     runs-on: ubuntu-latest
 
     steps:
@@ -554,17 +559,16 @@ jobs:
       - name: Install doxygen & imagemagick
         # Need imagemagick for convert, to convert "Test Image" exrs to jpgs
         # Need openexr for exrheader
-        # Need help2man for tool manpages
-        run: sudo apt-get install -y doxygen imagemagick openexr help2man
+        run: sudo apt-get install -y doxygen imagemagick openexr 
       - name: Install sphinx requirements
-        run: pip3 install -r docs/requirements.txt
+        run: pip3 install -r website/requirements.txt
       - name: Configure
-        run: cmake .. -DBUILD_DOCS='ON'
+        run: cmake .. -DBUILD_WEBSITE='ON'
         working-directory: _build
       - name: Build
         run: |
           cmake --build . \
-                --target docs \
+                --target website \
                 --config Release
         working-directory: _build
 
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -15,11 +15,11 @@ build:
     - openexr     # for exrheader, for test images
   jobs:
     pre_build:
-       - python docs/scripts/test_images.py 
+       - python website/scripts/test_images.py 
 
 sphinx:
-  configuration: docs/conf.py
+  configuration: website/conf.py
 
 python:
   install:
-    - requirements: docs/requirements.txt
+    - requirements: website/requirements.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,9 +134,13 @@ if(NOT OPENEXR_IS_SUBPROJECT)
   include(cmake/clang-format.cmake)
 endif()
 
-option(BUILD_DOCS "Set ON to build html documentation")
-if (BUILD_DOCS AND NOT OPENEXR_IS_SUBPROJECT)
-  option(INSTALL_DOCS "Set ON to install html documentation" ON)
+option(OPENEXR_INSTALL_DOCS "Set ON to install tool manpages")
+if (OPENEXR_INSTALL_DOCS AND NOT OPENEXR_IS_SUBPROJECT)
   add_subdirectory(docs)
 endif()
 
+option(BUILD_WEBSITE "Set ON to build website source")
+if (BUILD_WEBSITE AND NOT OPENEXR_IS_SUBPROJECT)
+  add_subdirectory(website)
+endif()
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -258,7 +258,7 @@ submitted, in order to solicit feedback, try to get as much consensus
 as possible, and alert all the stakeholders to be on the lookout for
 the eventual PR when it appears.
 
-* Trivial changes that don't affect functionality (typos, docs, tests)
+* Trivial changes that don't affect functionality (typos, tests, website)
 can be approved by the committer without review, after waiting at
 least 48 hours.
 

diff --git a/cmake/OpenEXRConfig.h.in b/cmake/OpenEXRConfig.h.in
@@ -80,7 +80,7 @@
 
 /// \defgroup ExportMacros Macros to manage symbol visibility
 ///
-/// See docs/SymbolVisibility.md for more discussion about the
+/// See website/SymbolVisibility.rst for more discussion about the
 /// motivation for these macros
 ///
 /// If we are compiling a DLL for Windows, there needs to be custom

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -3,73 +3,16 @@
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
-find_package(Doxygen REQUIRED)
-find_package(Sphinx REQUIRED)
-
-include(FindPythonPackage)
-find_python_package(sphinx-press-theme REQUIRED)
-
-set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR}/src/lib/OpenEXRCore)
-set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/doxygen)
-set(DOXYGEN_INDEX_FILE ${DOXYGEN_OUTPUT_DIR}/html/index.html)
-set(DOXYFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
-set(DOXYFILE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-
-set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR})
-set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/sphinx)
-set(SPHINX_INDEX_FILE ${SPHINX_BUILD}/index.html)
-
-set(SPHINX_OPTS "-W" CACHE STRING "Sphinx build options")
-
-set(OPENEXR_TEST_IMAGE_REPO "https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr-images" 
-    CACHE STRING "Repo for test images")
-set(OPENEXR_TEST_IMAGE_TAG "main" 
-    CACHE STRING "Tag for test image repo")
-
-set(TEST_IMAGE_INDEX_FILE ${PROJECT_SOURCE_DIR}/docs/_test_images/index.rst)
-set(TEST_IMAGE_PY_FILE ${PROJECT_SOURCE_DIR}/docs/scripts/test_images.py)
-set(TEST_IMAGE_INPUT_FILE ${PROJECT_SOURCE_DIR}/docs/test_images.txt)
-configure_file(${DOXYFILE_IN} ${DOXYFILE_OUT} @ONLY)
-
-file(MAKE_DIRECTORY ${DOXYGEN_OUTPUT_DIR})
-
-add_custom_command(OUTPUT ${DOXYGEN_INDEX_FILE}
-                   COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE_OUT}
-                   MAIN_DEPENDENCY ${DOXYFILE_OUT} ${DOXYFILE_IN}
-                   COMMENT "Running doxygen"
-                   VERBATIM)
-
-add_custom_command(OUTPUT ${TEST_IMAGE_INDEX_FILE}
-                   # run the test_images.py script with the PATH set
-                   # to include the build's bin directory, to pick up
-                   # the local bin/exrheader executable
-                   COMMAND ${CMAKE_COMMAND} -E env "PATH=${CMAKE_CURRENT_BINARY_DIR}/../bin:$ENV{PATH}"
-                   ${Python3_EXECUTABLE} ${TEST_IMAGE_PY_FILE} ${OPENEXR_TEST_IMAGE_REPO} ${OPENEXR_TEST_IMAGE_TAG} 
-                   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-                   DEPENDS
-                   ${TEST_IMAGE_PY_FILE} ${TEST_IMAGE_INPUT_FILE}
-                   COMMENT "Generating test image pages"
-                   VERBATIM)
-
-add_custom_command(OUTPUT ${SPHINX_INDEX_FILE}
-                   COMMAND 
-                     ${SPHINX_EXECUTABLE} -b html ${SPHINX_OPTS}
-                     # Tell Breathe where to find the Doxygen output
-                     -Dbreathe_projects.OpenEXR=${DOXYGEN_OUTPUT_DIR}/xml
-                   ${SPHINX_SOURCE} ${SPHINX_BUILD}
-                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                   DEPENDS ${DOXYGEN_INDEX_FILE} ${TEST_IMAGE_INDEX_FILE} ${TEST_IMAGE_PY_FILE} ${TEST_IMAGE_INPUT_FILE} 
-                   MAIN_DEPENDENCY ${SPHINX_CONF_PY_FILE}
-                   COMMENT "Generating documentation with Sphinx")
-
-
 # man pages for the bin programs
 
 find_program(HELP2MAN help2man)
 
 set(MANPAGE_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/man)
 file(MAKE_DIRECTORY ${MANPAGE_OUTPUT_DIR}/man1)
 
+message(STATUS "MANPAGE_OUTPUT_DIR=${MANPAGE_OUTPUT_DIR}")
+message(STATUS "CMAKE_INSTALL_MANDIR=${CMAKE_INSTALL_MANDIR}")
+
 set(manpage_files "")
 
 function(DEFINE_MANPAGE tool description)
@@ -103,12 +46,9 @@ define_manpage(exrmultiview   "convert between single/multi-view exr images")
 define_manpage(exrstdattr     "set exr image metadata")
 
 add_custom_target(docs ALL DEPENDS
-                 ${SPHINX_INDEX_FILE}
-                 ${DOXYGEN_INDEX_FILE}
-                 ${TEST_IMAGE_INDEX_FILE}
                  ${manpage_files})
 
-# Add a target to install the manpages, but *not* the html
+# Add a target to install the manpages
 
 if(INSTALL_DOCS)
     include(GNUInstallDirs)

diff --git a/src/lib/IlmThread/IlmThreadExport.h b/src/lib/IlmThread/IlmThreadExport.h
@@ -8,7 +8,7 @@
 
 #include "OpenEXRConfig.h"
 
-// See docs/SymbolVisibility.md for more discussion
+// See website/SymbolVisibility.rst for more discussion
 
 /// \addtogroup ExportMacros
 /// @{

diff --git a/docs/API.rst → website/API.rst b/docs/API.rst → website/API.rst
diff --git a/website/CMakeLists.txt b/website/CMakeLists.txt
@@ -0,0 +1,69 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+
+find_package(Doxygen REQUIRED)
+find_package(Sphinx REQUIRED)
+
+include(FindPythonPackage)
+find_python_package(sphinx-press-theme REQUIRED)
+
+set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR}/src/lib/OpenEXRCore)
+set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/doxygen)
+set(DOXYGEN_INDEX_FILE ${DOXYGEN_OUTPUT_DIR}/html/index.html)
+set(DOXYFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
+set(DOXYFILE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+
+set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR})
+set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/sphinx)
+set(SPHINX_INDEX_FILE ${SPHINX_BUILD}/index.html)
+
+set(SPHINX_OPTS "-W" CACHE STRING "Sphinx build options")
+
+set(OPENEXR_TEST_IMAGE_REPO "https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr-images" 
+    CACHE STRING "Repo for test images")
+set(OPENEXR_TEST_IMAGE_TAG "main" 
+    CACHE STRING "Tag for test image repo")
+
+set(TEST_IMAGE_INDEX_FILE ${PROJECT_SOURCE_DIR}/website/_test_images/index.rst)
+set(TEST_IMAGE_PY_FILE ${PROJECT_SOURCE_DIR}/website/scripts/test_images.py)
+set(TEST_IMAGE_INPUT_FILE ${PROJECT_SOURCE_DIR}/website/test_images.txt)
+configure_file(${DOXYFILE_IN} ${DOXYFILE_OUT} @ONLY)
+
+file(MAKE_DIRECTORY ${DOXYGEN_OUTPUT_DIR})
+
+add_custom_command(OUTPUT ${DOXYGEN_INDEX_FILE}
+                   COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE_OUT}
+                   MAIN_DEPENDENCY ${DOXYFILE_OUT} ${DOXYFILE_IN}
+                   COMMENT "Running doxygen"
+                   VERBATIM)
+
+add_custom_command(OUTPUT ${TEST_IMAGE_INDEX_FILE}
+                   # run the test_images.py script with the PATH set
+                   # to include the build's bin directory, to pick up
+                   # the local bin/exrheader executable
+                   COMMAND ${CMAKE_COMMAND} -E env "PATH=${CMAKE_CURRENT_BINARY_DIR}/../bin:$ENV{PATH}"
+                   ${Python3_EXECUTABLE} ${TEST_IMAGE_PY_FILE} ${OPENEXR_TEST_IMAGE_REPO} ${OPENEXR_TEST_IMAGE_TAG} 
+                   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+                   DEPENDS
+                   ${TEST_IMAGE_PY_FILE} ${TEST_IMAGE_INPUT_FILE}
+                   COMMENT "Generating test image pages"
+                   VERBATIM)
+
+add_custom_command(OUTPUT ${SPHINX_INDEX_FILE}
+                   COMMAND 
+                     ${SPHINX_EXECUTABLE} -b html ${SPHINX_OPTS}
+                     # Tell Breathe where to find the Doxygen output
+                     -Dbreathe_projects.OpenEXR=${DOXYGEN_OUTPUT_DIR}/xml
+                   ${SPHINX_SOURCE} ${SPHINX_BUILD}
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                   DEPENDS ${DOXYGEN_INDEX_FILE} ${TEST_IMAGE_INDEX_FILE} ${TEST_IMAGE_PY_FILE} ${TEST_IMAGE_INPUT_FILE} 
+                   MAIN_DEPENDENCY ${SPHINX_CONF_PY_FILE}
+                   COMMENT "Generating documentation with Sphinx")
+
+add_custom_target(website ALL DEPENDS
+                 ${SPHINX_INDEX_FILE}
+                 ${DOXYGEN_INDEX_FILE}
+                 ${TEST_IMAGE_INDEX_FILE})
+
diff --git a/docs/Doxyfile.in → website/Doxyfile.in b/docs/Doxyfile.in → website/Doxyfile.in
diff --git a/docs/HelloWorld.rst → website/HelloWorld.rst b/docs/HelloWorld.rst → website/HelloWorld.rst
diff --git a/docs/InterpretingDeepPixels.rst → website/InterpretingDeepPixels.rst b/docs/InterpretingDeepPixels.rst → website/InterpretingDeepPixels.rst
diff --git a/docs/MultiViewOpenEXR.rst → website/MultiViewOpenEXR.rst b/docs/MultiViewOpenEXR.rst → website/MultiViewOpenEXR.rst
diff --git a/docs/OpenEXRCoreAPI.rst → website/OpenEXRCoreAPI.rst b/docs/OpenEXRCoreAPI.rst → website/OpenEXRCoreAPI.rst
diff --git a/docs/OpenEXRFileLayout.rst → website/OpenEXRFileLayout.rst b/docs/OpenEXRFileLayout.rst → website/OpenEXRFileLayout.rst
diff --git a/docs/PortingGuide.rst → website/PortingGuide.rst b/docs/PortingGuide.rst → website/PortingGuide.rst
diff --git a/docs/ReadingAndWritingImageFiles.rst → website/ReadingAndWritingImageFiles.rst b/docs/ReadingAndWritingImageFiles.rst → website/ReadingAndWritingImageFiles.rst
diff --git a/docs/StandardOptionalAttributes.rst → website/StandardOptionalAttributes.rst b/docs/StandardOptionalAttributes.rst → website/StandardOptionalAttributes.rst
diff --git a/docs/SymbolVisibility.rst → website/SymbolVisibility.rst b/docs/SymbolVisibility.rst → website/SymbolVisibility.rst
diff --git a/docs/TechnicalIntroduction.rst → website/TechnicalIntroduction.rst b/docs/TechnicalIntroduction.rst → website/TechnicalIntroduction.rst
diff --git a/docs/TheoryDeepPixels.rst → website/TheoryDeepPixels.rst b/docs/TheoryDeepPixels.rst → website/TheoryDeepPixels.rst
diff --git a/docs/about.rst → website/about.rst b/docs/about.rst → website/about.rst
diff --git a/docs/bin/exr2aces.rst → website/bin/exr2aces.rst b/docs/bin/exr2aces.rst → website/bin/exr2aces.rst
diff --git a/docs/bin/exrcheck.rst → website/bin/exrcheck.rst b/docs/bin/exrcheck.rst → website/bin/exrcheck.rst
diff --git a/docs/bin/exrenvmap.rst → website/bin/exrenvmap.rst b/docs/bin/exrenvmap.rst → website/bin/exrenvmap.rst
diff --git a/docs/bin/exrheader.rst → website/bin/exrheader.rst b/docs/bin/exrheader.rst → website/bin/exrheader.rst
diff --git a/docs/bin/exrinfo.rst → website/bin/exrinfo.rst b/docs/bin/exrinfo.rst → website/bin/exrinfo.rst
diff --git a/docs/bin/exrmakepreview.rst → website/bin/exrmakepreview.rst b/docs/bin/exrmakepreview.rst → website/bin/exrmakepreview.rst
diff --git a/docs/bin/exrmaketiled.rst → website/bin/exrmaketiled.rst b/docs/bin/exrmaketiled.rst → website/bin/exrmaketiled.rst
diff --git a/docs/bin/exrmultipart.rst → website/bin/exrmultipart.rst b/docs/bin/exrmultipart.rst → website/bin/exrmultipart.rst
diff --git a/docs/bin/exrmultiview.rst → website/bin/exrmultiview.rst b/docs/bin/exrmultiview.rst → website/bin/exrmultiview.rst
diff --git a/docs/bin/exrstdattr.rst → website/bin/exrstdattr.rst b/docs/bin/exrstdattr.rst → website/bin/exrstdattr.rst
diff --git a/docs/concepts.rst → website/concepts.rst b/docs/concepts.rst → website/concepts.rst
diff --git a/docs/conf.py → website/conf.py b/docs/conf.py → website/conf.py
diff --git a/docs/images/InterpretingDeepPixels1.png → website/images/InterpretingDeepPixels1.png b/docs/images/InterpretingDeepPixels1.png → website/images/InterpretingDeepPixels1.png
diff --git a/docs/images/InterpretingDeepPixels2.png → website/images/InterpretingDeepPixels2.png b/docs/images/InterpretingDeepPixels2.png → website/images/InterpretingDeepPixels2.png
diff --git a/docs/images/InterpretingDeepPixels3.png → website/images/InterpretingDeepPixels3.png b/docs/images/InterpretingDeepPixels3.png → website/images/InterpretingDeepPixels3.png
diff --git a/docs/images/OpenEXR_Reel_2020.png → website/images/OpenEXR_Reel_2020.png b/docs/images/OpenEXR_Reel_2020.png → website/images/OpenEXR_Reel_2020.png
diff --git a/docs/images/cubeMap.big.png → website/images/cubeMap.big.png b/docs/images/cubeMap.big.png → website/images/cubeMap.big.png
diff --git a/docs/images/cubeMap.png → website/images/cubeMap.png b/docs/images/cubeMap.png → website/images/cubeMap.png
diff --git a/docs/images/drawing.png → website/images/drawing.png b/docs/images/drawing.png → website/images/drawing.png
diff --git a/docs/images/envcube.png → website/images/envcube.png b/docs/images/envcube.png → website/images/envcube.png
diff --git a/docs/images/latlong.png → website/images/latlong.png b/docs/images/latlong.png → website/images/latlong.png
diff --git a/docs/images/latlongMap.big.png → website/images/latlongMap.big.png b/docs/images/latlongMap.big.png → website/images/latlongMap.big.png
diff --git a/docs/images/latlongMap.png → website/images/latlongMap.png b/docs/images/latlongMap.png → website/images/latlongMap.png
diff --git a/docs/images/openexr-fav.ico → website/images/openexr-fav.ico b/docs/images/openexr-fav.ico → website/images/openexr-fav.ico
diff --git a/docs/images/openexr-horizontal-color.png → website/images/openexr-horizontal-color.png b/docs/images/openexr-horizontal-color.png → website/images/openexr-horizontal-color.png
diff --git a/docs/images/openexr-logo.jpg → website/images/openexr-logo.jpg b/docs/images/openexr-logo.jpg → website/images/openexr-logo.jpg
diff --git a/docs/images/openexr-stacked-color.png → website/images/openexr-stacked-color.png b/docs/images/openexr-stacked-color.png → website/images/openexr-stacked-color.png
diff --git a/docs/images/screenwin.big.png → website/images/screenwin.big.png b/docs/images/screenwin.big.png → website/images/screenwin.big.png
diff --git a/docs/images/screenwin.png → website/images/screenwin.png b/docs/images/screenwin.png → website/images/screenwin.png
diff --git a/docs/images/tiles.big.png → website/images/tiles.big.png b/docs/images/tiles.big.png → website/images/tiles.big.png
diff --git a/docs/images/tiles.png → website/images/tiles.png b/docs/images/tiles.png → website/images/tiles.png
diff --git a/docs/images/twosamples.png → website/images/twosamples.png b/docs/images/twosamples.png → website/images/twosamples.png
diff --git a/docs/images/windowExample1.big.png → website/images/windowExample1.big.png b/docs/images/windowExample1.big.png → website/images/windowExample1.big.png
diff --git a/docs/images/windowExample1.png → website/images/windowExample1.png b/docs/images/windowExample1.png → website/images/windowExample1.png
diff --git a/docs/images/windowExample1.small.png → website/images/windowExample1.small.png b/docs/images/windowExample1.small.png → website/images/windowExample1.small.png
diff --git a/docs/images/windowExample2.big.png → website/images/windowExample2.big.png b/docs/images/windowExample2.big.png → website/images/windowExample2.big.png
diff --git a/docs/images/windowExample2.png → website/images/windowExample2.png b/docs/images/windowExample2.png → website/images/windowExample2.png
diff --git a/docs/index.rst → website/index.rst b/docs/index.rst → website/index.rst
diff --git a/docs/install.rst → website/install.rst b/docs/install.rst → website/install.rst
@@ -201,8 +201,8 @@ See the :doc:`PortingGuide` for details about differences from previous
 releases and how to address them. Also refer to the porting guide for
 details about changes to Imath.
 
-Building the Documentation
---------------------------
+Building the Website
+--------------------
 
 The OpenEXR technical documentation at `https://openexr.readthedocs.io
 <https://openexr.readthedocs.io>`_ is generated via `Sphinx

diff --git a/docs/license.rst → website/license.rst b/docs/license.rst → website/license.rst
diff --git a/docs/news.rst → website/news.rst b/docs/news.rst → website/news.rst
diff --git a/docs/requirements.txt → website/requirements.txt b/docs/requirements.txt → website/requirements.txt
diff --git a/docs/scripts/test_images.py → website/scripts/test_images.py b/docs/scripts/test_images.py → website/scripts/test_images.py
@@ -6,7 +6,7 @@
 #
 # Generate the "Test Images" page for the openexr.com website
 #
-# The file "docs/test_images.txt" contains urls for either .exr files
+# The file "website/test_images.txt" contains urls for either .exr files
 # or README.txt files from
 # https://github.com/AcademySoftwareFoundation/openexr-images. This
 # script processes them into .rst files with a main index listing all
@@ -24,7 +24,7 @@
 # Note that the README.rst files in the openexr-images repo are never
 # actually processed directly by sphinx.
 #
-# The generated .rst and .jpg files all go in the "docs/_test_images"
+# The generated .rst and .jpg files all go in the "website/_test_images"
 # directory underneath the source root. Ideally, these would go in the
 # build root, but sphinx expects all source content under a single
 # root.
@@ -293,19 +293,19 @@ def write_exr_to_index(index_file, repo, tag, exr_lpath, readme):
 
     # Examples:
     #    repo = 'https://raw.githubusercontent.com/cary-ilm/openexr-images'
-    #    tag = 'docs'
+    #    tag = 'website'
     #    exr_lpath = v2/LeftView/Ground.exr
 
-    test_images = 'docs/_test_images/'
-    output_dirname = test_images + os.path.dirname(exr_lpath)    # docs/_test_images/v2/LeftView
+    test_images = 'website/_test_images/'
+    output_dirname = test_images + os.path.dirname(exr_lpath)    # website/_test_images/v2/LeftView
     os.makedirs(output_dirname, exist_ok=True)
     base_path = os.path.splitext(exr_lpath)[0]                   # v2/LeftView/Ground
     exr_filename = os.path.basename(exr_lpath)                   # Ground.exr
     exr_basename = os.path.splitext(exr_filename)[0]             # Ground
     exr_dirname = os.path.dirname(exr_lpath)                     # v2/LeftView
-    rst_lpath = f'{test_images}{exr_dirname}/{exr_basename}.rst' # docs/_test_images/v2/LeftView/Ground.rst
+    rst_lpath = f'{test_images}{exr_dirname}/{exr_basename}.rst' # website/_test_images/v2/LeftView/Ground.rst
     jpg_rpath = f'{exr_dirname}/{exr_dirname.replace("/", "_")}_{exr_basename}.jpg'
-    jpg_lpath =  test_images + jpg_rpath                         # docs/_test_images/v2/LeftView/Ground.K@#YSDF.jpg
+    jpg_lpath =  test_images + jpg_rpath                         # website/_test_images/v2/LeftView/Ground.K@#YSDF.jpg
 
     exr_url = f'{repo}/{tag}/{exr_lpath}'
 
@@ -401,9 +401,9 @@ def write_table_close(index_file):
 
 try:
 
-    os.makedirs('docs/_test_images', exist_ok=True)
+    os.makedirs('website/_test_images', exist_ok=True)
 
-    with open('docs/_test_images/index.rst', 'w') as index_file:
+    with open('website/_test_images/index.rst', 'w') as index_file:
 
         index_file.write('Test Images\n')
         index_file.write('###########\n')
@@ -421,7 +421,7 @@ def write_table_close(index_file):
 
         # Process each url in the .txt file
 
-        with open('docs/test_images.txt', 'r') as test_images_file:
+        with open('website/test_images.txt', 'r') as test_images_file:
             for line in test_images_file.readlines():
 
                 if line.startswith('#'):
@@ -452,7 +452,7 @@ def write_table_close(index_file):
 
         # Write the toctree file, one entry per .exr page
 
-        with open('docs/_test_images/toctree.rst', 'w') as toctree_file:
+        with open('website/_test_images/toctree.rst', 'w') as toctree_file:
             toctree_file.write('..\n')
             toctree_file.write('  SPDX-License-Identifier: BSD-3-Clause\n')
             toctree_file.write('  Copyright Contributors to the OpenEXR Project.\n')

diff --git a/docs/source_images/blobs.png → website/source_images/blobs.png b/docs/source_images/blobs.png → website/source_images/blobs.png
diff --git a/docs/source_images/cubeMap.fig → website/source_images/cubeMap.fig b/docs/source_images/cubeMap.fig → website/source_images/cubeMap.fig
diff --git a/docs/source_images/dataDisplayWindow.fig → website/source_images/dataDisplayWindow.fig b/docs/source_images/dataDisplayWindow.fig → website/source_images/dataDisplayWindow.fig
diff --git a/docs/source_images/kapaa.png → website/source_images/kapaa.png b/docs/source_images/kapaa.png → website/source_images/kapaa.png
diff --git a/docs/source_images/latlongMap.fig → website/source_images/latlongMap.fig b/docs/source_images/latlongMap.fig → website/source_images/latlongMap.fig
diff --git a/docs/source_images/screenwin.fig → website/source_images/screenwin.fig b/docs/source_images/screenwin.fig → website/source_images/screenwin.fig
diff --git a/docs/source_images/still.png → website/source_images/still.png b/docs/source_images/still.png → website/source_images/still.png
diff --git a/docs/source_images/tiles.fig → website/source_images/tiles.fig b/docs/source_images/tiles.fig → website/source_images/tiles.fig
diff --git a/docs/source_images/windowExample1.fig → website/source_images/windowExample1.fig b/docs/source_images/windowExample1.fig → website/source_images/windowExample1.fig
diff --git a/docs/source_images/windowExample2.fig → website/source_images/windowExample2.fig b/docs/source_images/windowExample2.fig → website/source_images/windowExample2.fig
diff --git a/docs/src/file.cpp → website/src/file.cpp b/docs/src/file.cpp → website/src/file.cpp
diff --git a/docs/src/makePreviewImage.cpp → website/src/makePreviewImage.cpp b/docs/src/makePreviewImage.cpp → website/src/makePreviewImage.cpp
diff --git a/docs/src/mergeOverlappingSamples.cpp → website/src/mergeOverlappingSamples.cpp b/docs/src/mergeOverlappingSamples.cpp → website/src/mergeOverlappingSamples.cpp
diff --git a/docs/src/readDeepScanlineFile.cpp → website/src/readDeepScanlineFile.cpp b/docs/src/readDeepScanlineFile.cpp → website/src/readDeepScanlineFile.cpp
diff --git a/docs/src/readDeepTiledFile.cpp → website/src/readDeepTiledFile.cpp b/docs/src/readDeepTiledFile.cpp → website/src/readDeepTiledFile.cpp
diff --git a/docs/src/readGZ1.cpp → website/src/readGZ1.cpp b/docs/src/readGZ1.cpp → website/src/readGZ1.cpp
diff --git a/docs/src/readGZ2.cpp → website/src/readGZ2.cpp b/docs/src/readGZ2.cpp → website/src/readGZ2.cpp
diff --git a/docs/src/readHeader.cpp → website/src/readHeader.cpp b/docs/src/readHeader.cpp → website/src/readHeader.cpp
diff --git a/docs/src/readRgba1.cpp → website/src/readRgba1.cpp b/docs/src/readRgba1.cpp → website/src/readRgba1.cpp
diff --git a/docs/src/readRgba2.cpp → website/src/readRgba2.cpp b/docs/src/readRgba2.cpp → website/src/readRgba2.cpp
diff --git a/docs/src/readRgbaFILE.cpp → website/src/readRgbaFILE.cpp b/docs/src/readRgbaFILE.cpp → website/src/readRgbaFILE.cpp
diff --git a/docs/src/readTiled1.cpp → website/src/readTiled1.cpp b/docs/src/readTiled1.cpp → website/src/readTiled1.cpp
diff --git a/docs/src/readTiledRgba1.cpp → website/src/readTiledRgba1.cpp b/docs/src/readTiledRgba1.cpp → website/src/readTiledRgba1.cpp
diff --git a/docs/src/reader/CMakeLists.txt → website/src/reader/CMakeLists.txt b/docs/src/reader/CMakeLists.txt → website/src/reader/CMakeLists.txt
diff --git a/docs/src/reader/build.sh → website/src/reader/build.sh b/docs/src/reader/build.sh → website/src/reader/build.sh
diff --git a/docs/src/reader/reader.cpp → website/src/reader/reader.cpp b/docs/src/reader/reader.cpp → website/src/reader/reader.cpp
diff --git a/docs/src/splitVolumeSample.cpp → website/src/splitVolumeSample.cpp b/docs/src/splitVolumeSample.cpp → website/src/splitVolumeSample.cpp
diff --git a/docs/src/writeDeepScanlineFile.cpp → website/src/writeDeepScanlineFile.cpp b/docs/src/writeDeepScanlineFile.cpp → website/src/writeDeepScanlineFile.cpp
diff --git a/docs/src/writeDeepTiledFile.cpp → website/src/writeDeepTiledFile.cpp b/docs/src/writeDeepTiledFile.cpp → website/src/writeDeepTiledFile.cpp
diff --git a/docs/src/writeGZ1.cpp → website/src/writeGZ1.cpp b/docs/src/writeGZ1.cpp → website/src/writeGZ1.cpp
diff --git a/docs/src/writeGZ2.cpp → website/src/writeGZ2.cpp b/docs/src/writeGZ2.cpp → website/src/writeGZ2.cpp
diff --git a/docs/src/writeRgba1.cpp → website/src/writeRgba1.cpp b/docs/src/writeRgba1.cpp → website/src/writeRgba1.cpp
diff --git a/docs/src/writeRgba2.cpp → website/src/writeRgba2.cpp b/docs/src/writeRgba2.cpp → website/src/writeRgba2.cpp
diff --git a/docs/src/writeRgba3.cpp → website/src/writeRgba3.cpp b/docs/src/writeRgba3.cpp → website/src/writeRgba3.cpp
diff --git a/docs/src/writeRgbaMT.cpp → website/src/writeRgbaMT.cpp b/docs/src/writeRgbaMT.cpp → website/src/writeRgbaMT.cpp
diff --git a/docs/src/writeRgbaWithPreview1.cpp → website/src/writeRgbaWithPreview1.cpp b/docs/src/writeRgbaWithPreview1.cpp → website/src/writeRgbaWithPreview1.cpp
diff --git a/docs/src/writeRgbaWithPreview2.cpp → website/src/writeRgbaWithPreview2.cpp b/docs/src/writeRgbaWithPreview2.cpp → website/src/writeRgbaWithPreview2.cpp
diff --git a/docs/src/writeTiled1.cpp → website/src/writeTiled1.cpp b/docs/src/writeTiled1.cpp → website/src/writeTiled1.cpp
diff --git a/docs/src/writeTiledRgbaMIP1.cpp → website/src/writeTiledRgbaMIP1.cpp b/docs/src/writeTiledRgbaMIP1.cpp → website/src/writeTiledRgbaMIP1.cpp
diff --git a/docs/src/writeTiledRgbaMIP2.cpp → website/src/writeTiledRgbaMIP2.cpp b/docs/src/writeTiledRgbaMIP2.cpp → website/src/writeTiledRgbaMIP2.cpp
diff --git a/docs/src/writeTiledRgbaONE1.cpp → website/src/writeTiledRgbaONE1.cpp b/docs/src/writeTiledRgbaONE1.cpp → website/src/writeTiledRgbaONE1.cpp
diff --git a/docs/src/writeTiledRgbaONE2.cpp → website/src/writeTiledRgbaONE2.cpp b/docs/src/writeTiledRgbaONE2.cpp → website/src/writeTiledRgbaONE2.cpp
diff --git a/docs/src/writeTiledRgbaRIP1.cpp → website/src/writeTiledRgbaRIP1.cpp b/docs/src/writeTiledRgbaRIP1.cpp → website/src/writeTiledRgbaRIP1.cpp
diff --git a/docs/src/writer/CMakeLists.txt → website/src/writer/CMakeLists.txt b/docs/src/writer/CMakeLists.txt → website/src/writer/CMakeLists.txt
diff --git a/docs/src/writer/build.sh → website/src/writer/build.sh b/docs/src/writer/build.sh → website/src/writer/build.sh
diff --git a/docs/src/writer/writer.cpp → website/src/writer/writer.cpp b/docs/src/writer/writer.cpp → website/src/writer/writer.cpp
diff --git a/docs/test_images.txt → website/test_images.txt b/docs/test_images.txt → website/test_images.txt
diff --git a/docs/toc_redirect.rst → website/toc_redirect.rst b/docs/toc_redirect.rst → website/toc_redirect.rst
diff --git a/docs/tools.rst → website/tools.rst b/docs/tools.rst → website/tools.rst