Merge lp:~knome/xubuntu-docs/contributor-doc-improvements into lp:xubuntu-docs/zesty

[Pasi Lallinaho]

Updated based on Kev's comments.

[Kev Bowring (flocculant)]

comments in line

review: Needs Fixing

[Kev Bowring (flocculant)]

Thanks Pasi - lgtm - leave it to last person to approve

[Kev Bowring (flocculant)]

review: Approve

[David Pearson (akxwi-dave)]

review: Approve (qa section reorganization)

[David Pires (slickymaster)]

Approved.
Thanks for these improvements, Pasi.

review: Approve

[David Pires (slickymaster)]

review: Approve

=== modified file 'contributor-docs/C/common-reference.xml'
--- contributor-docs/C/common-reference.xml	2017-02-19 07:48:04 +0000
+++ contributor-docs/C/common-reference.xml	2017-03-02 18:48:00 +0000
@@ -14,7 +14,7 @@
 	<title>Common Reference</title>
 
 	<section id="bzr">
-		<title>Bazaar (Bzr)</title>
+		<title>Using Bazaar (Bzr)</title>
 
 		<para>Bazaar (commonly referred to as Bzr) is the version control system primarily used in Xubuntu development.</para>
 
@@ -74,7 +74,7 @@
 	</section>
 
 	<section id="git">
-		<title>Git</title>
+		<title>Using Git</title>
 
 		<para>Git is the version control system used in Xfce development.</para>
 

=== modified file 'contributor-docs/C/development.xml'
--- contributor-docs/C/development.xml	2017-02-19 07:48:04 +0000
+++ contributor-docs/C/development.xml	2017-03-02 18:48:00 +0000
@@ -12,6 +12,7 @@
 ]>
 <chapter id="development">
 	<title>Development</title>
+	<?dbhtml stop-chunking?>
 
 	<section id="development-packageset">
 		<title>Xubuntu packageset</title>

=== added file 'contributor-docs/C/documentation-tasks.xml'
--- contributor-docs/C/documentation-tasks.xml	1970-01-01 00:00:00 +0000
+++ contributor-docs/C/documentation-tasks.xml	2017-03-02 18:48:00 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
+%xubuntu-common;
+<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
+%xubuntu-contributor;
+<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
+%xinclude;
+<!ENTITY language "&EnglishAmerican;">
+<!ENTITY language "C">
+]>
+<section id="docs-tasks">
+	<title>Tasks</title>
+
+	<section id="docs-tasks-user">
+		<title>User documentation</title>
+
+		<para>The documentation team works with the developers to ensure any new features that are part of the core functionality of the operating system are covered in the documentation. In addition, the documentation team makes sure features highlighted in the installer slideshow or any other marketing material are appropriately documented. When completely new sections are written, the documentation team makes sure the Xubuntu team has a chance to review and propose changes and fixes to the new sections. When any documented features are removed or changed, the team makes sure the documentation does not refer to any removed functionality.</para>
+
+		<note><para>The team should be aware of changes to new releases, particularly on LTS releases and potential SRUs, as those might affect documentation.</para></note>
+
+		<para>The documentation team is responsible for making sure the documentation is updated before the Documentation String Freeze prior to uploading. Once the upload is done, the team coordinates translation efforts and makes sure the documentation gets another upload before the Translation Freeze. The team should also request the <ulink url="http://docs.xubuntu.org/">online documentation</ulink> to be updated shortly before the release.</para>
+
+		<para>The documentation team should also look to improve and expand the existing documentation, especially during the development cycles when most uploads are done for maintenance purposes. The team should involve the community in these efforts the best way they see fit.</para>
+	</section>
+
+	<section id="docs-tasks-contributor">
+		<title>Contributor documentation</title>
+
+		<para>The documentation team lead the efforts to write the contributor documentation. While the various subteams are responsible for their own sections, the documentation team should help the teams to get their content pushed to the main branch and where needed, help contributors to format the content in the DocBook markup.</para>
+
+		<para>The <ulink url="http://docs.xubuntu.org/contributors/">online contributor documentation</ulink> should be kept updated especially when major changes are made; the documentation team should request an update whenever they see fit.</para>
+	</section>
+
+	<section id="docs-tasks-other">
+		<title>Other tasks</title>
+
+		<para>In addition to the above, the documentation team is strongly encouraged to do the following:</para>
+
+		<itemizedlist>
+			<listitem><para>Work with the Quality Assurance team to write and maintain testcases</para></listitem>
+			<listitem><para>Work with the website team to improve the website content and write FAQ or other documentation related articles</para></listitem>
+			<listitem><para>Work with the marketing team on various projects, like flyers</para></listitem>
+		</itemizedlist>
+	</section>
+</section>
\ No newline at end of file

