Skip to content

Commit 958e937

Browse files
committed
docs: Rename config terminology to workspace
1 parent 2ba822e commit 958e937

File tree

11 files changed

+41
-37
lines changed

11 files changed

+41
-37
lines changed

docs/about.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
tmuxp helps you manage tmux workspaces.
1010

1111
Built on a object relational mapper for tmux. tmux users can reload common
12-
workspaces from YAML, JSON and {py:obj}`dict` configurations like
13-
[tmuxinator][tmuxinator] and [teamocil][teamocil].
12+
workspaces from YAML, JSON and {py:obj}`dict` workspace files like
13+
[tmuxinator] and [teamocil].
1414

1515
tmuxp is used by developers for tmux automation at great companies like
16-
[Bugsnag][bugsnag], [Pragmatic Coders][pragmatic coders] and many others.
16+
[Bugsnag], [Pragmatic Coders] and many others.
1717

1818
To jump right in, see {ref}`quickstart` and {ref}`examples`.
1919

2020
Interested in some kung-fu or joining the effort? {ref}`api` and
2121
{ref}`developing`.
2222

23-
[MIT-licensed][mit-licensed]. Code on [github](http://github.com/tmux-python/tmuxp).
23+
[MIT-licensed]. Code on [github](http://github.com/tmux-python/tmuxp).
2424

2525
[bugsnag]: https://blog.bugsnag.com/benefits-of-using-tmux/
2626
[pragmatic coders]: http://pragmaticcoders.com/blog/tmuxp-preconfigured-sessions/
@@ -64,7 +64,7 @@ format [^id4]. See {ref}`cli-freeze`.
6464

6565
**JSON config** JSON config support. See {ref}`Examples`.
6666

67-
**ORM-based API** via [libtmux][libtmux] - Utilitizes tmux >= 1.8's unique ID's for
67+
**ORM-based API** via [libtmux] - Utilitizes tmux >= 1.8's unique ID's for
6868
panes, windows and sessions to create an object relational view of the tmux
6969
{class}`~libtmux.Server`, its {class}`~libtmux.Session`,
7070
{class}`~libtmux.Window`, and {class}`~libtmux.Pane`.

docs/about_tmux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ Tmux windows can be split into multiple panes.
456456

457457
## Configuring tmux
458458

459-
Tmux can be configured via a configuration at `~/.tmux.conf`.
459+
Tmux can be configured via a `tmux(1)` configuration at `~/.tmux.conf`.
460460

461461
Depending on your tmux version, there is different options available.
462462

docs/configuration/examples.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Short hand / inline style
66

7-
tmuxp has a short-hand syntax to for those who wish to keep their configs
7+
tmuxp has a short-hand syntax to for those who wish to keep their workspace
88
punctual.
99

1010
::::{sidebar} short hand
@@ -636,7 +636,7 @@ this example):
636636
```yaml
637637
session_name: my session
638638
before_script: ./bootstrap.py
639-
# ... the rest of your config
639+
# ... the rest of your workspace
640640
641641
```
642642
````
@@ -659,7 +659,7 @@ and panes omitted in this example)
659659
```yaml
660660
session_name: another example
661661
before_script: /absolute/path/this.sh # abs path to shell script
662-
# ... the rest of your config
662+
# ... the rest of your workspace
663663
664664
```
665665
````
@@ -677,21 +677,21 @@ before_script: /absolute/path/this.sh # abs path to shell script
677677

678678
[exit status]: http://tldp.org/LDP/abs/html/exit-status.html
679679

680-
## Per-project tmux config
680+
## Per-project tmuxp workspaces
681681

682682
You can load your software project in tmux by placing a `.tmuxp.yaml` or
683-
`.tmuxp.json` in the project's config and loading it.
683+
`.tmuxp.json` in the project's workspace and loading it.
684684

685-
tmuxp supports loading configs via absolute filename with `tmuxp load`
686-
and via `$ tmuxp load .` if config is in directory.
685+
tmuxp supports loading workspace via absolute filename with `tmuxp load`
686+
and via `$ tmuxp load .` if workspace is in the directory.
687687

688688
```console
689689

690690
$ tmuxp load ~/workspaces/myproject.yaml
691691

692692
```
693693

694-
See examples of `tmuxp` in the wild. Have a project config to show off?
694+
See examples of `tmuxp` in the wild. Have a project workspace to show off?
695695
Edit this page.
696696

697697
- <https://github.com/tony/dockerfiles/blob/master/.tmuxp.yaml>

docs/configuration/index.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
(configuration)=
44

5-
# Configuration
5+
(workspace)=
6+
7+
# Workspace files
68

79
tmuxp loads your terminal workspace into tmux using workspace files.
810

9-
The configuration file can be JSON or YAML. It's declarative style resembles tmux's object hierarchy: session, window and wanes.
11+
The workspace file can be JSON or YAML. It's declarative style resembles tmux's object hierarchy: session, window and wanes.
1012

1113
## Launching your session
1214

@@ -19,7 +21,7 @@ $ tmuxp load ./path/to/file
1921
tmuxp will offers to assist when:
2022

