Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected quickstart documentation #811

Merged
merged 1 commit into from
Jun 2, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Basic NGINX Installation and Configuration

Installing NGINX and setting up your first web host is relatively straightforward. To install
NGINX with the puppet module, simply call the class in a puppet manifest:
NGINX with the Puppet module, simply call the class in a Puppet manifest:
```
class{'nginx': }
```
Expand Down Expand Up @@ -89,7 +89,7 @@ Combining our configurations above into a single manifest, our code block looks
}
```

In summary, this puppet code block will:
In summary, this Puppet code block will:
* Install the latest version of nginx from the 'mainline' nginx distributino.
* Define a virtual host `www.myhost.com` for our website.
* Define an *upstream* service that consists of a single external IP address.
Expand All @@ -98,12 +98,12 @@ In summary, this puppet code block will:
## References
There are a number of resources available for learning how to use NGINX effectively. Here are a few that you may find useful:
[nginx.org][nginx]: The NGNIX homepage.
[NGINX Documentation][ngixdocs]: Open Source NGINX Documentation
[NGINX Documentation][nginxdocs]: Open Source NGINX Documentation
[NGINX vs. Apache][nginxvsapache]: A good article from [DigitalOcean][] describing the key differences between the use and architecture of NGINX vs. the Apache HTTPD server. This is a good article if you are new to NGINX or want a simple overview of the NGINX event driven architecture.

[nginx]: http://ngnix.org
[phpfpm]: http://php-fpm.org
[nginxdocs]: http://nginx.org/en/docs/
[puppetlabsapache]: https://forge.puppetlabs.com/puppetlabs/apache
[digitalocean]: https://www.digitalocean.com
[nginxvsapache]: https://www.digitalocean.com/community/tutorials/apache-vs-nginx-practical-considerations
[nginxvsapache]: https://www.digitalocean.com/community/tutorials/apache-vs-nginx-practical-considerations