| From: | Sascha Wildner <swildner@xxxxxxxxxxxxxxxxxxxxxxx> |
| Date: | Fri, 17 Feb 2006 11:35:07 -0800 (PST) |
swildner 2006/02/17 11:35:07 PST
DragonFly src repository
Modified files:
lib/libalias libalias.3
lib/libc/compat-43 gethostid.3 setruid.3 sigvec.2
lib/libc/gen dlinfo.3 exec.3 getbootfile.3
getdomainname.3 getgrent.3 gethostname.3
getnetgrent.3 getpwent.3 getvfsent.3
msgrcv.3 msgsnd.3 popen.3 rand48.3
readpassphrase.3 shm_open.3 sysconf.3
sysctl.3 utime.3
lib/libc/net ethers.3 eui64.3 getifaddrs.3
getipnodebyname.3 inet6_option_space.3
inet6_rthdr_space.3 rcmdsh.3
lib/libc/regex regex.3
lib/libc/rpc getrpcent.3
lib/libc/stdio mktemp.3 stdio.3
lib/libc/stdlib getenv.3 getopt.3 getopt_long.3 hcreate.3
malloc.3 qsort.3 random.3 tsearch.3
lib/libc/stdtime strptime.3
lib/libc/string strtok.3
lib/libc/sys aio_cancel.2 aio_return.2 aio_suspend.2
brk.2 getlogin.2 getpgrp.2 getrusage.2
getsockname.2 getsockopt.2 lseek.2
mlock.2 mount.2 poll.2 quotactl.2
reboot.2 rfork.2 rtprio.2 select.2 send.2
setpgid.2 sigaction.2 socketpair.2 stat.2
swapon.2 sync.2 sys_checkpoint.2
syscall.2 tls.2 truncate.2 umtx.2 vfork.2
wait.2
lib/libc_r/man pthread_attr_get_np.3
pthread_rwlock_destroy.3
pthread_rwlock_init.3
pthread_rwlock_rdlock.3
pthread_rwlock_unlock.3
pthread_rwlock_wrlock.3
pthread_rwlockattr_destroy.3
pthread_rwlockattr_getpshared.3
pthread_rwlockattr_init.3
pthread_rwlockattr_setpshared.3
lib/libcrypt crypt.3
lib/libftpio ftpio.3
lib/libkvm kvm_geterr.3 kvm_getfiles.3
kvm_getprocs.3 kvm_open.3
lib/libmd mdX.3 ripemd.3 sha.3
lib/libskey skey.3 skey.access.5
lib/libstand libstand.3
lib/libusbhid usbhid.3
lib/libutil _secure_path.3 auth.3 login.conf.5
property.3
lib/libvgl vgl.3
Log:
Sweep-fix man page section order to match mdoc(7), part 2/5.
Note: I haven't touched the few man pages that are still using
the old man(7) macros. They will be converted to mdoc later.
Revision Changes Path
1.3 +6 -6 src/lib/libalias/libalias.3
1.3 +3 -3 src/lib/libc/compat-43/gethostid.3
1.3 +4 -4 src/lib/libc/compat-43/setruid.3
1.3 +34 -34 src/lib/libc/compat-43/sigvec.2
1.5 +6 -6 src/lib/libc/gen/dlinfo.3
1.3 +32 -32 src/lib/libc/gen/exec.3
1.3 +7 -6 src/lib/libc/gen/getbootfile.3
1.3 +6 -6 src/lib/libc/gen/getdomainname.3
1.3 +6 -6 src/lib/libc/gen/getgrent.3
1.3 +6 -6 src/lib/libc/gen/gethostname.3
1.3 +3 -3 src/lib/libc/gen/getnetgrent.3
1.4 +5 -5 src/lib/libc/gen/getpwent.3
1.3 +6 -6 src/lib/libc/gen/getvfsent.3
1.4 +3 -3 src/lib/libc/gen/msgrcv.3
1.4 +2 -2 src/lib/libc/gen/msgsnd.3
1.3 +11 -11 src/lib/libc/gen/popen.3
1.3 +3 -3 src/lib/libc/gen/rand48.3
1.3 +26 -26 src/lib/libc/gen/readpassphrase.3
1.4 +9 -9 src/lib/libc/gen/shm_open.3
1.4 +4 -4 src/lib/libc/gen/sysconf.3
1.4 +21 -21 src/lib/libc/gen/sysctl.3
1.3 +6 -6 src/lib/libc/gen/utime.3
1.3 +6 -6 src/lib/libc/net/ethers.3
1.3 +6 -6 src/lib/libc/net/eui64.3
1.3 +11 -11 src/lib/libc/net/getifaddrs.3
1.3 +4 -4 src/lib/libc/net/getipnodebyname.3
1.5 +6 -6 src/lib/libc/net/inet6_option_space.3
1.4 +3 -3 src/lib/libc/net/inet6_rthdr_space.3
1.3 +5 -5 src/lib/libc/net/rcmdsh.3
1.3 +9 -9 src/lib/libc/regex/regex.3
1.3 +5 -5 src/lib/libc/rpc/getrpcent.3
1.3 +28 -28 src/lib/libc/stdio/mktemp.3
1.3 +5 -5 src/lib/libc/stdio/stdio.3
1.5 +11 -11 src/lib/libc/stdlib/getenv.3
1.4 +21 -21 src/lib/libc/stdlib/getopt.3
1.3 +41 -41 src/lib/libc/stdlib/getopt_long.3
1.4 +10 -10 src/lib/libc/stdlib/hcreate.3
1.7 +24 -24 src/lib/libc/stdlib/malloc.3
1.4 +6 -6 src/lib/libc/stdlib/qsort.3
1.3 +9 -9 src/lib/libc/stdlib/random.3
1.4 +4 -4 src/lib/libc/stdlib/tsearch.3
1.3 +6 -6 src/lib/libc/stdtime/strptime.3
1.4 +8 -8 src/lib/libc/string/strtok.3
1.3 +7 -7 src/lib/libc/sys/aio_cancel.2
1.3 +10 -10 src/lib/libc/sys/aio_return.2
1.3 +7 -7 src/lib/libc/sys/aio_suspend.2
1.3 +6 -6 src/lib/libc/sys/brk.2
1.3 +16 -16 src/lib/libc/sys/getlogin.2
1.3 +26 -26 src/lib/libc/sys/getpgrp.2
1.3 +4 -4 src/lib/libc/sys/getrusage.2
1.3 +5 -5 src/lib/libc/sys/getsockname.2
1.3 +3 -3 src/lib/libc/sys/getsockopt.2
1.3 +5 -5 src/lib/libc/sys/lseek.2
1.4 +7 -7 src/lib/libc/sys/mlock.2
1.3 +3 -3 src/lib/libc/sys/mount.2
1.3 +8 -8 src/lib/libc/sys/poll.2
1.3 +6 -6 src/lib/libc/sys/quotactl.2
1.3 +6 -6 src/lib/libc/sys/reboot.2
1.4 +4 -4 src/lib/libc/sys/rfork.2
1.4 +6 -6 src/lib/libc/sys/rtprio.2
1.6 +5 -5 src/lib/libc/sys/select.2
1.7 +12 -12 src/lib/libc/sys/send.2
1.3 +8 -8 src/lib/libc/sys/setpgid.2
1.5 +19 -19 src/lib/libc/sys/sigaction.2
1.3 +5 -5 src/lib/libc/sys/socketpair.2
1.3 +8 -8 src/lib/libc/sys/stat.2
1.3 +6 -6 src/lib/libc/sys/swapon.2
1.3 +4 -4 src/lib/libc/sys/sync.2
1.5 +72 -72 src/lib/libc/sys/sys_checkpoint.2
1.3 +5 -5 src/lib/libc/sys/syscall.2
1.6 +12 -12 src/lib/libc/sys/tls.2
1.3 +6 -6 src/lib/libc/sys/truncate.2
1.7 +16 -16 src/lib/libc/sys/umtx.2
1.3 +9 -9 src/lib/libc/sys/vfork.2
1.3 +6 -6 src/lib/libc/sys/wait.2
1.3 +6 -6 src/lib/libc_r/man/pthread_attr_get_np.3
1.3 +8 -8 src/lib/libc_r/man/pthread_rwlock_destroy.3
1.3 +10 -10 src/lib/libc_r/man/pthread_rwlock_init.3
1.3 +13 -13 src/lib/libc_r/man/pthread_rwlock_rdlock.3
1.3 +9 -9 src/lib/libc_r/man/pthread_rwlock_unlock.3
1.3 +12 -12 src/lib/libc_r/man/pthread_rwlock_wrlock.3
1.3 +8 -8 src/lib/libc_r/man/pthread_rwlockattr_destroy.3
1.3 +10 -10 src/lib/libc_r/man/pthread_rwlockattr_getpshared.3
1.3 +8 -8 src/lib/libc_r/man/pthread_rwlockattr_init.3
1.3 +10 -10 src/lib/libc_r/man/pthread_rwlockattr_setpshared.3
1.4 +8 -8 src/lib/libcrypt/crypt.3
1.3 +5 -5 src/lib/libftpio/ftpio.3
1.3 +12 -12 src/lib/libkvm/kvm_geterr.3
1.3 +3 -3 src/lib/libkvm/kvm_getfiles.3
1.3 +3 -3 src/lib/libkvm/kvm_getprocs.3
1.3 +7 -7 src/lib/libkvm/kvm_open.3
1.3 +4 -4 src/lib/libmd/mdX.3
1.3 +4 -4 src/lib/libmd/ripemd.3
1.3 +4 -4 src/lib/libmd/sha.3
1.4 +5 -5 src/lib/libskey/skey.3
1.3 +11 -11 src/lib/libskey/skey.access.5
1.5 +2 -2 src/lib/libstand/libstand.3
1.3 +5 -5 src/lib/libusbhid/usbhid.3
1.3 +5 -5 src/lib/libutil/_secure_path.3
1.3 +5 -5 src/lib/libutil/auth.3
1.5 +4 -4 src/lib/libutil/login.conf.5
1.4 +2 -2 src/lib/libutil/property.3
1.4 +2 -2 src/lib/libvgl/vgl.3
http://www.dragonflybsd.org/cvsweb/src/lib/libalias/libalias.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/compat-43/gethostid.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/compat-43/setruid.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/compat-43/sigvec.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/dlinfo.3.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/exec.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/getbootfile.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/getdomainname.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/getgrent.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/gethostname.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/getnetgrent.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/getpwent.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/getvfsent.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/msgrcv.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/msgsnd.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/popen.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/rand48.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/readpassphrase.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/shm_open.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/sysconf.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/sysctl.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/gen/utime.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/net/ethers.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/net/eui64.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/net/getifaddrs.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/net/getipnodebyname.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/net/inet6_option_space.3.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/net/inet6_rthdr_space.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/net/rcmdsh.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/regex/regex.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/rpc/getrpcent.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/mktemp.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/stdio.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdlib/getenv.3.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdlib/getopt.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdlib/getopt_long.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdlib/hcreate.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdlib/malloc.3.diff?r1=1.6&r2=1.7&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdlib/qsort.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdlib/random.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdlib/tsearch.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdtime/strptime.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/string/strtok.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/aio_cancel.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/aio_return.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/aio_suspend.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/brk.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/getlogin.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/getpgrp.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/getrusage.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/getsockname.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/getsockopt.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/lseek.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/mlock.2.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/mount.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/poll.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/quotactl.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/reboot.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/rfork.2.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/rtprio.2.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/select.2.diff?r1=1.5&r2=1.6&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/send.2.diff?r1=1.6&r2=1.7&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/setpgid.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/sigaction.2.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/socketpair.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/stat.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/swapon.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/sync.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/sys_checkpoint.2.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/syscall.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/tls.2.diff?r1=1.5&r2=1.6&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/truncate.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/umtx.2.diff?r1=1.6&r2=1.7&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/vfork.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc/sys/wait.2.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_attr_get_np.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlock_destroy.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlock_init.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlock_rdlock.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlock_unlock.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlock_wrlock.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlockattr_destroy.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlockattr_getpshared.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlockattr_init.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libc_r/man/pthread_rwlockattr_setpshared.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libcrypt/crypt.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libftpio/ftpio.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libkvm/kvm_geterr.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libkvm/kvm_getfiles.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libkvm/kvm_getprocs.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libkvm/kvm_open.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libmd/mdX.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libmd/ripemd.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libmd/sha.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libskey/skey.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libskey/skey.access.5.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libstand/libstand.3.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libusbhid/usbhid.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libutil/_secure_path.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libutil/auth.3.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libutil/login.conf.5.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libutil/property.3.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/lib/libvgl/vgl.3.diff?r1=1.3&r2=1.4&f=u