2123
- _Session already exists_: tmuxp will prompt you to re-attach. It does this
22-
by checking if the configuration's `session_name` matches a session already
24+
by checking if the workspace's `session_name` matches a session already
2325
running on the same server.
2426
- _When inside a tmux client_, `tmuxp` will let you create a new session and switch to it, or append the windows to your existing
2527
session.
@@ -57,7 +59,7 @@ As of 1.11.x.
5759
5860
````
5961

60-
Breaking down the basic configuration into sections:
62+
Breaking down the basic workspace into sections:
6163

6264
1. A session name
6365

@@ -102,7 +104,7 @@ Breaking down the basic configuration into sections:
102104

103105
### Direct
104106

105-
You can create a configuration and load it from anywhere in your file system.
107+
You can create a workspace and load it from anywhere in your file system.
106108

107109
```console
108110
$ tmuxp load [workspace-file]
@@ -120,7 +122,7 @@ $ tmuxp load /opt/myapp/favorites.yaml
120122
```
121123
````
122124

123-
### User-based configurations
125+
### User-based workspaces
124126

125127
tmuxp uses the [XDG Base Directory] specification.
126128

@@ -143,12 +145,12 @@ This path can be overridden by {ref}`TMUXP_CONFIGDIR`
143145

144146
### Project-specific
145147

146-
You can store a configuration in your project's root directory as `.tmuxp.yaml` or `.tmuxp.json`, then:
148+
You can store a workspace in your project's root directory as `.tmuxp.yaml` or `.tmuxp.json`, then:
147149

148150
Assume `.tmuxp.yaml` inside `/opt/myapp`
149151

150152
```console
151-
$ tmuxp load [config_path]
153+
$ tmuxp load [workspace-file]
152154
```
153155

154156
````{tab} In project root

docs/glossary.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ tmux(1)
1414
layer on top of tmux.
1515
1616
ConfigReader
17-
configuration management class.
17+
configuration management class, for parsing YAML / JSON / etc. files
18+
to and from python data (dictionaries, in the future, potentially
19+
dataclasses)
1820
1921
Server
2022
Tmux runs in the background of your system as a process.

docs/plugins/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ tmuxp without the need to change tmuxp itself.
88
## Using a Plugin
99

1010
To use a plugin, install it in your local python environment and add it to
11-
your tmuxp configuration file.
11+
your tmuxp workspace file.
1212

13-
### Example Configurations
13+
### Example Workspace files
1414

1515
````{tab} YAML
1616

docs/quickstart.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ via trunk (can break easily):
7373

7474
tmuxp launches workspaces / sessions from JSON and YAML files.
7575

76-
Configuration files can be stored in `$HOME/.tmuxp` or in project
76+
Workspace files can be stored in `$HOME/.tmuxp` or in project
7777
directories as `.tmuxp.py`, `.tmuxp.json` or `.tmuxp.yaml`.
7878

79-
Every configuration is required to have:
79+
Every workspace file is required to have:
8080

8181
1. `session_name`
8282
2. list of `windows`
@@ -106,7 +106,7 @@ $ tmuxp load example.yaml anothersession.yaml
106106
```
107107

108108
tmuxp will offer to `switch-client` for you if you're already in a
109-
session. You can also load a configuration, and append the windows to
109+
session. You can also load a workspace and append the windows to
110110
the current active session.
111111

112112
You can also have a custom tmuxp config directory by setting the

src/tmuxp/exc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ class TmuxpException(Exception):
1414

1515
class WorkspaceError(TmuxpException):
1616

17-
"""Error parsing tmuxp configuration dict."""
17+
"""Error parsing tmuxp workspace data."""
1818

1919

2020
class EmptyWorkspaceException(WorkspaceError):
2121

22-
"""Configuration is empty."""
22+
"""Workspace file is empty."""
2323

2424

2525
class TmuxpPluginException(TmuxpException):

src/tmuxp/plugin.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,17 +189,17 @@ def before_script(self, session):
189189
190190
This runs after the workspace has been loaded with ``tmuxp load``. It
191191
augments instead of replaces the ``before_script`` section of the
192-
configuration.
192+
workspace data.
193193
194194
This hook provides access to the LibTmux.session object for any
195195
behavior that would be used in the ``before_script`` section of the
196-
configuration file that needs access directly to the session object.
196+
workspace file that needs access directly to the session object.
197197
This runs after the workspace has been loaded with ``tmuxp load``.
198198
199199
The hook augments, rather than replaces, the ``before_script`` section
200-
of the configuration. While it is possible to do all of the
201-
``before_script`` configuration in this function, if a shell script
202-
is currently being used for the configuration, it would be cleaner to
200+
of the workspace. While it is possible to do all of the
201+
``before_script`` workspace in this function, if a shell script
202+
is currently being used for the workspace, it would be cleaner to
203203
continue using the script in the ``before_section``.
204204
205205
If changes to the session need to be made prior to

src/tmuxp/workspace/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""Create a tmux workspace from a workspace configuration :py:obj:`dict`.
1+
"""Create a tmux workspace from a workspace :py:obj:`dict`.
22
33
tmuxp.workspace.builder
44
~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)