1
=== modified file 'contributor-docs/C/common-reference.xml'
2
--- contributor-docs/C/common-reference.xml	2017-02-19 07:48:04 +0000
3
+++ contributor-docs/C/common-reference.xml	2017-03-02 18:48:00 +0000
4
@@ -14,7 +14,7 @@
5
14
	<title>Common Reference</title>
14
	<title>Common Reference</title>
6
15
15
7
16
	<section id="bzr">
16
	<section id="bzr">
9
17
		<title>Bazaar (Bzr)</title>
17
		<title>Using Bazaar (Bzr)</title>
10
18
18
11
19
		<para>Bazaar (commonly referred to as Bzr) is the version control system primarily used in Xubuntu development.</para>
19
		<para>Bazaar (commonly referred to as Bzr) is the version control system primarily used in Xubuntu development.</para>
12
20
20
13
@@ -74,7 +74,7 @@
14
74
	</section>
74
	</section>
15
75
75
16
76
	<section id="git">
76
	<section id="git">
18
77
		<title>Git</title>
77
		<title>Using Git</title>
19
78
78
20
79
		<para>Git is the version control system used in Xfce development.</para>
79
		<para>Git is the version control system used in Xfce development.</para>
21
80
80
22
81
81
23
=== modified file 'contributor-docs/C/development.xml'
24
--- contributor-docs/C/development.xml	2017-02-19 07:48:04 +0000
25
+++ contributor-docs/C/development.xml	2017-03-02 18:48:00 +0000
26
@@ -12,6 +12,7 @@
27
12
]>
12
]>
28
13
<chapter id="development">
13
<chapter id="development">
29
14
	<title>Development</title>
14
	<title>Development</title>
30
15
	<?dbhtml stop-chunking?>
31
15
16
32
16
	<section id="development-packageset">
17
	<section id="development-packageset">
33
17
		<title>Xubuntu packageset</title>
18
		<title>Xubuntu packageset</title>
34
18
19
35
=== added file 'contributor-docs/C/documentation-tasks.xml'
36
--- contributor-docs/C/documentation-tasks.xml	1970-01-01 00:00:00 +0000
37
+++ contributor-docs/C/documentation-tasks.xml	2017-03-02 18:48:00 +0000
38
@@ -0,0 +1,47 @@
39
1
<?xml version="1.0" encoding="UTF-8"?>
40
2
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
41
3
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
42
4
<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
43
5
%xubuntu-common;
44
6
<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
45
7
%xubuntu-contributor;
46
8
<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
47
9
%xinclude;
48
10
<!ENTITY language "&EnglishAmerican;">
49
11
<!ENTITY language "C">
50
12
]>
51
13
<section id="docs-tasks">
52
14
	<title>Tasks</title>
53
15
54
16
	<section id="docs-tasks-user">
55
17
		<title>User documentation</title>
56
18
57
19
		<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>
58
20
59
21
		<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>
60
22
61
23
		<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>
62
24
63
25
		<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>
64
26
	</section>
65
27
66
28
	<section id="docs-tasks-contributor">
67
29
		<title>Contributor documentation</title>
68
30
69
31
		<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>
70
32
71
33
		<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>
72
34
	</section>
73
35
74
36
	<section id="docs-tasks-other">
75
37
		<title>Other tasks</title>
76
38
77
39
		<para>In addition to the above, the documentation team is strongly encouraged to do the following:</para>
78
40
79
41
		<itemizedlist>
80
42
			<listitem><para>Work with the Quality Assurance team to write and maintain testcases</para></listitem>
81
43
			<listitem><para>Work with the website team to improve the website content and write FAQ or other documentation related articles</para></listitem>
82
44
			<listitem><para>Work with the marketing team on various projects, like flyers</para></listitem>
83
45
		</itemizedlist>
84
46
	</section>
85
47
</section>
86
0
\ No newline at end of file
48
\ No newline at end of file
87
1
49
88
=== added file 'contributor-docs/C/documentation-translations.xml'
89
--- contributor-docs/C/documentation-translations.xml	1970-01-01 00:00:00 +0000
90
+++ contributor-docs/C/documentation-translations.xml	2017-03-02 18:48:00 +0000
91
@@ -0,0 +1,82 @@
92
1
<?xml version="1.0" encoding="UTF-8"?>
93
2
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
94
3
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
95
4
<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
96
5
%xubuntu-common;
97
6
<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
98
7
%xubuntu-contributor;
99
8
<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
100
9
%xinclude;
101
10
<!ENTITY language "&EnglishAmerican;">
102
11
<!ENTITY language "C">
103
12
]>
104
13
<section id="docs-translations">
105
14
	<title>Translations</title>
106
15
107
16
	<section id="docs-packages">
108
17
		<title>Packages to be translated</title>
109
18
110
19
		<para>These are packages that the Xubuntu team considers important, and should take precedence when translating.</para>
111
20
112
21
		<section id="docs-packages-essential">
113
22
			<title>Packages that only exist in Xubuntu</title>
114
23
115
24
			<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>
116
25
117
26
			<itemizedlist>
118
27
				<listitem><para><ulink url="https://translations.launchpad.net/xubuntu-docs">Xubuntu Documentation</ulink></para></listitem>
119
28
				<listitem><para><ulink url="https://translations.launchpad.net/xubuntu-default-settings">Xubuntu Default Settings</ulink></para></listitem>
120
29
				<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>
121
30
			</itemizedlist>
122
31
		</section>
123
32
124
33
		<section id="docs-packages-xubuntu-important">
125
34
			<title>Used by Xubuntu</title>
126
35
127
36
			<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>
128
37
129
38
			<itemizedlist>
130
39
				<listitem><para><ulink url="https://translations.launchpad.net/catfish-search">Catfish</ulink></para></listitem>
131
40
				<listitem><para><ulink url="https://translations.launchpad.net/lightdm-gtk-greeter">LightDM GTK+ Greeter</ulink></para></listitem>
132
41
				<listitem><para><ulink url="https://translations.launchpad.net/lightdm-gtk-greeter-settings/">LightDM GTK+ Greeter Settings</ulink></para></listitem>
133
42
				<listitem><para><ulink url="https://translations.launchpad.net/menulibre">MenuLibre</ulink></para></listitem>
134
43
				<listitem><para><ulink url="https://translations.launchpad.net/mugshot">Mugshot</ulink></para></listitem>
135
44
				<listitem><para><ulink url="https://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/">Whiskermenu</ulink></para></listitem>
136
45
			</itemizedlist>
137
46
		</section>
138
47
	</section>
139
48
140
49
	<section id="docs-translation-guidelines">
141
50
		<title>Translation guidelines for Xubuntu packages</title>
142
51
143
52
		<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>
144
53
145
54
		<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>
146
55
147
56
		<para>More general translation guidelines can be found at the <ulink url="https://help.launchpad.net/Translations/Guide">Launchpad translations guide</ulink>.</para>
148
57
149
58
		<section id="docs-translation-guidelines-validity">
150
59
			<title>Maintain translation validity</title>
151
60
152
61
			<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>
153
62
154
63
			<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>
155
64
156
65
			<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>
157
66
158
67
			<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>
159
68
		</section>
160
69
161
70
		<section id="docs-translation-guidelines-conventions">
162
71
			<title>Follow good and existing conventions</title>
163
72
164
73
			<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>
165
74
166
75
			<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>
167
76
168
77
			<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>
169
78
170
79
			<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>
171
80
		</section>
172
81
	</section>
173
82
</section>
174
0
\ No newline at end of file
83
\ No newline at end of file
175
1
84
176
=== added file 'contributor-docs/C/documentation-working.xml'
177
--- contributor-docs/C/documentation-working.xml	1970-01-01 00:00:00 +0000
178
+++ contributor-docs/C/documentation-working.xml	2017-03-02 18:48:00 +0000
179
@@ -0,0 +1,37 @@
180
1
<?xml version="1.0" encoding="UTF-8"?>
181
2
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
182
3
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
183
4
<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
184
5
%xubuntu-common;
185
6
<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
186
7
%xubuntu-contributor;
187
8
<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
188
9
%xinclude;
189
10
<!ENTITY language "&EnglishAmerican;">
190
11
<!ENTITY language "C">
191
12
]>
192
13
<section id="docs-working">
193
14
	<title>Working with the documentation</title>
194
15
195
16
	<section id="docs-working-editing">
196
17
		<title>Editing the documentation</title>
197
18
198
19
		<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>
199
20
200
21
		<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>
201
22
202
23
		<para>Similarly, changes to the contributor documentation should be made to the .xml files under <literal>contributor-docs/C/</literal>.</para>
203
24
	</section>
204
25
205
26
	<section id="docs-working-notes-contributor">
206
27
		<title>Notes on the contributor documentation</title>
207
28
208
29
		<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>
209
30
210
31
		<itemizedlist>
211
32
			<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>
212
33
			<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>
213
34
			<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>
214
35
		</itemizedlist>
215
36
	</section>
216
37
</section>
217
0
38
218
=== modified file 'contributor-docs/C/documentation.xml'
219
--- contributor-docs/C/documentation.xml	2017-02-19 07:48:04 +0000
220
+++ contributor-docs/C/documentation.xml	2017-03-02 18:48:00 +0000
221
@@ -13,96 +13,13 @@
222
13
<chapter id="documentation">
13
<chapter id="documentation">
223
14
	<title>Documentation</title>
14
	<title>Documentation</title>
224
15
15
317
16
	<section id="docs-building">
16
	<simplesect>
318
17
		<title>Building the documentation locally</title>
17
		<title>Introduction</title>
319
18
18
320
19
		<itemizedlist>
19
		<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>
321
20
			<listitem><para>Get the Bzr branch <literal>&branch;lp:xubuntu-docs</literal>.</para></listitem>
20
	</simplesect>
322
21
			<listitem><para>Get the build dependencies for <literal>&package;xubuntu-docs</literal>.</para></listitem>
21
323
22
		</itemizedlist>
22
	<xi:include href="documentation-tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
324
23
	</section>
23
	<xi:include href="documentation-working.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
325
24
24
	<xi:include href="documentation-translations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
234
25
	<section id="docs-editing">
235
26
		<title>Editing the User Documentation</title>
236
27
237
28
		<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>
238
29
239
30
		<para>Similarly, changes to the contributor documentation should be made to the .xml files under <literal>contributor-docs/C/</literal>.</para>
240
31
	</section>
241
32
242
33
	<section id="docs-packages">
243
34
		<title>Packages to be translated</title>
244
35
245
36
		<para>These are packages that the Xubuntu team considers important, and should take precedence when translating.</para>
246
37
247
38
		<section id="docs-packages-xubuntu-only">
248
39
			<title>The packages that only exist in Xubuntu</title>
249
40
250
41
			<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>
251
42
252
43
			<itemizedlist>
253
44
				<listitem><para><ulink url="https://translations.launchpad.net/xubuntu-docs">Xubuntu Documentation</ulink></para></listitem>
254
45
				<listitem><para><ulink url="https://translations.launchpad.net/xubuntu-default-settings">Xubuntu Default Settings</ulink></para></listitem>
255
46
				<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>
256
47
			</itemizedlist>
257
48
		</section>
258
49
259
50
		<section id="docs-packages-xubuntu-used">
260
51
			<title>Used by and essential for Xubuntu</title>
261
52
262
53
			<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>
263
54
264
55
			<itemizedlist>
265
56
				<listitem><para><ulink url="https://translations.launchpad.net/catfish-search">Catfish</ulink></para></listitem>
266
57
				<listitem><para><ulink url="https://translations.launchpad.net/lightdm-gtk-greeter">LightDM GTK+ Greeter</ulink></para></listitem>
267
58
				<listitem><para><ulink url="https://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/">Whiskermenu</ulink></para></listitem>
268
59
			</itemizedlist>
269
60
		</section>
270
61
271
62
		<section id="docs-packages-xubuntu-mainly">
272
63
			<title>Mainly built for and used by Xubuntu</title>
273
64
274
65
			<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>
275
66
276
67
			<itemizedlist>
277
68
				<listitem><para><ulink url="https://translations.launchpad.net/lightdm-gtk-greeter-settings/">LightDM GTK+ Greeter Settings</ulink></para></listitem>
278
69
				<listitem><para><ulink url="https://translations.launchpad.net/menulibre">MenuLibre</ulink></para></listitem>
279
70
				<listitem><para><ulink url="https://translations.launchpad.net/mugshot">Mugshot</ulink></para></listitem>
280
71
			</itemizedlist>
281
72
		</section>
282
73
	</section>
283
74
284
75
	<section id="docs-translation-guidelines">
285
76
		<title>Translation guidelines for Xubuntu packages</title>
286
77
287
78
		<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>
288
79
289
80
		<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>
290
81
291
82
		<para>More general translation guidelines can be found at the <ulink url="https://help.launchpad.net/Translations/Guide">Launchpad translations guide</ulink>.</para>
292
83
293
84
		<section id="docs-translation-guidelines-validity">
294
85
			<title>Maintain translation validity</title>
295
86
296
87
			<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>
297
88
298
89
			<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>
299
90
300
91
			<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>
301
92
302
93
			<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>
303
94
		</section>
304
95
305
96
		<section id="docs-translation-guidelines-conventions">
306
97
			<title>Follow good and existing conventions</title>
307
98
308
99
			<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>
309
100
310
101
			<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>
311
102
312
103
			<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>
313
104
314
105
			<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>
315
106
		</section>
316
107
	</section>
326
108
</chapter>
25
</chapter>
327
109
26
328
=== modified file 'contributor-docs/C/getting-started.xml'
329
--- contributor-docs/C/getting-started.xml	2017-01-25 19:18:56 +0000
330
+++ contributor-docs/C/getting-started.xml	2017-03-02 18:48:00 +0000
331
@@ -12,6 +12,7 @@
332
12
]>
12
]>
333
13
<chapter id="getting-started">
13
<chapter id="getting-started">
334
14
	<title>Getting Started</title>
14
	<title>Getting Started</title>
335
15
	<?dbhtml stop-chunking?>
336
15
16
337
16
	<section id="important-places">
17
	<section id="important-places">
338
17
		<title>Important Places</title>
18
		<title>Important Places</title>
339
@@ -25,7 +26,7 @@
340
25
		<section id="status-tracker">
26
		<section id="status-tracker">
341
26
			<title>Status Tracker</title>
27
			<title>Status Tracker</title>
342
27
28
344
28
			<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>
29
			<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>
345
29
		</section>
30
		</section>
346
30
	</section>
31
	</section>
347
31
</chapter>
32
</chapter>
348
32
33
349
=== modified file 'contributor-docs/C/index.xml'
350
--- contributor-docs/C/index.xml	2017-01-25 19:18:56 +0000
351
+++ contributor-docs/C/index.xml	2017-03-02 18:48:00 +0000
352
@@ -44,7 +44,7 @@
353
44
		</legalnotice>
44
		</legalnotice>
354
45
45
355
46
		<copyright>
46
		<copyright>
357
47
			<year>2015</year>
47
			<year>2015–2017</year>
358
48
			<holder>The Xubuntu documentation team. Xubuntu and Canonical are registered trademarks of Canonical Ltd.</holder>
48
			<holder>The Xubuntu documentation team. Xubuntu and Canonical are registered trademarks of Canonical Ltd.</holder>
359
49
		</copyright>
49
		</copyright>
360
50
50
361
@@ -79,10 +79,7 @@
362
79
		<title>Subteam Documentation</title>
79
		<title>Subteam Documentation</title>
363
80
		<xi:include href="development.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
80
		<xi:include href="development.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
364
81
		<xi:include href="documentation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
81
		<xi:include href="documentation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
369
82
		<xi:include href="qa-tester.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
82
		<xi:include href="qa.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>	
366
83
		<xi:include href="qa-testing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
367
84
		<xi:include href="qa-bugs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
368
85
		<xi:include href="qa-team.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
370
86
		<xi:include href="website.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
83
		<xi:include href="website.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
371
87
	</part>
84
	</part>
372
88
	<!-- Common documentation -->
85
	<!-- Common documentation -->
373
89
86
374
=== modified file 'contributor-docs/C/processes.xml'
375
--- contributor-docs/C/processes.xml	2016-08-31 21:49:33 +0000
376
+++ contributor-docs/C/processes.xml	2017-03-02 18:48:00 +0000
377
@@ -12,6 +12,7 @@
378
12
]>
12
]>
379
13
<chapter id="processes">
13
<chapter id="processes">
380
14
	<title>Processes</title>
14
	<title>Processes</title>
381
15
	<?dbhtml stop-chunking?>
382
15
16
383
16
	<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>
17
	<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>
384
17
18
385
18
19
386
=== modified file 'contributor-docs/C/qa-bugs.xml'
387
--- contributor-docs/C/qa-bugs.xml	2017-02-19 07:48:04 +0000
388
+++ contributor-docs/C/qa-bugs.xml	2017-03-02 18:48:00 +0000
389
@@ -10,8 +10,7 @@
390
10
<!ENTITY language "&EnglishAmerican;">
10
<!ENTITY language "&EnglishAmerican;">
391
11
<!ENTITY language "C">
11
<!ENTITY language "C">
392
12
]>
12
]>
395
13
13
<sect1 id="qa-bugs">
394
14
<chapter id="qa-bugs">
396
15
	<title>Dealing with bugs</title>
14
	<title>Dealing with bugs</title>
397
16
15
398
17
	<section id="qa-bugs-tags">
16
	<section id="qa-bugs-tags">
399
@@ -67,4 +66,4 @@
400
67
66
401
68
		<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>
67
		<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>
402
69
	</section>
68
	</section>
404
70
</chapter>
69
</sect1>
405
71
70
406
=== added file 'contributor-docs/C/qa-infra.xml'
407
--- contributor-docs/C/qa-infra.xml	1970-01-01 00:00:00 +0000
408
+++ contributor-docs/C/qa-infra.xml	2017-03-02 18:48:00 +0000
409
@@ -0,0 +1,73 @@
410
1
<?xml version="1.0" encoding="UTF-8"?>
411
2
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
412
3
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
413
4
<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
414
5
%xubuntu-common;
415
6
<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
416
7
%xubuntu-contributor;
417
8
<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
418
9
%xinclude;
419
10
<!ENTITY language "&EnglishAmerican;">
420
11
<!ENTITY language "C">
421
12
]>
422
13
<sect1 id="qa-infra">
423
14
	<title>Testing Infrastructure</title>
424
15
	<section id="qa-infra-getting-ready">
425
16
		<title>Getting ready to test</title>
426
17
427
18
		<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>
428
19
	</section>
429
20
430
21
	<section id="qa-infra-specs">
431
22
		<title>Contacts</title>
432
23
433
24
		<para>You need a Launchpad account, in order to join the necessary team(s) on it, and log into the 2 QA trackers.</para>
434
25
435
26
		<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>
436
27
437
28
		<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>
438
29
439
30
		<para>Join the Xubuntu Testers <ulink url="https://launchpad.net/~xubuntu-testers">Launchpad</ulink> team.</para>
440
31
441
32
		<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>
442
33
	</section>
443
34
444
35
	<section id="qa-infra-iso">
445
36
		<title>Getting the ISO</title>
446
37
447
38
		<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>
448
39
449
40
		<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>
450
41
451
42
	</section>
452
43
453
44
	<section id="qa-infra-test">
454
45
		<title>Methods of testing</title>
455
46
456
47
		<para>Now you've set up your basic contact(s) and have your ISO, you are in a position to test it.</para>
457
48
458
49
		<para>There are two main methods of testing the ISO:</para>
459
50
460
51
		<itemizedlist>
461
52
			<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>
462
53
			<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>
463
54
		</itemizedlist>
464
55
465
56
		<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>
466
57
	</section>
467
58
468
59
	<section id="qa-infra-track">
469
60
		<title>Reporting your result</title>
470
61
471
62
		<para>There are two QA trackers we use.</para>
472
63
473
64
		<itemizedlist>
474
65
			<listitem><para>The ISO tracker mentioned above for any testing done with an ISO either an install or an upgrade test. </para></listitem>
475
66
			<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>
476
67
		</itemizedlist>
477
68
478
69
		<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>
479
70
480
71
		<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>
481
72
	</section>
482
73
</sect1>
483
0
\ No newline at end of file
74
\ No newline at end of file
484
1
75
485
=== removed file 'contributor-docs/C/qa-team.xml'
486
--- contributor-docs/C/qa-team.xml	2017-02-19 07:48:04 +0000
487
+++ contributor-docs/C/qa-team.xml	1970-01-01 00:00:00 +0000
488
@@ -1,136 +0,0 @@
489
1
<?xml version="1.0" encoding="UTF-8"?>
490
2
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
491
3
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
492
4
<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
493
5
%xubuntu-common;
494
6
<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
495
7
%xubuntu-contributor;
496
8
<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
497
9
%xinclude;
498
10
<!ENTITY language "&EnglishAmerican;">
499
11
<!ENTITY language "C">
500
12
]>
501
13
502
14
<chapter id="qa-team">
503
15
	<title>QA Team Responsibilies</title>
504
16
505
17
	<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>
506
18
507
19
	<section id="qa-team-basics">
508
20
		<title>QA Team</title>
509
21
510
22
		<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>
511
23
512
24
		<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>
513
25
514
26
		<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>
515
27
516
28
		<para>Members of the QA team should check the current Xubuntu QA blueprint, and assign themselves to tasks they feel able to undertake.</para>
517
29
	</section>
518
30
519
31
	<section id="qa-team-testing">
520
32
		<title>Testing Responsibilities</title>
521
33
522
34
		<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>
523
35
524
36
		<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>
525
37
526
38
		<itemizedlist>
527
39
			<listitem><para>Sufficient testing takes place prior to ISO Milestone releases</para></listitem>
528
40
			<listitem><para>Sufficient package testing takes place following calls to testers</para></listitem>
529
41
			<listitem><para>Sufficient testing has taken place by Final Release</para></listitem>
530
42
			<listitem><para>Bugs reported to our trackers are confirmed, or where unable to confirm, further information is requested from the reporter</para></listitem>
531
43
			<listitem><para>Where appropriate, confirmation of bugs can be asked of members of Xubuntu Team in the team devel IRC channel</para></listitem>
532
44
		</itemizedlist>
533
45
534
46
		<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>
535
47
	</section>
536
48
537
49
	<section id="qa-team-trackers">
538
50
		<title>Working with the QA Trackers</title>
539
51
540
52
		<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>
541
53
542
54
		<para>At the start of a cycle, the QA team needs to ensure that:</para>
543
55
544
56
		<itemizedlist>
545
57
			<listitem><para>Image testcases we use are still correct.</para></listitem>
546
58
			<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>
547
59
			<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>
548
60
			<listitem><para>Scheduling of ISO, and when appropriate Package, testing should take place amongst the QA team.</para></listitem>
549
61
		</itemizedlist>
550
62
551
63
		<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>
552
64
553
65
		<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>
554
66
555
67
		<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>
556
68
557
69
	</section>
558
70
559
71
	<section id="qa-team-testedits">
560
72
		<title>Working with Testcases</title>
561
73
562
74
		<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>
563
75
564
76
		<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>
565
77
566
78
		<para>To edit a testcase:</para>
567
79
568
80
		<itemizedlist>
569
81
			<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>
570
82
			<listitem><para>Assign yourself to the bug</para></listitem>
571
83
			<listitem><para>Create a local branch: <userinput>bzr branch lp:ubuntu-manual-tests</userinput></para></listitem>
572
84
			<listitem><para>Make changes to the testcase in your local branch</para></listitem>
573
85
			<listitem><para>Commit the changes: <userinput>bzr commit -m "Fix LP bug #BUGNO."</userinput></para></listitem>
574
86
			<listitem><para>Push to a personal remote branch: <userinput>bzr push lp:~username/ubuntu-manual-tests/bug-BUGNO</userinput></para></listitem>
575
87
		</itemizedlist>
576
88
577
89
		<para>Once pushed to a personal remote branch, propose the change for merging - <xref linkend="bzr-merge-proposal" />.</para>
578
90
579
91
		<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>
580
92
	</section>
581
93
582
94
	<section id="qa-team-users">
583
95
		<title>Communicating with Testers and Users</title>
584
96
585
97
		<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>
586
98
587
99
		<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>
588
100
589
101
		<para>Any member of the QA team can:</para>
590
102
591
103
		<itemizedlist>
592
104
			<listitem><para>Mail the devel list with a testing call</para></listitem>
593
105
			<listitem><para>Just prior to an upcoming ISO Milestone testing call, warn on the devel list</para></listitem>
594
106
			<listitem><para>Make an ISO Milestone testing call</para></listitem>
595
107
		</itemizedlist>
596
108
597
109
		<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>
598
110
	</section>
599
111
600
112
	<section id="qa-team-release">
601
113
		<title>Release Responsibilities</title>
602
114
603
115
		<para>Much of the responsibility for the QA team at any release lies with the QA Lead.</para>
604
116
605
117
		<para>However, <emphasis>any</emphasis> member of the QA team can:</para>
606
118
607
119
		<itemizedlist>
608
120
			<listitem><para>Work with the testing wiki <ulink url="https://wiki.ubuntu.com/Xubuntu/Testing/ReleaseNote">Release Note</ulink></para></listitem>
609
121
			<listitem><para>Check status of bugs listed on the above draft</para></listitem>
610
122
			<listitem><para>Check status of work items on the QA blueprint, marking as appropriate</para></listitem>
611
123
		</itemizedlist>
612
124
	</section>
613
125
614
126
	<section id="qa-post-release">
615
127
		<title>Post Release Tasks</title>
616
128
617
129
		<para>Following release, there are a few tasks that need to be done before the next release cycle begins.</para>
618
130
619
131
		<itemizedlist>
620
132
			 <listitem><para>QA Lead should set up the blueprints for both the QA team and the Bugs that the whole team uses</para></listitem>
621
133
			 <listitem><para>Check that the draft Release Note is up to date</para></listitem>
622
134
	 	</itemizedlist>
623
135
	</section>
624
136
</chapter>
625
137
0
626
=== removed file 'contributor-docs/C/qa-tester.xml'
627
--- contributor-docs/C/qa-tester.xml	2017-02-19 07:48:04 +0000
628
+++ contributor-docs/C/qa-tester.xml	1970-01-01 00:00:00 +0000
629
@@ -1,76 +0,0 @@
630
1
<?xml version="1.0" encoding="UTF-8"?>
631
2
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
632
3
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
633
4
<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
634
5
%xubuntu-common;
635
6
<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
636
7
%xubuntu-contributor;
637
8
<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
638
9
%xinclude;
639
10
<!ENTITY language "&EnglishAmerican;">
640
11
<!ENTITY language "C">
641
12
]>
642
13
643
14
<chapter id="qa-tester">
644
15
	<title>Testing Infrastructure</title>
645
16
	<section id="qa-infra">
646
17
		<title>Getting ready to test</title>
647
18
648
19
		<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>
