aboutsummaryrefslogtreecommitdiffstats
path: root/config/pre2upgrade
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2014-03-19 17:10:49 +0100
committerPiBa-NL <pba_2k3@yahoo.com>2014-03-19 17:10:49 +0100
commit39b3fe5d22482d16a161193167c00af90390343a (patch)
tree53b19691d90440731195eb2325db2ecd8511feb2 /config/pre2upgrade
parent2a4f986325ccd3a08273bee285993415da12aeb2 (diff)
parentfd710b1c45207f551d7b0a38eb95b5b5e353ac77 (diff)
downloadpfsense-packages-39b3fe5d22482d16a161193167c00af90390343a.tar.gz
pfsense-packages-39b3fe5d22482d16a161193167c00af90390343a.tar.bz2
pfsense-packages-39b3fe5d22482d16a161193167c00af90390343a.zip
Merge branch 'master' of https://github.com/pfsense/pfsense-packages into hap_de-install_logging
Conflicts: config/haproxy-devel/haproxy.inc
Diffstat (limited to 'config/pre2upgrade')
-rw-r--r--config/pre2upgrade/pre2upgrade.php2
-rw-r--r--config/pre2upgrade/pre2upgrade.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/pre2upgrade/pre2upgrade.php b/config/pre2upgrade/pre2upgrade.php
index 79097002..c9112850 100644
--- a/config/pre2upgrade/pre2upgrade.php
+++ b/config/pre2upgrade/pre2upgrade.php
@@ -64,7 +64,7 @@ Config check output:
<?php endif; ?>
<br/><br/>
Before proceeding with the upgrade, you should look over the upgrade guide on the doc wiki, which can be found here:<br/>
-<a href="http://doc.pfsense.org/index.php/Upgrade_Guide">http://doc.pfsense.org/index.php/Upgrade_Guide</a>.
+<a href="https://doc.pfsense.org/index.php/Upgrade_Guide">https://doc.pfsense.org/index.php/Upgrade_Guide</a>.
</td></tr>
</table>
</div>
diff --git a/config/pre2upgrade/pre2upgrade.xml b/config/pre2upgrade/pre2upgrade.xml
index 0895c1cf..a0a26956 100644
--- a/config/pre2upgrade/pre2upgrade.xml
+++ b/config/pre2upgrade/pre2upgrade.xml
@@ -41,7 +41,7 @@
<title>Diagnostics: Pre-2.0 Upgrade Check</title>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
- <item>http://www.pfsense.com/packages/config/pre2upgrade/pre2upgrade.php</item>
+ <item>https://packages.pfsense.org/packages/config/pre2upgrade/pre2upgrade.php</item>
</additional_files_needed>
<menu>
<name>Pre-Upgrade Check</name>