=== added file 'contributor-docs/C/documentation-translations.xml'
--- contributor-docs/C/documentation-translations.xml	1970-01-01 00:00:00 +0000
+++ contributor-docs/C/documentation-translations.xml	2017-03-02 18:48:00 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
+%xubuntu-common;
+<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
+%xubuntu-contributor;
+<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
+%xinclude;
+<!ENTITY language "&EnglishAmerican;">
+<!ENTITY language "C">
+]>
+<section id="docs-translations">
+	<title>Translations</title>
+
+	<section id="docs-packages">
+		<title>Packages to be translated</title>
+
+		<para>These are packages that the Xubuntu team considers important, and should take precedence when translating.</para>
+
+		<section id="docs-packages-essential">
+			<title>Packages that only exist in Xubuntu</title>
+
+			<para>These packages only exist in Xubuntu, so their translation is solely dealt with by Xubuntu translators. These are of high importance for the Xubuntu team.</para>
+
+			<itemizedlist>
+				<listitem><para><ulink url="https://translations.launchpad.net/xubuntu-docs">Xubuntu Documentation</ulink></para></listitem>
+				<listitem><para><ulink url="https://translations.launchpad.net/xubuntu-default-settings">Xubuntu Default Settings</ulink></para></listitem>
+				<listitem><para><ulink url="https://translations.launchpad.net/ubuntu/&devel-codename;/+source/ubiquity-slideshow-ubuntu/+pots/ubiquity-slideshow-xubuntu">Ubiquity Slideshow for Xubuntu</ulink></para></listitem>
+			</itemizedlist>
+		</section>
+
+		<section id="docs-packages-xubuntu-important">
+			<title>Used by Xubuntu</title>
+
+			<para>These packages are used by Xubuntu and provide features to the Xubuntu experience. When these are translated, the base system is immediately more usable for more people.</para>
+
+			<itemizedlist>
+				<listitem><para><ulink url="https://translations.launchpad.net/catfish-search">Catfish</ulink></para></listitem>
+				<listitem><para><ulink url="https://translations.launchpad.net/lightdm-gtk-greeter">LightDM GTK+ Greeter</ulink></para></listitem>
+				<listitem><para><ulink url="https://translations.launchpad.net/lightdm-gtk-greeter-settings/">LightDM GTK+ Greeter Settings</ulink></para></listitem>
+				<listitem><para><ulink url="https://translations.launchpad.net/menulibre">MenuLibre</ulink></para></listitem>
+				<listitem><para><ulink url="https://translations.launchpad.net/mugshot">Mugshot</ulink></para></listitem>
+				<listitem><para><ulink url="https://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/">Whiskermenu</ulink></para></listitem>
+			</itemizedlist>
+		</section>
+	</section>
+
+	<section id="docs-translation-guidelines">
+		<title>Translation guidelines for Xubuntu packages</title>
+
+		<para>These guidelines apply mostly to the Xubuntu documentation. They can generally be applied to any translation with minor modification. If unsure, ask the Documentation team members for assistance.</para>
+
+		<para>The <ulink url="https://wiki.ubuntu.com/Translations/Contact/Teams">language-specific translation teams</ulink> usually want to encourage some conventions; please contact the appropriate language-specific team before translating.</para>
+
+		<para>More general translation guidelines can be found at the <ulink url="https://help.launchpad.net/Translations/Guide">Launchpad translations guide</ulink>.</para>
+
+		<section id="docs-translation-guidelines-validity">
+			<title>Maintain translation validity</title>
+
+			<para><emphasis>Tags should not be translated.</emphasis> Where you see a tag in the source string (for example: "&lt;xref linkend="&amp;xubuntu-web;" /&gt;"), the tag and anything inside the tag itself should not be translated. It is very important to copy and paste these tags exactly as they appear in the source string. Note: The exception to this is where a tag contains a URL that has an equivalent, translated version. In those cases the translator should use discretion about whether to localise the URL.</para>
+
+			<para><emphasis>Entities should not be translated.</emphasis> Where you see a phrase expressed like "&amp;gt;" or "&amp;xubuntu-web;", do not change this.</para>
+
+			<para><emphasis>Always maintain the order of tags.</emphasis> When you see different tags nested inside each other (for example: "&lt;menuchoice&gt;&lt;guimenu&gt;System&lt;/guimenu&gt;&lt;guimenuitem&gt;Administration&lt;/guimenuitem&gt;&lt;guimenuitem&gt;Users and Groups&lt;/guimenuitem&gt;&lt;/menuchoice&gt;"), you must always preserve that order carefully - copying and pasting from the source language (English) is the best way to ensure that you do this correctly.</para>
+
+			<note><para>Different programming languages and software might have different variable syntaxes; make sure you are familiar with the appropriate software variable syntax when translating. More information on this can often be found in the translation string comment.</para></note>
+		</section>
+
+		<section id="docs-translation-guidelines-conventions">
+			<title>Follow good and existing conventions</title>
+
+			<para><emphasis>Use application and label names found in the (graphical) UI.</emphasis> When translating UI labels and application names, use the term or name that is used on the graphical UI. This makes it easier for the user to follow the instructions. Running the system in both the translation target language and English can help with this.</para>
+
+			<para><emphasis>Do not change the amount of spacing.</emphasis> When translating, do not change the amount of spacing inside our outside tags. Keeping the spacing as it is makes the technical reviewing of the translation easier.</para>
+
+			<para><emphasis>Do not change the type of quotes used inside the tags.</emphasis> The double quotes ( " ) doesn't have the same significance in a DocBook, XHTML or XML tag as the guillemets ( « » ). Using different kind of quotes can potentially develop into validity problems as well.</para>
+
+			<para><emphasis>Never change a tag to another.</emphasis> If you think a tag in the source is invalid or not semantic, file a bug against the package itself instead of changing it in the translation.</para>
+		</section>
+	</section>
+</section>
\ No newline at end of file

=== added file 'contributor-docs/C/documentation-working.xml'
--- contributor-docs/C/documentation-working.xml	1970-01-01 00:00:00 +0000
+++ contributor-docs/C/documentation-working.xml	2017-03-02 18:48:00 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
+%xubuntu-common;
+<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
+%xubuntu-contributor;
+<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
+%xinclude;
+<!ENTITY language "&EnglishAmerican;">
+<!ENTITY language "C">
+]>
+<section id="docs-working">
+	<title>Working with the documentation</title>
+
+	<section id="docs-working-editing">
+		<title>Editing the documentation</title>
+
+		<para>First make sure you have the Bzr branch <literal>&branch;lp:xubuntu-docs</literal> and the build dependencies for <literal>&package;xubuntu-docs</literal>.</para>
+
+		<para>Changes to the user documentation should be made to the .xml files under <literal>user-docs/C/</literal>. Once edited and saved, push changes to your local branch as detailed in <xref linkend="bzr" />.</para>
+
+		<para>Similarly, changes to the contributor documentation should be made to the .xml files under <literal>contributor-docs/C/</literal>.</para>
+	</section>
+
+	<section id="docs-working-notes-contributor">
+		<title>Notes on the contributor documentation</title>
+
+		<para>For various reasons, the contributor documentation is more complex in structure than the user documentation. Particularly, pay attention to the following when working with the subteam documentation:</para>
+
+		<itemizedlist>
+			<listitem><para>If you want to create an introductory paragraph that is shown on the subteam main page, use the <literal>&lt;simplesect&gt;</literal> element. Otherwise this will be chunked into a separate HTML file. Note that this also removes the section from the Table of Contents.</para></listitem>
+			<listitem><para>If you want a subsection of a section to be visible in the Table of Contents, use the <literal>&lt;sect1&gt;</literal> element. For an actual example, see the <literal>qa-*</literal> files.</para></listitem>
+			<listitem><para>The sections are chunked up to the first level; this means all direct ascendants of <literal>&lt;chapter&gt;</literal> elements will be chunked into separate HTML files. If you want to avoid this (for example if your chapter is very short), insert the <literal>&lt;?dbhtml stop-chunking?&gt;</literal> after the <literal>&lt;title&gt;</literal> element of your chapter. Note that doing this will not stop the Table of Contents from being printed with each section; you might can use the <literal>&lt;simplesect&gt;</literal> element again to hide sections from the Table of Contents.</para></listitem>
+		</itemizedlist>
+	</section>
+</section>

=== modified file 'contributor-docs/C/documentation.xml'
--- contributor-docs/C/documentation.xml	2017-02-19 07:48:04 +0000
+++ contributor-docs/C/documentation.xml	2017-03-02 18:48:00 +0000
@@ -13,96 +13,13 @@
 <chapter id="documentation">
 	<title>Documentation</title>
 
