From: Danny ter Haar Signed-off-by: Danny ter Haar Cc: Patrick McHardy Cc: Mikael Starvik Cc: Avi Kivity Signed-off-by: Andrew Morton --- Documentation/cris/README | 2 +- Documentation/ia64/kvm.txt | 9 +++++---- net/netfilter/nf_conntrack_acct.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff -puN Documentation/cris/README~fix-random-typos Documentation/cris/README --- a/Documentation/cris/README~fix-random-typos +++ a/Documentation/cris/README @@ -27,7 +27,7 @@ operating system. The ETRAX 100LX chip -------------------- -For reference, plase see the press-release: +For reference, please see the press-release: http://www.axis.com/news/us/001101_etrax.htm diff -puN Documentation/ia64/kvm.txt~fix-random-typos Documentation/ia64/kvm.txt --- a/Documentation/ia64/kvm.txt~fix-random-typos +++ a/Documentation/ia64/kvm.txt @@ -1,7 +1,8 @@ -Currently, kvm module in EXPERIMENTAL stage on IA64. This means that -interfaces are not stable enough to use. So, plase had better don't run -critical applications in virtual machine. We will try our best to make it -strong in future versions! +Currently, kvm module is in EXPERIMENTAL stage on IA64. This means that +interfaces are not stable enough to use. So, please don't run critical +applications in virtual machine. +We will try our best to improve it in future versions! + Guide: How to boot up guests on kvm/ia64 This guide is to describe how to enable kvm support for IA-64 systems. diff -puN net/netfilter/nf_conntrack_acct.c~fix-random-typos net/netfilter/nf_conntrack_acct.c --- a/net/netfilter/nf_conntrack_acct.c~fix-random-typos +++ a/net/netfilter/nf_conntrack_acct.c @@ -69,7 +69,7 @@ int nf_conntrack_acct_init(void) int ret; #ifdef CONFIG_NF_CT_ACCT - printk(KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Plase use\n"); + printk(KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n"); printk(KERN_WARNING "nf_conntrack.acct=1 kernel paramater, acct=1 nf_conntrack module option or\n"); printk(KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n"); #endif _