Skip to content

Commit 1013f0d

Browse files
authored
Update documentation links and fix minor typos across multiple files (MetOffice#467)
Correct various documentation links to reflect the proper repository name and fix minor typographical errors throughout the codebase. Addresses some of issues in MetOffice#329
1 parent f482d35 commit 1013f0d

22 files changed

Lines changed: 113 additions & 104 deletions

File tree

Documentation/Design/GraphObject.puml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ object fileSink02 {
137137
}
138138
link02 -> fileSink02
139139

140-
@end uml
140+
@enduml

Documentation/source/advanced_config.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ could be helpful to factor out the commonality into a shared module. Remember,
2323
your build configuration is just a Python script at the end of the day.
2424

2525
In Fab's
26-
`example configurations <https://github.com/metomi/fab/tree/master/run_configs>`_,
26+
`example configurations <https://github.com/MetOffice/fab/tree/main/run_configs>`_,
2727
we have two build scripts to compile GCOM. Much of the configuration for these
2828
two scripts is identical. We extracted the common steps into
29-
`gcom_build_steps.py <https://github.com/metomi/fab/blob/master/run_configs/gcom/gcom_build_steps.py>`_
29+
`gcom_build_steps.py <https://github.com/MetOffice/fab/blob/main/run_configs/gcom/gcom_build_steps.py>`_
3030
and used them in
31-
`build_gcom_ar.py <https://github.com/metomi/fab/blob/master/run_configs/gcom/build_gcom_ar.py>`_
31+
`build_gcom_ar.py <https://github.com/MetOffice/fab/blob/main/run_configs/gcom/build_gcom_ar.py>`_
3232
and
33-
`build_gcom_so.py <https://github.com/metomi/fab/blob/master/run_configs/gcom/build_gcom_so.py>`_.
33+
`build_gcom_so.py <https://github.com/MetOffice/fab/blob/main/run_configs/gcom/build_gcom_so.py>`_.
3434

3535

3636
Separate grab and build scripts
@@ -289,7 +289,7 @@ will be affected consistently.
289289

290290

291291
Tool arguments
292-
==============
292+
==============
293293

294294
Sometimes it is necessary to pass additional arguments when we call a software
295295
tool.
@@ -398,13 +398,13 @@ We can currently only *add* flags for a path.
398398
This can require some understanding of where and when files are placed in
399399
the *build_output* folder: It will generally match the structure you've
400400
created in ``*<project workspace>/source*``, with your grab steps.
401-
401+
402402
Early steps like preprocessors generally read files from ``*source*`` and
403403
write to ``*build_output*``.
404-
404+
405405
Later steps like compilers generally read files which are already in
406406
``*build_output*``.
407-
407+
408408
For more information on where files end up see :ref:`Directory Structure`.
409409

410410

@@ -608,7 +608,7 @@ Custom Step
608608
An alternative approach for some problems is to write a custom step to modify
609609
the source so that the language parser can process it. Here's a simple example,
610610
based on a
611-
`real workaround <https://github.com/metomi/fab/blob/216e00253ede22bfbcc2ee9b2e490d8c40421e5d/run_configs/um/build_um.py#L42-L65>`_
611+
`real workaround <https://github.com/MetOffice/fab/blob/216e00253ede22bfbcc2ee9b2e490d8c40421e5d/run_configs/um/build_um.py#L42-L65>`_
612612
where the parser gets confused by a variable called `NameListFile`.
613613

614614
.. code-block::

Documentation/source/conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
#
1313
import os
1414
import sys
15+
1516
from fab import __version__ as fab_version
17+
1618
sys.path.insert(0, os.path.abspath('../../source'))
1719

1820

@@ -73,7 +75,7 @@
7375
"icon_links": [
7476
{
7577
"name": "GitHub",
76-
"url": "https://github.com/metomi/fab",
78+
"url": "https://github.com/MetOffice/fab",
7779
"icon": "fa-brands fa-github"
7880
}
7981
],

Documentation/source/development.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This lets you edit the code without needing to reinstall fab after every change.
1919

2020
.. code-block:: console
2121
22-
$ git clone https://github.com/metomi/fab.git <fab-folder>
22+
$ git clone https://github.com/MetOffice/fab.git <fab-folder>
2323
$ pip install -e <fab-folder>
2424
2525
@@ -138,7 +138,7 @@ Build these docs
138138

139139
The github action to build the docs is defined in
140140
``.github/workflows/build_docs.yml``. It is manually triggered and can be run
141-
from any branch in the metomi repo.
141+
from any branch in the MetOffice repo.
142142

143143
You can also run it on your fork to produce a separate build, for viewing work
144144
in progress.

Documentation/source/environment.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ preferable to use one of the managed packages.
4141
Packages are made available through `PyPI`_ and `Conda forge`_ and are installed
4242
in the usual way for these services. Some examples follow.
4343

44-
.. _source: https://github.com/metomi/fab
44+
.. _source: https://github.com/MetOffice/fab
4545
.. _PyPI: https://pypi.org/project/sci-fab/
4646
.. _Conda forge: https://anaconda.org/conda-forge/sci-fab
4747

@@ -74,8 +74,8 @@ If you want to compile C you will need to add the prerequisites for that:
7474
7575
$ pip install python-clang
7676
77-
Note that this requires a suitible `libclang` to be installed on your system
78-
which may require system administrator internvention.
77+
Note that this requires a suitable `libclang` to be installed on your system
78+
which may require system administrator intervention.
7979

8080
Finally, to get plots from the metrics you will need:
8181

@@ -90,7 +90,7 @@ Using Anaconda
9090
--------------
9191

9292
Anaconda can be used in a similar way to the built in Python virtual
93-
environemnt but can also handle your C needs:
93+
environment but can also handle your C needs:
9494

9595
.. code-block:: console
9696
@@ -118,7 +118,7 @@ And again, if you want to plot the build metrics:
118118
Using Containers
119119
----------------
120120

121-
The dockerfile in `envs/docker`_ can be used to create a suitible container for
121+
The dockerfile in `envs/docker`_ can be used to create a suitable container for
122122
running Fab:
123123

124124
.. code-block:: console
@@ -129,4 +129,4 @@ running Fab:
129129
This was tested on Windows, running Ubuntu in WSL but is not regularly tested
130130
so can not be guaranteed.
131131

132-
.. _envs/docker: https://github.com/metomi/fab/tree/master/envs/docker
132+
.. _envs/docker: https://github.com/MetOffice/fab/tree/main/envs/docker

Documentation/source/features.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Limitations
8282
===========
8383

8484
Known problems at the time of writing. For further issues see the
85-
`issue tracker <https://github.com/metomi/fab/issues>`_.
85+
`issue tracker <https://github.com/MetOffice/fab/issues>`_.
8686

8787
Fortran single-line IF calls
8888
----------------------------
@@ -98,7 +98,7 @@ Name Clash
9898

9999
Fab currently assumes there are no name clashes in your project by the time we reach certain build steps:
100100

101-
- C and Fortran symbols go into one symbol table so there can be no duplicate
101+
- C and Fortran symbols go into one symbol table so there can be no duplicate
102102
symbol names by the time we reach the analysis stage.
103103
- Fortran mod files are created in a flat folder, so Fortran module names must
104104
be unique by the time we reach the compile stage.
@@ -122,4 +122,4 @@ override). It will *not* notice if a Fortran `*.mod` changes in an include
122122
folder elsewhere.
123123

124124
An example is the UM build which uses GCom's mpl.mod. This issue is raised in
125-
`#192 <https://github.com/metomi/fab/issues/192>`_.
125+
`#192 <https://github.com/MetOffice/fab/issues/192>`_.

Documentation/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ Config files
6161

6262
See also
6363
========
64-
* `Project wiki <https://github.com/metomi/fab/wiki>`_
64+
* `Project wiki <https://github.com/MetOffice/fab/wiki>`_
6565
* `Fab on PyPI <https://pypi.org/project/sci-fab/>`_
66-
* `Fab on Github <https://github.com/metomi/fab>`_
66+
* `Fab on Github <https://github.com/MetOffice/fab>`_
6767
* :ref:`Developers guide<Development>`
6868

6969

Documentation/source/metoffice.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Singularity Container
4747

4848
You can run Fab in a singularity container as follows::
4949

50-
singularity run oras://$URL/metomi/fab/MyImage:latest
50+
singularity run oras://$URL/MetOffice/fab/MyImage:latest
5151

5252
The necessary URL is that normally used with singularity. Ask Science I.T. for
5353
details.
@@ -115,12 +115,12 @@ so that changes you make are immediately available through the environment.
115115
$ pip install --editable $FAB_WORKING_COPY
116116
117117
118-
Mixing Conda and Environemnt Modules
118+
Mixing Conda and Environment Modules
119119
------------------------------------
120120

