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

trueos · Aug 8, 2013 · 5297889 · 5297889
2 parents e897460 + bbf3db3
commit 5297889
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build-files/conf/port-make.conf b/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

diff --git a/src-qt4/warden-gui/wizardNewJail.ui b/src-qt4/warden-gui/wizardNewJail.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>548</width>
+    <width>559</width>
-    <height>398</height>
+    <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>