Merge lp:~gesha/linaro-license-protection/configs-add-readme-textile-to-staging into lp:linaro-license-protection/configs

Proposed by Georgy Redkozubov
Status: Merged
Merged at revision: 26
Proposed branch: lp:~gesha/linaro-license-protection/configs-add-readme-textile-to-staging
Merge into: lp:linaro-license-protection/configs
Diff against target: 60 lines (+27/-8)
2 files modified
django/settings_releases.py (+8/-8)
django/settings_staging_releases.py (+19/-0)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/configs-add-readme-textile-to-staging
Reviewer Review Type Date Requested Status
Fathi Boudra Approve
Review via email: mp+131042@code.launchpad.net

Description of the change

This branch adds README.textile support for staging.releases.linaro.org

To post a comment you must log in.
Revision history for this message
Fathi Boudra (fboudra) wrote :

all LINUX_FILES should have the .textile extension.

review: Needs Fixing
27. By Georgy Redkozubov

Update LINUX_FILES according to spec

Revision history for this message
Fathi Boudra (fboudra) wrote :

ship it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'django/settings_releases.py'
--- django/settings_releases.py 2012-10-23 13:05:10 +0000
+++ django/settings_releases.py 2012-10-23 16:18:21 +0000
@@ -25,10 +25,10 @@
2525
26# Render TEXTILE files settings.26# Render TEXTILE files settings.
27LINUX_FILES = ('README.textile',27LINUX_FILES = ('README.textile',
28 'INSTALL',28 'INSTALL.textile',
29 'HACKING',29 'HACKING.textile',
30 'FIRMWARE',30 'FIRMWARE.textile',
31 'RTSM')31 'RTSM.textile')
32ANDROID_FILES = ('HOWTO_releasenotes.txt',32ANDROID_FILES = ('HOWTO_releasenotes.txt',
33 'HOWTO_install.txt',33 'HOWTO_install.txt',
34 'HOWTO_getsourceandbuild.txt',34 'HOWTO_getsourceandbuild.txt',
@@ -44,10 +44,10 @@
44 'HOWTO_flashfirmware.txt': 'Firmware Update',44 'HOWTO_flashfirmware.txt': 'Firmware Update',
45 'HOWTO_rtsm.txt': 'RTSM',45 'HOWTO_rtsm.txt': 'RTSM',
46 'README.textile': 'Release Notes',46 'README.textile': 'Release Notes',
47 'INSTALL': 'Binary Image Installation',47 'INSTALL.textile': 'Binary Image Installation',
48 'HACKING': 'Building From Source',48 'HACKING.textile': 'Building From Source',
49 'FIRMWARE': 'Firmware Update',49 'FIRMWARE.textile': 'Firmware Update',
50 'RTSM': 'RTSM'}50 'RTSM.textile': 'RTSM'}
5151
52TAB_PRIORITY = ['Release Notes',52TAB_PRIORITY = ['Release Notes',
53 'Binary Image Installation',53 'Binary Image Installation',
5454
=== modified file 'django/settings_staging_releases.py'
--- django/settings_staging_releases.py 2012-08-16 09:56:08 +0000
+++ django/settings_staging_releases.py 2012-10-23 16:18:21 +0000
@@ -18,3 +18,22 @@
18 os.path.join(PROJECT_ROOT, "templates" ),18 os.path.join(PROJECT_ROOT, "templates" ),
19 )19 )
20SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']20SERVED_PATHS = ['/srv/staging.releases.linaro.org/www']
21
22# Render TEXTILE files settings.
23LINUX_FILES = ('README.textile',
24 'INSTALL.textile',
25 'HACKING.textile',
26 'FIRMWARE.textile',
27 'RTSM.textile')
28
29FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
30 'HOWTO_install.txt': 'Binary Image Installation',
31 'HOWTO_getsourceandbuild.txt': 'Building From Source',
32 'HOWTO_flashfirmware.txt': 'Firmware Update',
33 'HOWTO_rtsm.txt': 'RTSM',
34 'README.textile': 'Release Notes',
35 'INSTALL.textile': 'Binary Image Installation',
36 'HACKING.textile': 'Building From Source',
37 'FIRMWARE.textile': 'Firmware Update',
38 'RTSM.textile': 'RTSM'}
39

Subscribers

People subscribed via source and target branches