summaryrefslogtreecommitdiffstats
path: root/docs/en/rst/installing
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2016-03-07 17:58:37 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2016-03-07 17:58:37 +0100
commit94baad58ceedd7db7fdd86117d0a9d18f06acacc (patch)
tree8bebb242bc08f98042d33190c0004d1bb9ab28ba /docs/en/rst/installing
parentb0ec2f04693289758c1c171b754f7f0d1a3117f7 (diff)
downloadbugzilla-94baad58ceedd7db7fdd86117d0a9d18f06acacc.tar.gz
bugzilla-94baad58ceedd7db7fdd86117d0a9d18f06acacc.tar.xz
Bug 1251672: "cpanm" is easier to remember and to type than "curl -L http://cpanmin.us | perl -"
r=dylan
Diffstat (limited to 'docs/en/rst/installing')
-rw-r--r--docs/en/rst/installing/linux.rst12
-rw-r--r--docs/en/rst/installing/mac-os-x.rst9
2 files changed, 14 insertions, 7 deletions
diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst
index e1672fc2a..edbe7b49f 100644
--- a/docs/en/rst/installing/linux.rst
+++ b/docs/en/rst/installing/linux.rst
@@ -153,14 +153,18 @@ To make sure you have all the core requirements to run Bugzilla, you should run
:command:`perl Makefile.PL`
-Should this command warn about missing prerequisites -- or prerequisites that are too old,
-you may use cpanm to install these.
+Should this command warn about missing prerequisites -- or prerequisites that
+are too old, you may use :file:`cpanm` to install these.
-:command:`curl -L http://cpanmin.us | perl - --installdeps -l local .`
+:command:`cpanm --installdeps -l local .`
If you want a more full-featured Bugzilla, use the following command:
-:command:`curl -L http://cpanmin.us | perl - --installdeps -l local --with-all-features --without-feature mod_perl --without-feature oracle --without-feature mysql --without-feature pg .`
+:command:`cpanm --installdeps -l local --with-all-features --without-feature mod_perl --without-feature oracle --without-feature mysql --without-feature pg .`
+
+If you don't have :file:`cpanm` installed, you can either find it in your
+:file:`cpanminus` or :file:`perl-App-cpanminus` package, or
+`download it <http://cpanmin.us>`_ from cpanmin.us.
.. _linux-config-webserver:
diff --git a/docs/en/rst/installing/mac-os-x.rst b/docs/en/rst/installing/mac-os-x.rst
index 938088272..7bf6ead96 100644
--- a/docs/en/rst/installing/mac-os-x.rst
+++ b/docs/en/rst/installing/mac-os-x.rst
@@ -74,13 +74,16 @@ Perl Modules
Bugzilla requires a number of Perl modules. Generally, the best way to install
these is with the cpanm command.
-Generally, the best way to install these is with cpanm:
+Generally, the best way to install these is with :file:`cpanm`:
-:command:`curl -L http://cpanmin.us | perl - --installdeps -l local .`
+:command:`cpanm --installdeps -l local .`
If you want a more full-featured Bugzilla:
-:command:`curl -L http://cpanmin.us | perl - --installdeps -l local --with-all-features --without-feature oracle --without-feature mysql --without-feature pg`
+:command:`cpanm --installdeps -l local --with-all-features --without-feature oracle --without-feature mysql --without-feature pg`
+
+If you don't have :file:`cpanm` installed, you can
+`download it <http://cpanmin.us>`_ from cpanmin.us.
.. _macosx-config-webserver: