Merge lp://qastaging/~ckimes/ubuntu-docs/my-ubuntu-doc into lp://qastaging/ubuntu-docs/karmic

Proposed by Connor Imes
Status: Merged
Merged at revision: 300
Proposed branch: lp://qastaging/~ckimes/ubuntu-docs/my-ubuntu-doc
Merge into: lp://qastaging/ubuntu-docs/karmic
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~ckimes/ubuntu-docs/my-ubuntu-doc
Reviewer Review Type Date Requested Status
Matthew East (community) Approve
Review via email: mp+6280@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Connor Imes (ckimes) wrote :

Patch for Karmic in bug 370730

Revision history for this message
Connor Imes (ckimes) wrote :

> Patch for Karmic in bug 371730

Revision history for this message
Nathan Handler (nhandler) wrote :

> > Patch for Karmic in bug 371730

The diff looks sane to me.

Revision history for this message
Matthew East (mdke) wrote :

Looks good, thanks Connor

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverguide/C/windows-networking.xml'
2--- serverguide/C/windows-networking.xml 2009-03-25 13:52:20 +0000
3+++ serverguide/C/windows-networking.xml 2009-05-07 01:30:24 +0000
4@@ -777,7 +777,7 @@
5 logon drive = H:
6 logon home = \\%N\%U
7 logon script = logon.cmd
8- add machine script = sudo /usr/sbin/useradd -n -g machines -c Machine -d /var/lib/samba -s /bin/false %u
9+ add machine script = sudo /usr/sbin/useradd -N -g machines -c Machine -d /var/lib/samba -s /bin/false %u
10 </programlisting>
11
12 <itemizedlist>

Subscribers

People subscribed via source and target branches