summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/dohtml7
-rw-r--r--man/ebuild.52
2 files changed, 5 insertions, 4 deletions
diff --git a/bin/dohtml b/bin/dohtml
index 917ca1b52..5087ca430 100755
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -14,8 +14,8 @@
# Detailed usage:
# dohtml <list-of-files>
# - will install the files in the list of files (space-separated list) into
-# /usr/share/doc/${PF}/html, provided the file ends in .html, .png, .jpg
-# or .css
+# /usr/share/doc/${PF}/html, provided the file ends in .htm, .html, .css,
+# .js, ,gif, .jpeg, .jpg, or .png.
# dohtml -r <list-of-files-and-directories>
# - will do as 'dohtml', but recurse into all directories, as long as the
# directory name is not CVS
@@ -80,7 +80,8 @@ class OptionsClass:
if os.environ.has_key("_E_DOCDESTTREE_"):
self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"]
- self.allowed_exts = [ 'png', 'gif', 'html', 'htm', 'jpg', 'css', 'js' ]
+ self.allowed_exts = [ 'htm', 'html', 'css', 'js',
+ 'gif', 'jpeg', 'jpg', 'png' ]
self.allowed_files = []
self.disallowed_dirs = [ 'CVS' ]
self.recurse = False
diff --git a/man/ebuild.5 b/man/ebuild.5
index f10e8c765..68b4f053a 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -775,7 +775,7 @@ Performs the ln command as either a hard link or symlink.
.TP
\fBdohtml\fR \fI [\-a filetypes] [\-r] [\-x list\-of\-dirs\-to\-ignore] [list\-of\-files\-and\-dirs]\fR
Installs the files in the list of files (space\-separated list) into
-/usr/share/doc/${PF}/html provided the file ends in .html, .htm, .gif, .jpg, .png, .js, or .css.
+/usr/share/doc/${PF}/html provided the file ends in .htm, .html, .css, .js, .gif, .jpeg, .jpg, or .png.
Setting \fI\-a\fR limits what types of files will be included,
\fI\-A\fR appends to the default list, setting \fI\-x\fR sets which dirs to
exclude (CVS excluded by default), \fI\-r\fR sets recursive.