Øyvind A. Holm <sunny@sunbase.org> writes:
> This is my suggestion on trimmimng down the descriptions of projects on
> the propaganda page, so there is room for more. :) In the spirit of one
> change per commit, I attach two patches — one with only the text
> changes, the other removes the empty line after the header line of every
> entry, which I think groups the entries better.
>
> [[[
> Trim the descriptions of projects using Subversion listed on the
> propaganda page.
>
> * www/propaganda.html
> Shorten the project descriptions and remove the quoting, as all
> descriptions are rewritten. Also break some long lines.
> ]]]
>
> http://sunbase.org/src/subversion/patch/r13365.propaganda1.patch
> 85f497da05b33d63581c3aaba8c46230 r13365.propaganda1.patch
>
>
> And this is for the next patch, relative to the patch above:
>
> [[[
> Remove empty line after the header line in the project list on the
> propaganda page.
>
> * www/propaganda.html
> Terminate header line with <br/> instead using a separate paragraph
> for it.
> ]]]
>
> http://sunbase.org/src/subversion/patch/r13365.propaganda2.patch
> f2da764484c79fc7665995e00194a245 r13365.propaganda2.patch
>
>
> You can see how the version with both patches looks at
> http://sunbase.org/utv/svn.collab.net/trunk/www/propaganda-2.html
>
> or with only the first patch applied at
> http://sunbase.org/utv/svn.collab.net/trunk/www/propaganda-1.html
Wow! Thank you so much for presenting this change in such a
review-friendly way, it really helps.
I have a few minor nits below. +1 to commit both patches, with the
changes below. I think committing them both in one revision is fine,
but it's your decision.
> Index: www/propaganda.html
> ===================================================================
> --- www/propaganda.html (revision 13365)
> +++ www/propaganda.html (working copy)
> @@ -36,8 +36,9 @@
> >http://www.apache.org/</a><br/>
> Repository: <a href="http://svn.apache.org/repos/asf/">
> http://svn.apache.org/repos/asf/</a><br/>
> - <em>"The Apache Software Foundation provides support for the
> - Apache community of open-source software projects."</em>
> + <em>Apache Software Foundation is the author of many open-source
> + software projects and is best known for the Apache web
> + server.</em>
> </li>
"The Apache Software Foundation is a community of many open-source
software projects, including the popular Apache HTTPD webserver."
> <li><p><strong>Samba</strong>: SMB services for *nix systems.</p>
> @@ -45,9 +46,8 @@
> >http://www.samba.org/</a><br/>
> Repository: <a href="http://websvn.samba.org/"
> >http://websvn.samba.org/</a><br/>
> - <em>"Samba is an Open Source/Free Software suite that provides
> - seamless file and print services to SMB/CIFS
> - clients."</em>
> + <em>Samba is an Open Source/Free Software suite that provides
> + seamless file and print services to SMB/CIFS clients.</em>
> </li>
Personally, I use "open source" and "free software" interchangeably,
except in contexts where I think the difference will mean something.
One thing I try not to do is use them both together, like above,
because it's verbose.
However, I just visited the Samba page, and I see you are simply using
their preferred language. I guess this is the right thing to do, even
if it is verbose. So never mind this comment :-).
> <li><p><strong>Mono</strong>: an open-source implementation of C#/.NET.</p>
> @@ -55,12 +55,8 @@
> >http://www.mono-project.com/</a><br/>
> Repository: <a href="svn://mono.myrealbox.com/source/"
> >svn://mono.myrealbox.com/source/</a><br/>
> - <em>"Mono is a comprehensive open source development platform
> - based on the .NET framework that allows developers to build
> - Linux and cross-platform applications with unprecedented
> - productivity. Mono's .NET implementation is based on the
> - ECMA standards for C# and the Common Language
> - Infrastructure."</em>
> + <em>Mono is a comprehensive open source development platform based
> + on the .NET framework.</em>
> </li>
>
> <li><p><strong>PuTTY</strong>: Win32 SSH/Telnet implementation</p>
> @@ -69,8 +65,8 @@
> >http://www.chiark.greenend.org.uk/~sgtatham/putty/</a><br/>
> Repository: <a href="svn://ixion.tartarus.org/main/putty/"
> >svn://ixion.tartarus.org/main/putty/</a><br/>
> - <em>"PuTTY is a free implementation of Telnet and SSH for Win32
> - and Unix platforms, along with an xterm terminal emulator."</em>
> + <em>PuTTY is a free implementation of Telnet and SSH for Win32 and
> + Unix platforms, along with an xterm terminal emulator.</em>
> </li>
>
> <li><p><strong>Zope</strong>: web application server/framework.</p>
> @@ -78,9 +74,8 @@
> >http://www.zope.org/</a><br/>
> Repository: <a href="http://svn.zope.org/"
> >http://svn.zope.org/</a><br/>
> - <em>"Zope is an open source application server for building
> - content managements, intranets, portals, and custom
> - applications."</em>
> + <em>Zope is an open source application server for building content
> + managements, intranets, portals, and custom applications.</em>
> </li>
>
> <li><p><strong>Plone</strong>: content management system.</p>
> @@ -89,9 +84,8 @@
> Repository: <a href="http://svn.plone.org/"
> >http://svn.plone.org/</a><br/>
>
> - <em>"Plone is [...] an intranet and extranet server, as a
> - document publishing system, a portal server and as a groupware
> - tool for collaboration between separately located entities."</em>
> + <em>Plone is an out-of-the-box ready content management system
> + built on the powerful and free Zope Application server.</em>
> </li>
>
> <li><p><strong>Xiph</strong>: open-source multimedia protocols.</p>
> @@ -99,11 +93,9 @@
> >http://www.xiph.org/</a><br/>
> Repository: <a href="http://svn.xiph.org/"
> >http://svn.xiph.org/</a><br/>
> - <em>"Xiph.Org Foundation is a non-profit corporation
> - dedicated to protecting the foundations of Internet
> - multimedia from control by private interests. Our purpose is
> - to support and develop free, open protocols and software to
> - serve the public, developer and business markets."</em>
> + <em>The Xiph.Org Foundation is a non-profit corporation best known
> + for the deveopment of the Ogg Vorbis sound compression format and
> + the Ogg Theora video codec.</em>
> </li>
Typo: "development".
> <li><p><strong>Debian</strong>: a popular Linux distribution.</p>
> @@ -112,10 +104,8 @@
> Repository: <a href="http://svn.debian.org/"
> >http://svn.debian.org/</a><br/>
>
> - <em>"Debian is a free operating system (OS) for your
> - computer. [...] Debian uses the Linux kernel (the core of an
> - operating system), but most of the basic OS tools come from the
> - GNU project; hence the name GNU/Linux."</em>
> + <em>Debian GNU/Linux is a free operating system for your
> + computer.</em>
> </li>
How about just:
"Debian GNU/Linux is a free operating system."
(It's obviously for computers; whether it's for the reader's computer
is the reader's decision :-) )
> <li><p><strong>CUPS (Common UNIX Printing System)</strong>: printing
> @@ -125,9 +115,8 @@
> Repository: <a href="http://svn.easysw.com/public/cups/trunk/"
> >http://svn.easysw.com/public/cups/trunk/</a><br/>
>
> - <em>"CUPS provides a portable printing layer for
> - Unix-based operating systems. [...] It is the standard
> - printing system in Mac OS X and in most Linux distributions."</em>
> + <em>CUPS provides a portable printing layer for Unix-based
> + operating systems.</em>
> </li>
>
> <li><p><strong>Irssi</strong>: a GPL-licensed IRC client.</p>
> @@ -137,34 +126,30 @@
> >http://svn.irssi.org/</a><br/>
>
> <em>Irssi is a popular and powerful text mode IRC client for
> - UNIX-like operating systems.</em>
> + Unix-like operating systems.</em>
> </li>
>
> - <li><p><strong>Linux From Scratch</strong>: a Linux distribution built from source.</p>
> + <li><p><strong>Linux From Scratch</strong>: a Linux distribution
> + built from source.</p>
> Project site: <a href="http://www.linuxfromscratch.org/"
> >http://www.linuxfromscratch.org/</a><br/>
> Repository: <a href="svn://linuxfromscratch.org/LFS/"
> >svn://linuxfromscratch.org/LFS/</a><br/>
>
> - <em>"The most important reason for LFS's existence is teaching people
> - how a Linux system works internally. Building an LFS system teaches
> - you about all that makes Linux tick, how things work together, and
> - depend on each other. And most importantly, how to customize it to
> - your own taste and needs."</em>
> + <em>A Linux distribution which gives you the power to build your
> + own, customized system and teaches you how a Linux system works
> + internally.</em>
> </li>
>
> - <li><p><strong>Conectiva</strong>: a South American Linux distribution.</p>
> + <li><p><strong>Conectiva</strong>: a South American Linux
> + distribution.</p>
> Project site: <a href="http://www.conectiva.com.br/"
> >http://www.conectiva.com.br/</a><br/>
> Repository: <a href="https://moin.conectiva.com.br/RepositorySystem"
> >https://moin.conectiva.com.br/RepositorySystem</a><br/>
>
> - <em>"A Conectiva, maior empresa em serviços Linux na
> - América Latina, oferece uma linha de produtos e
> - serviços que atende com eficácia os
> - usuários domésticos, pequenas e médias
> - empresas, grandes corporações e
> - órgãos governamentais."</em>
> + <em>Conectiva develops and distributes the Conectiva Linux
> + distribution which is aimed at use in Latin America.</em>
> </li>
Add a comma: "... distribution, which is aimed ..."
> <li><p><strong>Trac</strong>: a project management system.</p>
> @@ -172,10 +157,10 @@
> http://projects.edgewall.com/trac/</a><br/>
> Repository: <a href="http://svn.edgewall.com/repos/trac/"
> >http://svn.edgewall.com/repos/trac/</a><br/>
> - <em>"Trac is a minimalistic web-based software project
> - management and bug/issue tracking system. It provides an
> - interface to revision control systems (Subversion), an
> - integrated Wiki and convenient report facilities."</em>
> + <em>Trac is an enhanced wiki and issue tracking system for
> + software development projects. It provides an interface to
> + Subversion, an integrated wiki and convenient report
> + facilities.</em>
> </li>
>
> <li><p><strong>GNU Enterprise</strong>: enterprise application
> @@ -185,36 +170,31 @@
> Repository: <a href="http://www.gnuenterprise.org/developers/svn.php"
> >http://www.gnuenterprise.org/developers/svn.php</a>
> <br/>
> - <em>"GNU Enterprise (GNUe) is a meta-project which is part of
> - the overall GNU Project. GNUe's goal is to develop
> - enterprise-class data-aware applications as Free
> - software. "</em>
> + <em>GNU Enterprise (GNUe) is a meta-project which is part of the
> + overall GNU Project. GNUe's goal is to develop enterprise-class
> + data-aware applications as Free software.</em>
> </li>
>
> - <li><p><strong>Ethereal</strong>: a network protocol analyzer</p>
> + <li><p><strong>Ethereal</strong>: a free network protocol analyzer</p>
> Project site: <a href="http://www.ethereal.com/"
> >http://www.ethereal.com/</a><br/>
> Repository: <a href="http://anonsvn.ethereal.com/ethereal/"
> >http://anonsvn.ethereal.com/ethereal/</a><br/>
> - <em>"Ethereal is used by network professionals around the world
> - for troubleshooting, analysis, software and protocol
> - development, and education. It has all of the standard features
> - you would expect in a protocol analyzer, and several features
> - not seen in any other product."</em>
> + <em>Ethereal is a free network protocol analyzer with all the
> + standard features you would expect in a protocol analyzer, and
> + several features not seen in any other product.</em>
> </li>
>
> <li><p><strong>Netfilter</strong>: the Linux packet manipulation
> - framework</p>
> + framework</p>
> Project site: <a href="http://www.netfilter.org/"
> >http://www.netfilter.org/</a><br/>
> Repository: <a href="https://svn.netfilter.org/netfilter/"
> >https://svn.netfilter.org/netfilter/</a><br/>
> - <em>"netfilter and iptables are building blocks of a framework
> - inside the Linux 2.4.x and 2.6.x kernel. This framework
> - enables packet filtering, network addresss [and port]
> - translation (NA[P]T) and other packet mangling. It is the
> - re-designed and heavily improved successor of the
> - previous Linux 2.2.x ipchains and Linux 2.0.x ipfwadm systems."</em>
> + <em>netfilter is a set of hooks inside the Linux kernel that
> + allows kernel modules to register callback functions with the
> + network stack. iptables is a generic table structure for the
> + definition of rulesets.</em>
> </li>
>
> <li><p><strong>TWiki</strong>: a web based collaboration platform</p>
> @@ -222,11 +202,10 @@
> >http://twiki.org/</a><br/>
> Repository: <a href="http://ntwiki.ethermage.net/svn/twiki/"
> >http://ntwiki.ethermage.net/svn/twiki/</a><br/>
> - <em>"Use TWiki to run a project development space, a document
> - management system, a knowledge base, or any other groupware
> - tool, on an intranet or on the internet. Web content can be
> - created collaboratively by using just a browser. Developers
> - can create new web applications based on a Plugin API."</em>
> + <em>TWiki is a structured wiki, typically used to run a project
> + development space, a document management system, a knowledge
> + base, or any other groupware tool, on an intranet or on the
> + internet.</em>
> </li>
I think we can lose the "on an intranet or on the internet" part at
the end. It's pure marketing; very few things run on one but not the
other anyway.
Beautiful job, sir!
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 11 06:33:43 2005