nexusformat · PeterC-DLS · Jul 9, 2025 · Jul 8, 2025 · Jul 9, 2025
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ clean ::
 	$(RM) -rf ./source/$(BUILD_DIR)
 
 html:
-	$(SPHINX) -b html -W ./source/ ./source/$(BUILD_DIR)/html
+	$(SPHINX) -b html -W ./source/content ./source/$(BUILD_DIR)/html
 
 # for developer's use on local build host
 local ::

diff --git a/source/Makefile b/source/Makefile
@@ -5,7 +5,7 @@
 # from the environment for the first two.
 SPHINXOPTS    ?=
 SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = .
+SOURCEDIR     = content
 BUILDDIR      = _build
 
 # Put it first so that "make" without argument is like "make help".

diff --git a/source/_templates/sourcelink.html b/source/_templates/sourcelink.html
@@ -10,7 +10,7 @@
 {%- if show_source and has_source and sourcename %}
   <div role="note" aria-label="source link">
     <h3>{{ _('This Page') }}</h3>
-    <p>Have a Question? <a href="https://github.com/nexusformat/definitions/issues/new">Get help</a></p>
+    <p>Have a Question? <a href="https://github.com/nexusformat/wiki/issues/new">Get help</a></p>
     <ul class="this-page-menu">
     <style>
 		  .avatar-container {

diff --git a/source/content/ActiveProjects.md b/source/content/ActiveProjects.md
@@ -7,7 +7,7 @@ Active Projects
 ===============
 
 Developers are encouraged to list ongoing projects around NeXus on this page to enable collaboration in the active phase.
-Just issue a corresponding pull reguest to [this page](https://github.com/nexusformat/wiki/blob/master/content/ActiveProjects.md).
+Just issue a corresponding pull reguest to [this page](https://github.com/nexusformat/wiki/blob/master/source/content/ActiveProjects.md).
 Please also advertise your project on the
 [NeXus Mailing List](https://manual.nexusformat.org/mailinglist.html) for
 wider visibility.

diff --git a/source/content/CodeCamp2020-attendees.md b/source/content/CodeCamp2020-attendees.md
@@ -6,7 +6,7 @@ layout: wiki
 NeXus Code Camp - January 2020 - List of Attendees
 ==================================================
 
-<!-- # https://github.com/nexusformat/wiki/blob/master/content/CodeCamp2020.md -->
+<!-- # https://github.com/nexusformat/wiki/blob/master/source/content/CodeCamp2020.md -->
 
 | name | affiliation | country |
 | --- | --- | --- |

diff --git a/source/content/CodeCamp2020-topics.md b/source/content/CodeCamp2020-topics.md
@@ -6,7 +6,7 @@ layout: wiki
 NeXus Code Camp - January 2020 -- Topics
 ========================================
 
-<!-- #  https://github.com/nexusformat/wiki/blob/master/content/CodeCamp2020.md -->
+<!-- #  https://github.com/nexusformat/wiki/blob/master/source/content/CodeCamp2020.md -->
 
 ## purpose
 

diff --git a/source/content/CodeCamp2020.md b/source/content/CodeCamp2020.md
@@ -13,9 +13,9 @@ The code camp will take place at the [Advanced Photon Source](https://www.aps.an
 
 (We used an [online poll](https://doodle.com/poll/kf5xvbudzf2ccg6s) to help decide the exact dates.)
 
-<!-- #  https://github.com/nexusformat/wiki/blob/master/content/CodeCamp2020-attendees.md -->
+<!-- #  https://github.com/nexusformat/wiki/blob/master/source/content/CodeCamp2020-attendees.md -->
 
-<!-- #  https://github.com/nexusformat/wiki/blob/master/content/CodeCamp2020-topics.md -->
+<!-- #  https://github.com/nexusformat/wiki/blob/master/source/content/CodeCamp2020-topics.md -->
 
 <!-- # BTW: this is a comment line (https://stackoverflow.com/a/20885980/1046449) -->
 
@@ -33,7 +33,7 @@ Specific projects and tasks are described on the
 [GitHub issue tracker](https://github.com/nexusformat/definitions/milestones).
 Issues for consideration at 2020 NeXus Code Camp will be added to the Code Camp's
 [Topics page](https://www.nexusformat.org/CodeCamp2020-topics.html)
-([edit here](https://github.com/nexusformat/wiki/edit/master/content/CodeCamp2020-topics.md)).
+([edit here](https://github.com/nexusformat/wiki/edit/master/source/content/CodeCamp2020-topics.md)).
 These issues will be prioritized on the first day for handling at the Code Camp.
 
 (For more info on code camps, try searching Google for “code camp” or
@@ -317,4 +317,4 @@ definitions | [in release notes TOC, add link to each subsection](https://github
 
 -----------------------
 
-page source: [GitHub link](https://github.com/nexusformat/wiki/blob/master/content/CodeCamp2020.md)
+page source: [GitHub link](https://github.com/nexusformat/wiki/blob/master/source/content/CodeCamp2020.md)
diff --git a/source/content/Code_Camp_2015.md b/source/content/Code_Camp_2015.md
@@ -17,7 +17,7 @@ Location and Accommodation
 The event will take place at the [DESY
 Campus](https://www.openstreetmap.org/#map=17/53.57749/9.87851) in
 Hamburg. A PDF version of our site map can be found
-[here](../pdfs/NexusCodeCamp2015_map.pdf "wikilink").
+[here](pdfs/NexusCodeCamp2015_map.pdf "wikilink").
 
 ### Traveling
 

diff --git a/source/content/Muon_Time_Differential.md b/source/content/Muon_Time_Differential.md
@@ -8,14 +8,14 @@ Muon Time Differential
 
 The Instrument Definition for the Muon instruments has evolved from that
 proposed in 2001 to the more robust definition outlined in the linked
-[discussion document](../pdfs/Muon_V2R7.pdf).
+[discussion document](pdfs/Muon_V2R7.pdf).
 
 For completeness both are discussed in this document; however, the NIAC
 are asked to vote on and ratify the 'Muon Instrument Definition: Version
 2 - pulsedTD'
 
 Aspects of the Muon Definition either introduce new NeXus Classes or
 extend existing definitions. These are discussed separately in the
-[linked document](../pdfs/Elements_for_Muons.pdf), and the NIAC are asked
+[linked document](pdfs/Elements_for_Muons.pdf), and the NIAC are asked
 to separately consider and ratify these elements that are key to the
 Muon definition.
diff --git a/source/content/NIAC.md b/source/content/NIAC.md
@@ -188,24 +188,24 @@ Meetings
     ([minutes](NIAC2011_CodeCamp.html#Final_Report "wikilink"))
 -   [NIAC 2010](NIAC2010.html "wikilink") NeXus Code Camp and NIAC Meeting,
     ORNL, October 2010
-    ([minutes](../pdfs/Minutes_of_NeXus_Committee_2010.pdf "wikilink"))
+    ([minutes](pdfs/Minutes_of_NeXus_Committee_2010.pdf "wikilink"))
 -   [October 16-18 2009](NIAC2009.html "wikilink") NeXus Code Camp, hosted by
     APS, Chicago (Evanston, Illinois) (no minutes)
 -   [October 30-31, 2008](NIAC2008.html "wikilink") at ANSTO, Australia
-    ([minutes](../pdfs/NIAC2008_minutes.pdf "wikilink"))
+    ([minutes](pdfs/NIAC2008_minutes.pdf "wikilink"))
 -   [September 24-26, 2007](NIAC2007.html "wikilink") at HMI, Berlin, Germany
     ([online](NIAC2007_Minutes.html "wikilink") and [pdf
-    format](../pdfs/NIAC2007HMI_minutes.pdf "wikilink") minutes)
+    format](pdfs/NIAC2007HMI_minutes.pdf "wikilink") minutes)
 -   [October 5-6, 2006](NIAC2006LBL.html "wikilink") at LBL, Berkeley, CA,
-    USA ([minutes](../pdfs/NIAC2006LBL_minutes.pdf "wikilink"))
+    USA ([minutes](pdfs/NIAC2006LBL_minutes.pdf "wikilink"))
 -   [February 1-3, 2006](NIAC2006ILL.html "wikilink") at ILL, Grenoble,
-    France ([minutes](../pdfs/NIAC2006minutes.pdf "wikilink"))
+    France ([minutes](pdfs/NIAC2006minutes.pdf "wikilink"))
 -   April 26-28, 2005 at Bishops Lodge in Sante Fe, NM, USA
-    ([minutes](../pdfs/NIAC2005minutes.pdf "wikilink"))
+    ([minutes](pdfs/NIAC2005minutes.pdf "wikilink"))
 -   October 21-22, 2004 at PSI, Villigen, Switzerland
-    ([minutes](../pdfs/NeXusMinutes-Oct2004.pdf "wikilink"))
+    ([minutes](pdfs/NeXusMinutes-Oct2004.pdf "wikilink"))
 -   September 8-10, 2003 at Pasadena, CA, USA
-    ([minutes](../pdfs/NIAC2003Minutes.pdf "wikilink"))
+    ([minutes](pdfs/NIAC2003Minutes.pdf "wikilink"))
 
 NIAC Decisions sorted by Topic
 ------------------------------

diff --git a/source/content/NIAC2006LBL.md b/source/content/NIAC2006LBL.md
@@ -153,8 +153,8 @@ Minutes
 -------
 
 Here are the minutes in [pdf
-format](../pdfs/NIAC2006LBL_minutes.pdf "wikilink") or [MS-Word
-format](../pdfs/NIAC2006LBL_minutes.doc "wikilink").
+format](pdfs/NIAC2006LBL_minutes.pdf "wikilink") or [MS-Word
+format](pdfs/NIAC2006LBL_minutes.doc "wikilink").
 
 Photos
 ------

diff --git a/source/content/NIAC2007.md b/source/content/NIAC2007.md
@@ -135,7 +135,7 @@ All topics that are discussed within the whole group will meet in LS
     -   metaDTD vs Schema (XSD)
     -   Definition URL declaration
     -   Object oriented definitions, [ Marks
-        suggestion](../pdfs/NeXusOBJ.pdf "wikilink")
+        suggestion](pdfs/NeXusOBJ.pdf "wikilink")
     -   NeXusBeans
 
 ### Unscheduled
@@ -307,7 +307,7 @@ Minutes
 -------
 
 These are available [online](NIAC2007_Minutes.html "wikilink") or in [pdf
-format](../pdfs/NIAC2007HMI_minutes.pdf "wikilink").
+format](pdfs/NIAC2007HMI_minutes.pdf "wikilink").
 
 NIAC2007 photos
 ---------------

diff --git a/source/content/NIAC2007_Minutes.md b/source/content/NIAC2007_Minutes.md
@@ -6,7 +6,7 @@ layout: wiki
 NIAC2007 Minutes
 ================
 
-Version in [PDF](../pdfs/NIAC2007HMI_minutes.pdf "wikilink") format
+Version in [PDF](pdfs/NIAC2007HMI_minutes.pdf "wikilink") format
 
 NIAC meeting – HMI, Berlin (Germany) 24, 25, 26 September 2007
 --------------------------------------------------------------
@@ -245,7 +245,7 @@ general agreement that an object oriented type api is the way to go.
 Pete Petersons's talk – on URL's URI – version, implementation version
 e.g.
 
-`    `[`http://www.nexusformat.org/instruments/NXmonotas`](http://www.nexusformat.org/instruments/NXmonotas)
+> <https://www.nexusformat.org/NXmonotas-NIAC2006.html>
 
 Laurent suggested do not include the version in the uri. Freddie wanted
 to have a url and uri.

diff --git a/source/content/NIAC2008.md b/source/content/NIAC2008.md
@@ -76,7 +76,7 @@ Lunch
 -   Extending NXshape to handle [Constructive Solid Geometry
     (CSG)](http://en.wikipedia.org/wiki/Constructive_solid_geometry)
     descriptions of the instrument (see last part of
-    [MantidNeXusWorkspaceFormat](../pdfs/MantidNexusWorkspaceFormat.pdf "wikilink"))
+    [MantidNeXusWorkspaceFormat](pdfs/MantidNexusWorkspaceFormat.pdf "wikilink"))
 
 #### XML schema definitions
 
@@ -103,7 +103,7 @@ Lunch
     formats for all instrument classes?
 -   Proposal for storage of reduced data by the [Mantid
     project](http://www.mantidproject.org/) (see
-    [MantidNeXusWorkspaceFormat](../pdfs/MantidNexusWorkspaceFormat.pdf "wikilink"))
+    [MantidNeXusWorkspaceFormat](pdfs/MantidNexusWorkspaceFormat.pdf "wikilink"))
 
 #### Tech Group Breakout
 

diff --git a/source/content/NIAC2010.md b/source/content/NIAC2010.md
@@ -103,6 +103,6 @@ Agenda for NeXus International Advisory Committee Meeting
 Talks
 -----
 
--   [Mark Koennecke](../pdfs/Mark_Nexus_NIAC_2010.pdf "wikilink")
--   [Ray Osborn](../pdfs/NeXpy.pdf "wikilink")
+-   [Mark Koennecke](pdfs/Mark_Nexus_NIAC_2010.pdf "wikilink")
+-   [Ray Osborn](pdfs/NeXpy.pdf "wikilink")
 
diff --git a/source/content/NIAC2011_CodeCamp.md b/source/content/NIAC2011_CodeCamp.md
@@ -52,7 +52,7 @@ Meeting room is Building 401, Room B2100
 (\*) speakers for the working lunch include:
 
 -   Chris Jacobsen, APS (scientific lead, APS Data Exchange format)
-    ![](../pdfs/2011_10_20_nexus_heretics_v5.pdf "wikilink")
+    ![](pdfs/2011_10_20_nexus_heretics_v5.pdf "wikilink")
 -   Mark Koennecke, PSI (NeXus, chairman of NIAC)
 
 ### Friday, 2011 October 21
@@ -122,7 +122,7 @@ Items not currently on the project plan, but have arisen recently:
 
 1.  presentation about **cmake** (Freddie Akeroyd or Pete Peterson)
 2.  about **sphinx** for documentation (Pete Jemian) ![
-    PDF](../pdfs/2011-10-20_NeXus_manual_in_sphinx.pdf "wikilink")
+    PDF](pdfs/2011-10-20_NeXus_manual_in_sphinx.pdf "wikilink")
 3.  about **parallel HDF** (Mark Koennecke, anyone else with more
     experience?)
 4.  assessment of work to migrate from HDF 1.6 to HDF 1.8 (Freddie

diff --git a/source/content/NIACActionItems.md b/source/content/NIACActionItems.md
@@ -37,7 +37,7 @@ Generic Action Items
 
 ### In Progress
 
-From [2006 LBL Meeting](../pdfs/NIAC2006LBL_minutes.pdf "wikilink")
+From [2006 LBL Meeting](pdfs/NIAC2006LBL_minutes.pdf "wikilink")
 
 -   [Mark Könnecke] (Mark_Koennecke.html "wikilink") - to make a
     picture of his geometry
@@ -58,7 +58,7 @@ From [2006 LBL Meeting](../pdfs/NIAC2006LBL_minutes.pdf "wikilink")
 -   ALL - check old <http://www.nexus.anl.gov> web site and report any
     content that has not been moved to new WIKI server
 
-From [2006 ILL Meeting](../pdfs/NIAC2006minutes.pdf "wikilink")
+From [2006 ILL Meeting](pdfs/NIAC2006minutes.pdf "wikilink")
 
 -   [Peter Peterson] (Peter_Peterson.html "wikilink") - Write down the
     current responsibilities for the officers and circulate to the
@@ -80,7 +80,7 @@ From [2007 HMI-Wannsee, Berlin Meeting](NIAC2007.html "wikilink")
 -   Pete Jemian - Update website with constitution changes (some are
     even from the last meeting)
 
-From [2006 LBL Meeting](../pdfs/NIAC2006LBL_minutes.pdf "wikilink")
+From [2006 LBL Meeting](pdfs/NIAC2006LBL_minutes.pdf "wikilink")
 
 -   [Frederick Akeroyd] (Freddie_Akeroyd.html "wikilink") - to move
     NeXus code and definitions from CVS to Subversion
@@ -98,7 +98,7 @@ From [2006 LBL Meeting](../pdfs/NIAC2006LBL_minutes.pdf "wikilink")
 -   [Peter Peterson] (Peter_Peterson.html "wikilink") - to write up the
     versioning mechanism
 
-From [2006 ILL Meeting](../pdfs/NIAC2006minutes.pdf "wikilink")
+From [2006 ILL Meeting](pdfs/NIAC2006minutes.pdf "wikilink")
 
 -   Unassigned - NXcharacterization needs to be formalized and
     ratified - this has been repeated in

diff --git a/source/content/NeXus_CIF_Integration.md b/source/content/NeXus_CIF_Integration.md
@@ -80,7 +80,7 @@ To Discuss
 ### CIF-NeXus Presentation
 
 The draft for the NeXus CIF presentation can be downloaded here:
-[CIFNeXus.pdf](../pdfs/CIFNexus.pdf "wikilink"). May be we get a chance to discuss
+[CIFNeXus.pdf](pdfs/CIFNexus.pdf "wikilink"). May be we get a chance to discuss
 this on the next Telco.
 
 Details of how NeXus and CDF might be mapped are contained on the

diff --git a/source/content/OO-NeXus.md b/source/content/OO-NeXus.md
@@ -47,7 +47,7 @@ NeXus-API and object oriented definitions:
 This means to perform a full object oriented analysis of the NeXus base
 classes using polymorphism and inheritance. This was suggested by Darren
 Kelly at the NIAC meeting 2006 at ILL. An example of a [possible class
-hierarchy](../pdfs/NeXusOBJ.pdf "wikilink") was given by Mark Koennecke at
+hierarchy](pdfs/NeXusOBJ.pdf "wikilink") was given by Mark Koennecke at
 the NIAC meeting 2007 at HMI. There are some advantages to this
 approach:
 

diff --git a/source/content/TOFRaw.md b/source/content/TOFRaw.md
@@ -34,7 +34,7 @@ format as well as a [basic
 DTD](http://download.nexusformat.org/TOFRAW/examples/TOFRAW.xml).
 
 For historical information see the [draft proposal for an ISIS NeXus
-based RAW data file format](../pdfs/Isis_nexus_016.pdf "wikilink").
+based RAW data file format](pdfs/Isis_nexus_016.pdf "wikilink").
 
 Goal of the Definition
 ----------------------

diff --git a/source/content/Telco_20230213.md b/source/content/Telco_20230213.md
@@ -58,8 +58,8 @@ Conclusion: processing results shall be stored separately, but their structure c
 SB: documentation is important, NIAC shall not accept poor definition files  
 SB: NXdata base class also has offset and scaling_factor Fields  
 BW: MK added @offset, @scaling, @transformation without documentation in the nxdl file, but refferrng to 2010 NIAC. See:  
-[minutes of 2010 NIAC](https://github.com/nexusformat/wiki/blob/master/content/NIAC2010.html) and  
-[all NIAC meetings](https://www.nexusformat.org/NIAC.html) and  
+[minutes of 2010 NIAC](NIAC2010.html) and  
+[all NIAC meetings](NIAC.html) and  
 [specific details of 2010 NIAC](http://lns00.psi.ch/nexus2010/)  
 PJ: it seems it was used for something like NXtransformations now, but documentation in the nxdl files is necessary for proper understanding  
 SB action point for Code-CAMP: check the original intent and review (maybe depricate it)

diff --git a/source/conf.py → source/content/conf.py b/source/conf.py → source/content/conf.py
@@ -19,8 +19,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 # add the abs path to the custom extension for collecting the contributor variables from the rst files
-sys.path.insert(0, os.path.abspath('../dev_tools/ext'))
-sys.path.insert(0, os.path.abspath("content"))
+sys.path.insert(0, os.path.abspath('../../dev_tools/ext'))
 
 # Specify the master document
 master_doc = "index"  # Path relative to the source directory
@@ -57,7 +56,7 @@
 }
 
 # Add any paths that contain _templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['../_templates']
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -76,7 +75,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['../_static']
 html_file_suffix = ".html"
 
 # Add extra files