Ubuntu Documentation

Merge lp:~evfool/ubuntu-docs/fixes into lp:ubuntu-docs/natty

  1. fixes
  2. Merge into natty
Proposed by Robert Roth
Status: Superseded
Proposed branch: lp:~evfool/ubuntu-docs/fixes
Merge into: lp:ubuntu-docs/natty
Diff against target: 12 lines (+1/-1)
1 file modified
serverguide/C/web-servers.xml (+1/-1)
To merge this branch: bzr merge lp:~evfool/ubuntu-docs/fixes
Reviewer Review Type Date Requested Status
Matthew East (community) Needs Fixing
Review via email: mp+50814@code.launchpad.net

This proposal has been superseded by a proposal from 2011-02-23.

Description of the change

Fixed lp:#723162, unpriviledged corrected to unprivileged.

To post a comment you must log in.
Revision history for this message
Matthew East (mdke) wrote :

Hi Robert, thanks for the patch - it looks good but could you revert the changes to the "po" files, these are created automatically so don't need to be edited. The only file you need to edit is the xml file.

review: Needs Fixing
lp:~evfool/ubuntu-docs/fixes updated
602. By Robert Roth

Reverted po file changes

Revision history for this message
Robert Roth (evfool) wrote :

Updated as requested. Next time I'll know that I don't have to change the po files.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverguide/C/web-servers.xml'
2--- serverguide/C/web-servers.xml 2010-09-08 19:33:57 +0000
3+++ serverguide/C/web-servers.xml 2011-02-23 21:05:21 +0000
4@@ -1046,7 +1046,7 @@
5 <para>The <application>Tomcat 6.0</application> packages in Ubuntu support
6 two different ways of running Tomcat. You can install them as a classic
7 unique system-wide instance, that will be started at boot time will run
8- as the tomcat6 unpriviledged user. But you can also deploy private
9+ as the tomcat6 unprivileged user. But you can also deploy private
10 instances that will run with your own user rights, and that you should
11 start and stop by yourself. This second way is particularly useful in a
12 development server context where multiple users need to test on their own

Subscribers

People subscribed via source and target branches