-	<section id="docs-building">
-		<title>Building the documentation locally</title>
-
-		<itemizedlist>
-			<listitem><para>Get the Bzr branch <literal>&branch;lp:xubuntu-docs</literal>.</para></listitem>
-			<listitem><para>Get the build dependencies for <literal>&package;xubuntu-docs</literal>.</para></listitem>
-		</itemizedlist>
-	</section>
-
-	<section id="docs-editing">
-		<title>Editing the User Documentation</title>
-
-		<para>Changes to the user documentation should be made to the .xml files under <literal>user-docs/C/</literal>. Once edited and saved, push changes to your local branch as detailed in <xref linkend="common-reference" />.</para>
-
-		<para>Similarly, changes to the contributor documentation should be made to the .xml files under <literal>contributor-docs/C/</literal>.</para>
-	</section>
-
-	<section id="docs-packages">
-		<title>Packages to be translated</title>
-
-		<para>These are packages that the Xubuntu team considers important, and should take precedence when translating.</para>
-
-		<section id="docs-packages-xubuntu-only">
-			<title>The packages that only exist in Xubuntu</title>
-
-			<para>These packages only exist in Xubuntu, so their translation is solely dealt with by Xubuntu translators. These are of high importance for the Xubuntu team.</para>
-
-			<itemizedlist>
-				<listitem><para><ulink url="https://translations.launchpad.net/xubuntu-docs">Xubuntu Documentation</ulink></para></listitem>
-				<listitem><para><ulink url="https://translations.launchpad.net/xubuntu-default-settings">Xubuntu Default Settings</ulink></para></listitem>
-				<listitem><para><ulink url="https://translations.launchpad.net/ubuntu/&devel-codename;/+source/ubiquity-slideshow-ubuntu/+pots/ubiquity-slideshow-xubuntu">Ubiquity Slideshow for Xubuntu</ulink></para></listitem>
-			</itemizedlist>
-		</section>
-
-		<section id="docs-packages-xubuntu-used">
-			<title>Used by and essential for Xubuntu</title>
-
-			<para>These packages are used by Xubuntu and provide essential features to the Xubuntu experience. When these are translated, the base system is immediately more usable for more people.</para>
-
-			<itemizedlist>
-				<listitem><para><ulink url="https://translations.launchpad.net/catfish-search">Catfish</ulink></para></listitem>
-				<listitem><para><ulink url="https://translations.launchpad.net/lightdm-gtk-greeter">LightDM GTK+ Greeter</ulink></para></listitem>
-				<listitem><para><ulink url="https://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/">Whiskermenu</ulink></para></listitem>
-			</itemizedlist>
-		</section>
-
-		<section id="docs-packages-xubuntu-mainly">
-			<title>Mainly built for and used by Xubuntu</title>
-
-			<para>These packages exist outside Xubuntu, but they are mainly built to fit a need in Xubuntu. Unless/until they are spread much wider than now (and have gathered the interest of other translation groups), the Xubuntu translators should take care of translating these packages.</para>
-
-			<itemizedlist>
-				<listitem><para><ulink url="https://translations.launchpad.net/lightdm-gtk-greeter-settings/">LightDM GTK+ Greeter Settings</ulink></para></listitem>
-				<listitem><para><ulink url="https://translations.launchpad.net/menulibre">MenuLibre</ulink></para></listitem>
-				<listitem><para><ulink url="https://translations.launchpad.net/mugshot">Mugshot</ulink></para></listitem>
-			</itemizedlist>
-		</section>
-	</section>
-
-	<section id="docs-translation-guidelines">
-		<title>Translation guidelines for Xubuntu packages</title>
-
-		<para>These guidelines apply mostly to the Xubuntu documentation. They can generally be applied to any translation with minor modification. If unsure, ask the Documentation team members for assistance.</para>
-
-		<para>The <ulink url="https://wiki.ubuntu.com/Translations/Contact/Teams">language-specific translation teams</ulink> usually want to encourage some conventions; please contact the appropriate language-specific team before translating.</para>
-
-		<para>More general translation guidelines can be found at the <ulink url="https://help.launchpad.net/Translations/Guide">Launchpad translations guide</ulink>.</para>
-
-		<section id="docs-translation-guidelines-validity">
-			<title>Maintain translation validity</title>
-
-			<para><emphasis>Tags should not be translated.</emphasis> Where you see a tag in the source string (for example: "&lt;xref linkend="&amp;xubuntu-web;" /&gt;"), the tag and anything inside the tag itself should not be translated. It is very important to copy and paste these tags exactly as they appear in the source string. Note: The exception to this is where a tag contains a URL that has an equivalent, translated version. In those cases the translator should use discretion about whether to localise the URL.</para>
-
-			<para><emphasis>Entities should not be translated.</emphasis> Where you see a phrase expressed like "&amp;gt;" or "&amp;xubuntu-web;", do not change this.</para>
-
-			<para><emphasis>Always maintain the order of tags.</emphasis> When you see different tags nested inside each other (for example: "&lt;menuchoice&gt;&lt;guimenu&gt;System&lt;/guimenu&gt;&lt;guimenuitem&gt;Administration&lt;/guimenuitem&gt;&lt;guimenuitem&gt;Users and Groups&lt;/guimenuitem&gt;&lt;/menuchoice&gt;"), you must always preserve that order carefully - copying and pasting from the source language (English) is the best way to ensure that you do this correctly.</para>
-
-			<note><para>Different programming languages and software might have different variable syntaxes; make sure you are familiar with the appropriate software variable syntax when translating. More information on this can often be found in the translation string comment.</para></note>
-		</section>
-
-		<section id="docs-translation-guidelines-conventions">
-			<title>Follow good and existing conventions</title>
-
-			<para><emphasis>Use application and label names found in the (graphical) UI.</emphasis> When translating UI labels and application names, use the term or name that is used on the graphical UI. This makes it easier for the user to follow the instructions. Running the system in both the translation target language and English can help with this.</para>
-
-			<para><emphasis>Do not change the amount of spacing.</emphasis> When translating, do not change the amount of spacing inside our outside tags. Keeping the spacing as it is makes the technical reviewing of the translation easier.</para>
-
-			<para><emphasis>Do not change the type of quotes used inside the tags.</emphasis> The double quotes ( " ) doesn't have the same significance in a DocBook, XHTML or XML tag as the guillemets ( « » ). Using different kind of quotes can potentially develop into validity problems as well.</para>
-
-			<para><emphasis>Never change a tag to another.</emphasis> If you think a tag in the source is invalid or not semantic, file a bug against the package itself instead of changing it in the translation.</para>
-		</section>
-	</section>
+	<simplesect>
+		<title>Introduction</title>
+
+		<para>The Xubuntu documentation oversees the user documentation and contributor documentation as translations for the documentation and other packages important to Xubuntu. In addition the team works together with other teams in producing content and more.</para>
+	</simplesect>
+
+	<xi:include href="documentation-tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="documentation-working.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="documentation-translations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </chapter>

=== modified file 'contributor-docs/C/getting-started.xml'
--- contributor-docs/C/getting-started.xml	2017-01-25 19:18:56 +0000
+++ contributor-docs/C/getting-started.xml	2017-03-02 18:48:00 +0000
@@ -12,6 +12,7 @@
 ]>
 <chapter id="getting-started">
 	<title>Getting Started</title>
+	<?dbhtml stop-chunking?>
 
 	<section id="important-places">
 		<title>Important Places</title>
@@ -25,7 +26,7 @@
 		<section id="status-tracker">
 			<title>Status Tracker</title>
 
-			<para>The development for the current Xubuntu release is tracked in the <ulink url="&status-tracker;">Xubuntu work items tracker</ulink>. In addition to showing the current status for blueprints and their individual work items, the tracker displays some general progress. Finally, you can access the team calendar, Xubuntu wiki, development mailing list and join the development IRC channel #xubuntu-devel from it.</para>
+			<para>The development for the current Xubuntu release is tracked in the <ulink url="http://dev.xubuntu.org/">Xubuntu development tracker</ulink>. In addition to showing the current status for blueprints and their individual work items, the tracker displays some general progress. Finally, you can access the team calendar, Xubuntu wiki, development mailing list and join the development IRC channel #xubuntu-devel from it.</para>
 		</section>
 	</section>
 </chapter>

=== modified file 'contributor-docs/C/index.xml'
--- contributor-docs/C/index.xml	2017-01-25 19:18:56 +0000
+++ contributor-docs/C/index.xml	2017-03-02 18:48:00 +0000
@@ -44,7 +44,7 @@
 		</legalnotice>
 
 		<copyright>
-			<year>2015</year>
+			<year>2015–2017</year>
 			<holder>The Xubuntu documentation team. Xubuntu and Canonical are registered trademarks of Canonical Ltd.</holder>
 		</copyright>
 
@@ -79,10 +79,7 @@
 		<title>Subteam Documentation</title>
 		<xi:include href="development.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="documentation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include href="qa-tester.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include href="qa-testing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include href="qa-bugs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include href="qa-team.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<xi:include href="qa.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>	
 		<xi:include href="website.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	</part>
 	<!-- Common documentation -->

=== modified file 'contributor-docs/C/processes.xml'
--- contributor-docs/C/processes.xml	2016-08-31 21:49:33 +0000
+++ contributor-docs/C/processes.xml	2017-03-02 18:48:00 +0000
@@ -12,6 +12,7 @@
 ]>
 <chapter id="processes">
 	<title>Processes</title>
+	<?dbhtml stop-chunking?>
 
 	<para>This section describes some of the community processes for Xubuntu development. The processes should be used as guidelines: the main goal of this section is to describe <emphasis>what we do</emphasis>, not so much to describe <emphasis>what we should do</emphasis>.</para>
 

=== modified file 'contributor-docs/C/qa-bugs.xml'
--- contributor-docs/C/qa-bugs.xml	2017-02-19 07:48:04 +0000
+++ contributor-docs/C/qa-bugs.xml	2017-03-02 18:48:00 +0000
@@ -10,8 +10,7 @@
 <!ENTITY language "&EnglishAmerican;">
 <!ENTITY language "C">
 ]>
-
-<chapter id="qa-bugs">
+<sect1 id="qa-bugs">
 	<title>Dealing with bugs</title>
 
 	<section id="qa-bugs-tags">