649
20
	</section>
650
21
651
22
	<section id="qa-infra-specs">
652
23
		<title>Contacts</title>
653
24
654
25
		<para>You need a Launchpad account, in order to join the necessary team(s) on it, and log into the 2 QA trackers.</para>
655
26
656
27
		<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>
657
28
658
29
		<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>
659
30
660
31
		<para>Join the Xubuntu Testers <ulink url="https://launchpad.net/~xubuntu-testers">Launchpad</ulink> team.</para>
661
32
662
33
		<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>
663
34
	</section>
664
35
665
36
	<section id="qa-infra-iso">
666
37
		<title>Getting the ISO</title>
667
38
668
39
		<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>
669
40
670
41
		<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>
671
42
672
43
	</section>
673
44
674
45
	<section id="qa-infra-test">
675
46
		<title>Methods of testing</title>
676
47
677
48
		<para>Now you've set up your basic contact(s) and have your ISO, you are in a position to test it.</para>
678
49
679
50
		<para>There are two main methods of testing the ISO:</para>
680
51
681
52
		<itemizedlist>
682
53
			<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>
683
54
			<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>
684
55
		</itemizedlist>
685
56
686
57
		<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>
687
58
	</section>
688
59
689
60
	<section id="qa-infra-track">
690
61
		<title>Reporting your result</title>
691
62
692
63
		<para>There are two QA trackers we use.</para>
693
64
694
65
		<itemizedlist>
695
66
			<listitem><para>The ISO tracker mentioned above for any testing done with an ISO either an install or an upgrade test. </para></listitem>
696
67
			<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>
697
68
		</itemizedlist>
698
69
699
70
		<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>
700
71
701
72
		<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>
702
73
	</section>
703
74
704
75
705
76
</chapter>
706
77
0
707
=== modified file 'contributor-docs/C/qa-testing.xml'
708
--- contributor-docs/C/qa-testing.xml	2017-02-19 07:48:04 +0000
709
+++ contributor-docs/C/qa-testing.xml	2017-03-02 18:48:00 +0000
710
@@ -10,10 +10,9 @@
711
10
<!ENTITY language "&EnglishAmerican;">
10
<!ENTITY language "&EnglishAmerican;">
712
11
<!ENTITY language "C">
11
<!ENTITY language "C">
713
12
]>
12
]>
716
13
13
<sect1 id="qa-testing">
715
14
<chapter id="qa-testing">
717
15
	<title>Package and ISO Testing</title>
14
	<title>Package and ISO Testing</title>
719
16
	<section id="qa-iso">
15
	<section id="qa-testing-iso">
720
17
		<title>ISOs</title>
16
		<title>ISOs</title>
721
18
17
722
19
		<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>
18
		<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>
723
@@ -111,4 +110,4 @@
724
111
110
725
112
		<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>
111
		<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>
726
113
	</section>
112
	</section>
728
114
</chapter>
113
</sect1>
729
115
114
730
=== added file 'contributor-docs/C/qa.xml'
731
--- contributor-docs/C/qa.xml	1970-01-01 00:00:00 +0000
732
+++ contributor-docs/C/qa.xml	2017-03-02 18:48:00 +0000
733
@@ -0,0 +1,138 @@
734
1
<?xml version="1.0" encoding="UTF-8"?>
735
2
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
736
3
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
737
4
<!ENTITY % xubuntu-common SYSTEM "../../libs-common/xubuntu-common.ent">
738
5
%xubuntu-common;
739
6
<!ENTITY % xubuntu-contributor SYSTEM "../libs/xubuntu-contributor.ent">
740
7
%xubuntu-contributor;
741
8
<!ENTITY % xinclude SYSTEM "../../libs-common/xinclude.mod">
742
9
%xinclude;
743
10
<!ENTITY language "&EnglishAmerican;">
744
11
<!ENTITY language "C">
745
12
]>
746
13
<chapter id="qa">
747
14
	<title>Quality Assurance (QA)</title>
748
15
749
16
	<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>
750
17
751
18
	<simplesect>
752
19
		<title>Introduction</title>
753
20
754
21
		<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>
755
22
756
23
		<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>
757
24
758
25
		<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>
759
26
760
27
		<para>Members of the QA team should check the current Xubuntu QA blueprint, and assign themselves to tasks they feel able to undertake.</para>
761
28
	</simplesect>
762
29
763
30
	<section id="qa-team-testing">
764
31
		<title>Testing</title>
765
32
766
33
		<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>
767
34
768
35
		<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>
769
36
770
37
		<itemizedlist>
771
38
			<listitem><para>Sufficient testing takes place prior to ISO Milestone releases</para></listitem>
772
39
			<listitem><para>Sufficient package testing takes place following calls to testers</para></listitem>
773
40
			<listitem><para>Sufficient testing has taken place by Final Release</para></listitem>
774
41
			<listitem><para>Bugs reported to our trackers are confirmed, or where unable to confirm, further information is requested from the reporter</para></listitem>
775
42
			<listitem><para>Where appropriate, confirmation of bugs can be asked of members of Xubuntu Team in the team devel IRC channel</para></listitem>
776
43
		</itemizedlist>
777
44
778
45
		<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>
779
46
780
47
		<xi:include href="qa-infra.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
781
48
		<xi:include href="qa-testing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
782
49
		<xi:include href="qa-bugs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
783
50
	</section>
784
51
785
52
	<section id="qa-team-trackers">
786
53
		<title>Working with trackers</title>
787
54
788
55
		<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>
789
56
790
57
		<para>At the start of a cycle, the QA team needs to ensure that:</para>
791
58
792
59
		<itemizedlist>
793
60
			<listitem><para>Image testcases we use are still correct.</para></listitem>
794
61
			<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>
795
62
			<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>
796
63
			<listitem><para>Scheduling of ISO, and when appropriate Package, testing should take place amongst the QA team.</para></listitem>
797
64
		</itemizedlist>
798
65
799
66
		<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>
800
67
801
68
		<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>
802
69
803
70
		<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>
804
71
	</section>
805
72
806
73
	<section id="qa-team-testcases">
807
74
		<title>Working with testcases</title>
808
75
809
76
		<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>
810
77
811
78
		<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>
812
79
813
80
		<para>To edit a testcase:</para>
814
81
815
82
		<itemizedlist>
816
83
			<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>
817
84
			<listitem><para>Assign yourself to the bug</para></listitem>
818
85
			<listitem><para>Create a local branch: <userinput>bzr branch lp:ubuntu-manual-tests</userinput></para></listitem>
819
86
			<listitem><para>Make changes to the testcase in your local branch</para></listitem>
820
87
			<listitem><para>Commit the changes: <userinput>bzr commit -m "Fix LP bug #BUGNO."</userinput></para></listitem>
821
88
			<listitem><para>Push to a personal remote branch: <userinput>bzr push lp:~username/ubuntu-manual-tests/bug-BUGNO</userinput></para></listitem>
