diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 12:09:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 12:09:35 -0700 |
| commit | 37aa7319cd81a0eb587e552b0ec7e88c03853bf7 (patch) | |
| tree | 42e7fcc140b411bca74dc9d4c0585976d2cd0343 /Documentation/filesystems/nfs/nfsroot.txt | |
| parent | bb7aeae3d680c2c777f54274b0270ced0599f33d (diff) | |
| parent | abfa6cd8cda71b9071191e72711bd474e539b1b2 (diff) | |
| download | talos-obmc-linux-37aa7319cd81a0eb587e552b0ec7e88c03853bf7.tar.gz talos-obmc-linux-37aa7319cd81a0eb587e552b0ec7e88c03853bf7.zip | |
Merge tag 'docs-for-linus' of git://git.lwn.net/linux
Pul documentation update from Jon Corbet:
"Another relatively boring cycle for the docs tree: typo fixes,
translation updates, etc"
* tag 'docs-for-linus' of git://git.lwn.net/linux:
modsign: Fix documentation on module signing enforcement parameter.
Doc: nfs: Fix typos in Documentation/filesystems/nfs
Documentation: kselftest: Remove duplicate word
doc: fix grammar
Documentation: Howto: Fixed subtitles style
Doc: ARM: Fix a typo in clksrc-change-registers.awk
Documentation/ko_KR: update maintainer information
Documentation: Fix int/unsigned int comparison
Documentation: Chinese translation of arm64/silicon-errata.txt
Documentation:Update Documentation/zh_CN/arm64/booting.txt
Documentation: HOWTO: remove obsolete info about regression postings
Doc: ja_JP: Fix a typo in HOWTO
Doc: i2c: Fix typo in Documentation/i2c
Doc: DocBook: Fix a typo in device-drivers.tmpl
Remove "arch" usage in Documentation/features/list-arch.sh
README: cosmetic fixes
Documentation/CodingStyle: add space before parenthesis in example macro
SubmittingPatches: fix spelling of "git send-email"
Diffstat (limited to 'Documentation/filesystems/nfs/nfsroot.txt')
| -rw-r--r-- | Documentation/filesystems/nfs/nfsroot.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/nfs/nfsroot.txt b/Documentation/filesystems/nfs/nfsroot.txt index bb5ab6de5924..0b2883b17d4c 100644 --- a/Documentation/filesystems/nfs/nfsroot.txt +++ b/Documentation/filesystems/nfs/nfsroot.txt @@ -166,7 +166,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>: Value gets exported by /proc/net/pnp which is often linked on embedded systems by /etc/resolv.conf. - <dns1-ip> IP address of secound nameserver. + <dns1-ip> IP address of second nameserver. Same as above. |
