Skip to content

Commit aea6bb0

Browse files
FrimkronFrimkron
committed
Added unique prefixes to each os-depedent section so that heading links are unique and can be linked to from other pages
1 parent aa73a36 commit aea6bb0

File tree

6 files changed

+53
-54
lines changed

6 files changed

+53
-54
lines changed

‎en/deploy/install_git.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ Git is a "version control system" used by a lot of programmers. This software ca
22

33
## Installing Git
44

5-
<!--sec data-title="Windows" data-id="git_install_windows"
5+
<!--sec data-title="Installing Git: Windows" data-id="git_install_windows"
66
data-collapse=true ces-->
77

88
You can download Git from [git-scm.com](https://git-scm.com/). You can hit "next" on all steps except for one; in the fifth step entitled "Adjusting your PATH environment", choose "Use Git and optional Unix tools from the Windows Command Prompt" (the bottom option). Other than that, the defaults are fine. Checkout Windows-style, commit Unix-style line endings is good.
99

1010
Do not forget to restart the command prompt or powershell after the installation finished successfully.
1111
<!--endsec-->
1212

13-
<!--sec data-title="OS X" data-id="git_install_OSX"
13+
<!--sec data-title="Installing Git: OS X" data-id="git_install_OSX"
1414
data-collapse=true ces-->
1515

1616
Download Git from [git-scm.com](https://git-scm.com/) and just follow the instructions.
@@ -19,7 +19,7 @@ Download Git from [git-scm.com](https://git-scm.com/) and just follow the instru
1919
2020
<!--endsec-->
2121

22-
<!--sec data-title="Debian or Ubuntu" data-id="git_install_debian_ubuntu"
22+
<!--sec data-title="Installing Git: Debian or Ubuntu" data-id="git_install_debian_ubuntu"
2323
data-collapse=true ces-->
2424

2525
{% filename %}command-line{% endfilename %}
@@ -29,7 +29,7 @@ $ sudo apt-get install git
2929

3030
<!--endsec-->
3131

32-
<!--sec data-title="Fedora" data-id="git_install_fedora"
32+
<!--sec data-title="Installing Git: Fedora" data-id="git_install_fedora"
3333
data-collapse=true ces-->
3434

3535
{% filename %}command-line{% endfilename %}
@@ -39,7 +39,7 @@ $ sudo dnf install git
3939

4040
<!--endsec-->
4141

42-
<!--sec data-title="openSUSE" data-id="git_install_openSUSE"
42+
<!--sec data-title="Installing Git: openSUSE" data-id="git_install_openSUSE"
4343
data-collapse=true ces-->
4444

4545
{% filename %}command-line{% endfilename %}

‎en/django_installation/instructions.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ We will make a virtualenv called `myvenv`. The general command will be in the fo
3131
$ python3 -m venv myvenv
3232
```
3333

34-
<!--sec data-title="Windows" data-id="virtualenv_installation_windows"
34+
<!--sec data-title="Virtual environment: Windows" data-id="virtualenv_installation_windows"
3535
data-collapse=true ces-->
3636

3737
To create a new `virtualenv`, you need to open the command prompt and run `python -m venv myvenv`. It will look like this:
@@ -45,7 +45,7 @@ Where `myvenv` is the name of your `virtualenv`. You can use any other name, but
4545

4646
<!--endsec-->
4747

48-
<!--sec data-title="Linux and OS X" data-id="virtualenv_installation_linuxosx"
48+
<!--sec data-title="Virtual environment: Linux and OS X" data-id="virtualenv_installation_linuxosx"
4949
data-collapse=true ces-->
5050

5151
Creating a `virtualenv` on both Linux and OS X is as simple as running `python3 -m venv myvenv`.
@@ -108,7 +108,7 @@ $ python3 -m venv myvenv
108108
109109
The command above will create a directory called `myvenv` (or whatever name you chose) that contains our virtual environment (basically a bunch of directory and files).
110110
111-
<!--sec data-title="Windows" data-id="virtualenv_windows"
111+
<!--sec data-title="Working with virtualenv: Windows" data-id="virtualenv_windows"
112112
data-collapse=true ces-->
113113
114114
Start your virtual environment by running:
@@ -129,7 +129,7 @@ C:\Users\Name\djangogirls> myvenv\Scripts\activate
129129
130130
<!--endsec-->
131131
132-
<!--sec data-title="Linux and OS X" data-id="virtualenv_linuxosx"
132+
<!--sec data-title="Working with virtualenv: Linux and OS X" data-id="virtualenv_linuxosx"
133133
data-collapse=true ces-->
134134
135135
Start your virtual environment by running:
@@ -178,14 +178,14 @@ Installing collected packages: django
178178
Successfully installed django-1.11.3
179179
```
180180
181-
<!--sec data-title="Windows" data-id="django_err_windows"
181+
<!--sec data-title="Installing Django: Windows" data-id="django_err_windows"
182182
data-collapse=true ces-->
183183
184184
> If you get an error when calling pip on Windows platform, please check if your project pathname contains spaces, accents or special characters (for example, `C:\Users\User Name\djangogirls`). If it does, please consider using another place without spaces, accents or special characters (suggestion: `C:\djangogirls`). Create a new virtualenv in the new directory, then delete the old one and try the above command again. (Moving the virtualenv directory won't work since virtualenv uses absolute paths.)
185185
186186
<!--endsec-->
187187
188-
<!--sec data-title="Windows 8 and Windows 10" data-id="django_err_windows8and10"
188+
<!--sec data-title="Installing Django: Windows 8 and Windows 10" data-id="django_err_windows8and10"
189189
data-collapse=true ces-->
190190
191191
> Your command line might freeze after when you try to install Django. If this happens, instead of the above command use:
@@ -197,7 +197,7 @@ data-collapse=true ces-->
197197
198198
<!--endsec-->
199199
200-
<!--sec data-title="Linux" data-id="django_err_linux"
200+
<!--sec data-title="Installing Django: Linux" data-id="django_err_linux"
201201
data-collapse=true ces-->
202202
203203
> If you get an error when calling pip on Ubuntu 12.04 please run `python -m pip install -U --force-reinstall pip` to fix the pip installation in the virtualenv.

‎en/django_start_project/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The names of some files and directories are very important for Django. You shoul
1616
> Remember to run everything in the virtualenv. If you don't see a prefix `(myvenv)` in your console, you need to activate your virtualenv. We explained how to do that in the __Django installation__ chapter in the __Working with virtualenv__ part. Typing `myvenv\Scripts\activate` on Windows or
1717
`source myvenv/bin/activate` on Mac OS X or Linux will do this for you.
1818

19-
<!--sec data-title="OS X or Linux" data-id="django_start_project_OSX_Linux" data-collapse=true ces-->
19+
<!--sec data-title="Create project: OS X or Linux" data-id="django_start_project_OSX_Linux" data-collapse=true ces-->
2020

2121
In your Mac OS X or Linux console, you should run the following command. **Don't forget to add the period (or dot) `.` at the end!**
2222

@@ -32,7 +32,7 @@ The `(myvenv) ~/djangogirls$` part shown here is just example of the prompt that
3232

3333
<!--endsec-->
3434

35-
<!--sec data-title="Windows" data-id="django_start_project_windows" data-collapse=true ces-->
35+
<!--sec data-title="Create project: Windows" data-id="django_start_project_windows" data-collapse=true ces-->
3636

3737
On Windows you should run the following command. **(Don't forget to add the period (or dot) `.` at the end)**:
3838

‎en/intro_to_command_line/README.md‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The window, which is usually called the __command line__ or __command-line inter
1919
To start some experiments we need to open our command-line interface first.
2020

2121

22-
<!--sec data-title="Windows" data-id="windows_prompt" data-collapse=true ces-->
22+
<!--sec data-title="Opening: Windows" data-id="windows_prompt" data-collapse=true ces-->
2323

2424
Go to Start menu → Windows System → Command Prompt.
2525

@@ -28,13 +28,13 @@ Go to Start menu → Windows System → Command Prompt.
2828
<!--endsec-->
2929

3030

31-
<!--sec data-title="OS X" data-id="OSX_prompt" data-collapse=true ces-->
31+
<!--sec data-title="Opening: OS X" data-id="OSX_prompt" data-collapse=true ces-->
3232

3333
Go to Applications → Utilities → Terminal.
3434

3535
<!--endsec-->
3636

37-
<!--sec data-title="Linux" data-id="linux_prompt" data-collapse=true ces-->
37+
<!--sec data-title="Opening: Linux" data-id="linux_prompt" data-collapse=true ces-->
3838

3939
It's probably under Applications → Accessories → Terminal, but that may depend on your system. If it's not there, just Google it. :)
4040

@@ -44,7 +44,7 @@ It's probably under Applications → Accessories → Terminal, but that may depe
4444

4545
You now should see a white or black window that is waiting for your commands.
4646

47-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_prompt" data-collapse=true ces-->
47+
<!--sec data-title="Prompt: OS X and Linux" data-id="OSX_Linux_prompt" data-collapse=true ces-->
4848

4949

5050
If you're on Mac or Linux, you probably see `$`, just like this:
@@ -55,7 +55,7 @@ $
5555
```
5656
<!--endsec-->
5757

58-
<!--sec data-title="Windows" data-id="windows_prompt2" data-collapse=true ces-->
58+
<!--sec data-title="Prompt: Windows" data-id="windows_prompt2" data-collapse=true ces-->
5959

6060

6161
On Windows, it's a `>` sign, like this:
@@ -78,7 +78,7 @@ In the tutorial, when we want you to type in a command, we will include the `$`
7878

7979
Let's start with something simple. Type this command:
8080

81-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_whoami" data-collapse=true ces-->
81+
<!--sec data-title="Your first command: OS X and Linux" data-id="OSX_Linux_whoami" data-collapse=true ces-->
8282

8383
{% filename %}command-line{% endfilename %}
8484
```
@@ -88,7 +88,7 @@ $ whoami
8888
<!--endsec-->
8989

9090

91-
<!--sec data-title="Windows" data-id="windows_whoami" data-collapse=true ces-->
91+
<!--sec data-title="Your first command: Windows" data-id="windows_whoami" data-collapse=true ces-->
9292

9393
{% filename %}command-line{% endfilename %}
9494
```
@@ -117,7 +117,7 @@ Each operating system has a slightly different set of commands for the command l
117117

118118
It'd be nice to know where are we now, right? Let's see. Type this command and hit `enter`:
119119

120-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_pwd" data-collapse=true ces-->
120+
<!--sec data-title="Current directory: OS X and Linux" data-id="OSX_Linux_pwd" data-collapse=true ces-->
121121

122122

123123
{% filename %}command-line{% endfilename %}
@@ -131,7 +131,7 @@ $ pwd
131131
<!--endsec-->
132132

133133

134-
<!--sec data-title="Windows" data-id="windows_cd" data-collapse=true ces-->
134+
<!--sec data-title="Current directory: Windows" data-id="windows_cd" data-collapse=true ces-->
135135

136136
{% filename %}command-line{% endfilename %}
137137
```
@@ -150,7 +150,7 @@ You'll probably see something similar on your machine. Once you open the command
150150

151151
So what's in it? It'd be cool to find out. Let's see:
152152

153-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_ls" data-collapse=true ces-->
153+
<!--sec data-title="List files and directories: OS X and Linux" data-id="OSX_Linux_ls" data-collapse=true ces-->
154154

155155
{% filename %}command-line{% endfilename %}
156156
```
@@ -163,7 +163,7 @@ Music
163163
```
164164
<!--endsec-->
165165

166-
<!--sec data-title="Windows" data-id="windows_dir" data-collapse=true ces-->
166+
<!--sec data-title="List files and directories: Windows" data-id="windows_dir" data-collapse=true ces-->
167167

168168

169169
{% filename %}command-line{% endfilename %}
@@ -185,15 +185,15 @@ Music
185185

186186
Now, let's go to our Desktop directory:
187187

188-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_move_to" data-collapse=true ces-->
188+
<!--sec data-title="Change current directory: OS X and Linux" data-id="OSX_Linux_move_to" data-collapse=true ces-->
189189

190190
{% filename %}command-line{% endfilename %}
191191
```
192192
$ cd Desktop
193193
```
194194
<!--endsec-->
195195

196-
<!--sec data-title="Windows" data-id="windows_move_to" data-collapse=true ces-->
196+
<!--sec data-title="Change current directory: Windows" data-id="windows_move_to" data-collapse=true ces-->
197197

198198

199199
{% filename %}command-line{% endfilename %}
@@ -204,7 +204,7 @@ $ cd Desktop
204204

205205
Check if it's really changed:
206206

207-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_pwd2" data-collapse=true ces-->
207+
<!--sec data-title="Check if changed: OS X and Linux" data-id="OSX_Linux_pwd2" data-collapse=true ces-->
208208

209209
{% filename %}command-line{% endfilename %}
210210
```
@@ -213,7 +213,7 @@ $ pwd
213213
```
214214
<!--endsec-->
215215

216-
<!--sec data-title="Windows" data-id="windows_cd2" data-collapse=true ces-->
216+
<!--sec data-title="Check if changed: Windows" data-id="windows_cd2" data-collapse=true ces-->
217217

218218
{% filename %}command-line{% endfilename %}
219219
```
@@ -232,15 +232,15 @@ Here it is!
232232

233233
How about creating a practice directory on your desktop? You can do it this way:
234234

235-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_mkdir" data-collapse=true ces-->
235+
<!--sec data-title="Create directory: OS X and Linux" data-id="OSX_Linux_mkdir" data-collapse=true ces-->
236236

237237
{% filename %}command-line{% endfilename %}
238238
```
239239
$ mkdir practice
240240
```
241241
<!--endsec-->
242242

243-
<!--sec data-title="Windows" data-id="windows_mkdir" data-collapse=true ces-->
243+
<!--sec data-title="Create directory: Windows" data-id="windows_mkdir" data-collapse=true ces-->
244244

245245

246246
{% filename %}command-line{% endfilename %}
@@ -261,7 +261,7 @@ A small challenge for you: in your newly created `practice` directory, create a
261261

262262
#### Solution:
263263

264-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_test_dir" data-collapse=true ces-->
264+
<!--sec data-title="Exercise solution: OS X and Linux" data-id="OSX_Linux_test_dir" data-collapse=true ces-->
265265

266266
{% filename %}command-line{% endfilename %}
267267
```
@@ -272,7 +272,7 @@ test
272272
```
273273
<!--endsec-->
274274

275-
<!--sec data-title="Windows" data-id="windows_test_dir" data-collapse=true ces-->
275+
<!--sec data-title="Exercise solution: Windows" data-id="windows_test_dir" data-collapse=true ces-->
276276

277277

278278
{% filename %}command-line{% endfilename %}
@@ -294,15 +294,15 @@ We don't want to leave a mess, so let's remove everything we did until that poin
294294

295295
First, we need to get back to Desktop:
296296

297-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_back" data-collapse=true ces-->
297+
<!--sec data-title="Clean up: OS X and Linux" data-id="OSX_Linux_back" data-collapse=true ces-->
298298

299299
{% filename %}command-line{% endfilename %}
300300
```
301301
$ cd ..
302302
```
303303
<!--endsec-->
304304

305-
<!--sec data-title="Windows" data-id="windows_back" data-collapse=true ces-->
305+
<!--sec data-title="Clean up: Windows" data-id="windows_back" data-collapse=true ces-->
306306

307307

308308
{% filename %}command-line{% endfilename %}
@@ -315,7 +315,7 @@ Using `..` with the `cd` command will change your current directory to the paren
315315

316316
Check where you are:
317317

318-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_pwd3" data-collapse=true ces-->
318+
<!--sec data-title="Check location: OS X and Linux" data-id="OSX_Linux_pwd3" data-collapse=true ces-->
319319

320320
{% filename %}command-line{% endfilename %}
321321
```
@@ -324,7 +324,7 @@ $ pwd
324324
```
325325
<!--endsec-->
326326

327-
<!--sec data-title="Windows" data-id="windows_cd3" data-collapse=true ces-->
327+
<!--sec data-title="Check location: Windows" data-id="windows_cd3" data-collapse=true ces-->
328328

329329

330330
{% filename %}command-line{% endfilename %}
@@ -338,15 +338,15 @@ Now time to delete the `practice` directory:
338338

339339
> __Attention__: Deleting files using `del`, `rmdir` or `rm` is irrecoverable, meaning _the deleted files will be gone forever_! So be very careful with this command.
340340
341-
<!--sec data-title="Windows Powershell, OS X and Linux" data-id="OSX_Linux_rm" data-collapse=true ces-->
341+
<!--sec data-title="Delete directory: Windows Powershell, OS X and Linux" data-id="OSX_Linux_rm" data-collapse=true ces-->
342342

343343
{% filename %}command-line{% endfilename %}
344344
```
345345
$ rm -r practice
346346
```
347347
<!--endsec-->
348348

349-
<!--sec data-title="Windows Command Prompt" data-id="windows_rmdir" data-collapse=true ces-->
349+
<!--sec data-title="Delete directory: Windows Command Prompt" data-id="windows_rmdir" data-collapse=true ces-->
350350

351351

352352
{% filename %}command-line{% endfilename %}
@@ -358,15 +358,15 @@ practice, Are you sure <Y/N>? Y
358358

359359
Done! To be sure it's actually deleted, let's check it:
360360

361-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_ls2" data-collapse=true ces-->
361+
<!--sec data-title="Check deletion: OS X and Linux" data-id="OSX_Linux_ls2" data-collapse=true ces-->
362362

363363
{% filename %}command-line{% endfilename %}
364364
```
365365
$ ls
366366
```
367367
<!--endsec-->
368368

369-
<!--sec data-title="Windows" data-id="windows_dir2" data-collapse=true ces-->
369+
<!--sec data-title="Check deletion: Windows" data-id="windows_dir2" data-collapse=true ces-->
370370

371371

372372
{% filename %}command-line{% endfilename %}
@@ -379,15 +379,15 @@ $ ls
379379

380380
That's it for now! You can safely close the command line now. Let's do it the hacker way, alright? :)
381381

382-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_exit" data-collapse=true ces-->
382+
<!--sec data-title="Exit: OS X and Linux" data-id="OSX_Linux_exit" data-collapse=true ces-->
383383

384384
{% filename %}command-line{% endfilename %}
385385
```
386386
$ exit
387387
```
388388
<!--endsec-->
389389

390-
<!--sec data-title="Windows" data-id="windows_exit" data-collapse=true ces-->
390+
<!--sec data-title="Exit: Windows" data-id="windows_exit" data-collapse=true ces-->
391391

392392

393393
{% filename %}command-line{% endfilename %}

0 commit comments

Comments
 (0)