← Back to branch summary

~ubuntu-branches/ubuntu/saucy/manpages/saucy

« back to all changes in this revision

Viewing changes to man5/resolv.conf.5

  • Committer: Bazaar Package Importer
  • Author(s): Loïc Minier
  • Date: 2010-11-11 16:51:09 UTC
  • mfrom: (1.1.44 upstream) (2.2.7 sid)
  • Revision ID: james.westby@ubuntu.com-20101111165109-3yiyen1axa1ju3s0
Tags: 3.26-1ubuntu1
* Merge from Debian unstable; remaining changes:
  - ptrace.2, prctl.2: document Ubuntu-specific PTRACE_ATTACH,
    PR_SET_PTRACER behavior.

Show diffs side-by-side

added added

removed removed

Lines of Context:
man5/resolv.conf.5
264
264
.br
265
265
Name Server Operations Guide for BIND
266
266
.SH COLOPHON
267
 
This page is part of release 3.25 of the Linux
 
267
This page is part of release 3.26 of the Linux
268
268
.I man-pages
269
269
project.
270
270
A description of the project,