Current state

diff --git a/.etckeeper b/.etckeeper
index c935340bc6b2f4d3c1732669d5c5641ffe48f61c..98f5473cf5b25d76f8601d5d6b7f80f1671a110a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -5,7 +5,6 @@ mkdir -p './courier-imap/shared'
 mkdir -p './courier-imap/shared.tmp'
 mkdir -p './dpkg/dpkg.cfg.d'
 mkdir -p './foomatic/direct'
-mkdir -p './lvm/cache'
 mkdir -p './php/apache2-php5.4/ext'
 mkdir -p './php/apache2-php5.4/ext-active'
 mkdir -p './php/cgi-php5.4/ext'
@@ -1053,6 +1052,7 @@ maybe chmod 0600 './lvm/archive/vg00_00000.vg'
 maybe chmod 0700 './lvm/backup'
 maybe chmod 0600 './lvm/backup/vg00'
 maybe chmod 0700 './lvm/cache'
+maybe chmod 0600 './lvm/cache/.cache'
 maybe chmod 0644 './lvm/lvm.conf'
 maybe chmod 0644 './machine-id'
 maybe chmod 0755 './mail'

diff --git a/GeoIP.conf b/GeoIP.conf
index 33f55265569ad4da74038d69ac50fb1f4a617e30..75775cbb05396240e7260444b47f2d88439ac0ca 100644 (file)
--- a/GeoIP.conf
+++ b/GeoIP.conf
@@ -2,15 +2,22 @@
 # then you will obtain a license key which you can
 # use to automatically obtain updates.
 # for more details, please go to
-# http://www.maxmind.com/app/products
+# http://www.maxmind.com/en/geolocation_landing
 
-# see https://www.maxmind.com/app/license_key_login to obtain License Key,
+# HowTo configure geoipupdate
+# http://www.maxmind.com/en/license_key
+
+# customer find the user_id and license key here:
+# https://www.maxmind.com/en/my_license_key
+#
 # UserId, and available ProductIds
 
 # Enter your license key here
+# customers should insert their license key and user_id
+# free GeoLite users should use 000000000000 as license key
 LicenseKey YOUR_LICENSE_KEY_HERE
 
-# Enter your User ID here
+# Enter your User ID here ( GeoLite only users should use 999999 as user_id )
 UserId YOUR_USER_ID_HERE
 
 # Enter the Product ID(s) of the database(s) you would like to update

diff --git a/drirc b/drirc
index cf13cdb802096897896072a9808c1e4850013f87..a13941f681e7f7314998464e5df646d65203a937 100644 (file)
--- a/drirc
+++ b/drirc
@@ -22,5 +22,8 @@
         <application name="Unigine OilRush (64-bit)" executable="OilRush_x64">
             <option name="disable_blend_func_extended" value="true" />
        </application>
+        <application name="Savage 2" executable="savage2.bin">
+            <option name="disable_glsl_line_continuations" value="true" />
+        </application>
     </device>
 </driconf>

diff --git a/mutt/Muttrc.dist b/mutt/Muttrc.dist
index 5758000529e3d7c21f88aff6e147ab7101bc8951..89a5c4e3f99e7ac39e581fbcaad50ba64fb9fab8 100644 (file)
--- a/mutt/Muttrc.dist
+++ b/mutt/Muttrc.dist
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
 "call urlview to extract URLs out of a message"
 
 # Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape> less /usr/share/doc/mutt-1.5.21-r1/manual.txt<Enter>" "show Mutt documentation"
+macro generic,pager <F1> "<shell-escape> less /usr/share/doc/mutt-1.5.21-r12/manual.txt<Enter>" "show Mutt documentation"
 
 # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
 macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
@@ -3037,6 +3037,16 @@ attachments   -I message/external-body
 # This specifies whether or not to show sidebar (left-side list of folders).
 # 
 # 
+# set sidebar_sort=no
+#
+# Name: sidebar_sort
+# Type: boolean
+# Default: no
+# 
+# 
+# This specifies whether or not to sort the sidebar alphabetically.
+# 
+# 
 # set sidebar_width=0
 #
 # Name: sidebar_width
@@ -3047,6 +3057,19 @@ attachments   -I message/external-body
 # The width of the sidebar.
 # 
 # 
+# set sidebar_delim_chars="/."
+#
+# Name: sidebar_delim_chars
+# Type: string
+# Default: "/."
+# 
+# 
+# This contains the list of characters which you would like to treat
+# as folder separators for displaying paths in the sidebar.  If
+# you're not using IMAP folders, you probably prefer setting this to "/"
+# alone.
+# 
+# 
 # set pgp_use_gpg_agent=no
 #
 # Name: pgp_use_gpg_agent
@@ -3087,6 +3110,19 @@ attachments   -I message/external-body
 # (PGP only)
 # 
 # 
+# set pgp_display_signature=yes
+#
+# Name: pgp_display_signature
+# Type: boolean
+# Default: yes
+# 
+# 
+# If set, mutt will display the pgp_decode_command and
+# smime_decode_command outputs.
+# Defaults to true.
+# (PGP/SMIME only)
+# 
+# 
 # set pipe_decode=no
 #
 # Name: pipe_decode
@@ -4001,6 +4037,28 @@ attachments   -I message/external-body
 # happens at the beginning of a line.
 # 
 # 
+# set pgp_mime_signature_filename="signature.asc"
+#
+# Name: pgp_mime_signature_filename
+# Type: string
+# Default: "signature.asc"
+# 
+# 
+# This option sets the filename used for signature parts in PGP/MIME
+# signed messages.
+# 
+# 
+# set pgp_mime_signature_description="Digital signature"
+#
+# Name: pgp_mime_signature_description
+# Type: string
+# Default: "Digital signature"
+# 
+# 
+# This option sets the Content-Description used for signature parts in
+# PGP/MIME signed messages.
+# 
+# 
 # set smime_ask_cert_label=yes
 #
 # Name: smime_ask_cert_label
@@ -4878,6 +4936,56 @@ attachments   -I message/external-body
 # was sent to a mailing-list you subscribe to.
 # 
 # 
+# set ts_icon_format="M%?n?AIL&ail?"
+#
+# Name: ts_icon_format
+# Type: string
+# Default: "M%?n?AIL&ail?"
+# 
+# 
+# Controls the format of the icon title, as long as ``$ts_enabled'' is set.
+# This string is identical in formatting to the one used by
+# ``$status_format''.
+# 
+# 
+# set ts_enabled=no
+#
+# Name: ts_enabled
+# Type: boolean
+# Default: no
+# 
+# 
+# Controls whether mutt tries to set the terminal status line and icon name.
+# Most terminal emulators emulate the status line in the window title.
+# 
+# 
+# set ts_status_format="Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
+#
+# Name: ts_status_format
+# Type: string
+# Default: "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"
+# 
+# 
+# Controls the format of the terminal status line (or window title),
+# provided that ``$ts_enabled'' has been set. This string is identical in
+# formatting to the one used by ``$status_format''.
+# 
+# 
+# set trash=""
+#
+# Name: trash
+# Type: path
+# Default: ""
+# 
+# 
+# If set, this variable specifies the path of the trash folder where the
+# mails marked for deletion will be moved, instead of being irremediably
+# purged.
+# 
+# NOTE: When you delete a message in the trash folder, it is really
+# deleted, so that you have a way to clean the trash.
+# 
+# 
 # set tunnel=""
 #
 # Name: tunnel