@@ -67,4 +66,4 @@
 
 		<para>The Ubuntu wiki has an extensive page on <ulink url="https://wiki.ubuntu.com/Bugs/Upstream">forwarding bugs upstream</ulink> along with instructions on how to report bugs in the upstream bug trackers. Detailed information on the way to add an upstream bug to Launchpad can be found on the <ulink url="https://wiki.ubuntu.com/Bugs/Watches">Bugs/Watches</ulink> page on the Ubuntu wiki.</para>
 	</section>
-</chapter>
+</sect1>

=== added file 'contributor-docs/C/qa-infra.xml'
--- contributor-docs/C/qa-infra.xml	1970-01-01 00:00:00 +0000
+++ contributor-docs/C/qa-infra.xml	2017-03-02 18:48:00 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
+%xubuntu-common;
+<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
+%xubuntu-contributor;
+<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
+%xinclude;
+<!ENTITY language "&EnglishAmerican;">
+<!ENTITY language "C">
+]>
+<sect1 id="qa-infra">
+	<title>Testing Infrastructure</title>
+	<section id="qa-infra-getting-ready">
+		<title>Getting ready to test</title>
+
+		<para>To successfully test for Xubuntu, you will need at a minimum 4 things: a Launchpad account, mailing list subscription, an image and something to test it on. This page will give you the basic information in order to do those things and more.</para>
+	</section>
+
+	<section id="qa-infra-specs">
+		<title>Contacts</title>
+
+		<para>You need a Launchpad account, in order to join the necessary team(s) on it, and log into the 2 QA trackers.</para>
+
+		<para>We use one mailing list to detail what we intend to test during a cycle, we use the same list when we are calling for tests. This list is also used by the team to discuss the development of Xubuntu. You will need to join the Xubuntu Devel <ulink url="https://lists.ubuntu.com/mailman/listinfo/xubuntu-devel">Mailing</ulink> list.</para>
+
+		<para>While it is not necessary to do so, we make much use of IRC, so having an account you can use to access the main #xubuntu-devel channel will help you, alternatively you can access the channel via the IRC tab of the Xubuntu <ulink url="http://dev.xubuntu.org/">development</ulink> tracker.</para>
+
+		<para>Join the Xubuntu Testers <ulink url="https://launchpad.net/~xubuntu-testers">Launchpad</ulink> team.</para>
+
+		<para>Consider adding your details to the <ulink url="http://wiki.xubuntu.org/qa/teamhardware">Hardware</ulink> page. We can use this data to request specific testing from specific testers.</para>
+	</section>
+
+	<section id="qa-infra-iso">
+		<title>Getting the ISO</title>
+
+		<para>ISOs can be obtained through a few methods. The simplest method is to visit the <ulink url="http://iso.qa.ubuntu.com/">ISO</ulink> tracker. Follow the testcases through version to Xubuntu's group of tests. Then choose either 32 or 64 bit. Download links are available there.</para>
+
+		<para>When testing more regularly, you might find (especially where bandwidth is an issue for you) using the <ulink url="https://help.ubuntu.com/community/ZsyncCdImage">zsync</ulink> link more appropriate. This is will just grab the difference between your local copy and the current one.</para>
+
+	</section>
+
+	<section id="qa-infra-test">
+		<title>Methods of testing</title>
+
+		<para>Now you've set up your basic contact(s) and have your ISO, you are in a position to test it.</para>
+
+		<para>There are two main methods of testing the ISO:</para>
+
+		<itemizedlist>
+			<listitem><para>Using a virtual machine enables you to carry on using a normal release and to test our ISOs. You can install a virtual machine by directly using your downloaded ISO.</para></listitem>
+			<listitem><para>Install the ISO to hardware where that possibility is available. This is more important towards the end of the development cycle. You will necessarily need to have the ISO in some bootable medium. A member of Xubuntu's Website team details a simple method for preparing a bootable <ulink url="http://princessleia.com/journal/2016/03/xubuntu-16-04-iso-testing-tips/">USB</ulink> stick with Gnome Disks.</para></listitem>
+		</itemizedlist>
+
+		<note><para>While it is possible to use VirtualBox, past experience has shown that issues found when testing in VirtualBox are hard to replicate elsewhere. You might want to look into using <ulink url="https://help.ubuntu.com/community/KVM">KVM</ulink>. Members of Xubuntu QA have some experience with using this for testing and can help.</para></note>
+	</section>
+
+	<section id="qa-infra-track">
+		<title>Reporting your result</title>
+
+		<para>There are two QA trackers we use.</para>
+
+		<itemizedlist>
+			<listitem><para>The ISO tracker mentioned above for any testing done with an ISO either an install or an upgrade test. </para></listitem>
+			<listitem><para>The <ulink url="http://packages.qa.ubuntu.com/">Package</ulink> tracker, which is used when we are testing applications during a cycle.</para></listitem>
+		</itemizedlist>
+
+		<para>These trackers form the backbone of what we are able to gain from your testing. It is important that you report your results.</para>
+
+		<para>The next two sections of these documents go into more detail on how you can test for us and how to report bugs for us.</para>
+	</section>
+</sect1>
\ No newline at end of file

