Skip to content

Commit 1f67cbe

Browse files
committed
Document how to do redirects & add redirects
1 parent bac73d6 commit 1f67cbe

File tree

8 files changed

+27
-19
lines changed

8 files changed

+27
-19
lines changed

doc/Editing-the-Wiki.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,11 @@ This is a tip!
146146
:::
147147

148148
The list of supported admonitions is [on the MyST documentation](https://myst-parser.readthedocs.io/en/latest/syntax/admonitions.html).
149+
150+
## Removing & deleting pages
151+
152+
When moving pages, it is helpful to add redirects to the new location, so that links external to the wiki continue to
153+
work. To do this, we are using the [`sphinx-reredirects`](https://documatt.com/sphinx-reredirects/usage/) plugin.
154+
155+
When moving a page, add a redirect from the old location to the new location. When deleting a page, add a redirect to
156+
the most suitable alternative documentation. The redirects are configured by the `redirects` key in `doc/conf.py`.

doc/client/compiling/Building-the-GUI.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ install_pre_commit_hook.bat
3535

3636
You must use a version of eclipse which supports the RCP and Java versions currently in use by the client. There are
3737
two options for this:
38-
- Use the most recent version in `\\isis\inst$\Kits$\CompGroup\ICP\Developer Tools`
3938
- Download a recent Eclipse version directly from
4039
[the eclipse website](https://www.eclipse.org/downloads/packages/); choose the package for "RCP and RAP developers"
40+
- Use the most recent version in `\\isis\inst$\Kits$\CompGroup\ICP\Developer Tools` (which is simply a download from
41+
the Eclipse website, at a specific version).
4142

4243
By convention eclipse versions are installed into `c:\tools`, for example in
4344
`c:\tools\eclipse-rcp-2024-06-R-win32-x86_64`.

doc/client/eclipse/Common-Eclipse-Issues.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,9 @@ to the `eclipse.exe` executable).
139139
If you see a `java.lang.UnsupportedClassVersionError` error at runtime, then:
140140
- Select Window -> Preferences -> Java -> Compiler
141141
- Set compliance level to 21.
142+
143+
## Adding a dictionary to Eclipse's spelling checker
144+
145+
- In Eclipse open `Window > Preferences > General > Editors > Text Editors > Spelling`
146+
- Change the "User defined dictionary" to `<ISIS Experiment Controls Shares>/Eclipse settings/code_dictionary.txt`
147+

doc/client/eclipse/Common-Eclipse-Tasks.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ public class FooDisplay extends Canvas
127127

128128
Instructions on adding a new perspective can be found [here](../coding/Adding-a-Button-to-the-Perspective-Switcher).
129129

130-
Add A Preference Page
131-
---------------------
130+
## Add A Preference Page
132131

133132
Many plugins may have options that you want the user of the client to be able to configure. The simplest way to achieve this is to have the plugin contribute a preference page to the client's preference window.
134133

@@ -296,7 +295,3 @@ The ``plugin.xml`` should now resemble:
296295
</plugin>
297296
```
298297
The menu should now be visible in the client UI. For more details see the [Vogella menus tutorial](http://www.vogella.com/tutorials/EclipseCommands/article.html).
299-
300-
## Add A Third Party Library To A Plugin
301-
302-
To do

doc/client/eclipse/Creating-the-IBEX-Developer-Version-of-Eclipse.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

doc/client/eclipse/Dictionary-setup.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

doc/conf.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
"sphinx.ext.intersphinx",
3939
# Add links to source code in API docs
4040
"sphinx.ext.viewcode",
41+
# Redirects
42+
"sphinx_reredirects",
4143
]
4244
napoleon_google_docstring = True
4345
napoleon_numpy_docstring = False
@@ -81,3 +83,10 @@
8183
spelling_warning = True
8284
spelling_show_suggestions = True
8385
spelling_suggestion_limit = 3
86+
87+
redirects = {
88+
"client/GUI-Getting-Started": "GUI-Building.html",
89+
"client/eclipse/Creating-the-IBEX-Developer-Version-of-Eclipse": "../compiling/Building-the-GUI.html#gui-build-install-eclipse", # noqa E501
90+
"client/eclipse/Dictionary-setup": "Common-Eclipse-Issues.html#adding-a-dictionary-to-eclipse-s-spelling-checker", # noqa E501
91+
"client/getting_started/GUI-Development-Workflow": "../../processes/git_and_github/Git-workflow.html", # noqa E501
92+
}

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies = [
3030
"sphinx-autobuild",
3131
"linkify-it-py",
3232
"sphinxcontrib-spelling",
33+
"sphinx-reredirects",
3334
"pytest",
3435
]
3536

0 commit comments

Comments
 (0)