Commit3ff23e9

Alasdair Allan

authored

Merge pull request#1980 from raspberrypi/titles3

Fix page titles - again again!

2 parents5833f33 +3ecb89f commit3ff23e9Copy full SHA for 3ff23e9

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<metacharset="utf-8">`
`2`	`2`	`<metahttp-equiv="X-UA-Compatible"content="IE=edge">`
`3`	`3`	`<metaname="viewport"content="width=device-width, initial-scale=1">`
`4`		`-<title>{{site.title }} - {{page.title }}</title>`
`5`		`-<metaproperty="og:title"content="{{site.title }} - {{page.title }}">`
	`4`	`+<title>{{ page.title }}</title>`
	`5`	`+<metaproperty="og:title"content="{{ page.title }}">`
`6`	`6`	`<metaproperty="og:description"content="The official documentation for Raspberry Pi computers and microcontrollers">`
`7`	`7`	`<metaproperty="og:url"content="https://www.raspberrypi.org{{ page.url \| relative_url }}">`
`8`	`8`	`<metaproperty="og:image"content="https://www.raspberrypi.org{{"/images/opensocial.png" \| relative_url }}">`

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`:page-layout: docs`
`32`	`32`	`:includedir: {}`
`33`	`33`	`:doctitle: {}`
	`34`	`+:page-sub_title: {}`
`34`	`35`
`35`	`36`	`include::{{includedir}}/{{parentdir}}/{}[]`
`36`		`-""".format(output_path,src_dir,index_title,adoc_filename))`
	`37`	`+""".format(output_path,src_dir,'Raspberry Pi Documentation - {}'.format(index_title),index_title,adoc_filename))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ def scan_adoc(adoc_filename, apparent_filename):`
`38`	`38`	`output_dir=sys.argv[3]`
`39`	`39`	`output_ninjabuild=sys.argv[4]`
`40`	`40`
`41`		`-category_pages=set([('index.adoc','Index')])`
	`41`	`+category_pages=set([('index.adoc','Raspberry Pi Documentation')])`
`42`	`42`	`doc_pages=set()`
`43`	`43`	`page_images=set()`
`44`	`44`
`@@ -50,7 +50,7 @@ def scan_adoc(adoc_filename, apparent_filename):`
`50`	`50`	`assert ('path'intab)== ('subitems'intab)`
`51`	`51`	`if'path'intab:`
`52`	`52`	`# category (boxes) page`
`53`		`-category_pages.add((os.path.join(tab['path'],'index.adoc'),tab['title']))`
	`53`	`+category_pages.add((os.path.join(tab['path'],'index.adoc'),'Raspberry Pi Documentation - {}'.format(tab['title'])))`
`54`	`54`	`# build_adoc`
`55`	`55`	`forsubitemintab['subitems']:`
`56`	`56`	`if'subpath'insubitem:`

Comments

(0)