MAAS

Merge lp:~rvb/maas/gen-api-doc into lp:~maas-committers/maas/trunk

  1. gen-api-doc
  2. Merge into trunk
Proposed by Raphaël Badin
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 2287
Proposed branch: lp:~rvb/maas/gen-api-doc
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
Makefile (+1/-1)
To merge this branch: bzr merge lp:~rvb/maas/gen-api-doc
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+216884@code.launchpad.net

Commit message

The 'doc-with-versions' target should depend on docs/api.rst so that the API doc is part of the generated documentation.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 review: approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlNYXPwACgkQWhGlTF8G/Hdx6ACggiC2TRkw9wSmrkPS/1SQXGNa
et4AoJ/U9idgsqHnJ84/SQCQ5OiQZajg
=hhNa
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2014-04-08 20:58:05 +0000
+++ Makefile 2014-04-23 13:52:49 +0000
@@ -164,7 +164,7 @@
164doc: bin/sphinx docs/api.rst164doc: bin/sphinx docs/api.rst
165 bin/sphinx165 bin/sphinx
166166
167doc-with-versions: bin/sphinx167doc-with-versions: bin/sphinx docs/api.rst
168 cd docs/_build; make SPHINXOPTS="-A add_version_switcher=true" html168 cd docs/_build; make SPHINXOPTS="-A add_version_switcher=true" html
169169
170man: $(patsubst docs/man/%.rst,man/%,$(wildcard docs/man/*.rst))170man: $(patsubst docs/man/%.rst,man/%,$(wildcard docs/man/*.rst))