summaryrefslogtreecommitdiff
path: root/doc/gitlab-basics
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:28 +0000
commitbe2f4c5788975597dd7be1c8a3525549770c1216 (patch)
tree083ed0d7e29e26d479c00e00d9cb89d74ebbb0ef /doc/gitlab-basics
parent2711c26beaca6c3a5a3be4b65e01557faf0185b6 (diff)
downloadgitlab-ce-be2f4c5788975597dd7be1c8a3525549770c1216.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/gitlab-basics')
-rw-r--r--doc/gitlab-basics/command-line-commands.md12
-rw-r--r--doc/gitlab-basics/create-project.md3
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/gitlab-basics/command-line-commands.md b/doc/gitlab-basics/command-line-commands.md
index 74539b33642..fed91046c32 100644
--- a/doc/gitlab-basics/command-line-commands.md
+++ b/doc/gitlab-basics/command-line-commands.md
@@ -43,7 +43,7 @@ The list below is not exhaustive, but contains many of the most commonly used co
To create a text file from the command line, for example `README.md`, follow these
steps:
-```
+```shell
touch README.md
nano README.md
#### ADD YOUR INFORMATION
@@ -59,14 +59,14 @@ It is easy to delete (remove) a file or directory, but be careful:
DANGER: **Danger:**
This will **permanently** delete a file.
-```
+```shell
rm NAME-OF-FILE
```
DANGER: **Danger:**
This will **permanently** delete a directory and **all** of its contents.
-```
+```shell
rm -r NAME-OF-DIRECTORY
```
@@ -77,14 +77,14 @@ and then execute any of them again, if needed.
First, list the commands you executed previously:
-```
+```shell
history
```
Then, choose a command from the list and check the number next to the command (`123`,
for example) . Execute the same full command with:
-```
+```shell
!123
```
@@ -95,7 +95,7 @@ need administrator's rights to execute commands that affect the system, or try t
protected data, for example. You can use `sudo` to execute these commands, but you
will likely be asked for an administrator password.
-```
+```shell
sudo RESTRICTED-COMMAND
```
diff --git a/doc/gitlab-basics/create-project.md b/doc/gitlab-basics/create-project.md
index f42a58a67b0..34e3ff7a6fa 100644
--- a/doc/gitlab-basics/create-project.md
+++ b/doc/gitlab-basics/create-project.md
@@ -87,8 +87,7 @@ You can improve the existing built-in templates or contribute new ones in the
#### Custom project templates **(PREMIUM)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/6860) in
-[GitLab Premium](https://about.gitlab.com/pricing/) 11.2.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/6860) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.2.
Creating new projects based on custom project templates is a convenient option for
quickly starting projects.