← Back to branch summary

~allenap/maas/docs-and-man-tidy

~allenap/maas/docs-and-man-tidy

Viewing all changes in revision 1354.

Committer: Gavin Panella
Date: 2012-11-20 17:37:20 UTC
mfrom: (1352.2.3 maas)
Revision ID: gavin.panella@canonical.com-20121120173720-fevvh23a0dostk5q

Merged trunk into docs-and-man-tidy.

files added:
docs/man/maas-import-pxe-files.8.rst

docs/man/maas.8.rst

files removed:
man/maas-import-pxe-files.8

files modified:
docs/conf.py

docs/man/maas-cli.8.rst

src/maascli/__init__.py

src/maascli/tests/test_integration.py

src/provisioningserver/boot_images.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_start_cluster_controller.py

src/provisioningserver/tests/test_tags.py

Show diffs side-by-side

added added

removed removed

docs/man/maas-cli.8.rst

docs/man/maas-import-pxe-files.8.rst

docs/man/maas.8.rst

man/maas-import-pxe-files.8

src/maascli/__init__.py

src/maascli/tests/test_integration.py

src/provisioningserver/boot_images.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_start_cluster_controller.py

src/provisioningserver/tests/test_tags.py

Older »