From: frank Date: Wed, 11 Apr 2012 11:15:56 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=91593cc2011e5ca9c9bb1e2f754db4f5c2c9dff0;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/ImageMagick/._cfg0000_delegates.xml b/ImageMagick/._cfg0000_delegates.xml deleted file mode 100644 index a21e0e7f..00000000 --- a/ImageMagick/._cfg0000_delegates.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ImageMagick/._cfg0000_policy.xml b/ImageMagick/._cfg0000_policy.xml deleted file mode 100644 index 3be0a4bc..00000000 --- a/ImageMagick/._cfg0000_policy.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - - - diff --git a/ImageMagick/._cfg0000_type-ghostscript.xml b/ImageMagick/._cfg0000_type-ghostscript.xml deleted file mode 100644 index 213cb31a..00000000 --- a/ImageMagick/._cfg0000_type-ghostscript.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ImageMagick/delegates.xml b/ImageMagick/delegates.xml index 3870f06d..a21e0e7f 100644 --- a/ImageMagick/delegates.xml +++ b/ImageMagick/delegates.xml @@ -66,7 +66,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/ImageMagick/policy.xml b/ImageMagick/policy.xml index 19e97962..3be0a4bc 100644 --- a/ImageMagick/policy.xml +++ b/ImageMagick/policy.xml @@ -39,9 +39,10 @@ - Note, resource policies are maximums for each instance of ImageMagick (e.g. - policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit - is 1GB). + Define arguments for the memory, map, area, and disk resources with + SI prefixes (.e.g 100MB). In addition, resource policies are maximums for + each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB + exceeds policy maximum so memory limit is 1GB). --> diff --git a/ImageMagick/type-ghostscript.xml b/ImageMagick/type-ghostscript.xml index 30182b86..213cb31a 100644 --- a/ImageMagick/type-ghostscript.xml +++ b/ImageMagick/type-ghostscript.xml @@ -17,38 +17,38 @@ ]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config-archive/etc/ImageMagick/delegates.xml b/config-archive/etc/ImageMagick/delegates.xml index db829d8e..3870f06d 100644 --- a/config-archive/etc/ImageMagick/delegates.xml +++ b/config-archive/etc/ImageMagick/delegates.xml @@ -80,14 +80,14 @@ - + - + - + @@ -100,11 +100,11 @@ - + - + diff --git a/config-archive/etc/ImageMagick/delegates.xml.1 b/config-archive/etc/ImageMagick/delegates.xml.1 new file mode 100644 index 00000000..db829d8e --- /dev/null +++ b/config-archive/etc/ImageMagick/delegates.xml.1 @@ -0,0 +1,112 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config-archive/etc/ImageMagick/delegates.xml.dist b/config-archive/etc/ImageMagick/delegates.xml.dist index 3870f06d..a21e0e7f 100644 --- a/config-archive/etc/ImageMagick/delegates.xml.dist +++ b/config-archive/etc/ImageMagick/delegates.xml.dist @@ -66,7 +66,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/config-archive/etc/ImageMagick/policy.xml b/config-archive/etc/ImageMagick/policy.xml index 28eda178..19e97962 100644 --- a/config-archive/etc/ImageMagick/policy.xml +++ b/config-archive/etc/ImageMagick/policy.xml @@ -37,7 +37,7 @@ Any large image is cached to disk rather than memory: - + Note, resource policies are maximums for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit @@ -48,8 +48,8 @@ - - + + diff --git a/config-archive/etc/ImageMagick/policy.xml.1 b/config-archive/etc/ImageMagick/policy.xml.1 new file mode 100644 index 00000000..28eda178 --- /dev/null +++ b/config-archive/etc/ImageMagick/policy.xml.1 @@ -0,0 +1,57 @@ + + + + + + + + +]> + + + + + + + + + + + + + diff --git a/config-archive/etc/ImageMagick/policy.xml.dist b/config-archive/etc/ImageMagick/policy.xml.dist index 19e97962..3be0a4bc 100644 --- a/config-archive/etc/ImageMagick/policy.xml.dist +++ b/config-archive/etc/ImageMagick/policy.xml.dist @@ -39,9 +39,10 @@ - Note, resource policies are maximums for each instance of ImageMagick (e.g. - policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit - is 1GB). + Define arguments for the memory, map, area, and disk resources with + SI prefixes (.e.g 100MB). In addition, resource policies are maximums for + each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB + exceeds policy maximum so memory limit is 1GB). --> diff --git a/config-archive/etc/ImageMagick/type-ghostscript.xml b/config-archive/etc/ImageMagick/type-ghostscript.xml new file mode 100644 index 00000000..30182b86 --- /dev/null +++ b/config-archive/etc/ImageMagick/type-ghostscript.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config-archive/etc/ImageMagick/type-ghostscript.xml.dist b/config-archive/etc/ImageMagick/type-ghostscript.xml.dist new file mode 100644 index 00000000..213cb31a --- /dev/null +++ b/config-archive/etc/ImageMagick/type-ghostscript.xml.dist @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +