summaryrefslogtreecommitdiff
path: root/libc/manual
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-12-22 19:27:39 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-12-22 19:27:39 +0000
commit8a031172c235ab0def5763dd5f3a00f9ff10c053 (patch)
tree11ba9c29e8edc754174f18e6db425971144769c9 /libc/manual
parenta179b968417641981213cfe422c741141d8394e4 (diff)
downloadeglibc2-8a031172c235ab0def5763dd5f3a00f9ff10c053.tar.gz
Merge changes between r16068 and r16332 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@16333 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/manual')
-rw-r--r--libc/manual/resource.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/manual/resource.texi b/libc/manual/resource.texi
index 05495722f..8e3155cb0 100644
--- a/libc/manual/resource.texi
+++ b/libc/manual/resource.texi
@@ -1607,7 +1607,7 @@ processors and so the call
@end smallexample
@noindent
-returns the number of processors which are currently inline (i.e.,
+returns the number of processors which are currently online (i.e.,
available).
For these two pieces of information the GNU C library also provides