Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35540
b: refs/heads/master
c: 00e4d11
h: refs/heads/master
v: v3
  • Loading branch information
Gerrit Renker authored and Arnaldo Carvalho de Melo committed Sep 24, 2006
1 parent f91a030 commit 148ca2d
Show file tree
Hide file tree
Showing 701 changed files with 33,306 additions and 90,142 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d6c7ae22d4fadbc83677ea1a6144eea8911e319
refs/heads/master: 00e4d116a7ef94eb910be037912b0b2fc09f608b
7 changes: 4 additions & 3 deletions trunk/Documentation/Changes
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,15 @@ o e2fsprogs 1.29 # tune2fs
o jfsutils 1.1.3 # fsck.jfs -V
o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs
o xfsprogs 2.6.0 # xfs_db -V
o pcmciautils 004 # pccardctl -V
o pcmciautils 004
o pcmcia-cs 3.1.21 # cardmgr -V
o quota-tools 3.09 # quota -V
o PPP 2.4.0 # pppd --version
o isdn4k-utils 3.1pre1 # isdnctrl 2>&1|grep version
o nfs-utils 1.0.5 # showmount --version
o procps 3.2.0 # ps --version
o oprofile 0.9 # oprofiled --version
o udev 081 # udevinfo -V
o udev 071 # udevinfo -V

Kernel compilation
==================
Expand Down Expand Up @@ -267,7 +268,7 @@ active clients.

To enable this new functionality, you need to:

mount -t nfsd nfsd /proc/fs/nfsd
mount -t nfsd nfsd /proc/fs/nfs

before running exportfs or mountd. It is recommended that all NFS
services be protected from the internet-at-large by a firewall where
Expand Down
12 changes: 6 additions & 6 deletions trunk/Documentation/DocBook/libata.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -868,18 +868,18 @@ and other resources, etc.

<chapter id="libataExt">
<title>libata Library</title>
!Edrivers/ata/libata-core.c
!Edrivers/scsi/libata-core.c
</chapter>

<chapter id="libataInt">
<title>libata Core Internals</title>
!Idrivers/ata/libata-core.c
!Idrivers/scsi/libata-core.c
</chapter>

<chapter id="libataScsiInt">
<title>libata SCSI translation/emulation</title>
!Edrivers/ata/libata-scsi.c
!Idrivers/ata/libata-scsi.c
!Edrivers/scsi/libata-scsi.c
!Idrivers/scsi/libata-scsi.c
</chapter>

<chapter id="ataExceptions">
Expand Down Expand Up @@ -1600,12 +1600,12 @@ and other resources, etc.

<chapter id="PiixInt">
<title>ata_piix Internals</title>
!Idrivers/ata/ata_piix.c
!Idrivers/scsi/ata_piix.c
</chapter>

<chapter id="SILInt">
<title>sata_sil Internals</title>
!Idrivers/ata/sata_sil.c
!Idrivers/scsi/sata_sil.c
</chapter>

<chapter id="libataThanks">
Expand Down
1 change: 0 additions & 1 deletion trunk/Documentation/dontdiff
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ tags
times.h*
tkparse
trix_boot.h
utsrelease.h*
version.h*
vmlinux
vmlinux-*
Expand Down
12 changes: 6 additions & 6 deletions trunk/Documentation/kbuild/kconfig-language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,19 @@ applicable everywhere (see syntax).
- default value: "default" <expr> ["if" <expr>]
A config option can have any number of default values. If multiple
default values are visible, only the first defined one is active.
Default values are not limited to the menu entry where they are
defined. This means the default can be defined somewhere else or be
Default values are not limited to the menu entry, where they are
defined, this means the default can be defined somewhere else or be
overridden by an earlier definition.
The default value is only assigned to the config symbol if no other
value was set by the user (via the input prompt above). If an input
prompt is visible the default value is presented to the user and can
be overridden by him.
Optionally, dependencies only for this default value can be added with
Optionally dependencies only for this default value can be added with
"if".

- dependencies: "depends on"/"requires" <expr>
This defines a dependency for this menu entry. If multiple
dependencies are defined, they are connected with '&&'. Dependencies
dependencies are defined they are connected with '&&'. Dependencies
are applied to all other options within this menu entry (which also
accept an "if" expression), so these two examples are equivalent:

Expand Down Expand Up @@ -153,7 +153,7 @@ Nonconstant symbols are the most common ones and are defined with the
'config' statement. Nonconstant symbols consist entirely of alphanumeric
characters or underscores.
Constant symbols are only part of expressions. Constant symbols are
always surrounded by single or double quotes. Within the quote, any
always surrounded by single or double quotes. Within the quote any
other character is allowed and the quotes can be escaped using '\'.

Menu structure
Expand Down Expand Up @@ -237,7 +237,7 @@ choices:
<choice block>
"endchoice"

This defines a choice group and accepts any of the above attributes as
This defines a choice group and accepts any of above attributes as
options. A choice can only be of type bool or tristate, while a boolean
choice only allows a single config entry to be selected, a tristate
choice also allows any number of config entries to be set to 'm'. This
Expand Down
Loading

0 comments on commit 148ca2d

Please sign in to comment.