Skip to content

Commit c4b7236

Browse files
committed
Merge branch 'rjmunro/improve-documentation' into release53
2 parents df6f8a2 + 7d7e386 commit c4b7236

File tree

20 files changed

+78
-84
lines changed

20 files changed

+78
-84
lines changed

packages/documentation/docs/user-guide/concepts-and-architecture.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ It is a [NodeJS](https://nodejs.org/) process backed up by a [MongoDB](https://w
1515

1616
### Gateways
1717

18-
Gateways are applications that connect to Sofie Core and and exchanges data; such as rundown data from an NRCS or the [Timeline](#timeline) for playout.
18+
Gateways are applications that connect to Sofie Core and exchange data; such as rundown data from an NRCS (Newsroom Computer System) or the [Timeline](#timeline) for playout.
1919

20-
An examples of a gateways is the [Spreadsheet Gateway](https://github.com/SuperFlyTV/spreadsheet-gateway).
20+
An example of a gateway is the [Spreadsheet Gateway](https://github.com/SuperFlyTV/spreadsheet-gateway).
2121
All gateways use the [Core Integration Library](https://github.com/nrkno/sofie-core/tree/master/packages/server-core-integration) to communicate with Core.
2222

2323
## System, \(Organization\), Studio & Show Style
2424

25-
To be able to facilitate various workflows and to Here's a short explanation about the differences between the "System", "Organization", "Studio" and "Show Style".
25+
To be able to facilitate various different kinds of show, Sofie Core has the concepts of "System", "Organization", "Studio" and "Show Style".
2626

2727
- The **System** defines the whole of the Sofie Core
2828
- The **Organization** \(only available if user accounts are enabled\) defines things that are common for an organization. An organization consists of: **Users, Studios** and **ShowStyles**.
2929
- The **Studio** contains things that are related to the "hardware" or "rig". Technically, a Studio is defined as an entity that can have one \(or none\) rundown active at any given time. In most cases, this will be a representation of your gallery, with cameras, video playback and graphics systems, external inputs, sound mixers, lighting controls and so on. A single System can easily control multiple Studios.
30-
- The **Show Style** contains settings for the "show", for example if there's a "Morning Show" and an "Afternoon Show" - produced in the same gallery - they might be two different Show Styles \(played in the same Studio\). Most importantly, the Show Style decides the "look and feel" of the Show towards the producer/director, dictating how data ingested from the NRCS will be interpreted and how the user will interact with the system during playback (see: [Show Style](../configuration/settings-view#show-style) in Settings).
30+
- The **Show Style** contains settings for the "show", for example if there's a "Morning Show" and an "Afternoon Show" - produced in the same gallery - they might be two different Show Styles \(played in the same Studio\). Most importantly, the Show Style decides the "look and feel" of the Show towards the producer/director, dictating how data ingested from the NRCS will be interpreted and how the user will interact with the system during playback (see: [Show Style](configuration/settings-view#show-style) in Settings).
3131
- A **Show Style Variant** is a set of Show Style _Blueprint_ configuration values, that allows to use the same interaction model across multiple Shows with potentially different assets, changing the outward look of the Show: for example news programs with different hosts produced from the same Studio, but with different light setups, backscreen and overlay graphics.
3232

3333
![Sofie Architecture Venn Diagram](/img/docs/main/features/sofie-venn-diagram.png)
@@ -40,7 +40,7 @@ To be able to facilitate various workflows and to Here's a short explanation abo
4040

4141
A Playlist \(or "Rundown Playlist"\) is the entity that "goes on air" and controls the playhead/Take Point.
4242

43-
It contains one or several Rundowns inside, which are playout out in order.
43+
It contains one or more Rundowns, which are played out in order.
4444

4545
:::info
4646
In some many studios, there is only ever one rundown in a playlist. In those cases, we sometimes lazily refer to playlists and rundowns as "being the same thing".
@@ -78,7 +78,7 @@ See also: [Showstyle](#system-organization-studio--show-style)
7878

7979
### AdLib Piece
8080

81-
The AdLib pieces are Pieces that isn't programmed to fire at a specific time, but instead intended to be manually triggered by the user.
81+
The AdLib pieces are Pieces that aren't programmed to fire at a specific time, but instead intended to be manually triggered by the user.
8282

8383
The AdLib pieces can either come from the currently playing Part, or it could be _global AdLibs_ that are available throughout the show.
8484

@@ -100,7 +100,7 @@ Being a web-based system, Sofie has a number of customisable, user-facing web [v
100100

101101
Blueprints are plug-ins that run in Sofie Core. They interpret the data coming in from the rundowns and transform them into a rich set of playable elements \(Segments, Parts, AdLibs etc\).
102102

103-
The blueprints are webpacked javascript bundles which are uploaded into Sofie via the GUI. They are custom-made and changes depending on the show style, type of input data \(NRCS\) and the types of controlled devices. A generic [blueprint that works with spreadsheets is available here](https://github.com/SuperFlyTV/sofie-demo-blueprints).
103+
The blueprints are webpacked javascript bundles which are uploaded into Sofie via the GUI. They are custom-made and vary depending on the show style, type of input data \(NRCS\) and the types of controlled devices. A generic [blueprint that works with spreadsheets is available here](https://github.com/SuperFlyTV/sofie-demo-blueprints).
104104

105105
When [Sofie Core](#sofie-core) calls upon a Blueprint, it returns a JavaScript object containing methods callable by Sofie Core. These methods will be called by Sofie Core in different situations, depending on the method.
106106
Documentation on these interfaces are available in the [Blueprints integration](https://www.npmjs.com/package/@sofie-automation/blueprints-integration) library.
@@ -111,19 +111,19 @@ There are 3 types of blueprints, and all 3 must be uploaded into Sofie before th
111111

112112
Handle things on the _System level_.
113113
Documentation on the interface to be exposed by the Blueprint:
114-
[https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api.ts#L75](https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api.ts#L75)
114+
[https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api/system.ts](https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api/system.ts)
115115

116116
### Studio Blueprints
117117

118118
Handle things on the _Studio level_, like "which showstyle to use for this rundown".
119119
Documentation on the interface to be exposed by the Blueprint:
120-
[https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api.ts#L85](https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api.ts#L85)
120+
[https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api/studio.ts](https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api/studio.ts)
121121

122122
### Showstyle Blueprints
123123

124124
Handle things on the _Showstyle level_, like generating [_Baseline_](#baseline), _Segments_, _Parts, Pieces_ and _Timelines_ in a rundown.
125125
Documentation on the interface to be exposed by the Blueprint:
126-
[https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api.ts#L117](https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api.ts#L117)
126+
[https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api/showStyle.ts](https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration/src/api/showStyle.ts)
127127

128128
## `PartInstances` and `PieceInstances`
129129

@@ -152,7 +152,7 @@ The Sofie system is made to work with a modern web- and IT-based approach in min
152152
One drawback of running in a cloud over the public internet is the - sometimes unpredictable - latency. The Timeline overcomes this by moving all the immediate control of the playout devices to the Playout Gateway, which is intended to run on a local network, close to the hardware it controls.
153153
This also gives the system a simple way of load-balancing - since the number of web-clients or load on Sofie Core won't affect the playout.
154154

155-
Another benefit of basing the playout on a timeline is that when programming the show \(the blueprints\), you only have to care about "what you want to be on screen", you don't have to care about cleaning up previously played things, or what was actually played out before. Those are things that are handled by the Playout Gateway automatically. This also allows the user to jump around in a rundown freely, without the risk of things going wrong on air.
155+
Another benefit of basing the playout on a timeline is that when programming the show \(the blueprints\), you only have to care about "what you want to be on screen", you don't have to care about cleaning up previously played things, or what was actually played out before. This is handled by the Playout Gateway automatically. This also allows the user to jump around in a rundown freely, without the risk of things going wrong on air.
156156

157157
### How does it work?
158158

@@ -181,7 +181,7 @@ The TSR then...
181181
- Maps the target-state to each playout device
182182
- Compares the target-states for each device with the currently-tracked-state and..
183183
- Generates commands to send to each device to account for the change
184-
- The commands are then put on queue and sent to the devices at the correct time
184+
- Puts the commands on the queue and sends them to the devices at the correct time.
185185

186186
:::info
187187
For more information about what playout devices _TSR_ supports, and examples of the timeline-objects, see the [README of TSR](https://github.com/nrkno/sofie-timeline-state-resolver#timeline-state-resolver)

packages/documentation/docs/user-guide/configuration/settings-view.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The Studio uses a studio-blueprint, which handles things like mapping up an inco
6363

6464
### Attached Devices
6565

66-
This section allows you to add and remove Gateways that are related to this _Studio_. When a Gateway is attached to a Studio, it will react to the changes happening within it, as well as feed the neccessary data into it.
66+
This section allows you to add and remove Gateways that are related to this _Studio_. When a Gateway is attached to a Studio, it will react to the changes happening within it, as well as feed the necessary data into it.
6767

6868
### Blueprint Configuration
6969

@@ -144,19 +144,19 @@ The triggers are designed to be either client-specific or issued by a peripheral
144144

145145
Currently, the Action Triggers system supports setting up two types of triggeers: Hotkeys and Device Triggers.
146146

147-
Hotkeys are valid in the scope of a browser window and can be either a single key, a combination of keys (_combo_) or a _chord_ - a sequnece of key combinations pressed in a particular order. _Chords_ are popular in some text editing applications and vastly expand the amount of actions that can be triggered from a keyboard, at the expense of the time needed to execute them. Currently, the Hotkey editor in Sofie does not support creating _Chords_, but they can be specified by Blueprints during migrations.
147+
Hotkeys are valid in the scope of a browser window and can be either a single key, a combination of keys (_combo_) or a _chord_ - a sequence of key combinations pressed in a particular order. _Chords_ are popular in some text editing applications and vastly expand the amount of actions that can be triggered from a keyboard, at the expense of the time needed to execute them. Currently, the Hotkey editor in Sofie does not support creating _Chords_, but they can be specified by Blueprints during migrations.
148148

149149
To edit a given trigger, click on the trigger pill on the left of the Trigger-Action set. When hovering, a **+** sign will appear, allowing you to add a new trigger to the set.
150150

151-
Device Triggers are valid in the scope of a Studio and will be evaluated on the currently active Rundown in a given Studio. To use Device Triggers, you need to have at least a single [Input Gateway](../installation/installing-input-gateway) attached to a Studio and a Device configured in the Input Gateway. Once that's done, when selecting a **Device** trigger type in the pop-up, you can invoke triggers on your Input Device and you will see a preview of the input events shown at the bottom of the pop-up. You can select which of these events should be the trigger by clicking on one of the previews. Note, that some devices differentiate between _Up_ and _Down_ triggers, while others don't. Some may also have other activites that can be done _to_ a trigger. What they are and how they are identified is device-specific and is best discovered through interaction with the device.
151+
Device Triggers are valid in the scope of a Studio and will be evaluated on the currently active Rundown in a given Studio. To use Device Triggers, you need to have at least a single [Input Gateway](../installation/installing-input-gateway) attached to a Studio and a Device configured in the Input Gateway. Once that's done, when selecting a **Device** trigger type in the pop-up, you can invoke triggers on your Input Device and you will see a preview of the input events shown at the bottom of the pop-up. You can select which of these events should be the trigger by clicking on one of the previews. Note, that some devices differentiate between _Up_ and _Down_ triggers, while others don't. Some may also have other activities that can be done _to_ a trigger. What they are and how they are identified is device-specific and is best discovered through interaction with the device.
152152

153153
If you would like to set up combination Triggers, using Device Triggers on an Input Device that does not support them natively, you may want to look into [Shift Registers](#shift-registers)
154154

155155
#### Actions
156156

157157
The actions are built using a base _action_ (such as _Activate a Rundown_ or _AdLib_) and a set of _filters_, limiting the scope of the _action_. Optionally, some of these _actions_ can take additional _parameters_. These filters can operate on various types of objects, depending on the action in question. All actions currently require that the chain of filters starts with scoping out the Rundown the action is supposed to affect. Currently, there is only one type of Rundown-level filter supported: "The Rundown currently in view".
158158

159-
The Action Triggers user interface guides the user in a wizzard-like fashion through the available _filter_ options on a given _action_.
159+
The Action Triggers user interface guides the user in a wizard-like fashion through the available _filter_ options on a given _action_.
160160

161161
![Actions can take additional parameters](/img/docs/main/features/action_triggers_2.png)
162162

packages/documentation/docs/user-guide/configuration/sofie-core-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ There are various settings you can set for an installation. See the list below:
9797
| `followOnAirSegmentsHistory` | How many segments of history to show when scrolling back in time (0 = show current segment only) | `0` |
9898
| `maximumDataAge` | Clean up stuff that are older than this [ms]) | 100 days |
9999
| `poisonKey` | Enable the use of poison key if present and use the key specified. | `'Escape'` |
100-
| `enableNTPTimeChecker` | If set, enables a check to ensure that the system time doesn't differ too much from the speficied NTP server time. | `null` |
100+
| `enableNTPTimeChecker` | If set, enables a check to ensure that the system time doesn't differ too much from the specified NTP server time. | `null` |
101101
| `defaultShelfDisplayOptions` | Default value used to toggle Shelf options when the 'display' URL argument is not provided. | `buckets,layout,shelfLayout,inspector` |
102102
| `enableKeyboardPreview` | The KeyboardPreview is a feature that is not implemented in the main Fork, and is kept here for compatibility | `false` |
103103
| `keyboardMapLayout` | Keyboard map layout (what physical layout to use for the keyboard) | STANDARD_102_TKL |

packages/documentation/docs/user-guide/features/access-levels.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ sidebar_position: 3
66

77
## Permissions
88

9-
There are a few different access levels that users can be assigned. They are not heirarchical, you will often need to enable multiple for each user.
9+
There are a few different access levels that users can be assigned. They are not hierarchical, you will often need to enable multiple for each user.
1010
Any client that can access Sofie always has at least view-only access to the rundowns, and system status pages.
1111

12-
| Level | Summary |
13-
| :------------ | :----------------------------------------------------------------------------------------------------------------------------------------------- |
14-
| **studio** | Grants access to operate a studio for playout of a rundown. |
15-
| **configure** | Grants access to the settings pages of Sofie, and other abilities to configure the system. |
16-
| **developer** | Grants access to some tools useful to developers. This also changes some ui behaviours to be less agressive in what is shown in the rundown view |
17-
| **testing** | Enables the page Test Tools, which contains various tools useful for testing the system during development |
18-
| **service** | Grants access to the external message status page, and some additional rundown management options that are not commonly needed |
19-
| **gateway** | Grants access to various APIs intended for use by the various gateways that connect Sofie to other systems. |
12+
| Level | Summary |
13+
| :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------ |
14+
| **studio** | Grants access to operate a studio for playout of a rundown. |
15+
| **configure** | Grants access to the settings pages of Sofie, and other abilities to configure the system. |
16+
| **developer** | Grants access to some tools useful to developers. This also changes some ui behaviours to be less aggressive in what is shown in the rundown view |
17+
| **testing** | Enables the page Test Tools, which contains various tools useful for testing the system during development |
18+
| **service** | Grants access to the external message status page, and some additional rundown management options that are not commonly needed |
19+
| **gateway** | Grants access to various APIs intended for use by the various gateways that connect Sofie to other systems. |
2020

2121
## Authentication providers
2222

0 commit comments

Comments
 (0)