Merge lp://staging/~rvb/maas/add-version-switcher into lp://staging/maas/1.4

Proposed by Raphaël Badin
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 1722
Proposed branch: lp://staging/~rvb/maas/add-version-switcher
Merge into: lp://staging/maas/1.4
Prerequisite: lp://staging/~rvb/maas/backport-doc-theme
Diff against target: 85 lines (+41/-0)
4 files modified
Makefile (+3/-0)
docs/_templates/maas/layout.html (+1/-0)
docs/_templates/maas/relations.html (+12/-0)
docs/conf.py (+25/-0)
To merge this branch: bzr merge lp://staging/~rvb/maas/add-version-switcher
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+214418@code.staging.launchpad.net

Commit message

Add the version switcher widget. Add the new `doc-with-versions` make target to generate a version of the documentation that includes the version switcher widget.

Description of the change

This works in conjunction with https://code.launchpad.net/~rvb/maas/multiple-versions-doc-1.6/+merge/214424.

The change to the 1.4 branch should be a one-off. No further modification should be required, even when publishing a new version of the documentation.

If 'add_version_switcher' is set to True, the code in docs/_templates/maas/relations.html dynamically fetches the Javascript file used to generate the version switcher widget from the trunk documentation.

See the result at http://162.213.35.95:8000/docs

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

Is this any different from the one I just approved? Doesn't look like it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlNCVXYACgkQWhGlTF8G/HeUyQCeOhCAu8iGHAa8/M/25jIfHoPp
4bMAn3sLNslz7tkdE5ktl0eTZ0Qbg2lB
=2lsm
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Raphaël Badin (rvb) wrote :

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> review: approve
>
> Is this any different from the one I just approved? Doesn't look like it.

Yep, it's the same, just not targeting the same branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: