merge

3 files changed, 34 insertions, 6 deletions

diff --git a/lib/constitution b/lib/constitution
index 516eac87d..21e8334af 100644
--- a/lib/constitution
+++ b/lib/constitution
@@ -1067,3 +1067,9 @@ account of age.
 
 Section 2.  The Congress shall have power to enforce this
 article by appropriate legislation.
+
+Article XXVII.
+
+No law, varying the compensation for the services of the
+Senators and Representatives, shall take effect, until an
+election of representatives shall have intervened.
diff --git a/rc/bin/rc-httpd/handlers/serve-static b/rc/bin/rc-httpd/handlers/serve-static
index 3f7544286..315621463 100755
--- a/rc/bin/rc-httpd/handlers/serve-static
+++ b/rc/bin/rc-httpd/handlers/serve-static
@@ -24,7 +24,7 @@ if not
 	max_age=604800	# 1 week
 echo 'HTTP/1.1 200 OK'^$cr
 emit_extra_headers
-echo 'Content-type: '^$type^$cr
+echo 'Content-type: '^$type^'; charset=utf-8'^$cr
 echo 'Cache-control: max-age='^$max_age^$cr
 echo $cr
 exec cat $full_path
diff --git a/sys/man/2/ndb b/sys/man/2/ndb
index 8024816a8..a733d20d2 100644
--- a/sys/man/2/ndb
+++ b/sys/man/2/ndb
@@ -340,13 +340,20 @@ find the IP addresses.  Returns
 domain name
 .RI ( dom )
 and ip address
-.RI ( ip )
+.RI ( ip ).
+.TP
+.B ipv6
+find the IPv6 addresses.  Returns
+domain name
+.RI ( dom )
+and ipv6 address
+.RI ( ipv6 ).
 .TP
 .B mx
 look up the mail exchangers.  Returns preference
 .RI ( pref )
 and exchanger
-.RI ( mx )
+.RI ( mx ).
 .TP
 .B ptr
 do a reverse query.  Here
@@ -356,13 +363,13 @@ must be an
 IP address.  Returns reverse name
 .RI ( ptr )
 and domain name
-.RI ( dom )
+.RI ( dom ).
 .TP
 .B cname
 get the system that this name is a nickname for.  Returns the nickname
 .RI ( dom )
 and the real name
-.RI ( cname )
+.RI ( cname ).
 .TP
 .B soa
 return the start of area record for this field.  Returns
@@ -381,11 +388,26 @@ expiration time in seconds
 and minimum time to lie
 .RI ( ttl ).
 .TP
+.B srv
+get the service records.  Returns the priority of target host
+.RI ( priority ),
+relative weight
+.RI ( weight )
+for entries with the same priority,
+port on this target host of this service
+.RI ( port ),
+and the domain name of the target host
+.RI ( target ).
+.TP
+.B txt
+get the descriptive text. The semantics of the text depends
+on the domain.
+.TP
 .B ns
 name servers.  Returns domain name
 .RI ( dom )
 and name server
-.RI ( ns )
+.RI ( ns ).
 .PP
 .I Ndbfindattr
 searches