822
89
		</itemizedlist>
823
90
824
91
		<para>Once pushed to a personal remote branch, propose the change for merging - <xref linkend="bzr-merge-proposal" />.</para>
825
92
826
93
		<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>
827
94
	</section>
828
95
829
96
	<section id="qa-team-communication">
830
97
		<title>Communicating with Testers and Users</title>
831
98
832
99
		<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>
833
100
834
101
		<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>
835
102
836
103
		<para>Any member of the QA team can:</para>
837
104
838
105
		<itemizedlist>
839
106
			<listitem><para>Mail the devel list with a testing call</para></listitem>
840
107
			<listitem><para>Just prior to an upcoming ISO Milestone testing call, warn on the devel list</para></listitem>
841
108
			<listitem><para>Make an ISO Milestone testing call</para></listitem>
842
109
		</itemizedlist>
843
110
844
111
		<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>
845
112
	</section>
846
113
847
114
	<section id="qa-team-release">
848
115
		<title>Release Responsibilities</title>
849
116
850
117
		<para>Much of the responsibility for the QA team at any release lies with the QA Lead.</para>
851
118
852
119
		<para>However, <emphasis>any</emphasis> member of the QA team can:</para>
853
120
854
121
		<itemizedlist>
855
122
			<listitem><para>Work with the testing wiki <ulink url="https://wiki.ubuntu.com/Xubuntu/Testing/ReleaseNote">Release Note</ulink></para></listitem>
856
123
			<listitem><para>Check status of bugs listed on the above draft</para></listitem>
857
124
			<listitem><para>Check status of work items on the QA blueprint, marking as appropriate</para></listitem>
858
125
		</itemizedlist>
859
126
	</section>
860
127
861
128
	<section id="qa-team-post-release">
862
129
		<title>Post Release Tasks</title>
863
130
864
131
		<para>Following release, there are a few tasks that need to be done before the next release cycle begins.</para>
865
132
866
133
		<itemizedlist>
867
134
			 <listitem><para>QA Lead should set up the blueprints for both the QA team and the Bugs that the whole team uses</para></listitem>
868
135
			 <listitem><para>Check that the draft Release Note is up to date</para></listitem>
869
136
	 	</itemizedlist>
870
137
	</section>
871
138
</chapter>
872
0
139
873
=== modified file 'contributor-docs/C/strategy-document.xml'
874
--- contributor-docs/C/strategy-document.xml	2016-09-02 20:41:05 +0000
875
+++ contributor-docs/C/strategy-document.xml	2017-03-02 18:48:00 +0000
876
@@ -12,6 +12,7 @@
877
12
]>
12
]>
878
13
<appendix id="xsd">
13
<appendix id="xsd">
879
14
	<title>Strategy Document</title>
14
	<title>Strategy Document</title>
880
15
	<?dbhtml stop-chunking?>
881
15
16
882
16
	<section id="xsd-introduction">
17
	<section id="xsd-introduction">
883
17
		<title>Introduction</title>
18
		<title>Introduction</title>
884
18
19
885
=== modified file 'contributor-docs/C/website.xml'
886
--- contributor-docs/C/website.xml	2015-11-22 14:44:04 +0000
887
+++ contributor-docs/C/website.xml	2017-03-02 18:48:00 +0000
888
@@ -12,11 +12,12 @@
889
12
]>
12
]>
890
13
<chapter id="website">
13
<chapter id="website">
891
14
	<title>Website</title>
14
	<title>Website</title>
892
15
	<?dbhtml stop-chunking?>
893
15
16
894
16
	<section id="website-introduction">
17
	<section id="website-introduction">
895
17
		<title>Introduction to the Xubuntu web presence</title>
18
		<title>Introduction to the Xubuntu web presence</title>
896
18
19
898
19
		<section id="website-introduction-xubuntu-org">
20
		<simplesect id="website-introduction-xubuntu-org">
899
20
			<title>Xubuntu.org</title>
21
			<title>Xubuntu.org</title>
900
21
22
901
22
			<para><emphasis>The website is the main output for end-users.</emphasis> The content on the website should be easily understandable and approachable.</para>
23
			<para><emphasis>The website is the main output for end-users.</emphasis> The content on the website should be easily understandable and approachable.</para>
902
@@ -24,12 +25,12 @@
903
24
			<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>
25
			<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>
904
25
26
905
26
			<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>
27
			<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>
907
27
		</section>
28
		</simplesect>
908
28
29
910
29
		<section id="website-introduction-wiki">
30
		<simplesect id="website-introduction-wiki">
911
30
			<title>Xubuntu wiki</title>
31
			<title>Xubuntu wiki</title>
912
31
32
913
32
			<para><emphasis>The Xubuntu wiki is used for some developer communication and serves as an archive for older release roadmaps and specification.</emphasis></para>
33
			<para><emphasis>The Xubuntu wiki is used for some developer communication and serves as an archive for older release roadmaps and specification.</emphasis></para>
915
33
		</section>
34
		</simplesect>
916
34
	</section>
35
	</section>
917
35
</chapter>
36
</chapter>
918
36
\ No newline at end of file
37
\ No newline at end of file
919
37
38
920
=== modified file 'contributor-docs/Makefile'
921
--- contributor-docs/Makefile	2015-11-24 22:10:36 +0000
922
+++ contributor-docs/Makefile	2017-03-02 18:48:00 +0000
923
@@ -10,7 +10,7 @@
924
10
endif
10
endif
925
11
11
926
12
# Xubuntu Docbook Customization Layers
12
# Xubuntu Docbook Customization Layers
928
13
XUBUNTUXSL_HTML = ../libs-common/xubuntu-docbook-xhtml.xsl
13
XUBUNTUXSL_HTML_CONTRIBUTOR = ../libs-common/xubuntu-docbook-xhtml-contributor.xsl
929
14
XUBUNTUXSL_PDF = ../libs-common/xubuntu-docbook-pdf.xsl
14
XUBUNTUXSL_PDF = ../libs-common/xubuntu-docbook-pdf.xsl
930
15
15
931
16
# All available translations
16
# All available translations
932
@@ -23,7 +23,7 @@
933
23
all: clean html html-translations pdf pdf-translations
23
all: clean html html-translations pdf pdf-translations
934
24
24
935
25
html: html-style
25
html: html-style
937
26
	xsltproc --xinclude -o ../build/contributor/C/index.html $(XUBUNTUXSL_HTML) C/index.xml
26
	xsltproc --xinclude -o ../build/contributor/C/index.html $(XUBUNTUXSL_HTML_CONTRIBUTOR) C/index.xml
938
27
27
939
28
pdf:
28
pdf:
940
29
	xsltproc --stringparam paper.type A4 --xinclude -o fo/C-A4.fo $(XUBUNTUXSL_PDF) C/index.xml
