Skip to content

Commit a451dd5

Browse files
author
Carolin Latze
committed
some clarifications for windows, especially powershell
1 parent 7ac28c8 commit a451dd5

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

en/deploy/install_git.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ 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

10+
Do not forget to restart the command prompt or powershell after the installation finished successfully.
1011
<!--endsec-->
1112

1213
<!--sec data-title="OS X" data-id="git_install_OSX"

en/django_forms/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ Change it to this:
394394
{% endif %}
395395
```
396396

397-
Since you're likely logged in, if you refresh the page, you won't see anything different. Load the page in a different browser or an incognito window, though, and you'll see that the link doesn't show up, and the icon doesn't display either!
397+
Since you're likely logged in, if you refresh the page, you won't see anything different. Load the page in a different browser or an incognito window (called "InPrivate" in Windows Edge), though, and you'll see that the link doesn't show up, and the icon doesn't display either!
398398

399399
## One more thing: deploy time!
400400

en/intro_to_command_line/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ Music
174174
05/08/2014 07:28 PM <DIR> Music
175175
...
176176
```
177+
> Note: In powershell you can also use 'ls' like on Linux and Mac OS X.
177178
<!--endsec-->
178179
179180
---
@@ -335,15 +336,15 @@ Now time to delete the `practice` directory:
335336

336337
> __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.
337338
338-
<!--sec data-title="OS X and Linux" data-id="OSX_Linux_rm" data-collapse=true ces-->
339+
<!--sec data-title="Windows Powershell, OS X and Linux" data-id="OSX_Linux_rm" data-collapse=true ces-->
339340

340341
{% filename %}command-line{% endfilename %}
341342
```
342343
$ rm -r practice
343344
```
344345
<!--endsec-->
345346

346-
<!--sec data-title="Windows" data-id="windows_rmdir" data-collapse=true ces-->
347+
<!--sec data-title="Windows Command Prompt" data-id="windows_rmdir" data-collapse=true ces-->
347348

348349

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

en/python_introduction/README.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,16 +607,28 @@ $ cd ~/Desktop
607607

608608
<!--endsec-->
609609

610-
<!--sec data-title="Windows" data-id="python_windows" data-collapse=true ces-->
610+
<!--sec data-title="Windows Command Prompt" data-id="python_windows" data-collapse=true ces-->
611611

612-
And on Windows, it will be like this:
612+
On Windows Command Prompt, it will be like this:
613613

614614
{% filename %}command-line{% endfilename %}
615615
```
616616
> cd %HomePath%\Desktop
617617
```
618618
<!--endsec-->
619619

620+
621+
<!--sec data-title="Windows Powershell" data-id="python_windowsPSH" data-collapse=true ces-->
622+
623+
And on Windows Powershell, it will be like this:
624+
625+
{% filename %}command-line{% endfilename %}
626+
```
627+
> cd $Home\Desktop
628+
```
629+
<!--endsec-->
630+
631+
620632
If you get stuck, just ask for help.
621633

622634
Now use Python to execute the code in the file like this:

en/template_extending/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Now save `base.html` and open your `blog/templates/blog/post_list.html` again.
102102
We want to use this as part of our template for all the content blocks.
103103
Time to add block tags to this file!
104104

105-
{% raw %}You want your block tag to match the tag in your `base.html` file. You also want it to include all the code that belongs in your content blocks. To do that, put everything between `{% block content %}` and `{% endblock content %}`. Like this:{% endraw %}
105+
{% raw %}You want your block tag to match the tag in your `base.html` file. You also want it to include all the code that belongs in your content blocks. To do that, put everything between `{% block content %}` and `{% endblock %}`. Like this:{% endraw %}
106106

107107
{% filename %}blog/templates/blog/post_list.html{% endfilename %}
108108
```html

0 commit comments

Comments
 (0)