Skip to content

Commit d80e393

Browse files
committed
general: Reformat documentation with better formatting and wording
General purpose reformating and rewording in (a few places). This should also make markdown linting happier. Prefer back-ticks wherever useful and use `console` for code blocks to be executed on terminal. Also, update references links wherever possible (including update from 'http://' to 'https://').
1 parent 8edc5e9 commit d80e393

File tree

44 files changed

+1245
-1453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1245
-1453
lines changed

CONTRIBUTING.md

+32-33
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
1-
Contributing
2-
------------
1+
# Contributing
32

43
This project would not exist without all of its users and [contributors][1].
54

65
If you have ideas on how to make the configuration easier to maintain or
76
improve its performance, do not hesitate to fork and send pull requests.
87

9-
### Issue Reporting
8+
## Issue Reporting
109

11-
- Check that the issue has not already been reported.
12-
- Check that the issue has not already been fixed in the latest code.
13-
- Open an issue with a clear title and description in grammatically correct,
14-
complete sentences.
10+
- Check that the issue has not already been reported.
11+
- Check that the issue has not already been fixed in the latest code.
12+
- Open an issue with a clear title and description in grammatically correct,
13+
complete sentences.
1514

16-
### Pull Request
15+
## Pull Request
1716

18-
- Read [how to properly contribute to open source projects on GitHub][2].
19-
- Use a topic branch to easily amend a pull request later, if necessary.
20-
- Write [good commit messages][3].
21-
- Squash commits on the topic branch before opening a pull request.
22-
- Use the same coding style and spacing.
23-
- Open a [pull request][4] that relates to but one subject with a clear
24-
title and description in grammatically correct, complete sentences.
17+
- Read [how to properly contribute to open source projects on GitHub][2].
18+
- Use a topic branch to easily amend a pull request later, if necessary.
19+
- Write [good commit messages][3].
20+
- Squash commits on the topic branch before opening a pull request.
21+
- Use the same coding style and spacing.
22+
- Open a [pull request][4] that relates to but one subject with a clear title
23+
and description in grammatically correct, complete sentences.
2524

26-
#### Code Style
25+
### Code Style
2726

2827
This project follows the [Google Shell Style Guide][5] when possible. However,
2928
there are a number of additional things to keep in mind.
3029

31-
- Local variables should be used whenever possible.
32-
- Prefer `zstyle` over environment variables for configuration.
33-
- Prefer (( ... )) over [[ ... ]] for arithmetic expression.
34-
- Use the function keyword to define functions.
35-
- The 80 character hard limit can be waived for readability.
30+
- Local variables should be used whenever possible.
31+
- Prefer `zstyle` over environment variables for configuration.
32+
- Prefer (( ... )) over [[ ... ]] for arithmetic expression.
33+
- Use the function keyword to define functions.
34+
- The 80 character hard limit can be waived for readability.
3635

37-
#### Using an Alternative zprezto Directory
36+
### Using an Alternative *zprezto* Directory
3837

39-
To work on zprezto without messing with your current configuration:
38+
To work on Prezto without affecting your current configuration:
4039

4140
```sh
4241
mkdir devel-zprezto
@@ -52,24 +51,24 @@ done
5251

5352
Then to start zsh in this development environment you will run:
5453

55-
```sh
54+
```console
5655
ZDOTDIR=/path/to/devel-zprezto zsh
5756
```
5857

59-
#### Modules
58+
### Modules
6059

61-
- A *README.md* must be present.
62-
- Large functions must be placed in a *functions* directory.
63-
- Functions that take arguments must have completion.
60+
- A *README.md* must be present.
61+
- Large functions must be placed in a *functions* directory.
62+
- Functions that take arguments must have completion.
6463

65-
#### Themes
64+
### Themes
6665

67-
- A screenshots section must be present in the file header.
68-
- The pull request description must have [embedded screenshots][6].
66+
- A screenshots section must be present in the file header.
67+
- The pull request description must have [embedded screenshots][6].
6968

7069
[1]: https://github.com/sorin-ionescu/prezto/contributors
71-
[2]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request
70+
[2]: https://gun.io/blog/how-to-github-fork-branch-and-pull-request
7271
[3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
7372
[4]: https://help.github.com/articles/using-pull-requests
7473
[5]: https://google.github.io/styleguide/shell.xml
75-
[6]: http://daringfireball.net/projects/markdown/syntax#img
74+
[6]: https://github.github.com/gfm/#images

README.md

+74-80
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,64 @@
1-
Prezto — Instantly Awesome Zsh
2-
==============================
1+
# Prezto — Instantly Awesome Zsh
32

43
Prezto is the configuration framework for [Zsh][1]; it enriches the command line
54
interface environment with sane defaults, aliases, functions, auto completion,
65
and prompt themes.
76

8-
Installation
9-
------------
7+
## Installation
108

119
Prezto will work with any recent release of Zsh, but the minimum required
12-
version is 4.3.11.
10+
version is **4.3.11**.
1311

14-
1. Launch Zsh:
12+
01. Launch Zsh:
1513

16-
```console
17-
zsh
18-
```
14+
```console
15+
zsh
16+
```
1917

20-
2. Clone the repository:
18+
02. Clone the repository:
2119

22-
```console
23-
git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
24-
```
20+
```console
21+
git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
22+
```
2523

26-
3. Create a new Zsh configuration by copying the Zsh configuration files
27-
provided:
24+
03. Create a new Zsh configuration by copying the Zsh configuration files
25+
provided:
2826

29-
```sh
30-
setopt EXTENDED_GLOB
31-
for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
32-
ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
33-
done
34-
```
27+
```console
28+
setopt EXTENDED_GLOB
29+
for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
30+
ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
31+
done
32+
```
3533

36-
Note: If you already have any of the given configuration files, `ln` will
37-
cause error. In simple cases you can load prezto by adding the line
38-
`source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"` to the bottom of your
39-
`.zshrc` and keep the rest of your Zsh configuration intact. For more
40-
complicated setups, it is recommended that you back up your original
41-
configs and replace them with the provided prezto runcoms.
34+
**Note:** If you already have any of the given configuration files, `ln` in
35+
the above operation will cause an error. In simple cases, you can load
36+
Prezto by adding the line `source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"` to
37+
the bottom of your *${ZDOTDIR:-$HOME}/.zshrc* and keep the rest of your Zsh
38+
configuration intact. For more complicated setups, we recommend that you
39+
back up your original configs and replace them with the provided Prezto
40+
*runcoms*.
4241

43-
4. Set Zsh as your default shell:
42+
04. Set Zsh as your default shell:
4443

45-
```console
46-
chsh -s /bin/zsh
47-
```
44+
```console
45+
chsh -s /bin/zsh
46+
```
4847

49-
5. Open a new Zsh terminal window or tab.
48+
05. Open a new Zsh terminal window or tab.
5049

5150
### Troubleshooting
5251

53-
If you are not able to find certain commands after switching to *Prezto*,
54-
modify the `PATH` variable in *~/.zprofile* then open a new Zsh terminal
55-
window or tab.
52+
If you are not able to find certain commands after switching to Prezto, modify
53+
the `PATH` variable in *${ZDOTDIR:-$HOME}/.zprofile* then open a new Zsh
54+
terminal window or tab.
5655

57-
Updating
58-
--------
56+
## Updating
5957

60-
Run `zprezto-update` to automatically check if there is an update to zprezto.
61-
If there are no file conflicts, zprezto and its submodules will be
62-
automatically updated. If there are conflicts you will be instructed to go into
63-
the `$ZPREZTODIR` directory and resolve them yourself.
58+
Run `zprezto-update` to automatically check if there is an update to Prezto.
59+
If there are no file conflicts, Prezto and its submodules will be automatically
60+
updated. If there are conflicts you will be instructed to go into the
61+
`$ZPREZTODIR` directory and resolve them yourself.
6462

6563
To pull the latest changes and update submodules manually:
6664

@@ -70,67 +68,63 @@ git pull
7068
git submodule update --init --recursive
7169
```
7270

73-
Usage
74-
-----
71+
## Usage
7572

76-
Prezto has many features disabled by default. Read the source code and
77-
accompanying README files to learn of what is available.
73+
Prezto has many features disabled by default. Read the source code and the
74+
accompanying README files to learn about what is available.
7875

7976
### Modules
8077

81-
1. Browse */modules* to see what is available.
82-
2. Load the modules you need in *~/.zpreztorc* then open a new Zsh terminal
83-
window or tab.
78+
01. Browse */modules* to see what is available.
79+
02. Load the modules you need in *${ZDOTDIR:-$HOME}/.zpreztorc* then open a new
80+
Zsh terminal window or tab.
8481

8582
### Themes
8683

87-
1. For a list of themes, type `prompt -l`.
88-
2. To preview a theme, type `prompt -p name`.
89-
3. Load the theme you like in *~/.zpreztorc* then open a new Zsh terminal
90-
window or tab.
84+
01. For a list of themes, type `prompt -l`.
85+
02. To preview a theme, type `prompt -p name`.
86+
03. Load the theme you like in *${ZDOTDIR:-$HOME}/.zpreztorc* then open a new
87+
Zsh terminal window or tab.
9188

92-
![sorin theme][2]
93-
Note that the 'git' module may be required for special symbols to appear,
94-
such as those on the right of the above image. Add `'git'` to the `pmodule`
95-
list (under `zstyle ':prezto:load' pmodule \` in your *~/.zpreztorc*) to
96-
enable this module.
89+
![sorin theme][2]
90+
Note that the *git* module may be required for special symbols to appear,
91+
such as those on the right of the above image. Add `'git'` to the `pmodule`
92+
list (under `zstyle ':prezto:load' pmodule \` in your
93+
*${ZDOTDIR:-$HOME}/.zpreztorc*) to enable this module.
9794

9895
### External Modules
9996

100-
1. By default modules will be loaded from */modules* and */contrib*.
101-
2. Additional module directories can be added to the
102-
`:prezto:load:pmodule-dirs` setting in *~/.zpreztorc*.
97+
01. By default modules will be loaded from */modules* and */contrib*.
98+
02. Additional module directories can be added to the
99+
`:prezto:load:pmodule-dirs` setting in *${ZDOTDIR:-$HOME}/.zpreztorc*.
103100

104-
Note that module names need to be unique or they will cause an error when
105-
loading.
101+
Note that module names need to be unique or they will cause an error when
102+
loading.
106103

107-
```sh
108-
zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
109-
```
104+
```console
105+
zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
106+
```
110107

111-
Customization
112-
-------------
108+
## Customization
113109

114-
The project is managed via [Git][3]. It is highly recommended that you fork this
115-
project; so, that you can commit your changes and push them to [GitHub][4] to
116-
not lose them. If you do not know how to use Git, follow this [tutorial][5] and
117-
bookmark this [reference][6].
110+
The project is managed via [Git][3]. We highly recommend that you fork this
111+
project so that you can commit your changes and push them to your fork on
112+
[GitHub][4] to preserve them. If you do not know how to use Git, follow this
113+
[tutorial][5] and bookmark this [reference][6].
118114

119-
Resources
120-
---------
115+
## Resources
121116

122117
The [Zsh Reference Card][7] and the [zsh-lovers][8] man page are indispensable.
123118

124-
License
125-
-------
119+
## License
126120

127121
This project is licensed under the MIT License.
128122

129-
[1]: http://www.zsh.org
130-
[2]: http://i.imgur.com/nrGV6pg.png "sorin theme"
131-
[3]: http://git-scm.com
123+
[1]: https://www.zsh.org
124+
[2]: https://i.imgur.com/nrGV6pg.png "sorin theme"
125+
[3]: https://git-scm.com
132126
[4]: https://github.com
133-
[5]: http://gitimmersion.com
127+
[5]: https://gitimmersion.com
134128
[6]: https://git.github.io/git-reference/
135129
[7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
136-
[8]: http://grml.org/zsh/zsh-lovers.html
130+
[8]: https://grml.org/zsh/zsh-lovers.html

0 commit comments

Comments
 (0)