Skip to content

Commit c6e4436

Browse files
authored
Merge pull request #23 from ISISComputingGroup/update_user_manual_links
Update user manual links
2 parents 5c75d6b + 59d57a5 commit c6e4436

File tree

19 files changed

+32
-25
lines changed

19 files changed

+32
-25
lines changed

doc/Providing-Support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ There are a number of tips for [trouble shooting](#all_troubleshooting_links) al
132132
1. I can't use this button to get to more details/why doesn't this bit of the OPI work
133133
- Check they are in manager mode
134134
1. I need to add this device to my system
135-
- Check [the user manual](https://github.com/ISISComputingGroup/ibex_user_manual/wiki) for IBEX, for SECI, if you don't know already ask someone else
135+
- Check {external+ibex_user_manual:doc}`the user manual <index>` for IBEX, for SECI, if you don't know already ask someone else
136136
1. My motor won't move
137137
- Are both limits made?
138138
- Yes: Something has happened in the physical realm, refer it to EUSG via the MCR
@@ -178,7 +178,7 @@ There are a number of tips for [trouble shooting](#all_troubleshooting_links) al
178178
<summary>Script issues</summary>
179179

180180
1. My script won't load
181-
- If `g.load_script` is being used and you see errors of the form `E: 1: error description (error-name)`, these errors are coming from the linter. Detailed linter troubleshooting is available [here](https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Error-Checking-Troubleshooting).
181+
- If `g.load_script` is being used and you see errors of the form `E: 1: error description (error-name)`, these errors are coming from the linter. Detailed linter troubleshooting is available {external+ibex_user_manual:doc}`here <scripting/Error-Checking-Troubleshooting>`.
182182
1. My script isn't behaving in the way I expect it to
183183
- This is a best efforts, and not everyone can provide the same level of support
184184
- Look at it with respect to basic coding standards and obvious race condition points

doc/conf.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,8 @@
9797
"client/getting_started/GUI-Development-Workflow": "../../processes/git_and_github/Git-workflow.html", # noqa E501
9898
"client/testing/Using-Mockito-for-Testing-in-the-GUI": "Mockito.html",
9999
}
100+
101+
intersphinx_mapping = {
102+
"ibex_user_manual": ("https://isiscomputinggroup.github.io/ibex_user_manual/", None),
103+
}
104+

doc/deployment/Creating-a-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Project is ready to be released not for a specific event, e.g. at the end of a s
7272
1. Update the "Latest Stable Release" link on the [IBEX wiki homepage](https://github.com/ISISComputingGroup/IBEX) to be the new `"Release X.x.m"` and commit to master.
7373
1. Remove all entries from `Upcoming Release Notes`, leaving a blank file with only the headers, e.g. "Instrument Specific Changes", etc. and commit to master.
7474
1. If applicable, update the dependencies since the last release and add them to the bottom of the release notes. To find the python dependencies list, run a `pip freeze` on a cleanly released `uktena`. Note that you will need to specify the scripts directory to run pip commands. i.e. `C:\Instrument\Apps\Python3\Scripts\Pip.exe freeze`
75-
1. Update the [user manual](https://github.com/ISISComputingGroup/ibex_user_manual/wiki) with any relevant changes
75+
1. Update the {external+ibex_user_manual:doc}`user manual <index>` with any relevant changes
7676
1. copy the release to `control-svcs`, this is so we can set git remotes for hotfixes etc. as part of the deploy. So if release is number 1.2.3
7777
- `robocopy "Kits$\CompGroup\ICP\Releases\1.2.3\EPICS\.git" "\\control-svcs.nd.rl.ac.uk\git$\releases\1.2.3\EPICS.git" /mir /nfl /ndl`
7878
- edit `EPICS.git\config` on the control-svcs version (you can browse straight to the `\\control-svcs` share above)

doc/deployment/deploy/Configure-Mini-Inst.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
To install a mini inst, you need to install the EPICS backend and add the following in the `\NDXxxxxx\configurations\` area.
44

55
- `startup.txt`: contains a list of the IOCs to start (use the IOC name as in the IOCs list)
6-
- `globals.txt`: add macro values you want the IOCs in `startup.txt` to start up with. [To do this, add a line per macro of the format `<IOC_name>__<macro_name>=<macro_value>`](https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Create-and-Manage-Configurations#editing-a-global-setting)
6+
- `globals.txt`: add macro values you want the IOCs in `startup.txt` to start up with. To do this, {external+ibex_user_manual:ref}`add a line per macro of the format <manage_configs_globals>` `<IOC_name>__<macro_name>=<macro_value>`.
77

88
### Startup and shutdown
99

1010
You can start up the mini inst using the normal `start_ibex_server` and stop it with `stop_ibex_server`. It will look for the `startup.txt` and start up the mini inst instead of the full IBEX server if it exists.
1111

1212
### Updating config
1313

14-
If you update a configuration in [globals.txt](https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Create-and-Manage-Configurations#editing-a-global-setting) then don't forget to restart the IOC. This can be done either by running `start_ibex_server` but it is more efficient to console to the IOC and restart it using `ctrl+x`.
14+
If you update a configuration in {external+ibex_user_manual:ref}`globals.txt <manage_configs_globals>` then don't forget to restart the IOC. This can be done either by running `start_ibex_server` but it is more efficient to console to the IOC and restart it using `ctrl+x`.
1515

1616
### Adding Devices
1717

doc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ Processes
5252
## External Documentation
5353

5454
- [IBEX project wiki](https://github.com/isiscomputinggroup/ibex/wiki)
55-
- [IBEX user manual](https://github.com/isiscomputinggroup/ibex_user_manual/wiki)
55+
- {external+ibex_user_manual:doc}`IBEX user manual <index>`
5656
- [Python shared scripts (also known as shared instrument scripts)](https://github.com/ISISNeutronMuon/InstrumentScripts/wiki)
5757
- [Scientific Advisory Group (sharepoint)](https://stfc365.sharepoint.com/sites/IBEXSAG)

doc/overview/Links-and-Resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
## Links
2727

2828
- [IBEX wiki](https://github.com/ISISComputingGroup/IBEX/wiki)
29-
- [IBEX User Manual](https://github.com/ISISComputingGroup/ibex_user_manual/wiki)
29+
- {external+ibex_user_manual:doc}`IBEX user manual <index>`
3030
- [IBEX Project Board for Issues](https://github.com/ISISComputingGroup/IBEX/projects/1)
3131
- [Stream Protocol Page](http://epics.web.psi.ch/software/streamdevice/doc/)
3232
- [genie_python reference](http://shadow.nd.rl.ac.uk/genie_python/sphinx/genie_python.html)

doc/overview/New-Starters.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ Here's some useful bits and bobs for how our team operates and the conventions w
8181

8282
While that's installing, get to know the IBEX components. Get to know EPICS. It's the software environment that IBEX uses to control the ISIS instruments.
8383

84-
Ironically, to get a well-explained overview of what IBEX is, and how to interact with it as a dev, the [IBEX User Manual](https://github.com/ISISComputingGroup/ibex_user_manual/wiki) is a really nice place to start. In particular, see:
84+
Ironically, to get a well-explained overview of what IBEX is, and how to interact with it as a dev, the {external+ibex_user_manual:doc}`IBEX user manual <index>` is a really nice place to start. In particular, see:
8585

86-
- [IBEX Key Concepts](https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Key-Concepts-in-IBEX)
87-
- [IBEX GUI Features](https://github.com/ISISComputingGroup/ibex_user_manual/wiki/IBEX-GUI-Features)
88-
- [How To Do Things In IBEX](https://github.com/ISISComputingGroup/ibex_user_manual/wiki/How-To-Do-Things-In-IBEX)
86+
- {external+ibex_user_manual:doc}`IBEX Key Concepts <Key-Concepts-in-IBEX>`
87+
- {external+ibex_user_manual:doc}`IBEX-GUI-Features`
88+
- {external+ibex_user_manual:doc}`How To Do Things In IBEX <How-To>`
8989

9090
There are some training materials available that we use to train scientists on IBEX, which is also a nice way to get started:
9191

doc/processes/dev_processes/Project-Documentation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
We have three wikis:
44

55
1. [IBEX wiki](https://github.com/ISISComputingGroup/IBEX/wiki)
6-
1. [IBEX user manual](https://github.com/ISISComputingGroup/ibex_user_manual/wiki)
7-
- [on shadow](http://shadow.nd.rl.ac.uk/ibex_user_manual/Home)
6+
1. {external+ibex_user_manual:doc}`IBEX user manual <index>`
7+
- [on shadow](http://shadow.nd.rl.ac.uk/ibex_user_manual/)
88
1. [IBEX developer wiki](/index)
99

1010
## IBEX wiki

doc/processes/meetings_with_scientists/Training-Instrument-Scientists-in-IBEX.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ We record people who would like to attend the next training session by listing t
1818
- [Mantid](https://www.mantidproject.org/Documentation)
1919
- [IBEX](/overview/Links-and-Resources)
2020
- There are various slides at the end of the material: "Reference card", "GUI Reference Card" and "Useful Locations". These are supposed to provide a brief reference of the major IBEX features, GUI elements and a memo sheet for folder locations respectively. Print off a copy of each for each delegate.
21-
- [genie_python](https://github.com/ISISComputingGroup/ibex_user_manual/wiki/genie_python-and-IBEX-%28Introduction%29)
21+
- {external+ibex_user_manual:doc}`scripting/Genie-Python-Training`
2222

2323
## Planning the IBEX and genie_python training courses
2424
This section summarises the steps you will need to consider when planning the IBEX and genie_python training courses.

doc/scripting/Genie-Python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ genie_python/*
1313

1414
### User documentation
1515

16-
- [Scripting in the user manual](https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Scripting)
16+
- {external+ibex_user_manual:doc}`Scripting in the user manual <Scripting>`
1717
- [genie_python reference](http://shadow.nd.rl.ac.uk/genie_python/sphinx/genie_python.html)

0 commit comments

Comments
 (0)