Merge remote-tracking branch 'upstream/master'

2 files changed, 11 insertions, 25 deletions

diff --git a/man/man1/0intro.1 b/man/man1/0intro.1
index f018fc8a..16134933 100644
--- a/man/man1/0intro.1
+++ b/man/man1/0intro.1
@@ -5,7 +5,7 @@ intro \- introduction to Plan 9 from User Space
 Plan 9 is a distributed computing environment built
 at Bell Labs starting in the late 1980s.
 The system can be obtained from Bell Labs at
-.B http://plan9.bell-labs.com/plan9
+.B http://9p.io/plan9
 and runs on PCs and a variety of other platforms.
 Plan 9 became a convenient platform for experimenting
 with new ideas, applications, and services.
diff --git a/man/man1/rc.1 b/man/man1/rc.1
index 7ea8998a..792cdc95 100644
--- a/man/man1/rc.1
+++ b/man/man1/rc.1
@@ -109,7 +109,7 @@ The simplest kind of argument is the unquoted word:
 a sequence of one or more characters none of which is a blank, tab,
 newline, or any of the following:
 .EX
-	# ; & | ^ $ = ` ' { } ( ) < >
+	# ; & | ^ $ ` ' { } ( ) < >
 .EE
 An unquoted word that contains any of the characters
 .B *
@@ -290,28 +290,10 @@ then one operand must have one component, and the other must be non-empty,
 and concatenation is distributive.
 .PD
 .SS Free Carets
-In most circumstances,
-.I rc
+.I Rc
 will insert the
 .B ^
 operator automatically between words that are not separated by white space.
-Whenever one of
-.B $
-.B '
-.B `
-follows a quoted or unquoted word or an unquoted word follows a quoted word
-with no intervening blanks or tabs,
-a
-.B ^
-is inserted between the two.
-If an unquoted word immediately follows a
-.BR $ 
-and contains a character other than an alphanumeric, underscore,
-or
-.BR * ,
-a
-.B ^
-is inserted before the first such character.
 Thus
 .IP
 .B cc -$flags $stem.c
@@ -367,7 +349,7 @@ or
 .I Fd1
 is a previously opened file descriptor and
 .I fd0
-becomes a new copy (in the sense of 
+becomes a new copy (in the sense of
 .IR dup (3))
 of it.
 A file descriptor may be closed by writing
@@ -477,7 +459,7 @@ is executed.
 The
 .I command
 is executed once for each
-.IR argument 
+.IR argument
 with that argument assigned to
 .IR name .
 If the argument list is omitted,
@@ -982,8 +964,6 @@ changes
 .PP
 Functions that use here documents don't work.
 .PP
-Free carets don't get inserted next to keywords.
-.PP
 The
 .BI <{ command }
 syntax depends on the underlying operating system
@@ -1009,3 +989,9 @@ and then
 .B fstab
 ensures causes FreeBSD to mount the file system
 automatically at boot time.)
+.PP
+Some systems require
+.B \*9/bin/rc
+to be listed in
+.B /etc/shells
+before it can be used as a login shell.