Skip to content

Commit 9214401

Browse files
igalicBrandon Schneider
authored and
Brandon Schneider
committed
run markdownlint-cli on *.md (truenas#355)
consistently style (and display!) our markdown
1 parent 4eec869 commit 9214401

File tree

2 files changed

+57
-36
lines changed

2 files changed

+57
-36
lines changed

CONTRIBUTING.md

+18-10
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,32 @@ Following the contribution guidelines saves everyone time, requires less back
44
and forth during the review process, and helps to ensures a consistent codebase.
55
I use PyCharm for all of my programming, and these are what I use for my settings, adapt to your editor of choice.
66

7-
####A few general rules first:
7+
## A few general rules first:
8+
89
- Open any pull request against the `master` branch
910
- Keep code to 80 characters or less.
1011
- Comment your code
1112
- Pull request description should clearly show what the change is including output if relevant.
1213
- Squash commits before opening a pull request.
13-
- Test and then test again! Make sure it works with the latest changes in
14-
`master`.
14+
- Test and then test again! Make sure it works with the latest changes in `master`.
1515
- Spaces instead of Tabs
1616
- 4 spaces for first indent and each from then on.
1717
- Spaces around Assignment `(=, +=, …)`, Equality `(==, !=)`, Relational `(<, >, <=, >=)`, Bitwise `(*, |,^)`, Additive `(+, -)`, Multiplicative `(*, @, /, %)`, Shift `(<<, >>, >>>)` and Power operators `(**)`.
1818
- Spaces after:
19-
```
19+
20+
```python
2021
,
2122
:
2223
#
2324
```
25+
2426
- Spaces before:
25-
```
27+
28+
```python
2629
\
2730
#
2831
```
32+
2933
- Align multiline method call arguments and method declaration parameters
3034
- New line after a colon
3135
- Align multiline import statements
@@ -41,16 +45,19 @@ I use PyCharm for all of my programming, and these are what I use for my setting
4145
- 1 line before and after `while` loops
4246
- Run isort on `import` statements, including `from imports`.
4347
- Keep `from imports` within their own group:
44-
```
48+
49+
```python
4550
import bar
4651
import foo
4752

4853
from baz import foo
4954
from foobar import morefoo
5055
```
56+
5157
- Join `from imports` with the same source
5258
- Align dictionaries on colons:
53-
```
59+
60+
```python
5461
x = max(
5562
1,
5663
2,
@@ -61,8 +68,9 @@ x = max(
6168
"eggs and ham": -0.0e0
6269
}
6370
```
71+
6472
- Add a linefeed at the end of the file
6573

66-
####Documentation for Read The Docs
67-
-----
68-
If you wish to update some of our [documentation] (http://iocage.readthedocs.org), you only need to submit a PR for the files you change in iocage/doc/source. They will automatically be updated when the changes are merged.
74+
## Documentation for Read The Docs
75+
76+
If you wish to update some of our [documentation](http://iocage.readthedocs.org), you only need to submit a PR for the files you change in iocage/doc/source. They will automatically be updated when the changes are merged.

README.md

+39-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
iocage
2-
======
1+
# iocage
32

43
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/iocage/iocage.svg)](http://isitmaintained.com/project/iocage/iocage "Average time to resolve an issue")
54
[![Percentage of issues still open](http://isitmaintained.com/badge/open/iocage/iocage.svg)](http://isitmaintained.com/project/iocage/iocage "Percentage of issues still open")
@@ -9,7 +8,7 @@ iocage
98
[![GitHub stars](https://img.shields.io/github/stars/iocage/iocage.svg)](https://github.com/iocage/iocage/stargazers)
109
[![Twitter](https://img.shields.io/twitter/url/https/github.com/iocage/iocage.svg?style=social)](https://twitter.com/intent/tweet?text=@iocage)
1110

12-
**A FreeBSD jail manager.**
11+
## A FreeBSD jail manager
1312

1413
iocage is a jail/container manager amalgamating some of the best features and
1514
technologies the FreeBSD operating system has to offer. It is geared for ease
@@ -18,55 +17,63 @@ technologies the FreeBSD operating system has to offer. It is geared for ease
1817
iocage is in the FreeBSD ports tree as sysutils/py-iocage.
1918
To install using binary packages, simply run: `pkg install py36-iocage`
2019

21-
# Installation
20+
## Installation
21+
22+
### GitHub:
23+
24+
`/usr/src` is ***required*** to build from GitHub
2225

23-
##### GitHub:
24-
*/usr/src is required to build from GitHub*
2526
- `pkg install python36 git-lite libgit2`
2627
- `git clone --recursive https://github.com/iocage/iocage`
2728
- `make install` as root
2829

2930
To install subsequent updates: run `make install` as root.
3031

31-
##### Ports:
32+
### Ports:
33+
3234
- Build the port as follows: `cd /usr/ports/sysutils/py3-iocage/ ; make install clean`
3335

3436
*Note: `sysutils/py3-iocage` will conflict with other previous versions of iocage included into the ports tree. We suggest you first uninstall any other previous version of iocage prior to install this one.*
3537

36-
##### Pkg:
38+
### Pkg:
39+
3740
- It is possible to install pre-built packages using pkg(8) if you are using FreeBSD 10 or above: `pkg install py36-iocage`
3841

39-
###### Upgrading from `iocage_legacy`:
42+
#### Upgrading from `iocage_legacy`:
4043

4144
This repository replaces `iocage_legacy`. To upgrade to the current version:
4245

4346
1. Stop the jails (`service iocage stop; iocage stop ALL`)
44-
2. Back up your data
45-
3. Remove the old `iocage` package if it is installed (`pkg delete iocage`)
46-
4. Install `py3-iocage` using one of the methods above
47-
5. Migrate the jails. This can be done by running `iocage list` as root
48-
6. Start the jails (`service iocage onestart`)
47+
1. Back up your data
48+
1. Remove the old `iocage` package if it is installed (`pkg delete iocage`)
49+
1. Install `py3-iocage` using one of the methods above
50+
1. Migrate the jails. This can be done by running `iocage list` as root
51+
1. Start the jails (`service iocage onestart`)
4952

5053
## WARNING:
54+
5155
- This is beta quality software, there be dragons! Please report them.
5256
- Some features of the previous iocage_legacy are either being dropped or simply not ported yet, feel free to open an issue asking about your favorite feature. But please search before opening a new one. PR's welcome for any feature you want!
5357
- **[DOCUMENTATION](http://iocage.readthedocs.org/en/latest/index.html)**
54-
- **Mailing list**: https://groups.google.com/forum/#!forum/iocage
58+
- **[Mailing list](https://groups.google.com/forum/#!forum/iocage)**
5559

56-
#### Raising an issue:
60+
## Raising an issue:
5761

5862
We _like_ issues! If you are having trouble with `iocage` please open a GitHub [issue](https://github.com/iocage/iocage/issues) and we will ~~run around with our hair on fire~~ look into it. Before doing so, please give us some information about the situation:
63+
5964
- Tell us what version of FreeBSD you are using with something like `uname -ro`
6065
- It would also be helpful if you gave us the output of `iocage --version`
6166
- Most importantly, try to be detailed. Simply stating "I tried consoling into a jail and it broke" will not help us very much.
6267
- Use the [Markdown Basics](https://help.github.com/articles/markdown-basics/#code-formatting) GitHub page for more information on how to paste lines of code and terminal output.
6368

64-
#### Submitting a pull request:
69+
## Submitting a pull request:
70+
6571
Please be detailed on the exact use case of your change and a short demo of
6672
it. Make sure it conforms with PEP-8 and that you supply a test with it if
6773
relevant. Lines may not be longer then 80 characters.
6874

69-
**FEATURES:**
75+
## FEATURES
76+
7077
- Ease of use
7178
- Rapid jail creation within seconds
7279
- Automatic package installation
@@ -76,8 +83,9 @@ relevant. Lines may not be longer then 80 characters.
7683
- Export and import
7784
- And many more!
7885

79-
---
80-
**QUICK HOWTO:**
86+
----
87+
88+
## QUICK HOWTO
8189

8290
Activate a zpool:
8391

@@ -108,27 +116,32 @@ spot to begin configuration of your jail.
108116

109117
To see a list of commands available to you now, type `iocage` outside the jail.
110118

111-
------
119+
----
120+
121+
### REQUIREMENTS
112122

113-
**REQUIREMENTS**
114123
- FreeBSD 9.3-RELEASE amd64 and higher or HardenedBSD/TrueOS
115124
- ZFS file system
116125
- Python 3.6+
117126
- UTF-8 locale (place into your ~/.login_conf):
118-
```
127+
128+
```plain
119129
me:\
120130
:charset=UTF-8:\
121131
:lang=en_US.UTF-8:\
122132
:setenv=LC_COLLATE=C:
123133
```
124-
**Optional**
125-
- Kernel compiled with:
134+
135+
### Optional
136+
137+
- Kernel compiled with:
126138

127139
# This is optional and only needed if you need VNET
128140

129141
options VIMAGE # VNET/Vimage support
130142

131-
**Helpful Considerations**
143+
### Helpful Considerations
144+
132145
- For the explanations on jail properties read jail(8)
133146
- Create bridge0 and bridge1 interfaces for VNET jails to attach to.
134147
- Use `iocage set` to modify properties and `iocage get` to retrieve property

0 commit comments

Comments
 (0)