=== removed file 'contributor-docs/C/qa-team.xml'
--- contributor-docs/C/qa-team.xml	2017-02-19 07:48:04 +0000
+++ contributor-docs/C/qa-team.xml	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
-%xubuntu-common;
-<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
-%xubuntu-contributor;
-<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
-%xinclude;
-<!ENTITY language "&EnglishAmerican;">
-<!ENTITY language "C">
-]>
-
-<chapter id="qa-team">
-	<title>QA Team Responsibilies</title>
-
-	<note><para>There are various QA trackers, wiki and Launchpad pages, the links to which can be found on <xref linkend="qa-team-links" />.</para></note>
-
-	<section id="qa-team-basics">
-		<title>QA Team</title>
-
-		<para>The Xubuntu QA team was formed to ensure that the quality of a released Xubuntu conforms to the parameters laid out in the Xubuntu Processes documents. In order to successfully accomplish this, close team working relationships, especially with the development team and the Xubuntu Council are paramount. Xubuntu's success is based on close working amongst all of its various teams.</para>
-
-		<para>In addition, the team gives people contributing through testing of Xubuntu the opportunity to become part of the <ulink url="https://launchpad.net/~xubuntu-team">Xubuntu Team</ulink>. For that to be of practical use, the QA team should keep an eye on testing reports on the trackers and propose users they have seen taking a keen interest in the work of the QA team.</para>
-
-		<para>Excluding testing itself, control of the testcases that we use for ISO and Package testing, along with communicating the testing requirements for any particular development cycle (hereafter cycle) to the community, makes up the bulk of the teams work in any given cycle.</para>
-
-		<para>Members of the QA team should check the current Xubuntu QA blueprint, and assign themselves to tasks they feel able to undertake.</para>
-	</section>
-
-	<section id="qa-team-testing">
-		<title>Testing Responsibilities</title>
-
-		<para>At the start of a cycle, the Release Team will discuss which ISO Milestones we will participate in. Then, during a Community Meeting, members of Xubuntu Team will discuss and then ratify Xubuntu's participation during the cycle.</para>
-
-		<para>Along with general testing of our OS, dealt with further in <xref linkend="qa-testing-exploratory" /> and <xref linkend="qa-testing-ppa" />, further responsibilities lie with ensuring that:</para>
-
-		<itemizedlist>
-			<listitem><para>Sufficient testing takes place prior to ISO Milestone releases</para></listitem>
-			<listitem><para>Sufficient package testing takes place following calls to testers</para></listitem>
-			<listitem><para>Sufficient testing has taken place by Final Release</para></listitem>
-			<listitem><para>Bugs reported to our trackers are confirmed, or where unable to confirm, further information is requested from the reporter</para></listitem>
-			<listitem><para>Where appropriate, confirmation of bugs can be asked of members of Xubuntu Team in the team devel IRC channel</para></listitem>
-		</itemizedlist>
-
-		<para>Members of the QA team might find it useful subscribing to the <ulink url="https://launchpad.net/~xubuntu-bugs">Xubuntu Bugs</ulink> team in order to be aware of bugs being reported by users.</para>
-	</section>
-
-	<section id="qa-team-trackers">
-		<title>Working with the QA Trackers</title>
-
-		<para>The initial decisions on what and when to test, will be taken following discussion with the members of the <ulink url="https://launchpad.net/~xubuntu-release">Xubuntu Release</ulink> team.</para>
-
-		<para>At the start of a cycle, the QA team needs to ensure that:</para>
-
-		<itemizedlist>
-			<listitem><para>Image testcases we use are still correct.</para></listitem>
-			<listitem><para>When the intention is that package testing will take place during the cycle, package testcases required during the cycle are still correct.</para></listitem>
-			<listitem><para>The testsuites on the Package Tracker make sense for what we intend to test during the cycle. Differences between regular and LTS releases are often, but not always, needed.</para></listitem>
-			<listitem><para>Scheduling of ISO, and when appropriate Package, testing should take place amongst the QA team.</para></listitem>
-		</itemizedlist>
-
-		<para>When there are changes to a package we test, following for example a bug fix, a further check of the testcase involved should take place. Further testing calls for that package should be made to check for regression during the cycle.</para>
-
-		<para>When a package during test constantly fails, or bug reports indicate a failure in a package for something not tested, the testcase for that package can be disabled temporarily. The QA Lead is responsible for ensuring tests are both disabled and re-enabled when appropriate.</para>
-
-		<para>Xubuntu ISOs are built and added to the tracker at approximately 02:00 UTC. This time can be changed by amending our build times on the <ulink url="http://bazaar.launchpad.net/~ubuntu-cdimage/ubuntu-cdimage/mainline/files/head:/etc/">ubuntu-cdimage crontab</ulink> and proposing the change.</para>
-
-	</section>
-
-	<section id="qa-team-testedits">
-		<title>Working with Testcases</title>
-
-		<para>Information on the basic method of working with testcases can be found at the Ubuntu QA Team <ulink url="https://wiki.ubuntu.com/QATeam/ContributingTestcases/Manual">Manual Testcases</ulink> page.</para>
-
-		<para><emphasis>We</emphasis> are only concerned with a specific set of tasks: grabbing the branch, making edits and then pushing the changes we need to the main branch. We have people in the Testcase Admin team for the LP Testcases, in addition any member of our Release Team can edit the tracker, this helps ensure that changes are moved through to the trackers quickly.</para>
-
-		<para>To edit a testcase:</para>
-
-		<itemizedlist>
-			<listitem><para><ulink url="https://bugs.launchpad.net/ubuntu-manual-tests/+filebug">Report</ulink> the required change as a bug against the testcase project</para></listitem>
-			<listitem><para>Assign yourself to the bug</para></listitem>
-			<listitem><para>Create a local branch: <userinput>bzr branch lp:ubuntu-manual-tests</userinput></para></listitem>
-			<listitem><para>Make changes to the testcase in your local branch</para></listitem>
-			<listitem><para>Commit the changes: <userinput>bzr commit -m "Fix LP bug #BUGNO."</userinput></para></listitem>
-			<listitem><para>Push to a personal remote branch: <userinput>bzr push lp:~username/ubuntu-manual-tests/bug-BUGNO</userinput></para></listitem>
-		</itemizedlist>
-
-		<para>Once pushed to a personal remote branch, propose the change for merging - <xref linkend="bzr-merge-proposal" />.</para>
-
-		<para>Respond to any requests for changes when asked by the Testcase Admins in order to get the required change through in a timely manner.</para>
-	</section>
-
-	<section id="qa-team-users">
-		<title>Communicating with Testers and Users</title>
-
-		<para>While we have two sets of people in the community that we contact about required testing, Testers will get regular contact from us, but we should only, in general, call on Users at later stages.</para>
-
-		<para>The QA Lead will be an administrator on the Testers Launchpad page and can contact those users via LP. Copies of testing calls sent to the devel mailing list should go to this group each time.</para>
-
-		<para>Any member of the QA team can:</para>
-
-		<itemizedlist>
-			<listitem><para>Mail the devel list with a testing call</para></listitem>
-			<listitem><para>Just prior to an upcoming ISO Milestone testing call, warn on the devel list</para></listitem>
-			<listitem><para>Make an ISO Milestone testing call</para></listitem>
-		</itemizedlist>
-
-		<para>Xubuntu Users will be contacted for ISO testing at later ISO Milestones, at the earliest the Beta 1 milestone, depending on the state of the current ISO and our packages.</para>
-	</section>
-
-	<section id="qa-team-release">
-		<title>Release Responsibilities</title>
-
-		<para>Much of the responsibility for the QA team at any release lies with the QA Lead.</para>
-
-		<para>However, <emphasis>any</emphasis> member of the QA team can:</para>
-
-		<itemizedlist>
-			<listitem><para>Work with the testing wiki <ulink url="https://wiki.ubuntu.com/Xubuntu/Testing/ReleaseNote">Release Note</ulink></para></listitem>
-			<listitem><para>Check status of bugs listed on the above draft</para></listitem>
-			<listitem><para>Check status of work items on the QA blueprint, marking as appropriate</para></listitem>
-		</itemizedlist>
-	</section>
-
-	<section id="qa-post-release">
-		<title>Post Release Tasks</title>
-
-		<para>Following release, there are a few tasks that need to be done before the next release cycle begins.</para>
-
-		<itemizedlist>
-			 <listitem><para>QA Lead should set up the blueprints for both the QA team and the Bugs that the whole team uses</para></listitem>
-			 <listitem><para>Check that the draft Release Note is up to date</para></listitem>
-	 	</itemizedlist>
-	</section>
-</chapter>

