sync
proyecto.pl
Merge branch 'master' of github.com:dcortes92/rit1

Conflicts:
	man.es/addr2line.1.c
	man.es/man1/awk.1.txt
	man.es/man1/bunzip2.1.txt
	man.es/man1/cdp.1.txt
	man.es/man1/dd.1.txt
	man.es/man1/df.1.txt
	man.es/man1/dirname.1.txt
	man.es/man1/dumpkeys.1.txt
	man.es/man1/echo.1.txt
	man.es/man1/find.1.txt
	man.es/man1/fixscribeps.1.txt
	man.es/man1/fixtpps.1.txt
	man.es/man1/getafm.1.txt
	man.es/man1/grep.1.txt
	man.es/man1/hostname.1.txt
	man.es/man1/look.1.txt
	man.es/man1/mformat.1.txt
	man.es/man1/mrd.1.txt
	man.es/man1/objcopy.1.txt
	man.es/man1/printf.1.txt
	man.es/man1/psfstriptable.1.txt
	man.es/man1/pwd.1.txt
	man.es/man1/stty.1.txt
	man.es/man1/testhost.1.txt
	man.es/man1/users.1.txt
	man.es/man1/whoami.1.txt
	man.es/man1/zcmp.1.txt
	man.es/man1/zdiff.1.txt
	man.es/man1/zgrep.1.txt
	man.es/man1/zmore.1.txt
	man.es/man2/_sysctl.2.txt
	man.es/man2/adjtimex.2.txt
	man.es/man2/afs_syscall.2.txt
	man.es/man2/break.2.txt
	man.es/man2/chdir.2.txt
	man.es/man2/chmod.2.txt
	man.es/man2/execve.2.txt
	man.es/man2/fchown.2.txt
	man.es/man2/fcntl.2.txt
	man.es/man2/fstat.2.txt
	man.es/man2/fstatfs.2.txt
	man.es/man2/fsync.2.txt
	man.es/man2/ftruncate.2.txt
	man.es/man2/getgroups.2.txt
	man.es/man2/getitimer.2.txt
	man.es/man2/getpeername.2.txt
	man.es/man2/getpgid.2.txt
	man.es/man2/getpgrp.2.txt
	man.es/man2/getpid.2.txt
	man.es/man2/getresgid.2.txt
	man.es/man2/getsockname.2.txt
	man.es/man2/init_module.2.txt
	man.es/man2/killpg.2.txt
	man.es/man2/listen.2.txt
	man.es/man2/mlockall.2.txt
	man.es/man2/mprotect.2.txt
	man.es/man2/mremap.2.txt
	man.es/man2/msgctl.2.txt
	man.es/man2/munlockall.2.txt
	man.es/man2/munmap.2.txt
	man.es/man2/nanosleep.2.txt
	man.es/man2/outb.2.txt
	man.es/man2/query_module.2.txt
	man.es/man2/read.2.txt
	man.es/man2/recvfrom.2.txt
	man.es/man2/recvmsg.2.txt
	man.es/man2/rmdir.2.txt
	man.es/man2/semop.2.txt
	man.es/man2/seteuid.2.txt
	man.es/man2/setfsgid.2.txt
	man.es/man2/setresgid.2.txt
	man.es/man2/setsockopt.2.txt
	man.es/man2/shmdt.2.txt
	man.es/man2/sigpause.2.txt
	man.es/man2/sigpending.2.txt
	man.es/man2/sigvec.2.txt
	man.es/man2/socketcall.2.txt
	man.es/man2/statfs.2.txt
	man.es/man2/stty.2.txt
	man.es/man2/syscalls.2.txt
	man.es/man2/sysinfo.2.txt
	man.es/man2/umask.2.txt
	man.es/man2/umount.2.txt
	man.es/man2/ustat.2.txt
	man.es/man2/utime.2.txt
	man.es/man2/utimes.2.txt
	man.es/man2/vfork.2.txt
	man.es/man2/waitpid.2.txt
	man.es/man2/writev.2.txt
	man.es/man3/__setfpucw.3.txt
	man.es/man3/abort.3.txt
	man.es/man3/acos.3.txt
	man.es/man3/acosh.3.txt
	man.es/man3/addmntent.3.txt
	man.es/man3/alphasort.3.txt
	man.es/man3/asctime.3.txt
	man.es/man3/asinh.3.txt
	man.es/man3/assert.3.txt
	man.es/man3/atan2.3.txt
	man.es/man3/atexit.3.txt
	man.es/man3/atoi.3.txt
	man.es/man3/atol.3.txt
	man.es/man3/bcmp.3.txt
	man.es/man3/bsearch.3.txt
	man.es/man3/bstring.3.txt
	man.es/man3/btree.3.txt
	man.es/man3/byteorder.3.txt
	man.es/man3/calloc.3.txt
	man.es/man3/catclose.3.txt
	man.es/man3/catgets.3.txt
	man.es/man3/cbrt.3.txt
	man.es/man3/ceil.3.txt
	man.es/man3/cfgetispeed.3.txt
	man.es/man3/cfgetospeed.3.txt
	man.es/man3/cfmakeraw.3.txt
	man.es/man3/cfsetispeed.3.txt
	man.es/man3/cfsetospeed.3.txt
	man.es/man3/clock.3.txt
	man.es/man3/closedir.3.txt
	man.es/man3/closelog.3.txt
	man.es/man3/cmsg.3.txt
	man.es/man3/copysign.3.txt
	man.es/man3/cosh.3.txt
	man.es/man3/ctermid.3.txt
	man.es/man3/ctime.3.txt
	man.es/man3/db.3.txt
	man.es/man3/difftime.3.txt
	man.es/man3/dlclose.3.txt
	man.es/man3/dlerror.3.txt
	man.es/man3/dlopen.3.txt
	man.es/man3/dn_comp.3.txt
	man.es/man3/dn_expand.3.txt
	man.es/man3/drem.3.txt
	man.es/man3/endgrent.3.txt
	man.es/man3/endhostent.3.txt
	man.es/man3/endnetent.3.txt
	man.es/man3/endservent.3.txt
	man.es/man3/endutent.3.txt
	man.es/man3/erand48.3.txt
	man.es/man3/erf.3.txt
	man.es/man3/erfc.3.txt
	man.es/man3/execl.3.txt
	man.es/man3/execle.3.txt
	man.es/man3/execlp.3.txt
	man.es/man3/execv.3.txt
	man.es/man3/execvp.3.txt
	man.es/man3/exit.3.txt
	man.es/man3/exp.3.txt
	man.es/man3/expm1.3.txt
	man.es/man3/fabs.3.txt
	man.es/man3/fclose.3.txt
	man.es/man3/fcvt.3.txt
	man.es/man3/feof.3.txt
	man.es/man3/fflush.3.txt
	man.es/man3/ffs.3.txt
	man.es/man3/fgetc.3.txt
	man.es/man3/fgetgrent.3.txt
	man.es/man3/fgetpos.3.txt
	man.es/man3/fgetpwent.3.txt
	man.es/man3/fgets.3.txt
	man.es/man3/fileno.3.txt
	man.es/man3/finite.3.txt
	man.es/man3/floor.3.txt
	man.es/man3/fmod.3.txt
	man.es/man3/fpathconf.3.txt
	man.es/man3/fprintf.3.txt
	man.es/man3/fputc.3.txt
	man.es/man3/fread.3.txt
	man.es/man3/free.3.txt
	man.es/man3/frexp.3.txt
	man.es/man3/fscanf.3.txt
	man.es/man3/ftell.3.txt
	man.es/man3/ftok.3.txt
	man.es/man3/ftw.3.txt
	man.es/man3/gcvt.3.txt
	man.es/man3/get_current_dir_name.3.txt
	man.es/man3/getc.3.txt
	man.es/man3/getchar.3.txt
	man.es/man3/getcwd.3.txt
	man.es/man3/getdirentries.3.txt
	man.es/man3/getenv.3.txt
	man.es/man3/getgrent.3.txt
	man.es/man3/getgrgid.3.txt
	man.es/man3/getgrnam.3.txt
	man.es/man3/gethostbyaddr.3.txt
	man.es/man3/gethostbyname.3.txt
	man.es/man3/getmntent.3.txt
	man.es/man3/getnetbyname.3.txt
	man.es/man3/getnetent.3.txt
	man.es/man3/getopt_long_only.3.txt
	man.es/man3/getprotobynumber.3.txt
	man.es/man3/getpw.3.txt
	man.es/man3/getpwent.3.txt
	man.es/man3/getpwnam.3.txt
	man.es/man3/getservbyname.3.txt
	man.es/man3/getservbyport.3.txt
	man.es/man3/getservent.3.txt
	man.es/man3/getusershell.3.txt
	man.es/man3/getutent.3.txt
	man.es/man3/getutline.3.txt
	man.es/man3/getwd.3.txt
	man.es/man3/globfree.3.txt
	man.es/man3/gmtime.3.txt
	man.es/man3/hash.3.txt
	man.es/man3/htons.3.txt
	man.es/man3/hypot.3.txt
	man.es/man3/index.3.txt
	man.es/man3/inet_addr.3.txt
	man.es/man3/inet_aton.3.txt
	man.es/man3/inet_lnaof.3.txt
	man.es/man3/inet_netof.3.txt
	man.es/man3/inet_network.3.txt
	man.es/man3/inet_ntoa.3.txt
	man.es/man3/initgroups.3.txt
	man.es/man3/initstate.3.txt
	man.es/man3/insque.3.txt
	man.es/man3/intro.3.txt
	man.es/man3/iruserok.3.txt
	man.es/man3/isalpha.3.txt
	man.es/man3/isatty.3.txt
	man.es/man3/isinf.3.txt
	man.es/man3/isnan.3.txt
	man.es/man3/ispunct.3.txt
	man.es/man3/isspace.3.txt
	man.es/man3/isxdigit.3.txt
	man.es/man3/j0.3.txt
	man.es/man3/jn.3.txt
	man.es/man3/jrand48.3.txt
	man.es/man3/killpg.3.txt
	man.es/man3/labs.3.txt
	man.es/man3/ldexp.3.txt
	man.es/man3/ldiv.3.txt
	man.es/man3/localtime.3.txt
	man.es/man3/log10.3.txt
	man.es/man3/logwtmp.3.txt
	man.es/man3/longjmp.3.txt
	man.es/man3/lrand48.3.txt
	man.es/man3/lsearch.3.txt
	man.es/man3/malloc.3.txt
	man.es/man3/mblen.3.txt
	man.es/man3/mbstowcs.3.txt
	man.es/man3/mbtowc.3.txt
	man.es/man3/memccpy.3.txt
	man.es/man3/memcmp.3.txt
	man.es/man3/memcpy.3.txt
	man.es/man3/memfrob.3.txt
	man.es/man3/memmem.3.txt
	man.es/man3/memmove.3.txt
	man.es/man3/mkfifo.3.txt
	man.es/man3/mkstemp.3.txt
	man.es/man3/mktemp.3.txt
	man.es/man3/mktime.3.txt
	man.es/man3/modf.3.txt
	man.es/man3/mpool.3.txt
	man.es/man3/ntohl.3.txt
	man.es/man3/ntohs.3.txt
	man.es/man3/on_exit.3.txt
	man.es/man3/opendir.3.txt
	man.es/man3/openlog.3.txt
	man.es/man3/pclose.3.txt
	man.es/man3/perror.3.txt
	man.es/man3/pow.3.txt
	man.es/man3/psignal.3.txt
	man.es/man3/putc.3.txt
	man.es/man3/putchar.3.txt
	man.es/man3/puts.3.txt
	man.es/man3/pututline.3.txt
	man.es/man3/putw.3.txt
	man.es/man3/qsort.3.txt
	man.es/man3/random.3.txt
	man.es/man3/rcmd.3.txt
	man.es/man3/re_exec.3.txt
	man.es/man3/readv.3.txt
	man.es/man3/realloc.3.txt
	man.es/man3/realpath.3.txt
	man.es/man3/recno.3.txt
	man.es/man3/regcomp.3.txt
	man.es/man3/regerror.3.txt
	man.es/man3/regex.3.txt
	man.es/man3/regexec.3.txt
	man.es/man3/regfree.3.txt
	man.es/man3/remove.3.txt
	man.es/man3/remque.3.txt
	man.es/man3/res_init.3.txt
	man.es/man3/res_mkquery.3.txt
	man.es/man3/res_querydomain.3.txt
	man.es/man3/res_search.3.txt
	man.es/man3/res_send.3.txt
	man.es/man3/resolver.3.txt
	man.es/man3/rewinddir.3.txt
	man.es/man3/rindex.3.txt
	man.es/man3/rint.3.txt
	man.es/man3/rresvport.3.txt
	man.es/man3/rtnetlink.3.txt
	man.es/man3/ruserok.3.txt
	man.es/man3/scanf.3.txt
	man.es/man3/seed48.3.txt
	man.es/man3/seekdir.3.txt
	man.es/man3/setbuf.3.txt
	man.es/man3/setbuffer.3.txt
	man.es/man3/setenv.3.txt
	man.es/man3/setgrent.3.txt
	man.es/man3/sethostent.3.txt
	man.es/man3/setjmp.3.txt
	man.es/man3/setmntent.3.txt
	man.es/man3/setnetent.3.txt
	man.es/man3/setpwent.3.txt
	man.es/man3/setservent.3.txt
	man.es/man3/setstate.3.txt
	man.es/man3/setutent.3.txt
	man.es/man3/setvbuf.3.txt
	man.es/man3/sigaddset.3.txt
	man.es/man3/sigdelset.3.txt
	man.es/man3/sigemptyset.3.txt
	man.es/man3/sigfillset.3.txt
	man.es/man3/siginterrupt.3.txt
	man.es/man3/sigismember.3.txt
	man.es/man3/siglongjmp.3.txt
	man.es/man3/sigsetjmp.3.txt
	man.es/man3/sigsetops.3.txt
	man.es/man3/sinh.3.txt
	man.es/man3/sleep.3.txt
	man.es/man3/snprintf.3.txt
	man.es/man3/sprintf.3.txt
	man.es/man3/sqrt.3.txt
	man.es/man3/srand.3.txt
	man.es/man3/srand48.3.txt
	man.es/man3/srandom.3.txt
	man.es/man3/stderr.3.txt
	man.es/man3/stdin.3.txt
	man.es/man3/stdio.3.txt
	man.es/man3/stdout.3.txt
	man.es/man3/stpcpy.3.txt
	man.es/man3/strcasecmp.3.txt
	man.es/man3/strchr.3.txt
	man.es/man3/strcmp.3.txt
	man.es/man3/strcoll.3.txt
	man.es/man3/strcspn.3.txt
	man.es/man3/strerror.3.txt
	man.es/man3/strfry.3.txt
	man.es/man3/strftime.3.txt
	man.es/man3/string.3.txt
	man.es/man3/strlen.3.txt
	man.es/man3/strncasecmp.3.txt
	man.es/man3/strncat.3.txt
	man.es/man3/strncmp.3.txt
	man.es/man3/strpbrk.3.txt
	man.es/man3/strrchr.3.txt
	man.es/man3/strsep.3.txt
	man.es/man3/strstr.3.txt
	man.es/man3/strtok.3.txt
	man.es/man3/strtol.3.txt
	man.es/man3/strxfrm.3.txt
	man.es/man3/swab.3.txt
	man.es/man3/sysconf.3.txt
	man.es/man3/system.3.txt
	man.es/man3/tan.3.txt
	man.es/man3/tanh.3.txt
	man.es/man3/tcdrain.3.txt
	man.es/man3/tcflow.3.txt
	man.es/man3/tcflush.3.txt
	man.es/man3/tcsendbreak.3.txt
	man.es/man3/tcsetpgrp.3.txt
	man.es/man3/telldir.3.txt
	man.es/man3/termios.3.txt
	man.es/man3/tfind.3.txt
	man.es/man3/tmpfile.3.txt
	man.es/man3/tmpnam.3.txt
	man.es/man3/toascii.3.txt
	man.es/man3/tolower.3.txt
	man.es/man3/tsearch.3.txt
	man.es/man3/ttyname.3.txt
	man.es/man3/twalk.3.txt
	man.es/man3/tzset.3.txt
	man.es/man3/ulimit.3.txt
	man.es/man3/undocumented.3.txt
	man.es/man3/ungetc.3.txt
	man.es/man3/unsetenv.3.txt
	man.es/man3/updwtmp.3.txt
	man.es/man3/usleep.3.txt
	man.es/man3/utmpname.3.txt
	man.es/man3/va_arg.3.txt
	man.es/man3/va_start.3.txt
	man.es/man3/vfscanf.3.txt
	man.es/man3/vscanf.3.txt
	man.es/man3/vsnprintf.3.txt
	man.es/man3/vsprintf.3.txt
	man.es/man3/vsscanf.3.txt
	man.es/man3/wcstombs.3.txt
	man.es/man3/writev.3.txt
	man.es/man3/y0.3.txt
	man.es/man3/y1.3.txt
	man.es/man3/yn.3.txt
	proyecto1.pl
Merge branch 'master' of github.com:dcortes92/rit1

Conflicts:
	proyecto1.pl
Arreglado \b