From aa1361d04cfe09f90e7d8bece90c00dd6e4185bb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 16:57:47 -0400
Subject: [PATCH] Replace Dagger with Guice 4.0 beta and update Guava to 16.0.1

---
 src/site/setup_go.mkd |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/site/setup_go.mkd b/src/site/setup_go.mkd
index 2e8f864..f099cc0 100644
--- a/src/site/setup_go.mkd
+++ b/src/site/setup_go.mkd
@@ -5,7 +5,7 @@
 2. The server itself is configured through a simple text file.
 Open `data/gitblit.properties` in your favorite text editor and make sure to review and set:
     - *server.httpPort* and *server.httpsPort*
-    - *server.storePassword*
+    - *server.storePassword* (do not enter *#* characters)
     **https** is strongly recommended because passwords are insecurely transmitted form your browser/git client using Basic authentication!
     - *git.packedGitLimit* (set larger than the size of your largest repository)
     - *git.streamFileThreshold* (set larger than the size of your largest committed file)
@@ -38,6 +38,8 @@
 	Reason: https:/myserver.com/git/myrepo.git: cannot open git-upload-pack
 
 If you want to serve your repositories to another machine over https then you will want to generate a new certificate for the hostname or ip address you are serving from.
+
+**NOTE:** The Gitblit Authority is a GUI tool and will require X11 forwarding on headless UNIX boxes.
 
 1. `authority.cmd` or `java -jar authority.jar --baseFolder data`
 2. Click the *new ssl certificate* button (red rosette in the toolbar in upper left of window)
@@ -117,10 +119,10 @@
     --baseFolder           The default base folder for all relative file reference settings
     --repositoriesFolder   Git Repositories Folder
     --userService          Authentication and Authorization Service (filename or fully qualified classname)
-    --useNio               Use NIO Connector else use Socket Connector.
     --httpPort             HTTP port for to serve. (port <= 0 will disable this connector)
     --httpsPort            HTTPS port to serve.  (port <= 0 will disable this connector)
-    --ajpPort              AJP port to serve.  (port <= 0 will disable this connector)
+    --sshPort              SSH Daemon port to serve.  (port <= 0 will disable this daemon)
+    --gitPort              Git Daemon port to serve.  (port <= 0 will disable this daemon)
     --alias                Alias in keystore of SSL cert to use for https serving
     --storePassword        Password for SSL (https) keystore.
     --shutdownPort         Port for Shutdown Monitor to listen on. (port <= 0 will disable this monitor)

--
Gitblit v1.9.1