Skip to content

Commit 6183723

Browse files
code-warriorcode-warrior
committed
Resolve merge in Preferences.sublime-settings
2 parents bc8dc6b + 2fe6ae8 commit 6183723

File tree

2 files changed

+135
-97
lines changed

2 files changed

+135
-97
lines changed

‎tutorials/sublime-text/User/Preferences.sublime-settings‎

Lines changed: 75 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,77 @@
11
{
2-
"always_prompt_for_file_reload": true,
3-
"always_show_minimap_viewport": true,
4-
"auto_complete_cycle": true,
5-
"auto_complete_with_fields": true,
6-
"bold_folder_labels": true,
7-
"caret_style": "phase",
8-
"close_windows_when_empty": true,
9-
"copy_with_empty_selection": false,
10-
"create_window_at_startup": true,
11-
"default_line_ending": "unix",
12-
"detect_indentation": false,
13-
"drag_text": false,
14-
"draw_minimap_border": true,
15-
"draw_white_space": "all",
16-
"enable_telemetry": "false",
17-
"ensure_newline_at_eof_on_save": true,
18-
"fade_fold_buttons": false,
19-
"find_selected_text": true,
20-
"folder_exclude_patterns":
21-
[
22-
".idea",
23-
".sass-cache",
24-
".git"
25-
],
26-
"font_face": "Ubuntu Mono",
27-
"font_options":
28-
[
29-
"subpixel_antialias"
30-
],
31-
"font_size": 22,
32-
"highlight_modified_tabs": true,
33-
"hot_exit": false,
34-
"ignored_packages":
35-
[
36-
"Vintage"
37-
],
38-
"indent_guide_options":
39-
[
40-
"draw_active"
41-
],
42-
"indent_to_bracket": true,
43-
"margin": 0,
44-
"match_brackets_angle": true,
45-
"move_to_limit_on_up_down": true,
46-
"rulers":
47-
[
48-
60,
49-
72,
50-
85,
51-
120
52-
],
53-
"scroll_past_end": true,
54-
"shift_tab_unindent": true,
55-
"show_encoding": true,
56-
"show_full_path": true,
57-
"show_line_endings": true,
58-
"smart_indent": false,
59-
"spell_check": true,
60-
"tab_size": 3,
61-
"translate_tabs_to_spaces": true,
62-
"trim_trailing_white_space_on_save": true,
63-
"word_separators": "./\\()\"'_-–—“”‘”:,.;<>~!@#$%^&*|+=[]{}`~?",
64-
"word_wrap": "true",
65-
"wrap_width": 0
2+
"always_prompt_for_file_reload": true,
3+
"always_show_minimap_viewport": true,
4+
"auto_complete": false,
5+
"auto_complete_cycle": true,
6+
"auto_complete_with_fields": true,
7+
"bold_folder_labels": true,
8+
"caret_extra_bottom": 0,
9+
"caret_extra_top": 0,
10+
"caret_extra_width": 0,
11+
"caret_style": "phase",
12+
"close_windows_when_empty": true,
13+
"copy_with_empty_selection": false,
14+
"control_character_style": "names",
15+
"create_window_at_startup": false,
16+
"default_line_ending": "unix",
17+
"detect_indentation": false,
18+
"drag_text": false,
19+
"draw_minimap_border": true,
20+
"draw_unicode_white_space": "all",
21+
"draw_white_space": "all",
22+
"enable_telemetry": "false",
23+
"ensure_newline_at_eof_on_save": true,
24+
"fade_fold_buttons": false,
25+
"find_selected_text": true,
26+
"folder_exclude_patterns": [
27+
".idea",
28+
".sass-cache",
29+
".git",
30+
".Trash",
31+
".Trash-*"
32+
],
33+
"font_face": "IBM Plex Mono",
34+
"font_face": "Ubuntu Mono",
35+
"font_options": [
36+
"subpixel_antialias"
37+
],
38+
"font_size": 16,
39+
"highlight_modified_tabs": true,
40+
"highlight_gutter": true,
41+
"hot_exit": false,
42+
"ignored_packages": [
43+
"AutoFileName",
44+
"Neon Color Scheme",
45+
"SideBarGit",
46+
"Tag",
47+
"Vintage"
48+
],
49+
"indent_guide_options": [
50+
"draw_active"
51+
],
52+
"indent_to_bracket": true,
53+
"margin": 0,
54+
"match_brackets_angle": true,
55+
"move_to_limit_on_up_down": true,
56+
"open_files_in_new_window": "always",
57+
"remember_workspace": false,
58+
"rulers": [
59+
60, 72, 80, 85, 120
60+
],
61+
"scroll_past_end": true,
62+
"shift_tab_unindent": true,
63+
"show_definitions": false,
64+
"show_encoding": true,
65+
"show_full_path": true,
66+
"show_line_endings": true,
67+
"smart_indent": false,
68+
"spell_check": true,
69+
"tab_completion": false,
70+
"tab_size": 2,
71+
"translate_tabs_to_spaces": true,
72+
"trim_trailing_white_space_on_save": "all",
73+
"update_check": false,
74+
"word_separators": "./\\()\"'_-–—“”‘”:,.;<>~!@#$%^&*|+=[]{}`~?",
75+
"word_wrap": "true",
76+
"wrap_width": 0
6677
}

‎tutorials/the-terminal/index.html‎

Lines changed: 60 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,41 @@
4242
padding: 1px 2px;
4343
}
4444

45-
kbd, code {
46-
font-size: 1rem;
45+
code {
46+
background-color: transparent;
47+
}
48+
49+
code .small-caps {
50+
font-weight: bold;
4751
}
4852

4953
dd {
50-
margin-top: 12px;
51-
margin-bottom: 28px;
54+
margin-bottom: 40px;
55+
}
56+
57+
dt {
58+
background-color: rgb(245, 245, 245);
59+
border-radius: 6px;
60+
padding-left: 8px;
61+
line-height: 32px;
62+
}
63+
64+
samp {
65+
font-family: monospace;
66+
font-size: 1rem;
67+
}
68+
69+
.small-caps {
70+
letter-spacing: .025rem;
71+
/* font-size: 1.125rem; */
72+
font-variant: small-caps;
5273
}
5374
</style>
5475
</head>
5576
<body>
5677
<main>
5778
<h1>Basic Terminal Tutorial</h1>
58-
<p>In the examples below, items in <code>CAPS</code> are filler content representing an actual file or folder on your computer. Items you type into The Terminal appear in <kbd>light blue</kbd>.</p>
79+
<p>In the examples below, content in small capital letters set in a monospace typeface, such as <code class="small-caps">file</code> and <code class="small-caps">folder</code>, indicate filler content, such as a file or folder from your computer. Content you’d type into The Terminal is also set in a monospace typeface, but surrounded by a <kbd>light blue</kbd> background.</p>
5980
<dl>
6081
<dt><kbd>./</kbd></dt>
6182
<dd>The current directory.</dd>
@@ -64,58 +85,64 @@ <h1>Basic Terminal Tutorial</h1>
6485
<dd>The parent of the current directory.</dd>
6586

6687
<dt><kbd>alias</kbd></dt>
67-
<dd>Displays all keyboard aliases (shortcuts), usually in a file called <code>.bash_aliases</code>.</dd>
88+
<dd>Displays all aliases (keyboard shortcuts), usually in a file called <code>.bash_aliases</code>, assigned to commands. <strong>Note</strong>: To run the default version of any command to which an alias has been assigned, precede it with a backslash (<code>\</code>). For example, running <kbd>\rm</kbd> in my terminal would bypass my alias of <code>'rm -i'</code>.</dd>
6889

69-
<dt><kbd>atom</kbd></dt>
70-
<dd>Launches Atom, assuming the shell commands have been installed. Typing <kbd>atom .</kbd> opens the current folder in Atom and typing <kbd>atom FILE</kbd> opens <code>FILE</code> in Atom.</dd>
90+
<dt><kbd>code</kbd></dt>
91+
<dd>Launches <span class="small-caps">vs</span> Code, assuming the shell commands have been installed. Typing <kbd>code .</kbd> opens the current folder in <span class="small-caps">vs</span> Code, and typing <kbd>code <span class="small-caps">file</span></kbd> opens <code class="small-caps">file</code> in <span class="small-caps">vs</span> Code.</dd>
7192

72-
<dt><kbd>cat FILE</kbd></dt>
73-
<dd>Displays the contents of <code>FILE</code>, then returns control to The Terminal.</dd>
93+
<dt><kbd>cat <span class="small-caps">file</span></kbd></dt>
94+
<dd>Displays the contents of <code class="small-caps">file</code>, then returns control to The Terminal.</dd>
7495

7596
<dt><kbd>cd</kbd></dt>
76-
<dd>Changes directory to your home folder, <code>~/Users/YOUR_NAME</code>. Typing <kbd>cd FOLDER</kbd> changes into <code>FOLDER</code> and typing <kbd>cd ../FOLDER</kbd> changes into a directory called <code>FOLDER</code> in the current directory’s parent.</dd>
97+
<dd>Changes directory to your home folder, which is likely <code>~/Users/<span class="small-caps">your_name</span></code>. Typing <kbd>cd <span class="small-caps">folder</span></kbd> changes into <code class="small-caps">folder</code> and typing <kbd>cd ../<span class="small-caps">folder</span></kbd> changes into a directory called <code class="small-caps">folder</code> in the current directory’s parent. Typing <kbd>cd</kbd> from anywhere in your directory tree will take you home.</dd>
7798

7899
<dt><kbd>clear</kbd></dt>
79100
<dd>Clears the screen of any content, placing the cursor at the top of The Terminal’s window.</dd>
80101

81-
<dt><kbd>cp FILE.txt COPY-OF-FILE.txt</kbd></dt>
82-
<dd>Copies the file <code>FILE.txt</code> to a new file called <code>COPY-OF-FILE.txt</code></dd>
102+
<dt><kbd>cp <span class="small-caps">file</span>.txt <span class="small-caps">copy-of-file</span>.txt</kbd></dt>
103+
<dd>Copies the file <code><span class="small-caps">file</span>.txt</code> to a new file called <code><span class="small-caps">copy-of-file</span>.txt</code></dd>
83104

84-
<dt><kbd>head FILE.html</kbd></dt>
85-
<dd>Shows the first 10 lines of <code>FILE.html</code></dd>
105+
<dt><kbd>head <span class="small-caps">file</span>.html</kbd></dt>
106+
<dd>Shows the first 10 lines of <code><span class="small-caps">file</span>.html</code></dd>
86107

87108
<dt><kbd>history</kbd></dt>
88-
<dd>Displays a history of all the typed commands into The Terminal.</dd>
109+
<dd>Displays a history of all the commands typed into The Terminal.</dd>
89110

90111
<dt><kbd>ls</kbd></dt>
91112
<dd>Displays the files and folders in the current directory, excluding those that start with a dot. Typing <kbd>ls -a</kbd> lists all files and folders that start with and without a dot. And, typing <kbd>ls -d .*</kbd> lists only files and folders that start with a dot.</dd>
92113

93-
<dt><kbd>man COMMAND</kbd></dt>
94-
<dd>Displays the manual for <code>COMMAND</code>.</dd>
114+
<dt><kbd>man <span class="small-caps">command</span></kbd></dt>
115+
<dd>Displays the manual for <code class="small-caps">command</code>.</dd>
95116

96-
<dt><kbd>mkdir NEW_FOLDER</kbd></dt>
97-
<dd>Creates a new folder called <code>NEW_FOLDER</code> in the current directory. Using the <code>-p</code> flag creates intermediate folders. For example, to create folder <code>C</code> inside folder <code>B</code> inside folder <code>A</code>, none of which exists, you’d run <kbd>mkdir -p A/B/C</kbd>.</dd>
117+
<dt><kbd>mkdir <span class="small-caps">new_folder</span></kbd></dt>
118+
<dd>Creates a new folder called <code class="small-caps">new_folder</code> in the current directory. Using the <code>-p</code> flag creates any non-existing intermediate folders without having to create each of the intermediate folders individually. For example, assume folders <code class="small-caps">a</code>, <code class="small-caps"><code class="small-caps">b</code></code>, and <code class="small-caps">c</code> don’t exist. Running <kbd>mkdir -p <span class="small-caps">a/b/c</span></kbd> would create folder <code class="small-caps">c</code> inside folder <code class="small-caps">b</code> inside folder <code class="small-caps">a</code>.</dd>
98119

99-
<dt><kbd>mv FILE FOLDER/</kbd></dt>
100-
<dd>Moves <code>FILE</code> inside <code>FOLDER</code>. <code>mv</code> is also used to rename a file. For example, <kbd>mv FILE FILE_WITH_NEW_NAME</kbd> renames <code>FILE</code> → <code>FILE_WITH_NEW_NAME</code></dd>
120+
<dt><kbd>mv <span class="small-caps">file</span> <span class="small-caps">folder</span>/</kbd></dt>
121+
<dd>Moves <code class="small-caps">file</code> inside <code class="small-caps">folder</code>. <code>mv</code> is also used to rename a file. For example, <kbd>mv <span class="small-caps">file</span> <span class="small-caps">file_with_new_name</span></kbd> renames <code class="small-caps">file</code> → <code class="small-caps">file_with_new_name</code></dd>
101122

102-
<dt><kbd>more FILE</kbd></dt>
103-
<dd>Render the contents of <code>FILE</code> one screenful at a time. You will need to type <kbd>q</kbd> to exit.</dd>
123+
<dt><kbd>more <span class="small-caps">file</span></kbd></dt>
124+
<dd>Render the contents of <code class="small-caps">file</code> one screenful at a time. Type <kbd>q</kbd> to exit.</dd>
104125

105126
<dt><kbd>open .</kbd></dt>
106-
<dd>Opens the current folder in Mac OS X’s Finder. (This is a Mac-only command.)</dd>
127+
<dd>Opens the current folder (<code>.</code>) in mac<span class="small-caps">os</span>’s Finder. Also does things like open a <code class="small-caps">url</code> in a browser. For example, <kbd>open https://github.com/code-warrior</kbd> launches the web address in your default browser. (In Cygwin, <code>open</code>’s equivalent is <code>cygstart</code> and in Ubuntu it’s <code>xdg-open</code>.)</dd>
128+
129+
<dt><kbd>rm <span class="small-caps">file</span></kbd></dt>
130+
<dd>Removes <code class="small-caps">file</code>. Some Linux and mac<span class="small-caps">os</span> systems don’t have a guard on the <code>rm</code> command, meaning that the user isn’t asked to verify the removal of a file. Because files removed with <code>rm</code> aren’t retrievable, use the <code>-i</code> flag so you can verify that, indeed, you want to remove a file. For example, <kbd>rm -i <span class="small-caps">file</span></kbd> would ask if you want to <code>remove <span class="small-caps">file</span>?</code>.<br><br>To recursively remove a folder, run <kbd>rm -r <span class="small-caps">folder</span></kbd>; and, to forcefully and recursively remove a directory without interaction, run <kbd>rm -fr <span class="small-caps">folder</span></kbd>.</dd>
131+
132+
<dt><kbd>sudo <span class="small-caps">command</span></kbd></dt>
133+
<dd>Run <code class="small-caps">command</code> as the current user with privileged access.</dd>
107134

108-
<dt><kbd>rm FILE</kbd></dt>
109-
<dd>Removes <code>FILE</code>. Some Linux and Mac OS systems don’t have a guard on the <code>rm</code> command, meaning that the user isn’t asked to verify the removal of a file. Because files removed with <code>rm</code> aren’t retrievable, use the <code>-i</code> flag so you can verify that, indeed, you want to remove a file. For example, <kbd>rm -i FILE</kbd> would ask if you want to <code>remove FILE?</code>.<br><br>To recursively remove a folder, run <kbd>rm -r FOLDER</kbd>; and, to forcefully and recursively remove a directory without interaction, run <kbd>rm -fr FOLDER</kbd>.</dd>
135+
<dt><kbd>tail <span class="small-caps">file</span></kbd></dt>
136+
<dd>Shows the last 10 lines of <code><span class="small-caps">file</span></code></dd>
110137

111-
<dt><kbd>sudo COMMAND</kbd></dt>
112-
<dd>Run <code>COMMAND</code> as the current user with privileged access.</dd>
138+
<dt><kbd>touch <span class="small-caps">file</span></kbd></dt>
139+
<dd>Creates a new, empty file called <code class="small-caps">file</code>. If <code class="small-caps">file</code> exists, <code>touch</code> does nothing.</dd>
113140

114-
<dt><kbd>tail FILE.html</kbd></dt>
115-
<dd>Shows the last 10 lines of <code>FILE.html</code></dd>
141+
<dt><kbd>type <span class="small-caps">program</span></kbd></dt>
142+
<dd>Provides info about whether <code class="small-caps">program</code> is an alias, command, function, etc. Combine the <code>-all</code> flag — for “all locations” — with <code>type</code> to see everything associated with <code class="small-caps">program</code>. For example, <kbd>type -all ls</kbd> reveals on my system that <code>ls</code> is aliased to <code>`ls --color=auto'</code> and that it resides at <code>/bin/ls</code> in my file system.</dd>
116143

117-
<dt><kbd>touch FILE</kbd></dt>
118-
<dd>Creates a new, empty file called <code>FILE</code>. If <code>FILE</code> exists, <code>touch</code> does nothing.</dd>
144+
<dt><kbd>which <span class="small-caps">program</span></kbd></dt>
145+
<dd>Locates and prints the path to <code class="small-caps">program</code>. For example, if you wanted to know where the <code>ls</code> program was installed, <kbd>which ls</kbd> would respond with <code>/bin/ls</code>. Consider aliasing <code>which</code> to <kbd>type -all</kbd> in order to get more info about <code class="small-caps">program</code>.</dd>
119146
</dl>
120147
</main>
121148
</body>

0 commit comments

Comments
 (0)