Re: Another manpage grammar tweak (ath.4)
On Thu, Apr 11, 2013 at 10:58:00PM -0400, Brian Callahan wrote: Hi tech -- Here's another small fix to correct a grammatically incorrect sentence in ath.4 OK? ~Brian Index: ath.4 === RCS file: /cvs/src/share/man/man4/ath.4,v retrieving revision 1.55 diff -u -p -r1.55 ath.4 --- ath.414 Feb 2013 07:40:42 -1.55 +++ ath.412 Apr 2013 02:54:45 - @@ -78,7 +78,7 @@ transmit speeds as above for 802.11a and .It AR5212 These devices support 802.11a, 802.11b, and 802.11g operation with transmit speeds as above for 802.11a, 802.11b, and 802.11g operation -(802.11g speeds are the same as for 802.11a speeds). +(802.11g speeds are the same as 802.11a speeds). .El .Pp All chips also support an Atheros Turbo Mode (TM) that operates in the hmm. i don;t think this is grammatically incorrect at all. it might sound strange to some ears, i guess. but wrong? why is it wrong? i guess we can reword it if folks think it sounds odd (or wrong ;) but if i had to do that, i'd say it'd sound better as the same as those for 802.11a. your mail suggests there's another man fix around. have i missed something? jmc
Re: Another manpage grammar tweak (ath.4)
On 04/12/13 08:07, Jason McIntyre wrote: On Thu, Apr 11, 2013 at 10:58:00PM -0400, Brian Callahan wrote: Hi tech -- Here's another small fix to correct a grammatically incorrect sentence in ath.4 OK? ~Brian Index: ath.4 === RCS file: /cvs/src/share/man/man4/ath.4,v retrieving revision 1.55 diff -u -p -r1.55 ath.4 --- ath.414 Feb 2013 07:40:42 -1.55 +++ ath.412 Apr 2013 02:54:45 - @@ -78,7 +78,7 @@ transmit speeds as above for 802.11a and .It AR5212 These devices support 802.11a, 802.11b, and 802.11g operation with transmit speeds as above for 802.11a, 802.11b, and 802.11g operation -(802.11g speeds are the same as for 802.11a speeds). +(802.11g speeds are the same as 802.11a speeds). .El .Pp All chips also support an Atheros Turbo Mode (TM) that operates in the hmm. i don;t think this is grammatically incorrect at all. it might sound strange to some ears, i guess. but wrong? why is it wrong? Cause the 802.11a speeds don't have speeds? Admittedly I'm not a native speaker, but I'd agree with the OP. i guess we can reword it if folks think it sounds odd (or wrong ;) but if i had to do that, i'd say it'd sound better as the same as those for 802.11a. This sounds even better. My ok on that one if you feel you need it. :) /Alexander your mail suggests there's another man fix around. have i missed something? jmc
Re: Another manpage grammar tweak (ath.4)
On Fri, Apr 12, 2013 at 08:30:16AM +0200, Alexander Hall wrote: .It AR5212 These devices support 802.11a, 802.11b, and 802.11g operation with transmit speeds as above for 802.11a, 802.11b, and 802.11g operation -(802.11g speeds are the same as for 802.11a speeds). +(802.11g speeds are the same as 802.11a speeds). .El .Pp All chips also support an Atheros Turbo Mode (TM) that operates in the hmm. i don;t think this is grammatically incorrect at all. it might sound strange to some ears, i guess. but wrong? why is it wrong? Cause the 802.11a speeds don't have speeds? Admittedly I'm not a native speaker, but I'd agree with the OP. it's not saying that. it says, in essence, that 11g speeds are the same as for (the) 11a speeds (listed above). it is omitting parts that can be left out because the intent should be fairly obvious. i guess we can reword it if folks think it sounds odd (or wrong ;) but if i had to do that, i'd say it'd sound better as the same as those for 802.11a. This sounds even better. My ok on that one if you feel you need it. :) i don;t really think it needs changed, unless folks are unhappy that it's unclear (or feel its wrong). i guess that's 2 votes so far to change it though ;) jmc
Re: Another manpage grammar tweak (ath.4)
On 04/12/13 08:40, Jason McIntyre wrote: On Fri, Apr 12, 2013 at 08:30:16AM +0200, Alexander Hall wrote: .It AR5212 These devices support 802.11a, 802.11b, and 802.11g operation with transmit speeds as above for 802.11a, 802.11b, and 802.11g operation -(802.11g speeds are the same as for 802.11a speeds). +(802.11g speeds are the same as 802.11a speeds). .El .Pp All chips also support an Atheros Turbo Mode (TM) that operates in the hmm. i don;t think this is grammatically incorrect at all. it might sound strange to some ears, i guess. but wrong? why is it wrong? Cause the 802.11a speeds don't have speeds? Admittedly I'm not a native speaker, but I'd agree with the OP. it's not saying that. it says, in essence, that 11g speeds are the same as for (the) 11a speeds (listed above). it is omitting parts that can be left out because the intent should be fairly obvious. The omitted parts didn't bother me, it's the for that doesn't make sense in my head, as that makes me read I have the same number of socks as your socks [do], implying that the socks have socks, instead of I have the same number of socks as you [do]. Anyway, this isn't a bikeshed I'm very attached to. Just emptying my pockets of pennies. i guess we can reword it if folks think it sounds odd (or wrong ;) but if i had to do that, i'd say it'd sound better as the same as those for 802.11a. This sounds even better. My ok on that one if you feel you need it. :) i don;t really think it needs changed, unless folks are unhappy that it's unclear (or feel its wrong). i guess that's 2 votes so far to change it though ;) Your veto easily outnumbers the two of us though. :-) /Alexander jmc
More 'extern' love: net proto
Simple diff to move all the redundant extern declaration into their
corresponding header.
ok?
Index: netinet/in_proto.c
===
RCS file: /home/ncvs/src/sys/netinet/in_proto.c,v
retrieving revision 1.58
diff -u -p -r1.58 in_proto.c
--- netinet/in_proto.c 17 Jan 2013 16:30:10 - 1.58
+++ netinet/in_proto.c 12 Apr 2013 10:12:56 -
@@ -176,7 +176,7 @@
#include netinet/ip_divert.h
#endif
-extern struct domain inetdomain;
+u_char ip_protox[IPPROTO_MAX];
struct protosw inetsw[] = {
{ 0, inetdomain,0, 0,
Index: netinet/ip_icmp.c
===
RCS file: /home/ncvs/src/sys/netinet/ip_icmp.c,v
retrieving revision 1.97
diff -u -p -r1.97 ip_icmp.c
--- netinet/ip_icmp.c 10 Apr 2013 08:50:59 - 1.97
+++ netinet/ip_icmp.c 12 Apr 2013 10:12:56 -
@@ -125,11 +125,6 @@ void icmp_mtudisc_timeout(struct rtentry
int icmp_ratelimit(const struct in_addr *, const int, const int);
void icmp_redirect_timeout(struct rtentry *, struct rttimer *);
-/* from ip_input.c */
-extern u_char ip_protox[];
-
-extern struct protosw inetsw[];
-
void
icmp_init(void)
{
Index: netinet/ip_input.c
===
RCS file: /home/ncvs/src/sys/netinet/ip_input.c,v
retrieving revision 1.208
diff -u -p -r1.208 ip_input.c
--- netinet/ip_input.c 10 Apr 2013 08:50:59 - 1.208
+++ netinet/ip_input.c 12 Apr 2013 10:12:56 -
@@ -121,9 +121,6 @@ extern struct baddynamicports baddynamic
int *ipctl_vars[IPCTL_MAXID] = IPCTL_VARS;
-extern struct domain inetdomain;
-extern struct protosw inetsw[];
-u_char ip_protox[IPPROTO_MAX];
struct in_ifaddrhead in_ifaddr;
struct ifqueue ipintrq;
Index: netinet/ipsec_input.c
===
RCS file: /home/ncvs/src/sys/netinet/ipsec_input.c,v
retrieving revision 1.113
diff -u -p -r1.113 ipsec_input.c
--- netinet/ipsec_input.c 11 Apr 2013 12:06:25 - 1.113
+++ netinet/ipsec_input.c 12 Apr 2013 10:12:56 -
@@ -110,11 +110,6 @@ int *espctl_vars[ESPCTL_MAXID] = ESPCTL_
int *ahctl_vars[AHCTL_MAXID] = AHCTL_VARS;
int *ipcompctl_vars[IPCOMPCTL_MAXID] = IPCOMPCTL_VARS;
-#ifdef INET6
-extern struct ip6protosw inet6sw[];
-extern u_char ip6_protox[];
-#endif
-
/*
* ipsec_common_input() gets called when we receive an IPsec-protected packet
* in IPv4 or IPv6. All it does is find the right TDB and call the appropriate
Index: netinet6/icmp6.c
===
RCS file: /home/ncvs/src/sys/netinet6/icmp6.c,v
retrieving revision 1.125
diff -u -p -r1.125 icmp6.c
--- netinet6/icmp6.c10 Apr 2013 01:35:55 - 1.125
+++ netinet6/icmp6.c12 Apr 2013 10:12:56 -
@@ -129,10 +129,6 @@
*/
#define in6p_ip6_nxt inp_ipv6.ip6_nxt
-extern struct domain inet6domain;
-extern struct ip6protosw inet6sw[];
-extern u_char ip6_protox[];
-
struct icmp6stat icmp6stat;
extern struct inpcbtable rawin6pcbtable;
Index: netinet6/in6_proto.c
===
RCS file: /home/ncvs/src/sys/netinet6/in6_proto.c,v
retrieving revision 1.66
diff -u -p -r1.66 in6_proto.c
--- netinet6/in6_proto.c1 Apr 2013 22:58:29 - 1.66
+++ netinet6/in6_proto.c12 Apr 2013 10:12:56 -
@@ -122,8 +122,7 @@
/*
* TCP/IP protocol family: IP6, ICMP6, UDP, TCP.
*/
-
-extern struct domain inet6domain;
+u_char ip6_protox[IPPROTO_MAX];
struct ip6protosw inet6sw[] = {
{ 0, inet6domain, IPPROTO_IPV6, 0,
Index: netinet6/ip6_input.c
===
RCS file: /home/ncvs/src/sys/netinet6/ip6_input.c,v
retrieving revision 1.111
diff -u -p -r1.111 ip6_input.c
--- netinet6/ip6_input.c28 Mar 2013 23:10:06 - 1.111
+++ netinet6/ip6_input.c12 Apr 2013 10:12:56 -
@@ -117,10 +117,6 @@
#include netinet/ip_carp.h
#endif
-extern struct domain inet6domain;
-extern struct ip6protosw inet6sw[];
-
-u_char ip6_protox[IPPROTO_MAX];
struct in6_ifaddrhead in6_ifaddr;
struct ifqueue ip6intrq;
Index: netinet6/ip6protosw.h
===
RCS file: /home/ncvs/src/sys/netinet6/ip6protosw.h,v
retrieving revision 1.7
diff -u -p -r1.7 ip6protosw.h
--- netinet6/ip6protosw.h 2 Jun 2003 23:28:16 - 1.7
+++ netinet6/ip6protosw.h 12 Apr 2013 10:12:56 -
@@ -142,4 +142,9 @@ struct ip6protosw {
int (*pr_sysctl)(int *, u_int, void *, size_t *, void *, size_t);
};
+#ifdef _KERNEL
+extern u_char ip6_protox[];
+extern struct ip6protosw inet6sw[];
+#endif
+
#endif /* !_NETINET6_IP6PROTOSW_H_ */
Re: Another manpage grammar tweak (ath.4)
On 4/12/2013 3:08 AM, Alexander Hall wrote: On 04/12/13 08:40, Jason McIntyre wrote: On Fri, Apr 12, 2013 at 08:30:16AM +0200, Alexander Hall wrote: .It AR5212 These devices support 802.11a, 802.11b, and 802.11g operation with transmit speeds as above for 802.11a, 802.11b, and 802.11g operation -(802.11g speeds are the same as for 802.11a speeds). +(802.11g speeds are the same as 802.11a speeds). .El .Pp All chips also support an Atheros Turbo Mode (TM) that operates in the hmm. i don;t think this is grammatically incorrect at all. it might sound strange to some ears, i guess. but wrong? why is it wrong? Cause the 802.11a speeds don't have speeds? Admittedly I'm not a native speaker, but I'd agree with the OP. it's not saying that. it says, in essence, that 11g speeds are the same as for (the) 11a speeds (listed above). it is omitting parts that can be left out because the intent should be fairly obvious. 11g speeds are the same as for the 11a speeds listed above is still awkward due to its wordiness. You can just say 11g and 11a speeds are the same. And the for still really bothers my ears in that sentence. The omitted parts didn't bother me, it's the for that doesn't make sense in my head, as that makes me read I have the same number of socks as your socks [do], implying that the socks have socks, instead of I have the same number of socks as you [do]. Anyway, this isn't a bikeshed I'm very attached to. Just emptying my pockets of pennies. i guess we can reword it if folks think it sounds odd (or wrong ;) but if i had to do that, i'd say it'd sound better as the same as those for 802.11a. We can go this route. ok for me too. Like Alex, I'm not attached to this. Just pointing out my thoughts. ~Brian
Re: Another manpage grammar tweak (ath.4)
Does this information belong in a device-specific manual in the first place? I don't see it in the manual for any other devices.. Maybe it would be better to remove this and replace with a note in ifmedia(4), or maybe A/B/G markers in the MEDIA TYPES AND OPTIONS FOR IEEE802.11 WIRELESS LAN table.
Re: Another manpage grammar tweak (ath.4)
On Fri, Apr 12, 2013 at 07:40:05AM +0100, Jason McIntyre wrote: On Fri, Apr 12, 2013 at 08:30:16AM +0200, Alexander Hall wrote: .It AR5212 These devices support 802.11a, 802.11b, and 802.11g operation with transmit speeds as above for 802.11a, 802.11b, and 802.11g operation -(802.11g speeds are the same as for 802.11a speeds). +(802.11g speeds are the same as 802.11a speeds). .El .Pp All chips also support an Atheros Turbo Mode (TM) that operates in the hmm. i don;t think this is grammatically incorrect at all. it might sound strange to some ears, i guess. but wrong? why is it wrong? Cause the 802.11a speeds don't have speeds? Admittedly I'm not a native speaker, but I'd agree with the OP. it's not saying that. it says, in essence, that 11g speeds are the same as for (the) 11a speeds (listed above). it is omitting parts that can be left out because the intent should be fairly obvious. i guess we can reword it if folks think it sounds odd (or wrong ;) but if i had to do that, i'd say it'd sound better as the same as those for 802.11a. This sounds even better. My ok on that one if you feel you need it. :) i don;t really think it needs changed, unless folks are unhappy that it's unclear (or feel its wrong). i guess that's 2 votes so far to change it though ;) jmc I'm with jmc. Doesn't seem wrong to me, a native Canadian speaker. Ken
Re: More 'extern' love: net proto
On 12 April 2013 12:26, Martin Pieuchot mpieuc...@nolizard.org wrote: Simple diff to move all the redundant extern declaration into their corresponding header. ok? looks fine to me.
Re: Another manpage grammar tweak (ath.4)
On Fri, Apr 12, 2013 at 12:38:29PM +0100, Stuart Henderson wrote: Does this information belong in a device-specific manual in the first place? I don't see it in the manual for any other devices.. Maybe it would be better to remove this and replace with a note in ifmedia(4), or maybe A/B/G markers in the MEDIA TYPES AND OPTIONS FOR IEEE802.11 WIRELESS LAN table. it maybe doesn;t belong there properly, but i certainly don;t think it does any harm. no objection to updating ifmedia(4) either - that certainly seems a better way. if we do that, i'd have no objection to zapping it from ath(4) (or whatever page it is we're discussing). jmc
