diff --git a/website/Makefile b/website/Makefile index f0b2c91c..c46620f7 100644 --- a/website/Makefile +++ b/website/Makefile @@ -189,4 +189,4 @@ publish: rsync -vlDtrz --delete --exclude='.svn' --include="exiv2-`cat var/__version__`*" --exclude='exiv2-*tar.gz' --exclude='exiv2-*.zip' -e ssh html/ `whoami`@localhost:rs really-publish: - rsync -vlDtrz --delete --exclude='misc/' --exclude='.svn' --include="exiv2-`cat var/__version__`*" --exclude='exiv2-*tar.gz' --exclude='exiv2-*.zip' -e "ssh -2 -i /home/andreas/.ssh/ahuggel.key" html/ ahuggel@exiv2.org: + rsync -vlDtrz --delete --exclude='misc/' --exclude='.svn' --include="exiv2-`cat var/__version__`*" --exclude='exiv2-*tar.gz' --exclude='exiv2-*.zip' -e "ssh -2 -i /home/andreas/.ssh/exiv2.pem" html/ root@exiv2.org:/var/www/exiv2/ diff --git a/website/bin/buglinks.sh b/website/bin/buglinks.sh index 8870f7ad..f0b238a6 100755 --- a/website/bin/buglinks.sh +++ b/website/bin/buglinks.sh @@ -12,5 +12,5 @@ file=$1 sed -e 's/\&/\&/g' -e 's/\</g' -e 's/>/\>/g' $file > $file.tmp mv $file.tmp $file -sed -e 's,\#\([1-9][0-9][0-9]\),#\1,g; s,\([0-9][0-9][0-9][0-9][0-9][0-9][0-9]\),\1,g' $file > $file.tmp +sed -e 's,\#\([1-9][0-9][0-9]\),#\1,g; s,\([0-9][0-9][0-9][0-9][0-9][0-9][0-9]\),\1,g' $file > $file.tmp mv $file.tmp $file diff --git a/website/html/Exif2-2.PDF b/website/html/Exif2-2.PDF new file mode 100644 index 00000000..02d42a1d Binary files /dev/null and b/website/html/Exif2-2.PDF differ diff --git a/website/master/download.html.in b/website/master/download.html.in index 34190af5..251c7563 100644 --- a/website/master/download.html.in +++ b/website/master/download.html.in @@ -12,7 +12,7 @@ __maintitle__
From the source package you can build the Exiv2 library, command line utility, the - organize + organize tool and a number of simple example and test applications. With a few additional third party tools you can also generate the complete API documentation. The package includes standard build files for @@ -112,7 +112,7 @@ for NLS,
Exiv2 is maintained in a Subversion repository. You can - browse the source code online + browse the source code online or get a copy of the latest development code from the repository. Once you have the source code, see the README file in the top directory for build and installation notes. diff --git a/website/master/index.html.in b/website/master/index.html.in index 8f317a5e..29c5bc3e 100644 --- a/website/master/index.html.in +++ b/website/master/index.html.in @@ -13,7 +13,7 @@ It provides fast and easy read and write access to the Exif, IPTC and XMP metadata -of images in various formats. +of images in various formats. Exiv2 is available as free software and with a commercial license, and is used in many projects.
@@ -79,7 +79,7 @@ Exiv2 is available as free software and withThe roadmap has details for the upcoming version.
+The roadmap has details for the upcoming version.
__footer__ diff --git a/website/master/makernote.html.in b/website/master/makernote.html.in index 4ccec7eb..c4e58cf4 100644 --- a/website/master/makernote.html.in +++ b/website/master/makernote.html.in @@ -10,8 +10,8 @@ __maintitle__The Makernote is tag 0x927c in the Exif IFD (Exif.Photo.MakerNote). According to the - -Exif 2.2 standard, the makernote is "a tag for manufacturers of +Exif 2.2 standard, +the makernote is "a tag for manufacturers of Exif writers to record any desired information. The contents are up to the manufacturer, but this tag should not be used for any other than its intended purpose."
diff --git a/website/master/news.xml b/website/master/news.xml index d2573c77..799cc338 100644 --- a/website/master/news.xml +++ b/website/master/news.xml @@ -1,5 +1,18 @@