Skip to content

Commit 00e2595

Browse files
committed
Update glossary internal reference tag. Update about_tmux aafig
1 parent bad192f commit 00e2595

File tree

2 files changed

+92
-59
lines changed

2 files changed

+92
-59
lines changed

doc/about_tmux.rst

Lines changed: 90 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,28 @@ the text dimension. Inside tmux you can:
3030
- have multiple windows (window) in the workspace (session)
3131
- switch between multiple workspaces, like virtual desktops
3232

33-
Overview
34-
========
35-
36-
For Terminals only.
37-
-------------------
38-
39-
No graphics.
40-
41-
Uses:
42-
43-
- window-manager for text-based applications
44-
- keep applications in a background process
33+
Thinking Tmux
34+
=============
4535

4636
Text-based window manager
4737
-------------------------
4838

4939
=================== ====================== ===============================
5040
**tmux** **"Desktop"-Speak** **Plain English**
5141
------------------- ---------------------- -------------------------------
52-
Multiplexer Multitasking Do more than one thing at once
53-
Session Desktop Where stuff gets done
54-
Window Virtual Desktop or Has windows inside
42+
Multiplexer Multi-tasking Multiple applications
43+
simulataneously.
44+
Session Desktop Applications are visible here
45+
Window Virtual Desktop or A desktop that stores it own
46+
applications
5547
screen
5648
Pane Application Performs operations
5749
=================== ====================== ===============================
5850

5951
Multiple terminals in one screen
6052
--------------------------------
61-
It allows multiple applications or terminals to run at once.
53+
Multiple applications or terminals to run on the same screen by splitting
54+
up 1 terminal into multiple.
6255

6356
Being able to run 2 or more terminals on one screen is convenient. This
6457
way one screen can be used to edit a file, and another may be used to
@@ -109,17 +102,32 @@ can create new windows as much as you want.
109102
.. aafig::
110103
:textual:
111104

112-
+---------+---------+ +--------------------+
113-
| $ bash | $ bash | | $ vim |
114-
| | | | |
115-
| | | /-----------------\ | |
116-
+---------+---------+ -> |'switch-window 2'| -> | |
117-
| $ vim | $ bash | \-----------------/ | |
118-
| | | | |
119-
| | | | |
120-
+---------+---------+ +--------------------+
121-
| '1:sys* 2:vim' | | '1:sys 2:vim*' |
122-
+-------------------+ +--------------------+
105+
+---------+---------+
106+
| $ bash | $ bash |
107+
| | |
108+
| | | /-----------------\
109+
+---------+---------+ -> |'switch-window 2'|
110+
| $ vim | $ bash | \-----------------/
111+
| | | |
112+
| | | |
113+
+---------+---------+ |
114+
| '1:sys* 2:vim' | |
115+
+-------------------+ |
116+
/
117+
/----------------------
118+
|
119+
v
120+
+---------+---------+
121+
| $ bash | $ bash |
122+
| | |
123+
| | |
124+
+---------+---------+
125+
| $ vim | $ bash |
126+
| | |
127+
| | |
128+
+---------+---------+
129+
| '1:sys* 2:vim' |
130+
+-------------------+
123131

124132
You can switch between the windows you create.
125133

@@ -132,47 +140,70 @@ sandwich, and re-(attach), all applications are still running!
132140
.. aafig::
133141
:textual:
134142

135-
+--------+--------+ +-----------------------+
136-
| $ bash | $ bash | | $ [screen detached] |
137-
| | | | |
138-
| | | /------------\ | |
139-
+--------+--------+ --> | detach | --> | |
140-
| $ vim | $ bash | | 'Ctrl-b b' | | |
141-
| | | \------------/ | |
142-
| | | | |
143-
+--------+--------+ +-----------------------+
144-
|
145-
+-------------------------------------------+
143+
+--------+--------+
144+
| $ bash | $ bash |
145+
| | |
146+
| | | /------------\
147+
+--------+--------+ --> | detach |
148+
| $ vim | $ bash | | 'Ctrl-b b' |
149+
| | | \------------/
150+
| | | |
151+
+--------+--------+ |
152+
/------------------/
153+
|
154+
v
155+
+-----------------------+
156+
| $ [screen detached] |
157+
| |
158+
| |
159+
| |
160+
| |
161+
| |
162+
| |
163+
+-----------------------+
164+
v
146165
|
147166
v
148-
+-----------------------+ +--------+--------+
149-
| $ [screen detached] | | $ bash | $ bash |
150-
| $ tmux attach | | | |
151-
| | /------------\ | | |
152-
| | --> | attaching | --> +--------+--------+
153-
| | \------------/ | $ vim | $ bash |
154-
| | | | |
155-
| | | | |
156-
+-----------------------+ +--------+--------+
167+
+-----------------------+
168+
| $ [screen detached] |
169+
| $ tmux attach |
170+
| | /------------\
171+
| | --> | attaching |
172+
| | \------------/
173+
| | |
174+
| | |
175+
+-----------------------+ |
176+
/
177+
/-------------------------
178+
v
179+
+--------+--------+
180+
| $ bash | $ bash |
181+
| | |
182+
| | |
183+
+--------+--------+
184+
| $ vim | $ bash |
185+
| | |
186+
| | |
187+
+--------+--------+
157188

189+
Manage workflow
190+
---------------
158191

159-
Core Concepts
160-
=============
192+
- System administrators monitor logs and services.
193+
- Programmers like to have an editor open with a CLI nearby.
161194

162-
Your workflow
163-
-------------
195+
Applications running on a remote server can be launched inside of a tmux
196+
session, detached, and reattached next timeyour `"train of thought"`_ and
197+
work.
164198

165-
You can keep tmux on a server with your latest work, come back and resume
166-
your `"train of thought"`_ and work.
199+
Multitasking. Preserving the thinking you have.
167200

168-
Multitasking. More important than any technical jargon - it's preserving
169-
the thinking you have, whether you were in the midst of a one-off task, or
170-
a common task.
201+
.. _"train of thought": http://en.wikipedia.org/wiki/Train_of_thought
171202

172-
If you do a task commonly, it may help to use an application which manages
173-
tmux workspaces.
203+
Core Concepts
204+
=============
174205

175-
.. _"train of thought": http://en.wikipedia.org/wiki/Train_of_thought
206+
.. seealso:: :ref:`glossary` has a dictionary of tmux words.
176207

177208
.. _server:
178209

doc/glossary.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _glossary:
2+
13
==============
24
tmuxp Glossary
35
==============

0 commit comments

Comments
 (0)