From 0ed4e22e54efd79f686958da4092b0b39874cdc8 Mon Sep 17 00:00:00 2001 From: Vaida Plankyte Date: Fri, 16 Jun 2017 15:03:51 +0100 Subject: [PATCH] docs: Fix lint/whitespace errors in GCI docs. --- docs/fixing-commits.md | 4 +++- docs/git-cheat-sheet-detailed.md | 6 +++--- docs/git-cheat-sheet.md | 2 +- docs/shell-tips.md | 2 +- docs/working-copies.md | 6 +++--- .../documentation_crawler/spiders/common/spiders.py | 2 ++ 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/docs/fixing-commits.md b/docs/fixing-commits.md index d171b50992..9bd258475a 100644 --- a/docs/fixing-commits.md +++ b/docs/fixing-commits.md @@ -1,5 +1,7 @@ # Fixing Commits -This is mostly from https://help.github.com/articles/changing-a-commit-message/#rewriting-the-most-recent-commit-message +This is mostly from +[here](https://help.github.com/articles/changing-a-commit-message/#rewriting-the-most-recent-commit-message). + ## Fixing the last commit ### Changing the last commit message 1. `git commit --amend -m "New Message"` diff --git a/docs/git-cheat-sheet-detailed.md b/docs/git-cheat-sheet-detailed.md index 6d4559e540..21c578b0c9 100644 --- a/docs/git-cheat-sheet-detailed.md +++ b/docs/git-cheat-sheet-detailed.md @@ -20,7 +20,7 @@ Commands: - diff - `git diff`: display the changes you have made to all files - `git diff --cached`: display the changes you have made to staged files - - `git diff HEAD~2..`: display the 2 most recent changes you have made to files + - `git diff HEAD~2..`: display the 2 most recent changes you have made to files - fetch - `git fetch origin`: fetch origin repository - `git fetch upstream`: fetch upstream repository @@ -34,7 +34,7 @@ Commands: - `git push origin +branch-name`: push your commits to your origin repository - rebase - `git rebase -i HEAD~3`: interactive rebasing current branch with first three items on HEAD - - `git rebase -i master`: interactive rebasing current branch with master branch + - `git rebase -i master`: interactive rebasing current branch with master branch - `git rebase upstream/master`: rebasing current branch with master branch from upstream repository - reflog - `git reflog | head -10`: manage reference logs for the past 10 commits @@ -50,5 +50,5 @@ Commands: - `git show master`: display most recent commit on `master` - status - `git status`: show the working tree status, unstaged and staged files - + [fix-commit]: fixing-commits.html diff --git a/docs/git-cheat-sheet.md b/docs/git-cheat-sheet.md index 55b1c857ef..1b8524d239 100644 --- a/docs/git-cheat-sheet.md +++ b/docs/git-cheat-sheet.md @@ -48,5 +48,5 @@ Commands: - `git show master` - status - `git status` - + [fix-commit]: fixing-commits.html diff --git a/docs/shell-tips.md b/docs/shell-tips.md index 84e455572a..606d266a92 100644 --- a/docs/shell-tips.md +++ b/docs/shell-tips.md @@ -13,7 +13,7 @@ If you're using Windows, [these videos](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGDV6SnbINlVUd0o2xT4JbMu) may be useful too, but keep in mind that the following tips only apply to Linux/macOS environments (Unix shells). You can also use a tool, for example -[Cygwin](https://www.cygwin.com/), to have a Unix-like shell on Windows. +[Cygwin](https://www.cygwin.com/), to have a Unix-like shell on Windows. ## The prompt (`$`) diff --git a/docs/working-copies.md b/docs/working-copies.md index 12081d51a7..52a0f9cfa6 100644 --- a/docs/working-copies.md +++ b/docs/working-copies.md @@ -18,13 +18,13 @@ the various working copies. Sometimes you need to get commits. Here are some scenarios: -- You may fork the official Zulip repo to your Github fork. +- You may fork the official Zulip repo to your GitHub fork. - You may fetch commits from the offical Zulip repo to your local copy. - You occasionally may fetch commits from your forked copy. Sometimes you want to publish commits. Here are scenarios: -- You push code from your local copy to your Github fork. (You usually +- You push code from your local copy to your GitHub fork. (You usually want to put the commit on a feature branch.) - You submit a PR to the official Zulip repo. @@ -32,7 +32,7 @@ Finally, the Zulip core team will occasionally want your changes! - The Zulip core team can accept your changes and add them to the official repo, usually on the master branch. - + ## Names We call remote working copies of the repository by these short diff --git a/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py b/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py index 29d88ae4e3..408504f704 100644 --- a/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py +++ b/tools/documentation_crawler/documentation_crawler/spiders/common/spiders.py @@ -17,6 +17,8 @@ EXCLUDED_URLS = [ 'https://calendar.google.com/calendar/embed?src=ktiduof4eoh47lmgcl2qunnc0o@group.calendar.google.com', # Returns 409 errors to HEAD requests frequently 'https://medium.freecodecamp.com', + # Returns 404 to HEAD requests unconditionally + 'https://www.git-tower.com/blog/command-line-cheat-sheet/', ]