Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents e897460 + bbf3db3 commit 5297889fed53d57f78953f7d86845384a144d768 Ken Moore committed Aug 8, 2013
Showing with 4 additions and 3 deletions.
  1. +1 −0 build-files/conf/port-make.conf
  2. +3 −3 src-qt4/warden-gui/wizardNewJail.ui
View
1 build-files/conf/port-make.conf
@@ -97,6 +97,7 @@ virtualbox_SET=VNC WEBSERVICE
# Options requested by FreeNAS
nginx_SET=HTTP_FLV HTTP_SSL PASSENGER
redmine_SET=POSTGRESQL PASSENGER
+redmine_UNSET=THIN
rubygem-passenger=NGINX
rubygem-rails=FCGI PASSENGER
rubygem-activerecord=PGSQL SQLITE3
View
6 src-qt4/warden-gui/wizardNewJail.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>548</width>
- <height>398</height>
+ <width>559</width>
+ <height>388</height>
</rect>
</property>
<property name="windowTitle">
@@ -85,7 +85,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>This wizard will walk you through creating a new jail. First, enter the hostname and any IP address then click next to continue.</string>
+ <string>This wizard will walk you through creating a new jail. First, enter a hostname and IP address not currently in use on the network. If you plan to use IPv6 to access the jail, check the IPv6 Address box and input a valid IPv6 address. When finished, click Next to continue.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

0 comments on commit 5297889

Please sign in to comment.