pyjuju

Merge lp:~charm-contributors/pyjuju/docs-fix-drafts into lp:~charm-contributors/pyjuju/docs

  1. docs-fix-drafts
  2. Merge into docs
Proposed by Clint Byrum
Status: Merged
Merged at revision: 71
Proposed branch: lp:~charm-contributors/pyjuju/docs-fix-drafts
Merge into: lp:~charm-contributors/pyjuju/docs
Diff against target: 38 lines (+6/-0)
3 files modified
Makefile (+1/-0)
source/drafts/.htaccess (+4/-0)
source/index.rst (+1/-0)
To merge this branch: bzr merge lp:~charm-contributors/pyjuju/docs-fix-drafts
Reviewer Review Type Date Requested Status
Brandon Holtsclaw Approve
Review via email: mp+128770@code.launchpad.net

Description of the change

Moves implemented changes into the root dir and the index (where appropriate). Also adds a .htaccess redirect.

To post a comment you must log in.
Revision history for this message
Brandon Holtsclaw (imbrandon) wrote :

looks good to me, merging

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2012-06-25 05:14:44 +0000
3+++ Makefile 2012-10-09 17:13:24 +0000
4@@ -40,6 +40,7 @@
5
6 html: clean
7 $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html && /bin/chmod -R 0775 $(BUILDDIR)/html
8+ install -m 0644 source/drafts/.htaccess $(BUILDDIR)/html/drafts/.htacess
9 @echo
10 @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
11
12
13=== renamed file 'source/drafts/charm-namespaces.rst' => 'source/charm-namespaces.rst'
14=== renamed file 'source/drafts/developer-install.rst' => 'source/developer-install.rst'
15=== added file 'source/drafts/.htaccess'
16--- source/drafts/.htaccess 1970-01-01 00:00:00 +0000
17+++ source/drafts/.htaccess 2012-10-09 17:13:24 +0000
18@@ -0,0 +1,4 @@
19+<IfModule rewrite>
20+ RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
21+ RewriteRule (.*) /docs/$1 [L,R=301]
22+</IfModule>
23
24=== modified file 'source/index.rst'
25--- source/index.rst 2012-09-26 21:00:10 +0000
26+++ source/index.rst 2012-10-09 17:13:24 +0000
27@@ -18,6 +18,7 @@
28 user-tutorial
29 write-charm
30 charm
31+ service-config
32 charm-store
33 charm-quality
34 charm-tests
35
36=== renamed file 'source/drafts/juju-status-changes.rst' => 'source/juju-status-changes.rst'
37=== renamed file 'source/drafts/resolved.rst' => 'source/resolved.rst'
38=== renamed file 'source/drafts/service-config.rst' => 'source/service-config.rst'

Subscribers

People subscribed via source and target branches