conflict resolution for nginx guides #1501
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [UPDATE] Install Cpanel * Travis
Faulty DNS records
* Add script for identifying old non-deprecated guides * Add command line argument for number of results
* added authy to 2fa guide * Update linode-manager-security-controls.md * Add script for identifying old non-deprecated guides * Add og_description and minor copy edits
and a quick glance through at the md
* Add script for identifying old non-deprecated guides * Deprecate Oracle XE Guide
* Add script for identifying old non-deprecated guides * Update sort and uniq guide
* added support faq to meltdown statement * meltdown statement modified date * meltdown trailing whitespace for travis
#how-to-reboot-into-an-updated-linode-kernel from #how-to-reboot-into-an-updated-kernel
#1417) Remove duplicated word in how-to-install-postgresql-on-ubuntu-16-04.md
* grsecurity kernel now has the -hardened suffix instead of -grsec * wheel group is built-in without the need to create a new group it is also recommended by the default /etc/sudoers
Add Code of Conduct as exception to test_filename.py
* Add script for identifying old non-deprecated guides * Add banner image to Docker container connection guide
Update UFW with h1
from: > We are constantly looking to __impove__ the quality of our library to: > We are constantly looking to __improve__ the quality of our library
* New quick answer and topical edits to tar docs * すみませんお願いします” ” * Tech edit * Clarified archive vs compress
* Fix spelling to security section from Vale * Typo fix
Adds "key" to example in step 5.
- add banner image - replace Thingsboard with ThingsBoard to match official documentation.
* Add Vale to Travis CI * Clean up dictionary Removed the following terms: - datacenter / datacenters (see #1479) - bottem (misspelling) - programatically (misspelling) - pyintotify (misspelling) - shortcod (misspelling) - spamhuas (misspelling) - shouldn (old tokenization) * Update dictionary Removed the following terms (#1474): * apha ("alpha" is in the standard dictionary, so I didn't add it here.) * datbase * deeplearning * ebjabberd * hilight * hilights * highlite * longivew * nonrecusive * standalones * tokyo2 * webbrowser * Update dictionary Removed the following terms (#1474): * apha ("alpha" is in the standard dictionary, so I didn't add it here.) * datbase * deeplearning * ebjabberd * hilight * hilights * highlite * longivew * nonrecusive * standalones * tokyo2 * webbrowser * Add "moby" and "backticks" * Add "ws", "Hilights", and "subfile(s)"
* Update image alt tags * Update meta descriptions and comments from TVF
|
LOL |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pulled in the latest and resolved merge conflicts - let's see if this works