← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to debian/patches/15_cups_docroot.diff

  • Committer: Bazaar Package Importer
  • Author(s): Ana Beatriz Guerrero Lopez
  • Date: 2009-04-05 05:22:13 UTC
  • mfrom: (0.4.2 experimental) (0.2.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 235.
  • Revision ID: james.westby@ubuntu.com-20090405052213-39thr4l6p2ss07uj
Tags: 4:4.2.2-1
http://bugs.debian.org/290285
http://bugs.debian.org/359680
http://bugs.debian.org/286342
http://bugs.debian.org/444800
* New upstream release:
  - khtml fixes. (Closes: #290285, #359680)
  - Default konsole sessions can be deleted. (Closes: #286342)
  - Tag widget uses standard application palette. (Closes: #444800)
  - ... and surely many more but we have lost track...

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/15_cups_docroot.diff
1
 
--- a/doc/kdeprint/cups-config.docbook
2
 
+++ b/doc/kdeprint/cups-config.docbook
3
 
@@ -487,11 +487,11 @@ unprivileged account for the server dire
4
 
 <term><guilabel>Server group</guilabel></term>
5
 
 <listitem>
6
 
 <para>The group the server runs under.  Normally this must be
7
 
-<systemitem class="groupname">sys</systemitem>, however you can
8
 
+<systemitem class="groupname">lpadmin</systemitem>, however you can
9
 
 configure things for another group as needed.</para>
10
 
 
11
 
 <informalexample>
12
 
-<para>Enter for example <userinput>sys</userinput>.</para>
13
 
+<para>Enter for example <userinput>lpadmin</userinput>.</para>
14
 
 </informalexample>
15
 
 </listitem>
16
 
 </varlistentry>
17
 
@@ -1012,7 +1012,7 @@ format="PNG"/></imageobject>
18
 
 <listitem>
19
 
 <para>The root folder for &HTTP; documents that are served.  By
20
 
 default the compiled in folder, <filename
21
 
-class="directory">/usr/share/cups/doc</filename></para>
22
 
+class="directory">/usr/share/cups/doc-root</filename></para>
23
 
 </listitem>
24
 
 </varlistentry>
25
 
 
26
 
@@ -1756,7 +1756,7 @@ over.</para>
27
 
 <para>The group name for <systemitem
28
 
 class="groupname">System</systemitem> or printer administration
29
 
 access.  The default varies depending on the operating system, but
30
 
-will be <systemitem class="groupname">sys</systemitem>, <systemitem
31
 
+will be <systemitem class="groupname">lpadmin</systemitem>, <systemitem
32
 
 class="groupname">system</systemitem> or <systemitem
33
 
 class="groupname">root</systemitem> (checked for in that order).</para>
34
 
 </listitem>