summaryrefslogtreecommitdiffstats
path: root/etc/inc/pkg-utils.inc
diff options
context:
space:
mode:
authorVinicius Coque <vinicius.coque@bluepex.com>2011-06-07 10:47:29 -0300
committerVinicius Coque <vinicius.coque@bluepex.com>2011-06-07 10:47:29 -0300
commitd8012adbce60d9a90dac54e5b7832f8fa7e82fb6 (patch)
tree1922288b0151aacb26a3091e9507f858473e3a22 /etc/inc/pkg-utils.inc
parent669113f9d12a43391cd480390dfbfbecf55d544e (diff)
parent3f8a13e051d17b6240f30f9a0c284baa3a0559ac (diff)
downloadpfsense-d8012adbce60d9a90dac54e5b7832f8fa7e82fb6.zip
pfsense-d8012adbce60d9a90dac54e5b7832f8fa7e82fb6.tar.gz
Merge remote-tracking branch 'mainline/master' into inc
Conflicts: etc/inc/voucher.inc usr/local/www/fbegin.inc
Diffstat (limited to 'etc/inc/pkg-utils.inc')
-rw-r--r--etc/inc/pkg-utils.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 1798f85..b735375 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -141,10 +141,10 @@ function get_pkg_id($pkg_name) {
/****f* pkg-utils/get_pkg_info
* NAME
- * get_pkg_info - Retrive package information from pfsense.com.
+ * get_pkg_info - Retrieve package information from pfsense.com.
* INPUTS
- * $pkgs - 'all' to retrive all packages, an array containing package names otherwise
- * $info - 'all' to retrive all information, an array containing keys otherwise
+ * $pkgs - 'all' to retrieve all packages, an array containing package names otherwise
+ * $info - 'all' to retrieve all information, an array containing keys otherwise
* RESULT
* $raw_versions - Array containing retrieved information, indexed by package name.
******/
OpenPOWER on IntegriCloud