From 1d16e16b30fab4dbd463bbfb01110cbf03abef7d Mon Sep 17 00:00:00 2001 From: David Haguenauer Date: Fri, 12 Oct 2018 17:46:15 +0200 Subject: [PATCH] docs: replace "Github" with "GitHub" This the way GitHub refer to themselves. --- CONTRIBUTING.md | 10 +++++----- MAINTAINERS.md | 2 +- MANUAL.md | 2 +- docs/content/about.md | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 23ea23b80..b87a162b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,14 +21,14 @@ with the [latest beta of rclone](https://beta.rclone.org/): ## Submitting a pull request ## If you find a bug that you'd like to fix, or a new feature that you'd -like to implement then please submit a pull request via Github. +like to implement then please submit a pull request via GitHub. If it is a big feature then make an issue first so it can be discussed. You'll need a Go environment set up with GOPATH set. See [the Go getting started docs](https://golang.org/doc/install) for more info. -First in your web browser press the fork button on [rclone's Github +First in your web browser press the fork button on [rclone's GitHub page](https://github.com/ncw/rclone). Now in your terminal @@ -74,13 +74,13 @@ When you are done with that git push origin my-new-feature -Go to the Github website and click [Create pull +Go to the GitHub website and click [Create pull request](https://help.github.com/articles/creating-a-pull-request/). You patch will get reviewed and you might get asked to fix some stuff. If so, then make the changes in the same branch, squash the commits, -rebase it to master then push it to Github with `--force`. +rebase it to master then push it to GitHub with `--force`. ## Enabling CI for your fork ## @@ -358,7 +358,7 @@ See the [testing](#testing) section for more information on integration tests. Add your fs to the docs - you'll need to pick an icon for it from [fontawesome](http://fontawesome.io/icons/). Keep lists of remotes in alphabetical order but with the local file system last. - * `README.md` - main Github page + * `README.md` - main GitHub page * `docs/content/remote.md` - main docs page (note the backend options are automatically added to this file with `make backenddocs`) * `docs/content/overview.md` - overview docs * `docs/content/docs.md` - list of remotes in config section diff --git a/MAINTAINERS.md b/MAINTAINERS.md index a3e342640..f0c056128 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -58,7 +58,7 @@ Close tickets as soon as you can - make sure they are tagged with a release. Po Try to process pull requests promptly! -Merging pull requests on Github itself works quite well now-a-days so you can squash and rebase or rebase pull requests. rclone doesn't use merge commits. Use the squash and rebase option if you need to edit the commit message. +Merging pull requests on GitHub itself works quite well now-a-days so you can squash and rebase or rebase pull requests. rclone doesn't use merge commits. Use the squash and rebase option if you need to edit the commit message. After merging the commit, in your local master branch, do `git pull` then run `bin/update-authors.py` to update the authors file then `git push`. diff --git a/MANUAL.md b/MANUAL.md index 8e58ee07c..d47cb786a 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -61,7 +61,7 @@ Features Links * [Home page](https://rclone.org/) - * [Github project page for source and bug tracker](https://github.com/ncw/rclone) + * [GitHub project page for source and bug tracker](https://github.com/ncw/rclone) * [Rclone Forum](https://forum.rclone.org) * Google+ page * [Downloads](https://rclone.org/downloads/) diff --git a/docs/content/about.md b/docs/content/about.md index c802d3243..05d4acdf8 100644 --- a/docs/content/about.md +++ b/docs/content/about.md @@ -66,7 +66,7 @@ Features Links * [Home page](https://rclone.org/) - * [Github project page for source and bug tracker](https://github.com/ncw/rclone) + * [GitHub project page for source and bug tracker](https://github.com/ncw/rclone) * [Rclone Forum](https://forum.rclone.org) * Google+ page * [Downloads](/downloads/)