Skip to content

Commit 2b99c84

Browse files
committed
Merging again
2 parents 1867d6a + 3a19fc2 commit 2b99c84

3 files changed

Lines changed: 80 additions & 14 deletions

File tree

SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Summary
22

33
* [How the Internet works?](how_internet_works/README.md)
4+
* [Intro to Command Line](intro_to_command_line/README.md)
45
* [Python installation](python_installation/README.md)
56
* [Introduction to Python](python_introduction/README.md)
67
* [What is Django?](django/README.md)

intro_to_command_line/README.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# Introduction to Command Line
2+
3+
4+
## Introduction
5+
Hey girls, the following steps will show you how to use the black window. This window is also called the "command line", "cmd", "prompt" and "terminal".
6+
7+
Each operating system has a set of commands for the command line.
8+
Here is a summary of some useful commands:
9+
10+
| Command (Windows) | Command (Mac OS / Linux) | Description | Example|
11+
| ------------- |-----------|-------------| -----|
12+
| exit | exit | close the window | **exit** |
13+
| cd | cd | change directory | **cd test** |
14+
| dir | ls |list folders/files | **dir** |
15+
| copy | cp | copy file | **copy c:\test\test.txt c:\windows\test.txt** |
16+
| move | mv | move file | **move c:\test\test.txt c:\windows\test.txt** |
17+
| md | mkdir | create a new folder | **md testfolder** |
18+
|del | rm | delete a folder/file | **del c:\test\test.txt**
19+
For more about the above commands, check out the Further Information section below.
20+
21+
These are just a very few of the possible black window commands.
22+
[ss64.com](http://ss64.com) contains a complete reference of commands for all operating systems.
23+
24+
## Useful shortcuts
25+
26+
* Up arrow - rerun previous commands. You can avoid typing the same commands again by using the up arrow key to rerun recently used commands.
27+
28+
29+
* Tab key - the tab key will autocomplete folder and file names. For example, typing **dir t ** + Tab will autocomplete to all directories starting with t in the current directory (such as task, test, tutorial).
30+
31+
32+
## Further information about the commands above
33+
34+
* The **exit** commmand - this will cause the window to close; it makes sense, right? No need to explain too much ...
35+
36+
37+
* The **cd** command - this command allows you to change your current directory. To use the cd command you type cd directoryname and press enter.
38+
For example if you are in a directory called c:\test, and there were three directories in that the test directory called A, B, and C, you could just type **cd A** and press enter. You would then be in the c:\test\A.
39+
40+
41+
* The **cd ..** command - this will take you to the next folder up.
42+
43+
44+
* The **dir** (Windows) and **ls** (others) command - this will list the files and directories contained in your current directory. If I typed **dir \test** or **ls test** I would see the contents of the c:\test directory.
45+
Also note for many commands you can use the \* symbol which stands for wildcard. With this in mind, typing **dir *.txt** on WIN or **ls *.txt** on other OS will only list those files that end with .txt.
46+
47+
48+
* The **copy** (Windows) or **cp** (others) command - this allows you to copy files from one location to another. To use this command you would type **copy *sourcefile targetfile***. For example if you have the file c:\test\test.txt and would like to copy it to c:\windows\test.txt you would type
49+
**copy c:\test\test.txt c:\windows\test.txt** and press enter.
50+
51+
52+
* The **move** (Windows) or **mv** (others) command - this allows you to move files from one location to another. The syntax you use is the same as for the **copy** command.
53+
54+
55+
* The **md** (Windows) or **mkdir** (others) command - this allows you to create a new directory. For example **md temp** creates a new folder called temp in the current directory.
56+
57+
58+
* The **del** (Windows) or **rm** command (others) - this allows you to delete the specified file. For example, **del test.txt** deletes the test.txt file from the current directory.
59+
60+
61+
62+
63+
64+
65+

python_installation/README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
# Let’s start with Python
22

3-
Huh, it's exciting, right?! You'll write your first line of code in just minutes!
3+
Huh, it's exciting, right?! You'll write your first line of code in just a few minutes!
44

5-
But first, let us tell you what Python is. Python is a very popular programming language that can be used for creating websites, games, science, graphics and much, much more.
5+
But first, let us tell you what Python is. Python is a very popular programming language that can be used for creating websites, games, scientific software, graphics and much, much more.
66

7-
Python originated in the late 1980s and its main goal is to be readable by human beings (not only machines!), which is why it looks much simpler than other programming languages. That makes it easy to learn, but don't worry, Python is also really powerful!
7+
Python originated in the late 1980s and its main goal is to be readable by human beings (not only machines!), which is why it looks much simpler than other programming languages. This makes it easy to learn, but don't worry, Python is also really powerful!
88

99
# Python installation
1010

1111
*This subchapter is based on awesome tutorials by Geek Girls Carrots (http://django.carrots.pl/)*
1212

13-
Django is written in Python. We need it to do anything in Django. Let's start with installing it! We want you to install Python 3.4, so if you have any earlier version, you will need to upgrade it.
13+
Django is written in Python. We need Python to do anything in Django. Let's start with installing it! We want you to install Python 3.4, so if you have any earlier version, you will need to upgrade it.
1414

1515
### Windows
1616

1717
You can download Python for Windows from the website https://www.python.org/download/releases/3.4.1/. After downloading the ***.msi** file, you should execute it (double-click on it) and follow the instructions there. It is important to remember the path (the folder) where you installed Python. It will be needed later!
1818

1919
### Linux
2020

21-
It is very likely that you already have Python installed out of the box. To check if you have it installed (and which version it is), open a console and type:
21+
It is very likely that you already have Python installed out of the box. To check if you have it installed (and which version it is), open a console and type the following command:
2222

2323
$ python3 --version
2424
Python 3.4.1
2525

26-
If you don't have Python installed or you want a different version, you can install it as follows.
26+
If you don't have Python installed or if you want a different version, you can install it as follows:
2727

2828
#### Ubuntu
2929

30-
You type in the console:
30+
Type this command into your console:
3131

3232
sudo apt-get install python3.4
3333

3434

3535
#### Fedora
3636

37-
You type in the console:
37+
Use this command in your console:
3838

3939
sudo yum install python3.4
4040

4141
### OS X
4242

43-
You need to go to the website https://www.python.org/downloads/release/python-341/ and download the installer.
43+
You need to go to the website https://www.python.org/downloads/release/python-341/ and download the Python installer:
4444

45-
* Download *Mac OS X 64-bit/32-bit installer* *DMG* file
46-
* Double click to open it
47-
* Double click *Python.mpkg* to run the installer
45+
* Download the *Mac OS X 64-bit/32-bit installer* *DMG* file,
46+
* double click to open it,
47+
* double click *Python.mpkg* to run the installer.
4848

49-
Verify the installation succeeded by opening *Terminal* and running `python` command:
49+
Verify the installation was successful by opening the *Terminal* application and running the `python3` command:
5050

5151
$ python3 --version
5252
Python 3.4.1
5353

5454
----
5555

56-
If you have any doubts or something went wrong and you have no idea what to do next - please ask your coach! Sometimes things are not going smoothly and it's better to ask for help from someone with more experience.
56+
If you have any doubts or if something went wrong and you have no idea what to do next - please ask your coach! Sometimes things are not going smoothly and it's better to ask for help from someone with more experience.

0 commit comments

Comments
 (0)