Skip to content

Commit 9838f95

Browse files
committed
Correct typos
1 parent 9678926 commit 9838f95

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

doc/iocs/compiling/Developer-Updating.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## using a pre-built distribution
44

5-
If you just want a clean start then you can use a pre-built build server checkout [[Developer-Server-Build]] as a new starting point. This is by far the easiest - it is the equivalent of deleting your current EPICS directory, doing a clean checkout and then building, just a bit quicker as it has already been built/compiled for you on the build server. If you have no important local changes (i.e. everything is pushed to github) then you will lose nothing and can just swap back to these branches after the new install.
5+
If you just want a clean start then you can use a [pre-built build server checkout](/iocs/compiling/Developer-Server-Build) as a new starting point. This is by far the easiest - it is the equivalent of deleting your current EPICS directory, doing a clean checkout and then building, just a bit quicker as it has already been built/compiled for you on the build server. If you have no important local changes (i.e. everything is pushed to github) then you will lose nothing and can just swap back to these branches after the new install.
66

77
## updating in-place
88

@@ -51,7 +51,7 @@ git submodule foreach --recursive "git reset --hard"
5151
git submodule foreach --recursive "git clean -fdx"
5252
```
5353

54-
Now build IBEX in the usual way. See [[Things-to-know-as-a-developer]] for speeding up a build.
54+
Now build IBEX in the usual way. See [here](/processes/dev_processes/Things-to-know-as-a-developer) for speeding up a build.
5555

5656
### Troubleshooting
5757

doc/iocs/creation/Creating-IOC-wrapper-VI.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ endif
5959

6060
## 2. Create the xml configuration file
6161

62-
This is a summary of [[more general LvDCOM instructions|http://epics.isis.stfc.ac.uk/doxygen/lvDCOM]].
62+
This is a summary of [more general LvDCOM instructions](http://epics.isis.stfc.ac.uk/doxygen/lvDCOM).
6363

6464
1. Open the VI in lab view.
6565
1. Export strings from the LabVIEW panel (In different version of LabVIEW this is different)

doc/processes/git_and_github/Git-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ NOTE: if you run `git config --global push.recurseSubmodules check` once, then t
7272

7373
## Updating all Submodules
7474

75-
If you want a clean start then you can use a [[Developer-Server-Build]] rather than an in place git update
75+
If you want a clean start then you can use a [Developer-Server-Build](/iocs/compiling/Developer-Server-Build) rather than an in place git update
7676

7777
The following command used to be used in the project I leave it here for the minute. I believe that when run from the EPICS directory it updates all submodules by merging in the last commit from origin. This feels like you could have problems if your submodule is on a different branch
7878

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Updating the old Galil driver
22

3-
As described in [[New Galil Driver]] The OLD galil driver is build from a galil-old top level EPICS branch on ndhspare53, this is because it needs to be compiled with Visual Studio 2010. This build is then copied on a release to provide support/galil-old and ioc/master/GALIL-OLD directories. A top level swap_galil.bat script is provided which swaps GALIL and GALIL-OLD, also when the release git repository is created a galil-old release files branch is created that matches the swapped branch.
3+
As described in [new Galil driver](New-Galil-Driver), the OLD Galil driver is build from a `galil-old` top level EPICS branch on ndhspare53, this is because it needs to be compiled with Visual Studio 2010. This build is then copied on a release to provide `support/galil-old` and `ioc/master/GALIL-OLD` directories. A top level `swap_galil.bat` script is provided which swaps `GALIL` and `GALIL-OLD`, also when the release git repository is created a `galil-old` release files branch is created that matches the swapped branch.
44

5-
The galil-old structures needs to be kept in step to some extent with the main master tree, however some care is needed as not all changes are relevant, and because of the need to compile with VS2010 not all changes are possible to integrate e.g. a third party dependency like mysql may need a higher compiler version. Also not that we are replacing just one IOC of a main distribution, so we don;t need every change on galil-old just those relevant to building this ioc.
5+
The `galil-old` structures needs to be kept in step to some extent with the main master tree, however some care is needed as not all changes are relevant, and because of the need to compile with VS2010 not all changes are possible to integrate e.g. a third party dependency like MySQL may need a higher compiler version. Also not that we are replacing just one IOC of a main distribution, so we don't need every change on `galil-old`, just those relevant to building this ioc.
66

7-
Currently explicit galil-old branches exist for EPICS top, support/galil and ioc/master - other modules have just have pinned versions to EPICS that may not be the most recent (e.g. because newer versions do not compile with VS2010). Updating the to level galil-old EPICS branch should consider the following.
8-
- if a change is made to support/galil master branch of EPICS-galil repository consider if this needs back-porting to the galil-old branch of this repository
9-
- if a change is made to ioc/master/GALIL or ioc/master/GALILMUL consider if it needs back-porting to galil-old branch of this repository
10-
- some support modules get built into the galil ioc so the galil-old EPICS top level needs to be pinned to the most recent version of these e.g. sampleChanger, motionSetpoints. In general it is not a problem (but not necessary) to have all submodule repositories that are not on a separate galil-old branch to be at the most recent version, however in some cases this is not possible due to compiler conflicts
7+
Currently explicit `galil-old` branches exist for EPICS top, `support/galil` and `ioc/master` - other modules have just have pinned versions to EPICS that may not be the most recent (e.g. because newer versions do not compile with VS2010). Updating the top level `galil-old` EPICS branch should consider the following.
8+
- If a change is made to `support/galil` master branch of EPICS-galil repository consider if this needs back-porting to the `galil-old` branch of this repository
9+
- If a change is made to `ioc/master/GALIL` or `ioc/master/GALILMUL` consider if it needs back-porting to `galil-old` branch of this repository
10+
- Some support modules get built into the galil ioc so the `galil-old` EPICS top level needs to be pinned to the most recent version of these e.g. sampleChanger, motionSetpoints. In general it is not a problem (but not necessary) to have all submodule repositories that are not on a separate `galil-old` branch to be at the most recent version, however in some cases this is not possible due to compiler conflicts
1111

1212

0 commit comments

Comments
 (0)