Commit 78b82ebf authored by Annika Backstrom's avatar Annika Backstrom

Removing superfluous p tags

parent 91e89496
......@@ -24,7 +24,7 @@ The highlights:
- This change will affect the new forums going live around the
Cataclysm release, so existing posts will not be affected.
I have an opinion, but maybe not the opinion one might expect if you've
ever had a conversation with me about privacy and freedom.
......@@ -10,11 +10,11 @@ Sitting here in my old house, wearing flannel-lined khakis and my
extremely orange [topato hoodie][], with my [new keyboard][] in arm's
reach. Life is good.
Happy Holidays to everybody!
[topato hoodie]:
[new keyboard]:
......@@ -13,7 +13,7 @@ plenty on the site of various quality and chromatic variation. Through
the wonders of PHP, you get a random one each time you visit my page.
Only five at the moment, but I'll add more if the mood strikes me.
If you want to create your own, they have a [sticker factory][] to help.
I used it for all of mine, but had to use [wget][] to download the
......@@ -22,7 +22,7 @@ images. Try <span class="code">wget
"http://image.url/goes/here" -O filename.gif</span>, if you have
[sticker factory]:
......@@ -8,7 +8,7 @@ WordPress-Post-Type: post
Here I go again, blogging about blogging.
Anyway, I was browsing the [recently updated blogs][], as I am wont to
do when I am bored, and I came across [Peter Lindberg's blog][]. His
......@@ -18,12 +18,12 @@ matter), fill out the form on GeoURL to ping your site, and you'll be
added to a global map of website. Pretty cool. Here are the [blogs near
my blog][].
They've only got 124 listings right now, so I encourage anybody reading
this to blog it as well.
[recently updated blogs]:
[Peter Lindberg's blog]:
......@@ -10,7 +10,7 @@ WordPress-Post-Type: post
I've been ignoring my blog for the past few days, so I thought I'd sit
down and feed MovableType.
For all you [MacRITters][], I've set up a new virtual host on my old
iBook. The [MacRIT Forum][] is now housed on the same server as this
......@@ -19,12 +19,12 @@ server, and no CGI ability on that server either. Along with the forum,
I'll also be installing a fresh copy of MT for the meeting minutes. It's
not quite ready yet, though.
That's all the news that's fit to print.. Hope you enjoyed the weekend,
'cause there it goes.
[MacRIT Forum]:
......@@ -9,19 +9,19 @@ WordPress-Post-Type: post
I just read Eric S. Raymond's <span class="worktitle">[Why I Am An
Anarchist][]</span>. Here's a quote:
... A majority of the people themselves are too easily seduced into
abandoning their own institutional protections against tyranny by the
false promises and poisonous dreams of statist propaganda.
I'd like to have a little more faith in democracy than Raymond puts
forward. Then again, maybe I'm just not cynical enough. I always have
this general feeling that the Bush administration is doing what it
wants, not what the people want. And *that* sure doesn't feel right.
[Why I Am An Anarchist]:
......@@ -9,7 +9,7 @@ WordPress-Post-Type: post
Guess it's a "freedom" kind of day. Here are a couple more things for
yous guys to read:
[*Now Corporations Claim The "Right To Lie"*][] documents the increasing
trend in *corporations* to claim the same *human rights* afforded to
......@@ -19,7 +19,7 @@ the Supreme Court (I believe) deemed that they are "persons". As the
author puts it, "they can't vote -- what are they doing in politics?"
Makes sense to me.
[*Supremes back Disney and pigopolists vs science and culture*][] is an
article from one of my favorite news sources of today, [The Register][].
......@@ -27,11 +27,11 @@ They're not afraid to get personal, which is something I admire. This
particular article is about the recent [Eldred vs. Ashcroft][] case,
regarding copyright laws.
[*Now Corporations Claim The "Right To Lie"*]:
[*Supremes back Disney and pigopolists vs science and culture*]:
......@@ -16,7 +16,7 @@ padding.
The Background
For several years now, I have used a series of AppleScripts to automate
enabling and disabling of the Mac OS X screen saver password. The
scripts were pulled from [a thread][] on the MacWorld forums and have
......@@ -24,10 +24,10 @@ worked well, save for one detail: there is quite a lot of overhead in
launching a compiled AppleScript just to execute two commands in the
do shell script "defaults -currentHost write askForPassword -int 0"do shell script "/Users/adam/bin/notif"
Under heavy load (ie. with all my normal apps, plus VMware Fusion
running one or more virtual machines) I often wait 30 seconds or more to
enable or disable the password.
......@@ -36,22 +36,22 @@ enable or disable the password.
create application shortcuts on your Desktop. Digging into one of these
applications, you see the following hierarchy:
adam@fsck[0]:/Applications:0$ find "Team Fortress"Team Fortress 2.appTeam Fortress Fortress Fortress Fortress Fortress Fortress
Here's `Info.plist`:
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" ""><plist version="1.0"><dict> <key>CFBundleExecutable</key> <string></string> <key>CFBundleIconFile</key> <string>shortcut.icns</string> <key>CFBundleInfoDictionaryVersion</key> <string>1.0</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> <string>1.0</string></dict></plist>
And the good stuff, ``:
#!/bin/bash# autogenerated file - do not editopen steam://run/440
This was a pretty big "wow" moment for me. No AppleScript, no [.command
files][] (which launch, just pure, instant command line
gratification. appify was born to quickly convert shell scripts into
......@@ -13,14 +13,14 @@ and isn't easily malleable. HTML looks nice, but it's hard to write on
the fly without a decent WYSIWYG editor. XML might work. Microsoft Word
will not.
Last night, I finally took the time to look for a decent script that
converts plain text into HTML. I found a couple of tools that offer
various levels of thoroughness and complexity. Which is good, because
now I don't have to try and write something from scratch.
The first is called [Gruatxt][]. It does all the things you would
expect, like \*emphasized\* text, bulleted lists, horizontal rules, and
......@@ -29,7 +29,7 @@ wouldn't let me nest a list inside another list, which I need for any
sort of note taking. Here is a [sample file][], and the [same file
converted][] with Gruatxt.
I stopped my search after finding [txt2html][]. The structure of a plain
text file for txt2html is a bit less rigid, which I find an annoyance,
......@@ -37,7 +37,7 @@ but it does my nested lists beautifully. Again, here's a [sample
file][1] and [formatted document][]. This is the tool I'll be tweaking
to work *just right* for me. Mmm.. open source.
[sample file]:
......@@ -15,7 +15,7 @@ before the real upgrade, just to be on the safe side.
Before the Storm: Finnix
I had no experience with [Finnix][] before this upgrade, but it was
exactly what I needed throughout the process. It's [built into the
Linode dashboard][] so you can use it as a recovery console if things go
......@@ -25,43 +25,43 @@ to my VM.
The Backup
`rsync` is my weapon of choice, since it allows for transport over SSH
and incremental backups. I used [this article][] to get started with
some suggested `rsync` flags. I ran this several times throughout the
rsync -avzPH --numeric-ids --delete --delete-excluded --exclude-from=backup.lst /mnt/sda1/
Here's my `backup.lst` exclusion file:
+ /dev/console+ /dev/initctl+ /dev/null+ /dev/zero- /dev/*- /proc/*- /sys/*- /tmp/*- *lost+found
After `rsync`, `chroot` to the cloned filesystem:
mount -R /proc /mnt/sda1/procmount -R /dev /mnt/sda1/devchroot /mnt/sda1 /bin/bashvi /etc/fstab # update mountpoints. change xvda to sda1, xvdb to sda2
Install a bootloader. The Linode VPS is in Xen and doesn't normally boot
its own kernel. (I know next to nothing about Xen, but this is what I've
apt-get install grubmkdir -p /boot/grubcp -r /usr/lib/grub/i386-pc/{stage1,stage2,e2fs_stage1_5} /boot/grubapt-get install linuxecho defoptions=vga=791 >>/boot/grub/menu.lstupdate-grub
Reboot. Make sure you kill your cron jobs while the VM is on, as many
are probably inappropriate for a backup server.
sudo service cron stop
I recommend taking a snapshot of your backup, here. It may actually be
faster to just `rsync` again, but it's nice to have a complete backup at
the ready.
......@@ -69,15 +69,15 @@ the ready.
I used a couple commands to update IP addresses on my backup so I could
more accurately test services post-upgrade:
sudo ~/bin/ack --follow -al '207\.192\.74\.235' /etc | sudo xargs sed -i.bak 's/207\.192\.74\.235/'sudo ~/bin/ack --follow -al '69\.164\.216\.5' /etc | sudo xargs sed -i.bak 's/69\.164\.216\.5/'
The Upgrade
The following notes were taking during my test upgrade, and referenced
during the real upgrade. I referenced the Ubuntu Community Documentation
project's "[Upgrading to Ubuntu 10.04 LTS][]" page. There is also a
......@@ -86,16 +86,16 @@ Linode article on [upgrading to Ubuntu 10.04][].
On the first pass, `python-setuptools` killed my install. This was fixed
by manually reinstalling before upgrade:
sudo dpkg -r python-setuptools && apt-get install python-setuptools
Ensure the update manager is installed, and issue the upgrade command:
sudo apt-get install update-manager-coresudo do-release-upgrade
I encountered conflicts in the following packages, where I had modified
local files. Also included is my resolution, which may or may not be
helpful to anyone else.
......@@ -121,7 +121,7 @@ helpful to anyone else.
installed, looked like the `GOTO="persistent_net_generator_end"` at
the start was intentional
Got a warning about vulnerable SSL keys generated by older versions of
Ubuntu; solution is to regenerate your keys. The dialog recommended
using `openssl-vulnkey` and `openvpn-vulnkey` to test.
......@@ -133,21 +133,21 @@ kernel in the Linode dashboard.
### python-setuptools error
More about that error with `python-setuptools`: [this thread][] was
helpful. From `/var/log/apt/term.log`:
Log started: 2010-10-06 08:35:15Setting up python-setuptools (0.6c9-0ubuntu1) ...pycentral: pycentral pkginstall: not overwriting local filespycentral pkginstall: not overwriting local filesdpkg: error processing python-setuptools (--configure): subprocess post-installation script returned error exit status 1Errors were encountered while processing: python-setuptoolsLog ended: 2010-10-06 08:35:15
Per the article, ran "apt-get remove python-setuptools" and "apt-get
install python-setuptools"
Post-upgrade Recompiling
Something required apt-get install `libltdl-dev`. Useful info for this
post, no?
......@@ -15,10 +15,10 @@ install. A quick copy of the full extlib folder fixed my problem right
up. So, in the end, my pinging problem was an incompatible version of
one of the libraries.
Hopefully this will help anybody else whose pings aren't working. I
looked all over the web and never found a good answer for my problem.
......@@ -13,12 +13,12 @@ plan on doing useful things in the future, like dissecting
[graffiti][] page and posting the completed source. Ooh, maybe I'll make
it XML and use XSLT and a server-side parser. Mmm..
I should blog more often, if I'm going to come up with nice ideas like
......@@ -14,17 +14,17 @@ use XWeb to apply stylesheets to the bare content and populate my local
Apache directory, and then rsync on the main web server to update the
public content.
Not terribly interesting to most of you, but it has a high geek factor.
So, now I've had a little experience running concurrent development and
production web servers, and using a content-management system to
organize documents and simplify site-wide updates. I'll probably make a
page describing the process, and I'm wont to do.
[my domain]:
......@@ -11,7 +11,7 @@ of [Bwerp][], my main site (indeed, it uses the same stylesheet). Any
comments? Do you like it? Is it hard to read? Does it look like crap in
Browser X? Feedback would be greatly appreciated.
[new template]: green
......@@ -18,6 +18,6 @@ What to do?
I want so badly to just stop it all, but it seems so big.
[Ani DiFranco]:
......@@ -10,6 +10,6 @@ Some of you may be experiencing problems with at the moment.
[My provider][] is shuffling around some of their servers, and you may
get a 503 Forbidden until your cache updates. Don't panic.
[My provider]:
......@@ -26,20 +26,20 @@ haven't evaluated them or their competitors recently.
The Meat
[gist file=Makefile]659427[/gist]
Customizing for Your Project
To make this file useful for your own project, you'll need to point it
at your CSS and JS files.
The first two variables define what scripts will be minified and
compressed when you type "make js" or "make css," respectively. Both of
these commands will run when you type "make all" or simply "make."
......@@ -48,34 +48,34 @@ when you type "make clean."
Some sample customizations are mentioned in the file.
CSS_TARGETS = $(shell cat manifest.txt)
If you would rather organize your list of CSS or JavaScript targets into
their own files, you can automatically expand that manifest file using
the cat command.
Some more advanced setups may combine several CSS files before
minification, or use a custom target to concatenate JavaScript using the
closure compiler. If you find that all your targets can be cleaned, you
can simply reference them automatically as above.
concatenated.min.js: file1.js file2.js java -jar ~/bin/compiler.jar $(addprefix --js=,$^) >$@
The closure compiler requires a prefix for all input JavaScript files.
Use the make function "`addprefix`" to format the argument list.
custom-concat.css: file1.css file2.css file3.css cat $^ >$@
Automatic variables greatly simplify most of the functionality within
this makefile. To create a concatenated CSS file, simplify specify the
target to the left of the colon, and its dependencies (the files to
......@@ -84,47 +84,47 @@ concatenate) to the right; the `cat` command never needs modification.
Of course, you can always define custom rules, ie. this one to fetch the
newest development version of jQuery:
jquery: curl -o jquery.js
Other Magic
Some other goodness happens below the "you shouldn't need to edit past
here" line. After we configure a few settings, we define how to create
files based on suffixes: .min.css gets passed through YUI Compressor,
.min.js through Closure, and .gz through gzip. We configure what files
we care about, and make handles the rest.
Set a default rule, rather than using the first rule in the file as the
.PHONY: css js
Prevent files named "css" or "js" from interfering with the css and js
%.gz: % gzip -9 <$< >$@
One of three pattern rules. This enables you to compress any file (not
just CSS or JS) by running "make filename.gz." I precompress my files
because I'm using [gzip\_static in nginx][].
CSS_GZIP = $(CSS_TARGETS:.css=.css.gz)
One of several variables that modifies filenames found in
`$(CSS_TARGETS)`, changing the suffix from `.css` to `.css.gz`. Note
that the colon/equals syntax is shorthand for [patsubst][]. Given
......@@ -136,14 +136,14 @@ general-purpose `%.gz` rule above.
See Also
- [Advanced Makefile Tricks][] -- macros (\$@ et al) and wildcard
- [GNU make manual][] -- [functions][], [automatic variables][],
[pattern rules][]
[YUI Compressor]:
......@@ -8,7 +8,7 @@ WordPress-Post-Type: post
From [an article][] on [][]:
Music sales in Germany have been in decline for the last five years,
dropping 11% last year, and German copyright holders seem to think
......@@ -17,17 +17,17 @@ president of Bundesverband Phono (Germany's RIAA), asked: "If it were
possible tomorrow to copy bread rolls, does anyone doubt that that would
mean a major economic problem for the baking industry?"
Well, we wouldn't want a major economic problem for the baking industry,
even if it meant that *nobody ever died of hunger again*. This is a
*terrible* analogy. Do people have no sense?
I'm going to bed. I've seen enough for one day.
[an article]:
......@@ -10,14 +10,14 @@ Everything but the weather, that is. Spring break has come to a close,
and today is the first day of the last quarter of my junior year. I'm
simply *bursting* with excitement.