misc: Update docs

This commit is contained in:
Donovan Glover 2018-12-11 16:31:10 -05:00
parent ebb3663105
commit 0394f17390
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 11 additions and 1 deletions

View File

@ -6,7 +6,7 @@
An operating system is a collection of software. Every operating system builds off of the work of many other individuals and their respective creations (the "software"). This is how systems work, and is not unique to operating systems nor computing itself. An operating system is a collection of software. Every operating system builds off of the work of many other individuals and their respective creations (the "software"). This is how systems work, and is not unique to operating systems nor computing itself.
GNU/Linux is a collection of software that most modern free operating systems use. Note that a significant amount of non-GNU/Linux software, such as systemd, Xorg, and other software, is used to make a complete GNU/Linux distribution. [GNU/Linux][gnulinux] is a collection of software that most modern free operating systems use. Note that a significant amount of non-GNU/Linux software, such as systemd, Xorg, and other software, is used to make a complete GNU/Linux distribution.
## Usage ## Usage
@ -84,6 +84,12 @@ Once you've verified that you indeed want my changes, update your local copy of
git pull git pull
``` ```
If you don't want changes straight from master, and instead want to update incrementally, checkout the version tag you want, like so:
```sh
git checkout 0.2.0
```
If you used the stow method, all of the dotfiles that you use from me will already be updated; you do not have to do anything else. If git tells you that there are conflicts, you probably want to rebase your changes on top of mine, or consider making your own version of those files instead. If you used the stow method, all of the dotfiles that you use from me will already be updated; you do not have to do anything else. If git tells you that there are conflicts, you probably want to rebase your changes on top of mine, or consider making your own version of those files instead.
## Downgrading ## Downgrading

View File

@ -15,5 +15,9 @@ You should not use Code if:
- You want to learn how compilers, git, find, grep, and other software work - You want to learn how compilers, git, find, grep, and other software work
- You want to learn [vim](/vim), the standard text editor - You want to learn [vim](/vim), the standard text editor
## Usage
Once Code is installed, run `make code-extensions` to install the extensions I use.
[code]: https://www.archlinux.org/packages/community/x86_64/code/ [code]: https://www.archlinux.org/packages/community/x86_64/code/
[vscode]: https://github.com/Microsoft/vscode [vscode]: https://github.com/Microsoft/vscode