launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #15504
[Merge] lp:~rvb/maas/simple-fix into lp:maas
Raphaël Badin has proposed merging lp:~rvb/maas/simple-fix into lp:maas.
Commit message:
Unify spacing in HACKING.txt.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~rvb/maas/simple-fix/+merge/159767
HACKING.txt contains double spacing and single spacing to separate sentences (depending on who wrote each part). Unify everything to single spacing. (single spacing seems to used most of the time in this file and in others like README as well.)
Okay, I must admit this is only to land a change in order to verify that my fixes to the landing environment have fixed the lander job.
--
https://code.launchpad.net/~rvb/maas/simple-fix/+merge/159767
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/simple-fix into lp:maas.
=== modified file 'HACKING.txt'
--- HACKING.txt 2012-11-21 12:18:42 +0000
+++ HACKING.txt 2013-04-19 08:00:37 +0000
@@ -39,7 +39,7 @@
$ bzr branch lp:maas maas && cd maas
MAAS depends on Postgres 9.1, RabbitMQ, Apache 2, Avahi, daemontools,
-pyinotify, and many other packages. To install everything that's
+pyinotify, and many other packages. To install everything that's
needed for running and developing MAAS, run::
$ make install-dependencies
@@ -111,12 +111,12 @@
Running JavaScript tests
^^^^^^^^^^^^^^^^^^^^^^^^
-The JavaScript tests are run using Selenium_. Firefox is the default
+The JavaScript tests are run using Selenium_. Firefox is the default
browser but any browser supported by Selenium can be used to run the
tests. Note that you might need to download the appropriate driver and
-make it available in the path. You can then choose which browsers to use by
+make it available in the path. You can then choose which browsers to use by
setting the environment variable ``MAAS_TEST_BROWSERS`` to a comma-separated
-list of the names of the browsers to use. For instance, to run the tests
+list of the names of the browsers to use. For instance, to run the tests
with Firefox and Chrome::
$ export MAAS_TEST_BROWSERS="Firefox, Chrome"
@@ -179,7 +179,7 @@
$ make sampledata
By default, the snippet ``maas_proxy`` includes a definition for an http
-proxy running on port 8000 on the same host as the MAAS server. This
+proxy running on port 8000 on the same host as the MAAS server. This
means you can *either* install ``squid-deb-proxy``::
$ sudo apt-get install squid-deb-proxy
@@ -251,8 +251,8 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
You will need to run the built-in TFTP server on the real TFTP port (69) if
-you want to boot some real hardware. By default, it's set to start up on
-port 5244 for testing purposes. Make these changes::
+you want to boot some real hardware. By default, it's set to start up on
+port 5244 for testing purposes. Make these changes::
* Edit ``etc/pserv.yaml`` to change the tftp/port setting to 69
* Install the ``authbind``package:
@@ -273,7 +273,7 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
There's a BIND daemon that is started up as part of the development service
-but it runs on port 5246 by default. If you want to make it run as a real
+but it runs on port 5246 by default. If you want to make it run as a real
DNS server on the box then edit ``services/dns/run`` and change the port
declaration there so it says::
@@ -291,20 +291,20 @@
^^^^^^^^^^^^^^^^
MAAS requires a properly configured DHCP server so it can boot machines using
-PXE. MAAS can work with its own instance of the ISC DHCP server, if you
+PXE. MAAS can work with its own instance of the ISC DHCP server, if you
install the maas-dhcp package::
$ sudo apt-get install maas-dhcp
If you choose to run your own ISC DHCP server, there is a bit more
-configuration to do. First, run this tool to generate a configuration that
+configuration to do. First, run this tool to generate a configuration that
will work with MAAS::
$ maas-provision generate-dhcp-config [options]
-Run ``maas-provision generate-dhcp-config -h`` to see the options. You will
+Run ``maas-provision generate-dhcp-config -h`` to see the options. You will
need to provide various IP details such as the range of IP addresses to assign
-to clients. You can use the generated output to configure your system's ISC
+to clients. You can use the generated output to configure your system's ISC
DHCP server, by inserting the configuration in the ``/etc/dhcp/dhcpd.conf``
file.
@@ -432,7 +432,7 @@
$ ./bin/maas schemamigration maasserver --auto description_of_the_change
This will generate a migration module named
-``src/maasserver/migrations/<auto_number>_description_of_the_change.py``. Don't
+``src/maasserver/migrations/<auto_number>_description_of_the_change.py``. Don't
forget to add that file to the project with::
$ bzr add src/maasserver/migrations/<auto_number>_description_of_the_change.py
@@ -446,7 +446,7 @@
^^^^^^^^^^^^^^^^^^^^^^^^^
If you need to perform data migration, very much in the same way, you will need
-to run South's `datamigration`_ command. For instance, if you want to perform
+to run South's `datamigration`_ command. For instance, if you want to perform
changes to the ``maasserver`` application, run::
$ ./bin/maas datamigration maasserver description_of_the_change