WIP

diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst
index 3975f7735db52c743683d950feccd428a558d03c..b3bf9a073b9e9490992b92756be37c10fd22c6b2 100644 (file)
--- a/docs/en/rst/administering/parameters.rst
+++ b/docs/en/rst/administering/parameters.rst
@@ -226,9 +226,7 @@ attachment_base
 
     Note that if you have set the :param:`cookiedomain` parameter, you should set :param:`attachment_base` to use a domain that would not be matched by :param:`cookiedomain`.
 
-    For added security, you can insert ``%bugid%`` into the URL, which will be replaced with the ID of the current bug that the attachment is on, when you access an attachment. This will limit attachments to accessing only other attachments on the same bug. Remember, though, that all those possible domain names (such as 1234.your.domain.com) must point to this same Bugzilla instance.
-
-    .. todo:: So this requires wildcard DNS? We should explain a bit about what is needed here.
+    For added security, you can insert ``%bugid%`` into the URL, which will be replaced with the ID of the current bug that the attachment is on, when you access an attachment. This will limit attachments to accessing only other attachments on the same bug. Remember, though, that all those possible domain names (such as 1234.your.domain.com) must point to this same Bugzilla instance. To set this up you need to investigate wildcard DNS.
 
 allow_attachment_deletion
     If this option is on, administrators will be able to delete the contents

diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst
index 4a872801abfa44fe787ca38e92cf92496b204daa..3fed95a3b4939d7df5cf8afde0f0b54854ff93e9 100644 (file)
--- a/docs/en/rst/installing/linux.rst
+++ b/docs/en/rst/installing/linux.rst
@@ -50,13 +50,23 @@ If you want to install a version of Bugzilla from the Bugzilla project, you
 will instead need:
 
 :command:`yum install httpd mysql-server mod_perl mod_perl-devel httpd-devel
-graphviz patchutils gcc perl-DateTime perl-Template-Toolkit perl-Email-Send
-perl-Email-MIME perl-GD perl-Chart perl-Template-GD perl-GDGraph
-perl-GDTextUtil perl-PatchReader perl-MIME-tools perl-LDAP perl-Authen-SASL
-perl-RadiusPerl perl-SOAP-Lite perl-JSON-RPC perl-JSON-XS perl-Test-Taint
-perl-HTML-Scrubber perl-Email-MIME-Attachment-Stripper perl-Email-Reply
-perl-TheSchwartz perl-Daemon-Generic perl-Math-Random-Secure perl-YAML
-perl-Class-Inspector`
+graphviz patchutils gcc  perl(Apache2::SizeLimit) perl(Authen::Radius)
+perl(Authen::SASL) perl(Cache::Memcached) perl(CGI) perl(Chart::Lines)
+perl(Daemon::Generic) perl(Date::Format) perl(DateTime)
+perl(DateTime::TimeZone) perl(DBI) perl(Digest::SHA) perl(Email::MIME)
+perl(Email::MIME::Attachment::Stripper) perl(Email::Reply) perl(Email::Sender)
+perl(Encode) perl(Encode::Detect) perl(File::MimeInfo::Magic)
+perl(File::Slurp) perl(GD) perl(GD::Graph) perl(GD::Text)
+perl(HTML::FormatText::WithLinks) perl(HTML::Parser) perl(HTML::Scrubber)
+perl(IO::Scalar) perl(JSON::RPC) perl(JSON::XS) perl(List::MoreUtils)
+perl(LWP::UserAgent) perl(Math::Random::ISAAC) perl(MIME::Parser)
+perl(mod_perl2) perl(Net::LDAP) perl(Net::SMTP::SSL) perl(PatchReader)
+perl(SOAP::Lite) perl(Template) perl(Template::Plugin::GD::Image)
+perl(Test::Taint) perl(TheSchwartz) perl(URI) perl(XMLRPC::Lite)
+perl(XML::Twig)`
+
+.. todo:: Converted to perl() form as per glob's request using info in
+   Requirements.pm, but I have no idea if that's exactly right...
 
 If you are running RHEL6, you will have to enable the "RHEL Server Optional"
 channel in RHN to get some of those packages. 
@@ -70,7 +80,7 @@ Ubuntu and Debian
 
 :command:`apt-get install apache2 mysql-server libappconfig-perl
 libdate-calc-perl libtemplate-perl libmime-perl build-essential
-libdatetime-timezone-perl libdatetime-perl libemail-send-perl
+libdatetime-timezone-perl libdatetime-perl libemail-sender-perl
 libemail-mime-perl libemail-mime-modifier-perl libdbi-perl libdbd-mysql-perl
 libcgi-pm-perl libmath-random-isaac-perl libmath-random-isaac-xs-perl
 apache2-mpm-prefork libapache2-mod-perl2 libapache2-mod-perl2-dev