=== removed file 'contributor-docs/C/qa-tester.xml'
--- contributor-docs/C/qa-tester.xml	2017-02-19 07:48:04 +0000
+++ contributor-docs/C/qa-tester.xml	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
-%xubuntu-common;
-<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
-%xubuntu-contributor;
-<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
-%xinclude;
-<!ENTITY language "&EnglishAmerican;">
-<!ENTITY language "C">
-]>
-
-<chapter id="qa-tester">
-	<title>Testing Infrastructure</title>
-	<section id="qa-infra">
-		<title>Getting ready to test</title>
-
-		<para>To successfully test for Xubuntu, you will need at a minimum 4 things: a Launchpad account, mailing list subscription, an image and something to test it on. This page will give you the basic information in order to do those things and more.</para>
-	</section>
-
-	<section id="qa-infra-specs">
-		<title>Contacts</title>
-
-		<para>You need a Launchpad account, in order to join the necessary team(s) on it, and log into the 2 QA trackers.</para>
-
-		<para>We use one mailing list to detail what we intend to test during a cycle, we use the same list when we are calling for tests. This list is also used by the team to discuss the development of Xubuntu. You will need to join the Xubuntu Devel <ulink url="https://lists.ubuntu.com/mailman/listinfo/xubuntu-devel">Mailing</ulink> list.</para>
-
-		<para>While it is not necessary to do so, we make much use of IRC, so having an account you can use to access the main #xubuntu-devel channel will help you, alternatively you can access the channel via the IRC tab of the Xubuntu <ulink url="http://dev.xubuntu.org/">development</ulink> tracker.</para>
-
-		<para>Join the Xubuntu Testers <ulink url="https://launchpad.net/~xubuntu-testers">Launchpad</ulink> team.</para>
-
-		<para>Consider adding your details to the <ulink url="http://wiki.xubuntu.org/qa/teamhardware">Hardware</ulink> page. We can use this data to request specific testing from specific testers.</para>
-	</section>
-
-	<section id="qa-infra-iso">
-		<title>Getting the ISO</title>
-
-		<para>ISOs can be obtained through a few methods. The simplest method is to visit the <ulink url="http://iso.qa.ubuntu.com/">ISO</ulink> tracker. Follow the testcases through version to Xubuntu's group of tests. Then choose either 32 or 64 bit. Download links are available there.</para>
-
-		<para>When testing more regularly, you might find (especially where bandwidth is an issue for you) using the <ulink url="https://help.ubuntu.com/community/ZsyncCdImage">zsync</ulink> link more appropriate. This is will just grab the difference between your local copy and the current one.</para>
-
-	</section>
-
-	<section id="qa-infra-test">
-		<title>Methods of testing</title>
-
-		<para>Now you've set up your basic contact(s) and have your ISO, you are in a position to test it.</para>
-
-		<para>There are two main methods of testing the ISO:</para>
-
-		<itemizedlist>
-			<listitem><para>Using a virtual machine enables you to carry on using a normal release and to test our ISOs. You can install a virtual machine by directly using your downloaded ISO.</para></listitem>
-			<listitem><para>Install the ISO to hardware where that possibility is available. This is more important towards the end of the development cycle. You will necessarily need to have the ISO in some bootable medium. A member of Xubuntu's Website team details a simple method for preparing a bootable <ulink url="http://princessleia.com/journal/2016/03/xubuntu-16-04-iso-testing-tips/">USB</ulink> stick with Gnome Disks.</para></listitem>
-		</itemizedlist>
-
-		<note><para>While it is possible to use VirtualBox, past experience has shown that issues found when testing in VirtualBox are hard to replicate elsewhere. You might want to look into using <ulink url="https://help.ubuntu.com/community/KVM">KVM</ulink>. Members of Xubuntu QA have some experience with using this for testing and can help.</para></note>
-	</section>
-
-	<section id="qa-infra-track">
-		<title>Reporting your result</title>
-
-		<para>There are two QA trackers we use.</para>
-
-		<itemizedlist>
-			<listitem><para>The ISO tracker mentioned above for any testing done with an ISO either an install or an upgrade test. </para></listitem>
-			<listitem><para>The <ulink url="http://packages.qa.ubuntu.com/">Package</ulink> tracker, which is used when we are testing applications during a cycle.</para></listitem>
-		</itemizedlist>
-
-		<para>These trackers form the backbone of what we are able to gain from your testing. It is important that you report your results.</para>
-
-		<para>The next two sections of these documents go into more detail on how you can test for us and how to report bugs for us.</para>
-	</section>
-
-
-</chapter>

=== modified file 'contributor-docs/C/qa-testing.xml'
--- contributor-docs/C/qa-testing.xml	2017-02-19 07:48:04 +0000
+++ contributor-docs/C/qa-testing.xml	2017-03-02 18:48:00 +0000
@@ -10,10 +10,9 @@
 <!ENTITY language "&EnglishAmerican;">
 <!ENTITY language "C">
 ]>
-
-<chapter id="qa-testing">
+<sect1 id="qa-testing">
 	<title>Package and ISO Testing</title>
-	<section id="qa-iso">
+	<section id="qa-testing-iso">
 		<title>ISOs</title>
 
 		<para>In general, links for specific ISOs for daily or milestone use can be found at the <ulink url="http://iso.qa.ubuntu.com/">ISO Tracker</ulink>. A link exists for the <ulink url="http://cdimage.ubuntu.com/xubuntu/daily-live/current/">current</ulink> development daily ISO. This can be useful, especially when setting up methods to download your testing ISO, such as with <ulink url="https://help.ubuntu.com/community/ZsyncCdImage">zsync</ulink></para>
@@ -111,4 +110,4 @@
 
 		<para>A schedule of planned tests will be mailed to the Xubuntu Devel mailing list close to the cycle start. Reminders of upcoming package test requirements are mailed to the Xubuntu devel mailing list as required. <emphasis>Specific developer testing requirement</emphasis> are mailed as they are available, often these packages will be those found on one of our PPAs.</para>
 	</section>
-</chapter>
+</sect1>

