Re: [diffs] www/ and www/faq/ tweaks (punctuation and typo fixes)
"Alan R. S. Bueno" <[email protected]>
| Newsgroups | gmane.os.openbsd.www |
|---|---|
| Message-ID | <[email protected]> |
On Fri, Sep 4, 2009 at 2:08 PM, Theo de Raadt<[email protected]> wrote: > Cannot apply mangled diffs. > > Content-Type: text/plain; charset=ISO-8859-1 > > As in, you line wrapped them. I don't understand where this world is headed to, > where straight text diffs are mailed in which then cannot be applied. > > I'm attaching the diffs now. I don't sent them previously due to connection problems here. Sorry for the noise. Index: faq10.html =================================================================== RCS file: /cvs/www/faq/faq10.html,v retrieving revision 1.144 diff -u faq10.html --- faq10.html 23 May 2009 11:34:24 -0000 1.144 +++ faq10.html 4 Sep 2009 17:56:38 -0000 @@ -205,9 +205,9 @@ <p> Here you can obviously see that starting up httpd normally no flags are necessary. So a line like: "<b> httpd_flags=""</b>" would be -necessary. But to start httpd with ssl enabled. (Refer to the -<a href="#HTTPS">SSL FAQ</a> or <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssl&sektion=8">ssl(8)</a>) -You should start with a line like: "httpd_flags="-DSSL"". +necessary. But to start httpd with ssl enabled (refer to the +<a href="#HTTPS">SSL FAQ</a> or <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssl&sektion=8">ssl(8)</a>), +you should start with a line like: "httpd_flags="-DSSL"". <p> A good approach is to never touch <i>/etc/rc.conf</i> itself. Instead, Index: faq12.html =================================================================== RCS file: /cvs/www/faq/faq12.html,v retrieving revision 1.98 diff -u faq12.html --- faq12.html 21 May 2009 01:34:31 -0000 1.98 +++ faq12.html 4 Sep 2009 17:56:49 -0000 @@ -305,7 +305,7 @@ <h2>12.3 - AMD 64</h2> <a name="amd64Intel"></a> -<h3>12.3.1 - Can I run OpenBSD/amd64 on my Intel P4</h3> +<h3>12.3.1 - Can I run OpenBSD/amd64 on my Intel P4?</h3> In the case of many recent processors, the answer is "yes". Unfortunately, trying to find out which Intel processor variations do and which do not properly support the amd64 instruction set is difficult. Index: faq13.html =================================================================== RCS file: /cvs/www/faq/faq13.html,v retrieving revision 1.127 diff -u faq13.html --- faq13.html 7 Apr 2009 00:41:14 -0000 1.127 +++ faq13.html 4 Sep 2009 17:57:22 -0000 @@ -664,7 +664,7 @@ the sounds, rather than the sounds. More information: <a href="http://www.harmony-central.com/MIDI/Doc/tutorial.html">Tutorial -on MIDI and Music Synthesis</a> +on MIDI and Music Synthesis</a>. <!-- <h3>Devices setup</h3> --> Index: faq2.html =================================================================== RCS file: /cvs/www/faq/faq2.html,v retrieving revision 1.101 diff -u faq2.html --- faq2.html 29 Aug 2009 21:50:35 -0000 1.101 +++ faq2.html 4 Sep 2009 17:57:26 -0000 @@ -677,7 +677,7 @@ output is sufficient in this respect. A detailed description of your problem is necessary. You will note that the dmesg described the hardware, the text explained why Smart User thought the system was not -broken, (ran 3.2 properly), how this crash was caused (starting X), and +broken (ran 3.2 properly), how this crash was caused (starting X), and the output of the debugger's "<tt>ps</tt>" and "<tt>trace</tt>" commands. In this case, Smart User provided output captured on a <a href="faq7.html#SerCon">serial console</a>; if you can not do that, you Index: faq4.html =================================================================== RCS file: /cvs/www/faq/faq4.html,v retrieving revision 1.283 diff -u faq4.html --- faq4.html 24 Aug 2009 10:26:18 -0000 1.283 +++ faq4.html 4 Sep 2009 17:57:53 -0000 @@ -494,7 +494,7 @@ don't have a new command mode. In this case, you need to experiment.) If you have multiple CD-ROM devices, you need to boot from the correct one. -try <tt>probe-scsi</tt> (or <tt>probe-ide</tt> on newer systems) from +Try <tt>probe-scsi</tt> (or <tt>probe-ide</tt> on newer systems) from the new command mode. <p> @@ -1989,7 +1989,7 @@ When you reboot, you should be able to select OpenBSD from the NT loader menu. There is much more information available about NTLDR at the <a href="http://www.tburke.net/info/ntldr/ntldr_hacking_guide.htm">NTLDR -Hacking Guide.</a> +Hacking Guide</a>. <p> On Windows XP you can also edit the boot information using the GUI; see the @@ -2000,7 +2000,7 @@ <a href="http://www.winimage.com/bootpart.htm">BootPart</a>. This program can be run from Windows NT/2000/XP, and will fetch the OpenBSD PBR, place it on your NT/2000/XP partition, and will -add it to <tt>C:\BOOT.INI</tt> +add it to <tt>C:\BOOT.INI</tt>. <p> Note: The Windows NT/2000/XP boot loader is only capable of booting OSs @@ -2011,10 +2011,10 @@ <p> With Vista, Microsoft dropped NTLDR support in favor of their newer Boot -Configuration Data (BCD) store used for controlling the boot -environment. Since <tt>BOOT.INI</tt> is no longer available for -customization, a command-line utility, <tt>bcdedit</tt>, takes its -place. +Configuration Data (BCD) store used for controlling the boot +environment. Since <tt>BOOT.INI</tt> is no longer available for +customization, a command-line utility, <tt>bcdedit</tt>, takes its +place. <p> Once OpenBSD's PBR is copied to Vista's system partition, the following @@ -2031,9 +2031,9 @@ <p> The GUID returned here, <tt>05a763ce-d81b-11db-b3ec-000000000000</tt>, -is shown for illustrative reasons. Take note of the GUID displayed -when you run this command as this value will need to be copied into -the following commands. Simply copying the GUID shown above will not +is shown for illustrative reasons. Take note of the GUID displayed +when you run this command as this value will need to be copied into +the following commands. Simply copying the GUID shown above will not work. <p> @@ -2053,14 +2053,14 @@ <p> Note the absolute pathname of the imported PBR file. Do not add a drive letter as it is assumed that the file is placed in the system partition. -<tt>bcdedit</tt> will not complain about an explicit drive +<tt>bcdedit</tt> will not complain about an explicit drive specification, but the boot manager will later balk claiming that it cannot resolve the designated pathname. <p> -Upon rebooting, Vista will be listed first in the boot manager -ultimately followed by OpenBSD. Selecting either entry will boot the -corresponding operating system. +Upon rebooting, Vista will be listed first in the boot manager +ultimately followed by OpenBSD. Selecting either entry will boot the +corresponding operating system. <p> For more information, consult <tt>bcdedit</tt>'s help by issuing: @@ -2072,12 +2072,12 @@ <p> or by searching Microsoft's documentation and Website. A good -introduction can be found in this TechNet +introduction can be found in this TechNet <a href="http://technet.microsoft.com/en-us/library/cc721886%28WS.10%29.aspx"> Frequently Asked Questions</a> article. - + <p> -For those who find manual configuration daunting, +For those who find manual configuration daunting, <a href="http://neosmart.net/dl.php?id=1">EasyBCD</a> provides a GUI alternative. @@ -2090,7 +2090,7 @@ multiboot environment with OpenBSD. <p> -After copying OpenBSD's PBR into Window 7's system partition, issue +After copying OpenBSD's PBR into Windows 7's system partition, issue the following command to initialize the needed registry hive: <p> @@ -2103,8 +2103,8 @@ <p> As admonished before, the -<tt>{0154a872-3d41-11de-bd67-a7060316bbb1}</tt> GUID is -system-dependent. Note the value you receive when executing, and copy +<tt>{0154a872-3d41-11de-bd67-a7060316bbb1}</tt> GUID is +system-dependent. Note the value you receive when executing, and copy it into the following commands: <p> @@ -2132,10 +2132,10 @@ <h3>Other boot loaders</h3> <p> -Some other bootloaders OpenBSD users have used successfully include +Some other bootloaders OpenBSD users have used successfully include <a href="http://gag.sourceforge.net/">GAG</a>, <a href="http://www.ranish.com/part/">The Ranish Partition Manager</a> -and <a href="http://www.gnu.org/software/grub/">GRUB</a>. +and <a href="http://www.gnu.org/software/grub/">GRUB</a>. <p> <h3>OpenBSD and Linux (i386)</h3> Index: faq5.html =================================================================== RCS file: /cvs/www/faq/faq5.html,v retrieving revision 1.172 diff -u faq5.html --- faq5.html 1 Sep 2009 00:39:14 -0000 1.172 +++ faq5.html 4 Sep 2009 17:58:03 -0000 @@ -1324,9 +1324,10 @@ via <b>boot -c</b>, you will need these changes to be written out permanently. To do this you need to use the <b>-u</b> option. In the following example, the computer was booted into the UKC and the -wi(4) device was disabled. Since changes made with boot -c are NOT -permanent, these changes must be written out. This example writes the -changes made from boot -c into a new kernel binary bsd.new. +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=wi&sektion=4">wi(4)</a> +device was disabled. Since changes made with boot -c are NOT permanent, +these changes must be written out. This example writes the changes made +from boot -c into a new kernel binary bsd.new. <blockquote><pre> $ <strong>sudo config -e -u -o bsd.new /bsd</strong> Index: faq6.html =================================================================== RCS file: /cvs/www/faq/faq6.html,v retrieving revision 1.277 diff -u faq6.html --- faq6.html 2 Jul 2009 11:35:51 -0000 1.277 +++ faq6.html 4 Sep 2009 17:58:41 -0000 @@ -1043,17 +1043,19 @@ <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sysctl&sektion=8">sysctl(8)</a>: <pre> -Set the list of reserved TCP ports that should not be allocated by the -kernel dynamically. This can be used to keep daemons from stealing a -specific port that another program needs to function. List elements may -be separated by commas and/or whitespace. +To set the list of reserved TCP ports that should not be allocated by the +kernel dynamically: - # <b>sysctl net.inet.tcp.baddynamic=749,750,751,760,761,871</b> + # <b>sysctl net.inet.tcp.baddynamic=749,750,751,760,761,871</b> -It is also possible to add or remove ports from the current list. +This can be used to keep daemons from stealing a specific port that an- +other program needs to function. List elements may be separated by com- +mas and/or whitespace. - # <b>sysctl net.inet.tcp.baddynamic=+748</b> - # <b>sysctl net.inet.tcp.baddynamic=-871</b> +It is also possible to add or remove ports from the current list: + + # <b>sysctl net.inet.tcp.baddynamic=+748</b> + # <b>sysctl net.inet.tcp.baddynamic=-871</b> </pre> <p> @@ -1830,7 +1832,7 @@ <p>Let's add another layer of complexity; we want <i>rachael</i> to stay master when possible. There are several reasons we might want this: hardware differences, -simple prejudice, "if this system isn't master, there's a problem," or +simple prejudice, "if this system isn't master, there's a problem", or knowing the default master without doing scripting to parse and email the output of ifconfig. Index: faq7.html =================================================================== RCS file: /cvs/www/faq/faq7.html,v retrieving revision 1.79 diff -u faq7.html --- faq7.html 18 Jul 2009 20:11:50 -0000 1.79 +++ faq7.html 4 Sep 2009 17:58:52 -0000 @@ -359,7 +359,7 @@ <ul> <li>OpenBSD numbers the serial ports starting at <i>tty00</i>, DOS/Windows labels them starting at <i>COM1</i>. So, keep in mind -<i>tty02</i> is <i>COM3</i>, not <i>COM2</i> +<i>tty02</i> is <i>COM3</i>, not <i>COM2</i>. <li>Some systems may be able to operate without a video card in the machine, but certainly not all -- many systems consider this an error Index: faq8.html =================================================================== RCS file: /cvs/www/faq/faq8.html,v retrieving revision 1.213 diff -u faq8.html --- faq8.html 30 Apr 2009 17:19:11 -0000 1.213 +++ faq8.html 4 Sep 2009 17:59:02 -0000 @@ -29,7 +29,7 @@ <p> <h3>Table of Contents</h3> <ul> -<li><a href= "#LostPW" >8.1 - I forgot my root password..... What +<li><a href= "#LostPW" >8.1 - I forgot my root password... What do I do now?</a> <li><a href= "#X" >8.2 - X won't start, I get lots of error messages</a> @@ -1166,14 +1166,14 @@ Why is it taking so long for me to log in?</h2> <p> Many new users to OpenBSD experience a two minute login delay when using -services such as -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&sektion=1">ssh,</a> -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&sektion=1">ftp,</a> or -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=telnet&sektion=1">telnet.</a> -This can also be experienced when using a proxy, such as -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp-proxy&sektion=8">ftp-proxy,</a> -or when sending mail out from a workstation through -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sendmail&sektion=8">sendmail.</a> +services such as +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&sektion=1">ssh</a>, +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&sektion=1">ftp</a>, or +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=telnet&sektion=1">telnet</a>. +This can also be experienced when using a proxy, such as +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp-proxy&sektion=8">ftp-proxy</a>, +or when sending mail out from a workstation through +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sendmail&sektion=8">sendmail</a>. <p> This is almost always due to a reverse-DNS problem. DNS is Domain Name Services, the system the Internet uses to convert a name, such as @@ -1181,14 +1181,14 @@ the ability to take a numeric address and convert it back to a "name", this is "Reverse DNS". <p> -In order to provide better logging, OpenBSD performs a reverse-DNS -lookup on any machine that attaches to it in many different ways, -including -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&sektion=1">ssh,</a> -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&sektion=1">ftp,</a> -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=telnet&sektion=1">telnet,</a> +In order to provide better logging, OpenBSD performs a reverse-DNS +lookup on any machine that attaches to it in many different ways, +including +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&sektion=1">ssh</a>, +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&sektion=1">ftp</a>, +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=telnet&sektion=1">telnet</a>, <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sendmail&sektion=8">sendmail</a> or -<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp-proxy&sektion=8">ftp-proxy.</a> +<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp-proxy&sektion=8">ftp-proxy</a>. Unfortunately, in some cases, the machine that is making the connection does not have a proper reverse DNS entry. Index: cvsup.html =================================================================== RCS file: /cvs/www/cvsup.html,v retrieving revision 1.120 diff -u cvsup.html --- cvsup.html 2 Sep 2009 13:23:15 -0000 1.120 +++ cvsup.html 4 Sep 2009 18:01:29 -0000 @@ -68,7 +68,7 @@ <ul> <li><b>src</b> - Houses all source code for the OpenBSD Operating System.</li> <li><b>ports</b> - Houses the <a href="./ports.html">OpenBSD Ports</a>.</li> - <li><b>www</b> - Houses all OpenBSD web pages. (Including this one).</li> + <li><b>www</b> - Houses all OpenBSD web pages. (Including this one.)</li> <li><b>X11</b> - Houses OpenBSD's adaptation of the <a href="http://www.XFree86.org/">XFree86-3</a> software project. This is here just for historical purposes, most users will have no Index: goals.html =================================================================== RCS file: /cvs/www/goals.html,v retrieving revision 1.70 diff -u goals.html --- goals.html 3 Apr 2008 22:31:06 -0000 1.70 +++ goals.html 4 Sep 2009 18:01:31 -0000 @@ -39,12 +39,12 @@ <a href="products.html">commercial spin-offs</a> of OpenBSD.<p> <li>Pay attention to <a href="security.html">security problems and fix them before anyone else does</a>. (Try to be the #1 most - secure operating system).<p> + secure operating system.)<p> <li><a href="crypto.html">Greater integration of cryptographic software.</a> This means IPsec, key engines, Kerberos, free-AFS, and other forms of strong crypto or crypto-using systems. OpenBSD is developed and released from Canada and due to Canadian - law it is legal to export crypto to the world. (As + law it is legal to export crypto to the world (as <a href="http://www.efc.ca/pages/doc/crypto-export.html"> researched by a Canadian individual</a> and as <a href="http://axion.physics.ubc.ca/ECL.html"> Index: plus46.html =================================================================== RCS file: /cvs/www/plus46.html,v retrieving revision 1.1 diff -u plus46.html --- plus46.html 10 Aug 2009 09:41:24 -0000 1.1 +++ plus46.html 4 Sep 2009 18:01:53 -0000 @@ -178,7 +178,7 @@ <li>For amd64 and i386, do not enable EST if the machine only reports a single state. <li>Updated time zone data to tzdata2009i. <!-- 2009/06/07 --> -<li>Fix file descriptor leaks in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sdiff&sektion=1&format=html">sdiff(1)</a> when diffing regurlar files. +<li>Fix file descriptor leaks in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sdiff&sektion=1&format=html">sdiff(1)</a> when diffing regular files. <!-- 2009/06/06 --> <li>Fixed minor memory leak in libc <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=yp&sektion=8&format=html">yp(8)</a> code. <li>Fix <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&sektion=1&format=html">ftp(1)</a> to handle abort transfers when talking to broken ftp servers. @@ -514,7 +514,7 @@ <li>Added support for -t, -v and -F cmdline args in the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd&sektion=8&format=html">smtpd(8)</a> sendmail interface. <!-- 2009/04/15 --> <li>After the large <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf&sektion=4&format=html">pf(4)</a> rewrite, fix a few things like correctly inheriting queue stuff, tag, rtableid from the rule if we have no state. -<li>Removed the unsused <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=en&sektion=4&format=html">en(4)</a> driver. +<li>Removed the unused <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=en&sektion=4&format=html">en(4)</a> driver. <!-- 2009/04/14 --> <li>Convert the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sis&sektion=4&format=html">sis(4)</a> driver to the MCLGETI buffer allocator. Makes it handle overcapacity far better. <li>Initial implementation of package signatures for <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pkg_add&sektion=1&format=html">pkg_add(1)</a>. @@ -577,7 +577,7 @@ <li>Added support in <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=relayd&sektion=8&format=html">relayd(8)</a> for client-side TCP connections from relays. <!-- 2009/03/31 --> <li>When the <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=acx&sektion=4&format=html">acx(4)</a> watchdog times out, reset the full chip. -<li>Fixed possible memory leaks in the yacc perser code used in various applications. +<li>Fixed possible memory leaks in the yacc parser code used in various applications. <!-- 2009/03/30 --> <li><font color="#e00000"><strong>RELIABILITY FIX: Use of pmap flags in DMA'able memory mapped by devices on i386 may cause the flags to be uninitialized and the devices to misbehave.</strong></font><br> <a href="errata45.html#003_bus_dma">A source code patch is available</a>.<br> Index: query-pr.html =================================================================== RCS file: /cvs/www/query-pr.html,v retrieving revision 1.2 diff -u query-pr.html --- query-pr.html 7 Mar 2003 14:58:14 -0000 1.2 +++ query-pr.html 4 Sep 2009 18:01:53 -0000 @@ -41,7 +41,7 @@ To search for PRs based on their contents, fill out the form below. Multiple selections are <tt>AND</tt>ed together. You may use regular expressions for all text boxes other than the -<em>PR numbers(s)</em> field. +<em>PR number(s)</em> field. You do not have to fill in everything; fields that are not filled in will simply be ignored.