29
	xsltproc --stringparam paper.type A4 --xinclude -o fo/C-A4.fo $(XUBUNTUXSL_PDF) C/index.xml
941
@@ -60,7 +60,7 @@
942
60
60
943
61
html-translations: html-style translate
61
html-translations: html-style translate
944
62
	for dir in $(TRANSLATIONS); do \
62
	for dir in $(TRANSLATIONS); do \
946
63
		xsltproc --xinclude -o ../build/contributor/$$dir/index.html $(XUBUNTUXSL_HTML) $$dir/index.xml; \
63
		xsltproc --xinclude -o ../build/contributor/$$dir/index.html $(XUBUNTUXSL_HTML_CONTRIBUTOR) $$dir/index.xml; \
947
64
	done
64
	done
948
65
65
949
66
pdf-translations: translate
66
pdf-translations: translate
950
67
67
951
=== modified file 'contributor-docs/libs/xubuntu-contributor.ent'
952
--- contributor-docs/libs/xubuntu-contributor.ent	2016-12-15 17:50:54 +0000
953
+++ contributor-docs/libs/xubuntu-contributor.ent	2017-03-02 18:48:00 +0000
954
@@ -1,2 +1,1 @@
957
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
956
2
<!ENTITY status-tracker 'http://dev.xubuntu.org/' >
958
3
\ No newline at end of file
2
\ No newline at end of file
959
4
3
960
=== modified file 'libs-common/css/style.css'
961
--- libs-common/css/style.css	2016-03-17 11:35:25 +0000
962
+++ libs-common/css/style.css	2017-03-02 18:48:00 +0000
963
@@ -120,6 +120,10 @@
964
120
	font-size: 90%;
120
	font-size: 90%;
965
121
}
121
}
966
122
122
967
123
dd span.sect1 {
968
124
	line-height: 1.5em;
969
125
}
970
126
971
123
.emphasis em {
127
.emphasis em {
972
124
	font-weight: bold;
128
	font-weight: bold;
973
125
}
129
}
974
@@ -203,29 +207,38 @@
975
203
207
976
204
div.toc {
208
div.toc {
977
205
	margin: 1em;
209
	margin: 1em;
979
206
	padding: 1em 1em 0.5em 1.5em;
210
	padding: 0 1em 0 1.5em;
980
207
	border-left: 2px solid #777; /* #2774e7 */
211
	border-left: 2px solid #777; /* #2774e7 */
981
208
}
212
}
982
209
213
983
210
	.toc p strong {
214
	.toc p strong {
986
211
		font-weight: normal;
215
		display: none;
985
212
		font-size: 130%;
987
213
	}
216
	}
988
214
217
989
215
	.toc dt {
218
	.toc dt {
990
216
		font-weight: bold;
219
		font-weight: bold;
991
217
	}
220
	}
992
218
221
993
222
	.section .toc dt,
994
223
	.appendix .toc dt,
995
219
	.chapter .toc dt {
224
	.chapter .toc dt {
996
220
		margin-bottom: 0;
225
		margin-bottom: 0;
997
221
	}
226
	}
998
222
227
999
228
	.section .toc a:empty {
1000
229
		display: none;
1001
230
	}
1002
231
	.section .toc dt,
1003
232
	.section .toc dd {
1004
233
		margin-left: 0;
1005
234
	}
1006
235
1007
223
	.toc dd dl dt {
236
	.toc dd dl dt {
1008
224
		margin-top: 0.2em;
237
		margin-top: 0.2em;
1009
225
		font-weight: normal;
238
		font-weight: normal;
1010
226
	}
239
	}
1011
227
240
1013
228
	.chapter .toc + p {
241
	.toc + p {
1014
229
		margin-top: 2em;
242
		margin-top: 2em;
1015
230
	}
243
	}
1016
231
244
1017
@@ -278,8 +291,8 @@
1018
278
div.note img,
291
div.note img,
1019
279
div.tip img,
292
div.tip img,
1020
280
div.warning img {
293
div.warning img {
1023
281
	margin-bottom: -32px;
294
	margin-bottom: -20px;
1024
282
	margin-right: 16px;
295
	margin-right: 4px;
1025
283
	padding-bottom: 16px;
296
	padding-bottom: 16px;
1026
284
}
297
}
1027
285
298
1028
286
299
1029
=== modified file 'libs-common/xubuntu-common.ent'
1030
--- libs-common/xubuntu-common.ent	2015-11-22 14:44:04 +0000
1031
+++ libs-common/xubuntu-common.ent	2017-03-02 18:48:00 +0000
1032
@@ -6,7 +6,7 @@
1033
6
	produce unwanted side-effects.
6
	produce unwanted side-effects.
1034
7
-->
7
-->
1035
8
8
1037
9
<!ENTITY devel-codename 'xenial' >
9
<!ENTITY devel-codename 'zesty' >
1038
10
10
1039
11
<!ENTITY branch '<inlinemediaobject role="icon-branch"><imageobject><imagedata role="icon-pad" fileref="../../libs-common/images/icon_branch.png" /></imageobject></inlinemediaobject>' >
11
<!ENTITY branch '<inlinemediaobject role="icon-branch"><imageobject><imagedata role="icon-pad" fileref="../../libs-common/images/icon_branch.png" /></imageobject></inlinemediaobject>' >
1040
12
<!ENTITY package '<inlinemediaobject role="icon-pkg"><imageobject><imagedata role="icon-pad" fileref="../../libs-common/images/icon_package.png" /></imageobject></inlinemediaobject>' >
12
<!ENTITY package '<inlinemediaobject role="icon-pkg"><imageobject><imagedata role="icon-pad" fileref="../../libs-common/images/icon_package.png" /></imageobject></inlinemediaobject>' >
1041
13
13
1042
=== added file 'libs-common/xubuntu-docbook-xhtml-contributor.xsl'
1043
--- libs-common/xubuntu-docbook-xhtml-contributor.xsl	1970-01-01 00:00:00 +0000
1044
+++ libs-common/xubuntu-docbook-xhtml-contributor.xsl	2017-03-02 18:48:00 +0000
1045
@@ -0,0 +1,35 @@
1046
1
<?xml version="1.0" encoding="UTF-8" ?>
1047
2
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
1048
3
	xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
1049
4
	<!-- This file is a customization layer for HTML -->
1050
5
1051
6
	<!-- Imports -->
1052
7
	<xsl:import href="xubuntu-docbook-xhtml.xsl"/>
1053
8
1054
9
	<!-- Params -->
1055
10
	<xsl:param name="toc.max.depth" select="3"/>
1056
11
	<xsl:param name="chunk.section.depth" select="1" />
1057
12
	<xsl:param name="chunk.first.sections" select="1" />
1058
13
	<xsl:param name="generate.section.toc.level" select="3"/>
1059
14
1060
15
	<xsl:param name="generate.toc">
1061
16
		appendix toc
1062
17
		appendix/section nop
