Skip to content

Commit f36d026

Browse files
committed
Merge origin/develop: add CPEX0049, fix URLs and Sphinx warnings, update CGNS submodule
2 parents b581639 + abef015 commit f36d026

21 files changed

Lines changed: 112 additions & 20 deletions

conf.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@
5959
'version': ('https://github.com/CGNS/CGNS/releases/tag/%s', 'version%s')}
6060

6161
#suppress_warnings = [ 'image.not_readable' ]
62-
suppress_warnings = ['autosectionlabel.*']
62+
suppress_warnings = ['autosectionlabel.*', 'ref.identifier', 'ref.ref']
63+
64+
# Note: ref.ref warnings from Doxygen-generated content (cgnslib_8h references
65+
# in c_api.rst doxygengroup directives) cannot be fixed with RST labels.
66+
# All other ref.ref warnings have been fixed by adding proper label targets.
6367

6468
# Add any paths that contain templates here, relative to this directory.
6569
templates_path = ['_templates']
460 KB
Binary file not shown.

source/current/CPEX.rst

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Comments on proposals should be submitted either to the `CGNSTalk Github Discuss
6161

6262
..
6363
_Comment: Below should be listed all CPEX implemented or waiting for review
64-
.. _CPEX0048:
64+
.. _CPEX0050:
6565

6666
CPEX0050
6767
--------
@@ -88,6 +88,33 @@ CPEX0050
8888
* - MLL Status
8989
- proposal under review
9090

91+
.. _CPEX0049:
92+
93+
CPEX0049
94+
--------
95+
96+
.. list-table::
97+
:stub-columns: 1
98+
99+
* - CPEX#
100+
- 0049
101+
* - Scope
102+
- Compatibility version control for improved interoperability
103+
* - Contacts
104+
- M. Scot Breitenfeld
105+
* - Documentation
106+
- :download:`CPEX-0049-compat-version.pdf <../../proposed_extensions/CPEX-0049-compat-version.pdf>`
107+
* - Date First Posted
108+
- Mar.28.26
109+
* - Date of Last Revision
110+
- Mar.28.26
111+
* - SIDS Status
112+
- proposed
113+
* - Filemap Status
114+
- proposed
115+
* - MLL Status
116+
- proposed
117+
91118
.. _CPEX0048:
92119

93120
CPEX0048

source/general/FAQ.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ In a directory (Noting item #4 of the `Prerequisites`_) download the HDF5 source
171171

172172
.. code-block:: console
173173
174-
git clone https://bitbucket.hdfgroup.org/scm/hdffv/hdf5.git
174+
git clone https://github.com/HDFGroup/hdf5.git
175175
176176
Copy three files in the HDF5 source directory hdf5\config\cmake\scripts to the current directory.
177177

source/general/glossary.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Glossary
3030

3131
Python
3232
Programming language, widely used for web tools.
33-
See `Python reference site <http:///www.python.org/>`_.
33+
See `Python reference site <https://www.python.org/>`_.
3434

3535
ReST
3636
The **Restructured Text** syntax is a simple documentation syntax.

source/general/history.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ participants from 20 different countries and at least 79 different
2929
organizations.
3030

3131
The software continues to be actively develop by many contributors
32-
to the CGNS git repository on `Github <http://www.github.com/CGNS/CGNS>`_
32+
to the CGNS git repository on `Github <https://github.com/CGNS/CGNS>`_
3333

3434
Several extensions to CGNS have been formally proposed. Documentation
3535
supporting these extensions, and information on their current status,

source/general/overview.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ begin with the current Overview document, or, if they require more
516516
detailed information, the AIAA papers listed above. Beyond that, most
517517
will find a quick read of the :ref:`SIDS File Mapping Manual <StandardFMM>` (or
518518
enlightening as to the logical form of the contents of CGNS
519-
files. Browsing the :ref:`figures in the File Mapping Manual<StandardFMMfigs>`, as well as the
519+
files. Browsing the :ref:`figures in the File Mapping Manual<StandardFMMFigures>`, as well as the
520520
:ref:`SIDS <CGNS-SIDS>` itself, will provide some feel for the scope of the system. The
521521
:ref:`User's Guide to CGNS <DocUserGuide>`, and the CGNS :ref:`Mid-Level Library <StandardMLL>`
522522
document should indicate what might be required to implement CGNS in a

source/governance/committee.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ The CGNS Steering Committee supports and even encourages
270270
the evolution of the standard for CGNS to remain useful. Therefore, the committee
271271
must solicit technical support and "in-kind" contributions. In
272272
addition, the Steering Committee must follow the policies described in
273-
the section of this document on :ref:`standard_Changes-ref <Changes or Additions>`
273+
the section of this document on :ref:`Changes or Additions <standard_Changes-ref>`
274274
to the Standard regarding the collection and evaluation of technical proposals.
275275

276276
.. _mission_Promote_the_acceptance-ref:

source/governance/support.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Building libraries and tools
4343
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4444

4545
The CGNS libs and tools are hosted on Github; the associated documentation
46-
can be found on `this page <http://www.github.com/CGNS/CGNS>`_.
46+
can be found on `this page <https://github.com/CGNS/CGNS>`_.
4747

4848
Building the documentation
4949
^^^^^^^^^^^^^^^^^^^^^^^^^^

source/standard/CGNS_CGIO.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Glossary of Terms
118118

119119
:Parent: A node that has subnodes directly associated with it.
120120

121-
:Pathname: Within a database, nodes can be referenced using the name of a node along with its parent ID, or by using a "pathname" whose syntax is roughly the same as a path name in the UNIX environment. A pathname that begins with a leading slash "/" is assumed to begin at the root node of the file. If no leading slash is given, the name is assumed to begin at the node specified by the parent ID. Although there is a 32-character limitation on the node Name, there is no restriction on the length of the pathname. For example, equivalent ways to refer to node N8 in the hierarchy in the :ref:`example database` figure are:
121+
:Pathname: Within a database, nodes can be referenced using the name of a node along with its parent ID, or by using a "pathname" whose syntax is roughly the same as a path name in the UNIX environment. A pathname that begins with a leading slash "/" is assumed to begin at the root node of the file. If no leading slash is given, the name is assumed to begin at the node specified by the parent ID. Although there is a 32-character limitation on the node Name, there is no restriction on the length of the pathname. For example, equivalent ways to refer to node N8 in the hierarchy in the :ref:`example database <ExampleNodeDatabase>` figure are:
122122

123123
- Node-ID for N6 and name = "N8"
124124
- Node-ID for N4 and name = "N6/N8"

0 commit comments

Comments
 (0)