From ce5077eace9314934c5bea23e6c7f359a3458472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 25 Jan 2010 12:45:59 +0000
Subject: [PATCH] rfe #2937840 [doc] Add some interesting configs to
 config.sample.inc.php.

---
 ChangeLog             |  1 +
 config.sample.inc.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7ec897828..dc1a8e923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2936482 [core] Fix SSL detection.
 + rfe #2937850 [doc] Add some hints to chk_rel.php for quick setup.
 + rfe #2938579 [interface] Add class to some elements for easier theming.
++ rfe #2937840 [doc] Add some interesting configs to config.sample.inc.php.
 
 3.3.0.0 (not yet released)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 436421ed0..b886ff34e 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -69,4 +69,32 @@ $cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
 $cfg['UploadDir'] = '';
 $cfg['SaveDir'] = '';
 
+/**
+ * Defines whether a user should be displayed a "show all (records)" 
+ * button in browse mode or not.
+ */
+//$cfg['ShowAll'] = false;
+
+/**
+ * Number of rows displayed when browsing a result set. If the result 
+ * set contains more rows, "Previous" and "Next".
+ */
+//$cfg['MaxRows'] = 30;
+
+/**
+ * Use graphically less intense menu tabs
+ */
+//$cfg['LightTabs'] = false;
+
+/**
+ * Set to true if you want DB-based query history.If false, this utilizes
+ * JS-routines to display query history (lost by window close)
+ *
+ * This requires advanced features enabled, see above.
+ */
+//$cfg['QueryHistoryDB'] = false;
+
+/*
+ * You can find more configuration options in Documentation.html
+ */
 ?>