1063
18
		appendix/section/section nop
1064
19
		book toc
1065
20
		chapter toc
1066
21
		chapter/section/section nop
1067
22
		part toc
1068
23
		section toc
1069
24
	</xsl:param>
1070
25
1071
26
	<xsl:template match="chapter" mode="toc">
1072
27
		<xsl:call-template name="subtoc">
1073
28
			<xsl:with-param name="nodes" select="section|section/sect1"/>
1074
29
		</xsl:call-template>
1075
30
	</xsl:template>
1076
31
1077
32
	<xsl:template match="sect1" mode="toc">
1078
33
		<dd><xsl:call-template name="toc.line"/></dd>
1079
34
	</xsl:template>
1080
35
</xsl:stylesheet>
1081
0
36
1082
=== modified file 'libs-common/xubuntu-docbook-xhtml.xsl'
1083
--- libs-common/xubuntu-docbook-xhtml.xsl	2015-11-22 14:44:04 +0000
1084
+++ libs-common/xubuntu-docbook-xhtml.xsl	2017-03-02 18:48:00 +0000
1085
@@ -12,6 +12,7 @@
1086
12
	<xsl:param name="use.id.as.filename" select="1"/>
12
	<xsl:param name="use.id.as.filename" select="1"/>
1087
13
	<xsl:param name="toc.section.depth" select="1"/>
13
	<xsl:param name="toc.section.depth" select="1"/>
1088
14
	<xsl:param name="chunker.output.indent" select="'yes'"/>
14
	<xsl:param name="chunker.output.indent" select="'yes'"/>
1089
15
	<xsl:param name="chunk.section.depth" select="0" />
1090
15
	<xsl:param name="body.font.master" select="10"/>
16
	<xsl:param name="body.font.master" select="10"/>
1091
16
	<xsl:param name="html.stylesheet" select="'../../libs-common/css/style.css'"/>
17
	<xsl:param name="html.stylesheet" select="'../../libs-common/css/style.css'"/>
1092
17
	<xsl:param name="shade.verbatim" select="0"/>
18
	<xsl:param name="shade.verbatim" select="0"/>
1093
@@ -30,13 +31,11 @@
1094
30
31
1095
31
	<!-- Print header with logo -->
32
	<!-- Print header with logo -->
1096
32
	<xsl:template name="header.navigation">
33
	<xsl:template name="header.navigation">
1104
33
		<xsl:variable name="home" select="/*[1]"/>
34
		<div id="masthead">
1105
34
		<xsl:variable name="up" select="parent::*"/>
35
			<a href="index.html">
1106
35
			<div id="masthead">
36
				<img src="../../libs-common/images/logo.png" alt="Xubuntu" />
1107
36
				<a href="index.html">
37
			</a>
1108
37
					<img src="../../libs-common/images/logo.png" alt="Xubuntu" />
38
		</div>
1102
38
				</a>
1103
39
			</div>
1109
40
	</xsl:template>
39
	</xsl:template>
1110
41
40
1111
42
	<!-- Navigation Graphics -->
41
	<!-- Navigation Graphics -->
1112
@@ -51,9 +50,6 @@
1113
51
	<xsl:param name="admon.graphics.path" select="'../../libs-common/images/'"/>
50
	<xsl:param name="admon.graphics.path" select="'../../libs-common/images/'"/>
1114
52
	<xsl:param name="admon.graphics.extension" select="'.png'"/>
51
	<xsl:param name="admon.graphics.extension" select="'.png'"/>
1115
53
	
52
	
1116
54
	<!-- Show all subpages directly below the mainpage -->
1117
55
	<xsl:param name="chunk.section.depth" select="0" />
1118
56
1119
57
	<!-- Formatting -->
53
	<!-- Formatting -->
1120
58
	<xsl:template match="application">
54
	<xsl:template match="application">
1121
59
		<xsl:call-template name="inline.boldseq"/>
55
		<xsl:call-template name="inline.boldseq"/>
1122
60
56
1123
=== modified file 'user-docs/C/index.xml'
1124
--- user-docs/C/index.xml	2016-03-10 23:36:50 +0000
1125
+++ user-docs/C/index.xml	2017-03-02 18:48:00 +0000
1126
@@ -62,10 +62,7 @@
1127
62
		</legalnotice>
62
		</legalnotice>
1128
63
63
1129
64
		<copyright>
64
		<copyright>
1134
65
			<year>2012</year>
65
			<year>2012–2017</year>
1131
66
			<year>2013</year>
1132
67
			<year>2014</year>
1133
68
			<year>2015</year>
1135
69
			<holder>The Xubuntu documentation team. Xubuntu and Canonical are registered trademarks of Canonical Ltd.</holder>
66
			<holder>The Xubuntu documentation team. Xubuntu and Canonical are registered trademarks of Canonical Ltd.</holder>
1136
70
		</copyright>
67
		</copyright>
1137
71
68
Status:	Merged
Merged at revision:	631
Proposed branch:	lp:~knome/xubuntu-docs/contributor-doc-improvements
Merge into:	lp:xubuntu-docs/zesty
Diff against target:	1136 lines (+471/-349) 24 files modified contributor-docs/C/common-reference.xml (+2/-2) contributor-docs/C/development.xml (+1/-0) contributor-docs/C/documentation-tasks.xml (+47/-0) contributor-docs/C/documentation-translations.xml (+82/-0) contributor-docs/C/documentation-working.xml (+37/-0) contributor-docs/C/documentation.xml (+9/-92) contributor-docs/C/getting-started.xml (+2/-1) contributor-docs/C/index.xml (+2/-5) contributor-docs/C/processes.xml (+1/-0) contributor-docs/C/qa-bugs.xml (+2/-3) contributor-docs/C/qa-infra.xml (+73/-0) contributor-docs/C/qa-team.xml (+0/-136) contributor-docs/C/qa-tester.xml (+0/-76) contributor-docs/C/qa-testing.xml (+3/-4) contributor-docs/C/qa.xml (+138/-0) contributor-docs/C/strategy-document.xml (+1/-0) contributor-docs/C/website.xml (+5/-4) contributor-docs/Makefile (+3/-3) contributor-docs/libs/xubuntu-contributor.ent (+1/-2) libs-common/css/style.css (+19/-6) libs-common/xubuntu-common.ent (+1/-1) libs-common/xubuntu-docbook-xhtml-contributor.xsl (+35/-0) libs-common/xubuntu-docbook-xhtml.xsl (+6/-10) user-docs/C/index.xml (+1/-4)
To merge this branch:	bzr merge lp:~knome/xubuntu-docs/contributor-doc-improvements
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
David Pires		2017-03-02	Approve on 2017-03-02
David Pearson (community)	qa section reorganization	2017-03-02	Approve on 2017-03-02
Kev Bowring (community)		2017-03-02	Approve on 2017-03-02
Review via email: mp+318825@code.launchpad.net