=== added file 'contributor-docs/C/qa.xml'
--- contributor-docs/C/qa.xml	1970-01-01 00:00:00 +0000
+++ contributor-docs/C/qa.xml	2017-03-02 18:48:00 +0000
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
+%xubuntu-common;
+<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
+%xubuntu-contributor;
+<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
+%xinclude;
+<!ENTITY language "&EnglishAmerican;">
+<!ENTITY language "C">
+]>
+<chapter id="qa">
+	<title>Quality Assurance (QA)</title>
+
+	<note><para>There are various QA trackers, wiki and Launchpad pages, the links to which can be found on <xref linkend="qa-team-links" />.</para></note>
+
+	<simplesect>
+		<title>Introduction</title>
+
+		<para>The Xubuntu QA team was formed to ensure that the quality of a released Xubuntu conforms to the parameters laid out in the Xubuntu Processes documents. In order to successfully accomplish this, close team working relationships, especially with the development team and the Xubuntu Council are paramount. Xubuntu's success is based on close working amongst all of its various teams.</para>
+
+		<para>In addition, the team gives people contributing through testing of Xubuntu the opportunity to become part of the <ulink url="https://launchpad.net/~xubuntu-team">Xubuntu Team</ulink>. For that to be of practical use, the QA team should keep an eye on testing reports on the trackers and propose users they have seen taking a keen interest in the work of the QA team.</para>
+
+		<para>Excluding testing itself, control of the testcases that we use for ISO and Package testing, along with communicating the testing requirements for any particular development cycle (hereafter cycle) to the community, makes up the bulk of the teams work in any given cycle.</para>
+
+		<para>Members of the QA team should check the current Xubuntu QA blueprint, and assign themselves to tasks they feel able to undertake.</para>
+	</simplesect>
+
+	<section id="qa-team-testing">
+		<title>Testing</title>
+
+		<para>At the start of a cycle, the Release Team will discuss which ISO Milestones we will participate in. Then, during a Community Meeting, members of Xubuntu Team will discuss and then ratify Xubuntu's participation during the cycle.</para>
+
+		<para>Along with general testing of our OS, dealt with further in <xref linkend="qa-testing-exploratory" /> and <xref linkend="qa-testing-ppa" />, further responsibilities lie with ensuring that:</para>
+
+		<itemizedlist>
+			<listitem><para>Sufficient testing takes place prior to ISO Milestone releases</para></listitem>
+			<listitem><para>Sufficient package testing takes place following calls to testers</para></listitem>
+			<listitem><para>Sufficient testing has taken place by Final Release</para></listitem>
+			<listitem><para>Bugs reported to our trackers are confirmed, or where unable to confirm, further information is requested from the reporter</para></listitem>
+			<listitem><para>Where appropriate, confirmation of bugs can be asked of members of Xubuntu Team in the team devel IRC channel</para></listitem>
+		</itemizedlist>
+
+		<para>Members of the QA team might find it useful subscribing to the <ulink url="https://launchpad.net/~xubuntu-bugs">Xubuntu Bugs</ulink> team in order to be aware of bugs being reported by users.</para>
+
+		<xi:include href="qa-infra.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<xi:include href="qa-testing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<xi:include href="qa-bugs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	</section>
+
+	<section id="qa-team-trackers">
+		<title>Working with trackers</title>
+
+		<para>The initial decisions on what and when to test, will be taken following discussion with the members of the <ulink url="https://launchpad.net/~xubuntu-release">Xubuntu Release</ulink> team.</para>
+
+		<para>At the start of a cycle, the QA team needs to ensure that:</para>
+
+		<itemizedlist>
+			<listitem><para>Image testcases we use are still correct.</para></listitem>
+			<listitem><para>When the intention is that package testing will take place during the cycle, package testcases required during the cycle are still correct.</para></listitem>
+			<listitem><para>The testsuites on the Package Tracker make sense for what we intend to test during the cycle. Differences between regular and LTS releases are often, but not always, needed.</para></listitem>
+			<listitem><para>Scheduling of ISO, and when appropriate Package, testing should take place amongst the QA team.</para></listitem>
+		</itemizedlist>
+
+		<para>When there are changes to a package we test, following for example a bug fix, a further check of the testcase involved should take place. Further testing calls for that package should be made to check for regression during the cycle.</para>
+
+		<para>When a package during test constantly fails, or bug reports indicate a failure in a package for something not tested, the testcase for that package can be disabled temporarily. The QA Lead is responsible for ensuring tests are both disabled and re-enabled when appropriate.</para>
+
+		<para>Xubuntu ISOs are built and added to the tracker at approximately 02:00 UTC. This time can be changed by amending our build times on the <ulink url="http://bazaar.launchpad.net/~ubuntu-cdimage/ubuntu-cdimage/mainline/files/head:/etc/">ubuntu-cdimage crontab</ulink> and proposing the change.</para>
+	</section>
+
+	<section id="qa-team-testcases">
+		<title>Working with testcases</title>
+
+		<para>Information on the basic method of working with testcases can be found at the Ubuntu QA Team <ulink url="https://wiki.ubuntu.com/QATeam/ContributingTestcases/Manual">Manual Testcases</ulink> page.</para>
+
+		<para><emphasis>We</emphasis> are only concerned with a specific set of tasks: grabbing the branch, making edits and then pushing the changes we need to the main branch. We have people in the Testcase Admin team for the LP Testcases, in addition any member of our Release Team can edit the tracker, this helps ensure that changes are moved through to the trackers quickly.</para>
+
+		<para>To edit a testcase:</para>
+
+		<itemizedlist>
+			<listitem><para><ulink url="https://bugs.launchpad.net/ubuntu-manual-tests/+filebug">Report</ulink> the required change as a bug against the testcase project</para></listitem>
+			<listitem><para>Assign yourself to the bug</para></listitem>
+			<listitem><para>Create a local branch: <userinput>bzr branch lp:ubuntu-manual-tests</userinput></para></listitem>
+			<listitem><para>Make changes to the testcase in your local branch</para></listitem>
+			<listitem><para>Commit the changes: <userinput>bzr commit -m "Fix LP bug #BUGNO."</userinput></para></listitem>
+			<listitem><para>Push to a personal remote branch: <userinput>bzr push lp:~username/ubuntu-manual-tests/bug-BUGNO</userinput></para></listitem>
+		</itemizedlist>
+
+		<para>Once pushed to a personal remote branch, propose the change for merging - <xref linkend="bzr-merge-proposal" />.</para>
+
+		<para>Respond to any requests for changes when asked by the Testcase Admins in order to get the required change through in a timely manner.</para>
+	</section>
+
+	<section id="qa-team-communication">
+		<title>Communicating with Testers and Users</title>
+
+		<para>While we have two sets of people in the community that we contact about required testing, Testers will get regular contact from us, but we should only, in general, call on Users at later stages.</para>
+
+		<para>The QA Lead will be an administrator on the Testers Launchpad page and can contact those users via LP. Copies of testing calls sent to the devel mailing list should go to this group each time.</para>
+
+		<para>Any member of the QA team can:</para>
+
+		<itemizedlist>
+			<listitem><para>Mail the devel list with a testing call</para></listitem>
+			<listitem><para>Just prior to an upcoming ISO Milestone testing call, warn on the devel list</para></listitem>
+			<listitem><para>Make an ISO Milestone testing call</para></listitem>
+		</itemizedlist>
+
+		<para>Xubuntu Users will be contacted for ISO testing at later ISO Milestones, at the earliest the Beta 1 milestone, depending on the state of the current ISO and our packages.</para>
+	</section>
+
+	<section id="qa-team-release">
+		<title>Release Responsibilities</title>
+
+		<para>Much of the responsibility for the QA team at any release lies with the QA Lead.</para>
+
+		<para>However, <emphasis>any</emphasis> member of the QA team can:</para>
+
+		<itemizedlist>
+			<listitem><para>Work with the testing wiki <ulink url="https://wiki.ubuntu.com/Xubuntu/Testing/ReleaseNote">Release Note</ulink></para></listitem>
+			<listitem><para>Check status of bugs listed on the above draft</para></listitem>
+			<listitem><para>Check status of work items on the QA blueprint, marking as appropriate</para></listitem>
+		</itemizedlist>
+	</section>
+
+	<section id="qa-team-post-release">
+		<title>Post Release Tasks</title>
+
+		<para>Following release, there are a few tasks that need to be done before the next release cycle begins.</para>
+
+		<itemizedlist>
+			 <listitem><para>QA Lead should set up the blueprints for both the QA team and the Bugs that the whole team uses</para></listitem>
+			 <listitem><para>Check that the draft Release Note is up to date</para></listitem>
+	 	</itemizedlist>
+	</section>
+</chapter>

=== modified file 'contributor-docs/C/strategy-document.xml'
--- contributor-docs/C/strategy-document.xml	2016-09-02 20:41:05 +0000
+++ contributor-docs/C/strategy-document.xml	2017-03-02 18:48:00 +0000
@@ -12,6 +12,7 @@
 ]>
 <appendix id="xsd">
 	<title>Strategy Document</title>
+	<?dbhtml stop-chunking?>
 
 	<section id="xsd-introduction">
 		<title>Introduction</title>

=== modified file 'contributor-docs/C/website.xml'
--- contributor-docs/C/website.xml	2015-11-22 14:44:04 +0000
+++ contributor-docs/C/website.xml	2017-03-02 18:48:00 +0000
@@ -12,11 +12,12 @@
 ]>
 <chapter id="website">
 	<title>Website</title>
+	<?dbhtml stop-chunking?>
 
 	<section id="website-introduction">
 		<title>Introduction to the Xubuntu web presence</title>
 
-		<section id="website-introduction-xubuntu-org">
+		<simplesect id="website-introduction-xubuntu-org">
 			<title>Xubuntu.org</title>
 
 			<para><emphasis>The website is the main output for end-users.</emphasis> The content on the website should be easily understandable and approachable.</para>
@@ -24,12 +25,12 @@
 			<para>The website is a WordPress instance on a server maintained by the Canonical IS. The website content is overseen and administrated by the Xubuntu website team. The website team can submit tickets to the Canonical IS for any problems. Bugs that are related to the website can be submitted on Launchpad, under the <ulink url="https://bugs.launchpad.net/xubuntu-website/+bugs">bugs for xubuntu-website</ulink>.</para>
 
 			<para>The source code for the website is available at <literal>&branch;lp:xubuntu-website</literal> (the theme) and <literal>&branch;lp:xubuntu-website/plugins</literal> (the plugins).</para>
-		</section>
+		</simplesect>
 
-		<section id="website-introduction-wiki">
+		<simplesect id="website-introduction-wiki">
 			<title>Xubuntu wiki</title>
 
 			<para><emphasis>The Xubuntu wiki is used for some developer communication and serves as an archive for older release roadmaps and specification.</emphasis></para>
-		</section>
+		</simplesect>
 	</section>
 </chapter>
\ No newline at end of file

=== modified file 'contributor-docs/Makefile'
--- contributor-docs/Makefile	2015-11-24 22:10:36 +0000
+++ contributor-docs/Makefile	2017-03-02 18:48:00 +0000
@@ -10,7 +10,7 @@
 endif
 
 # Xubuntu Docbook Customization Layers
-XUBUNTUXSL_HTML = ../libs-common/xubuntu-docbook-xhtml.xsl
+XUBUNTUXSL_HTML_CONTRIBUTOR = ../libs-common/xubuntu-docbook-xhtml-contributor.xsl
 XUBUNTUXSL_PDF = ../libs-common/xubuntu-docbook-pdf.xsl
 
 # All available translations