diff --git a/docs/en/rst/installing/quick-start.rst b/docs/en/rst/installing/quick-start.rst
index accc52d1656c2e1c7534da994ff5c072c932bdd3..414ebc2c38b2363b211262bff752ad100cf5921f 100644 (file)
--- a/docs/en/rst/installing/quick-start.rst
+++ b/docs/en/rst/installing/quick-start.rst
@@ -50,7 +50,7 @@ Install Prerequisites
 
 :command:`apt-get install git nano`
 
-:command:`apt-get install apache2 mysql-server libappconfig-perl libdate-calc-perl libtemplate-perl libmime-perl build-essential libdatetime-timezone-perl libdatetime-perl libemail-send-perl libemail-mime-perl libemail-mime-modifier-perl libdbi-perl libdbd-mysql-perl libcgi-pm-perl libmath-random-isaac-perl libmath-random-isaac-xs-perl apache2-mpm-prefork libapache2-mod-perl2 libapache2-mod-perl2-dev libchart-perl libxml-perl libxml-twig-perl perlmagick libgd-graph-perl libtemplate-plugin-gd-perl libsoap-lite-perl libhtml-scrubber-perl libjson-rpc-perl libdaemon-generic-perl libtheschwartz-perl libtest-taint-perl libauthen-radius-perl libfile-slurp-perl libencode-detect-perl libmodule-build-perl libnet-ldap-perl libauthen-sasl-perl libtemplate-perl-doc libfile-mimeinfo-perl libhtml-formattext-withlinks-perl libgd-dev lynx-cur`
+:command:`apt-get install apache2 mysql-server libappconfig-perl libdate-calc-perl libtemplate-perl libmime-perl build-essential libdatetime-timezone-perl libdatetime-perl libemail-sender-perl libemail-mime-perl libemail-mime-modifier-perl libdbi-perl libdbd-mysql-perl libcgi-pm-perl libmath-random-isaac-perl libmath-random-isaac-xs-perl apache2-mpm-prefork libapache2-mod-perl2 libapache2-mod-perl2-dev libchart-perl libxml-perl libxml-twig-perl perlmagick libgd-graph-perl libtemplate-plugin-gd-perl libsoap-lite-perl libhtml-scrubber-perl libjson-rpc-perl libdaemon-generic-perl libtheschwartz-perl libtest-taint-perl libauthen-radius-perl libfile-slurp-perl libencode-detect-perl libmodule-build-perl libnet-ldap-perl libauthen-sasl-perl libtemplate-perl-doc libfile-mimeinfo-perl libhtml-formattext-withlinks-perl libgd-dev lynx-cur`
 
 This will take a little while. It's split into two commands so you can do
 the next steps (up to step 7) in another terminal while you wait for the
@@ -94,6 +94,15 @@ make it possible to search for short words and terms:
 
 Save and exit.
 
+Then, add a user to MySQL for Bugzilla to use:
+
+:command:`mysql -u root -p -e "GRANT ALL PRIVILEGES ON bugs.* TO bugs@localhost IDENTIFIED BY '$db_pass'"`
+
+Replace ``$db_pass`` with a strong password you have generated. Write it down.
+When you run the above command, it will prompt you for the MySQL root password
+that you configured when you installed Ubuntu. You should make ``$db_pass``
+different to that password.
+
 Restart MySQL:
 
 :command:`service mysql restart`
@@ -105,7 +114,7 @@ Configure Apache
 
 Paste in the following and save:
 
-.. code-block:: none
+.. code-block:: apache
 
  ServerName localhost
 
@@ -143,13 +152,9 @@ Edit :file:`localconfig`
 You will need to set the following values:
 
 * Line 29: set ``$webservergroup`` to ``www-data``
-* Line 60: set ``$db_user`` to ``root``
-* Line 67: set ``$db_pass`` to the MySQL root user password you created
-  when installing Ubuntu
+* Line 67: set ``$db_pass`` to the password for the ``bugs`` user you created
+  in MySQL a few steps ago
 
-.. todo:: Given this is a quick setup on a dedicated box, is it OK to use the
-         MySQL root user?
-    
 Check Setup (again)
 ===================
 
@@ -166,10 +171,9 @@ Test Server
 
 :command:`./testserver.pl http://localhost/`
 
-All the tests should pass. (Note: currently, the first one will give a
-warning instead. You can ignore that. :bug:`1040728`.)
+All the tests should pass.
 
-.. todo:: Also, Chart::Base gives deprecation warnings :-|
+.. todo:: Chart::Base gives confusing deprecation warnings :-|
           https://rt.cpan.org/Public/Bug/Display.html?id=79658 , unfixed for
           2 years. :bug:`1070117`.