nginx: update caveats

1 files changed, 15 insertions, 14 deletions

diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index 1061550ed..74cfb3096 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -9,9 +9,9 @@ class Nginx < Formula
 
   skip_clean 'logs'
 
+  # Changes default port to 8080
+  # Tell configure to look for pcre in HOMEBREW_PREFIX
   def patches
-    # Changes default port to 8080
-    # Set configure to look in homebrew prefix for pcre
     DATA
   end
 
@@ -52,21 +52,22 @@ class Nginx < Formula
     (prefix+'org.nginx.nginx.plist').write startup_plist
   end
 
-  def caveats
-    <<-CAVEATS
-In the interest of allowing you to run `nginx` without `sudo`, the default
-port is set to localhost:8080.
+  def caveats; <<-EOS.undent
+    In the interest of allowing you to run `nginx` without `sudo`, the default
+    port is set to localhost:8080.
 
-If you want to host pages on your local machine to the public, you should
-change that to localhost:80, and run `sudo nginx`. You'll need to turn off
-any other web servers running port 80, of course.
+    If you want to host pages on your local machine to the public, you should
+    change that to localhost:80, and run `sudo nginx`. You'll need to turn off
+    any other web servers running port 80, of course.
 
-You can start nginx automatically on login with:
-    mkdir -p ~/Library/LaunchAgents
-    cp #{prefix}/org.nginx.nginx.plist ~/Library/LaunchAgents/
-    launchctl load -w ~/Library/LaunchAgents/org.nginx.nginx.plist
+    You can start nginx automatically on login running as your user with:
+      mkdir -p ~/Library/LaunchAgents
+      cp #{prefix}/org.nginx.nginx.plist ~/Library/LaunchAgents/
+      launchctl load -w ~/Library/LaunchAgents/org.nginx.nginx.plist
 
-    CAVEATS
+    Though note that if running as your user, the launch agent will fail if you
+    try to use a port below 1024 (such as http's default of 80.)
+    EOS
   end
 
   def startup_plist