@@ -23,7 +23,7 @@
 all: clean html html-translations pdf pdf-translations
 
 html: html-style
-	xsltproc --xinclude -o ../build/contributor/C/index.html $(XUBUNTUXSL_HTML) C/index.xml
+	xsltproc --xinclude -o ../build/contributor/C/index.html $(XUBUNTUXSL_HTML_CONTRIBUTOR) C/index.xml
 
 pdf:
 	xsltproc --stringparam paper.type A4 --xinclude -o fo/C-A4.fo $(XUBUNTUXSL_PDF) C/index.xml
@@ -60,7 +60,7 @@
 
 html-translations: html-style translate
 	for dir in $(TRANSLATIONS); do \
-		xsltproc --xinclude -o ../build/contributor/$$dir/index.html $(XUBUNTUXSL_HTML) $$dir/index.xml; \
+		xsltproc --xinclude -o ../build/contributor/$$dir/index.html $(XUBUNTUXSL_HTML_CONTRIBUTOR) $$dir/index.xml; \
 	done
 
 pdf-translations: translate

=== modified file 'contributor-docs/libs/xubuntu-contributor.ent'
--- contributor-docs/libs/xubuntu-contributor.ent	2016-12-15 17:50:54 +0000
+++ contributor-docs/libs/xubuntu-contributor.ent	2017-03-02 18:48:00 +0000
@@ -1,2 +1,1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY status-tracker 'http://dev.xubuntu.org/' >
+<?xml version="1.0" encoding="UTF-8"?>
\ No newline at end of file

=== modified file 'libs-common/css/style.css'
--- libs-common/css/style.css	2016-03-17 11:35:25 +0000
+++ libs-common/css/style.css	2017-03-02 18:48:00 +0000
@@ -120,6 +120,10 @@
 	font-size: 90%;
 }
 
+dd span.sect1 {
+	line-height: 1.5em;
+}
+
 .emphasis em {
 	font-weight: bold;
 }
@@ -203,29 +207,38 @@
 
 div.toc {
 	margin: 1em;
-	padding: 1em 1em 0.5em 1.5em;
+	padding: 0 1em 0 1.5em;
 	border-left: 2px solid #777; /* #2774e7 */
 }
 
 	.toc p strong {
-		font-weight: normal;
-		font-size: 130%;
+		display: none;
 	}
 
 	.toc dt {
 		font-weight: bold;
 	}
 
+	.section .toc dt,
+	.appendix .toc dt,
 	.chapter .toc dt {
 		margin-bottom: 0;
 	}
 
+	.section .toc a:empty {
+		display: none;
+	}
+	.section .toc dt,
+	.section .toc dd {
+		margin-left: 0;
+	}
+
 	.toc dd dl dt {
 		margin-top: 0.2em;
 		font-weight: normal;
 	}
 
-	.chapter .toc + p {
+	.toc + p {
 		margin-top: 2em;
 	}
 
@@ -278,8 +291,8 @@
 div.note img,
 div.tip img,
 div.warning img {
-	margin-bottom: -32px;
-	margin-right: 16px;
+	margin-bottom: -20px;
+	margin-right: 4px;
 	padding-bottom: 16px;
 }
 

=== modified file 'libs-common/xubuntu-common.ent'
--- libs-common/xubuntu-common.ent	2015-11-22 14:44:04 +0000
+++ libs-common/xubuntu-common.ent	2017-03-02 18:48:00 +0000
@@ -6,7 +6,7 @@
 	produce unwanted side-effects.
 -->
 
-<!ENTITY devel-codename 'xenial' >
+<!ENTITY devel-codename 'zesty' >
 
 <!ENTITY branch '<inlinemediaobject role="icon-branch"><imageobject><imagedata role="icon-pad" fileref="../../libs-common/images/icon_branch.png" /></imageobject></inlinemediaobject>' >
 <!ENTITY package '<inlinemediaobject role="icon-pkg"><imageobject><imagedata role="icon-pad" fileref="../../libs-common/images/icon_package.png" /></imageobject></inlinemediaobject>' >

=== added file 'libs-common/xubuntu-docbook-xhtml-contributor.xsl'
--- libs-common/xubuntu-docbook-xhtml-contributor.xsl	1970-01-01 00:00:00 +0000
+++ libs-common/xubuntu-docbook-xhtml-contributor.xsl	2017-03-02 18:48:00 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+	<!-- This file is a customization layer for HTML -->
+
+	<!-- Imports -->
+	<xsl:import href="xubuntu-docbook-xhtml.xsl"/>
+
+	<!-- Params -->
+	<xsl:param name="toc.max.depth" select="3"/>
+	<xsl:param name="chunk.section.depth" select="1" />
+	<xsl:param name="chunk.first.sections" select="1" />
+	<xsl:param name="generate.section.toc.level" select="3"/>
+
+	<xsl:param name="generate.toc">
+		appendix toc
+		appendix/section nop
+		appendix/section/section nop
+		book toc
+		chapter toc
+		chapter/section/section nop
+		part toc
+		section toc
+	</xsl:param>
+
+	<xsl:template match="chapter" mode="toc">
+		<xsl:call-template name="subtoc">
+			<xsl:with-param name="nodes" select="section|section/sect1"/>
+		</xsl:call-template>
+	</xsl:template>
+
+	<xsl:template match="sect1" mode="toc">
+		<dd><xsl:call-template name="toc.line"/></dd>
+	</xsl:template>
+</xsl:stylesheet>

=== modified file 'libs-common/xubuntu-docbook-xhtml.xsl'
--- libs-common/xubuntu-docbook-xhtml.xsl	2015-11-22 14:44:04 +0000
+++ libs-common/xubuntu-docbook-xhtml.xsl	2017-03-02 18:48:00 +0000
@@ -12,6 +12,7 @@
 	<xsl:param name="use.id.as.filename" select="1"/>
 	<xsl:param name="toc.section.depth" select="1"/>
 	<xsl:param name="chunker.output.indent" select="'yes'"/>
+	<xsl:param name="chunk.section.depth" select="0" />
 	<xsl:param name="body.font.master" select="10"/>
 	<xsl:param name="html.stylesheet" select="'../../libs-common/css/style.css'"/>
 	<xsl:param name="shade.verbatim" select="0"/>
@@ -30,13 +31,11 @@
 
 	<!-- Print header with logo -->
 	<xsl:template name="header.navigation">
-		<xsl:variable name="home" select="/*[1]"/>
-		<xsl:variable name="up" select="parent::*"/>
-			<div id="masthead">
-				<a href="index.html">
-					<img src="../../libs-common/images/logo.png" alt="Xubuntu" />
-				</a>
-			</div>
+		<div id="masthead">
+			<a href="index.html">
+				<img src="../../libs-common/images/logo.png" alt="Xubuntu" />
+			</a>
+		</div>
 	</xsl:template>
 
 	<!-- Navigation Graphics -->
@@ -51,9 +50,6 @@
 	<xsl:param name="admon.graphics.path" select="'../../libs-common/images/'"/>
 	<xsl:param name="admon.graphics.extension" select="'.png'"/>
 	
-	<!-- Show all subpages directly below the mainpage -->
-	<xsl:param name="chunk.section.depth" select="0" />
-
 	<!-- Formatting -->
 	<xsl:template match="application">
 		<xsl:call-template name="inline.boldseq"/>

=== modified file 'user-docs/C/index.xml'
--- user-docs/C/index.xml	2016-03-10 23:36:50 +0000
+++ user-docs/C/index.xml	2017-03-02 18:48:00 +0000
@@ -62,10 +62,7 @@
 		</legalnotice>
 
 		<copyright>
-			<year>2012</year>
-			<year>2013</year>
-			<year>2014</year>
-			<year>2015</year>
+			<year>2012–2017</year>
 			<holder>The Xubuntu documentation team. Xubuntu and Canonical are registered trademarks of Canonical Ltd.</holder>
 		</copyright>