121121
In order to have both an environment capable of building C files and modern
122122
Fortran compilers and the LFRic library stack you will need an awkward
123-
amalgemation of conda environment and environment modules.
123+
amalgamation of conda environment and environment modules.
124124

125125
The conda environment is created as follows:
126126

@@ -165,7 +165,7 @@ to be that in the conda environment.
165165
Rose
166166
----
167167
Various configs for building projects using Rose on SPICE can be found in
168-
`run_configs <https://github.com/metomi/fab/tree/master/run_configs>`_.
168+
`run_configs <https://github.com/MetOffice/fab/tree/main/run_configs>`_.
169169

170170

171171
.. _MetOfficeDevelopment:
@@ -192,12 +192,12 @@ The config file in envs/picasso defines the contents of a Singularity image
192192
which is built by the experimental Picasso app. We can build this image using a
193193
GitHub action, defined in ``.github/workflows/picasso_build.yml``.
194194

195-
This action is manually triggered. You have to push a branch to the metomi repo,
195+
This action is manually triggered. You have to push a branch to the MetOffice repo,
196196
not a fork, then you can trigger the action from your branch. Please remember
197197
to clean up the branch when you're finished.
198198

199199
You can see the image in artefactory
200-
`here <https://metoffice.jfrog.io/ui/repos/tree/General/docker-local/picasso/metomi/fab/MyImage>`_.
200+
`here <https://metoffice.jfrog.io/ui/repos/tree/General/docker-local/picasso/MetOffice/fab/MyImage>`_.
201201

202202

203203
See also

Documentation/source/site-specific-config.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ the user explicitly puts a tool into the ToolBox).
3737
compile, or a hard-coded set of criteria) which compiler to use.
3838

3939
Category
40-
==========
40+
========
4141
All possible categories are defined in
4242
:class:`~fab.tool.category.Category`. If additional categories
4343
should be required, they can be added.
@@ -218,4 +218,4 @@ instance in the Tool Repository
218218
Also, a lot of content in this chapter is not actually about site-specific
219219
configuration. This should likely be renamed or split (once we
220220
have details about the using site-specific configuration, which might be
221-
once the Baf base script is added to Fab).
221+
once the Baf base script is added to Fab).

Documentation/source/writing_config.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ before you run the :func:`~fab.steps.analyse.analyse` step below.
141141
* For :func:`~fab.steps.psyclone.psyclone`:
142142
You can pass in:
143143

144-
* kernel file roots to `kernel_roots`,
145-
* a function to get transformation script to `transformation_script`
144+
* kernel file roots to `kernel_roots`,
145+
* a function to get transformation script to `transformation_script`
146146
(see examples in ``~fab.run_configs.lfric.gungho.py`` and ``~fab.run_configs.lfric.atm.py``),
147147
* command-line arguments to `cli_args`,
148-
* override for input files to `source_getter`,
148+
* override for input files to `source_getter`,
149149
* folders containing override files to `overrides_folder`.
150150

151151

@@ -271,7 +271,7 @@ ArtefactStore
271271
=============
272272
Each build configuration contains an artefact store, containing various
273273
sets of artefacts. The artefact sets used by Fab are defined in the
274-
enum :class:`~fab.artefacts.ArtefactSet`. The most important sets are ``FORTRAN_BUILD_FILES``,
274+
enum :class:`~fab.artefacts.ArtefactSet`. The most important sets are ``FORTRAN_BUILD_FILES``,
275275
``C_BUILD_FILES``, which will always contain all known source files that
276276
will need to be analysed for dependencies, compiled, and linked. All existing
277277
steps in Fab will make sure to maintain these artefact sets consistently,
@@ -333,4 +333,4 @@ More advanced configuration topics are discussed in
333333
:ref:`Advanced Config`.
334334

335335
You can see more complicated configurations in the
336-
`developer testing directory <https://github.com/metomi/fab/tree/master/run_configs>`_.
336+
`developer testing directory <https://github.com/MetOffice/fab/tree/main/run_configs>`_.

0 commit comments

Comments
 (0)