Skip to content

Commit 566a51e

Browse files
authored
Merge pull request #45 from epics-containers/dev
Removed or flagged redundant pages.
2 parents f76ead7 + b202295 commit 566a51e

26 files changed

+217
-334
lines changed

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
# to complete as the docs build warns and fails.
153153
html_theme_options = dict(
154154
logo=dict(
155-
text=project,
155+
text="EPICS Containers",
156156
),
157157
navigation_with_keys=True,
158158
use_edit_page_button=True,

docs/index.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55

66
Update for October 2023
77
=======================
8-
The final round of improvements are done. The latest framework has
9-
become much simpler and has a good developer experience.
10-
11-
**WARNING**
12-
13-
The Tutorials are currently out of date and won't work. These are
14-
being updated now and will be available by end of November 2023.
8+
The tutorials are being updated to work with the improved framework.
9+
The first few are available now, take note of warnings about out of
10+
date tutorials.
1511

1612

1713
Communication

docs/user/explanations/kubernetes_cluster.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Three cluster topologies were considered for this project.
3737
Current Approach
3838
----------------
3939

40-
DLS is currently investigating Cluster per Beamline as the preferred topology. We
40+
DLS is using Cluster per Beamline as the preferred topology. We
4141
will continue to have a central cluster for shared services but in addition will
4242
have a cluster per beamline and a cluster for the accelerator.
4343

docs/user/explanations/repos.rst

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

docs/user/how-to/ibek-defs.rst renamed to docs/user/how-to/ibek-support.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
Updating and Testing ibek-defs
2-
==============================
1+
Updating and Testing ibek-support
2+
=================================
33

4-
TODO: this is draft
5-
TODO: this uses a Diamond internal repo as an example
4+
.. Warning::
5+
6+
This is draft only and out of date. It will be updated soon.
67

78
The ibek-defs repository contains ibek support yaml. Here is an example
89
procedure for local testing of changes to support yaml in ibek-defs

docs/user/how-to/run_iocs.rst

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

docs/user/how-to/update_templated.rst

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

docs/user/how-to/useful_k8s.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ The dashboard gives you a nice GUI for exploring and controlling your cluster.
1111
It is very useful for new users to get an understanding of what Kubernetes
1212
has to offer.
1313

14-
These commands should be run INSIDE the devcontainer.
14+
These commands should be run after you have set up your Kubernetes cluster and
15+
setup the environment variables as described in `../tutorials/setup_k8s`.
1516

1617
Execute this on your workstation:
1718

@@ -48,10 +49,6 @@ Then create the admin user and role by executing the following:
4849
4950
Get a token for the user and copy the token into your clipboard.
5051
51-
On k3s v1.23 and older::
52-
53-
kubectl -n kubernetes-dashboard describe secret admin-user-token | grep '^token'
54-
5552
On k3s v1.24 and newer::
5653
5754
kubectl -n kubernetes-dashboard create token admin-user

docs/user/images/bl01t-actions.png

46 KB
Loading

docs/user/images/edm_sim.png

-21.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)