From 2af49963448fa20be6918c07a94e104ef22ef98b Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Sun, 31 Dec 2017 03:58:52 -0200 Subject: [PATCH] Remove extra lines in doc Signed-off-by: Gabriel Caruso --- doc/config.rst | 7 ---- doc/credits.rst | 86 ------------------------------------------- doc/faq.rst | 15 -------- doc/import_export.rst | 5 --- doc/index.rst | 1 - doc/intro.rst | 3 -- doc/relations.rst | 1 - doc/setup.rst | 11 ------ doc/themes.rst | 1 - 9 files changed, 130 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index 095ba2e0f4..eb7dce6cc6 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -246,7 +246,6 @@ Server connection settings incrementation) serveral times. There is no need to define full server array, just define values you need to change. - .. config:option:: $cfg['Servers'][$i]['host'] :type: string @@ -438,7 +437,6 @@ Server connection settings :config:option:`$cfg['Servers'][$i]['ssl_ca_path']`, :config:option:`$cfg['Servers'][$i]['ssl_verify']` - .. config:option:: $cfg['Servers'][$i]['ssl_verify'] :type: boolean @@ -1345,7 +1343,6 @@ Server connection settings .. code-block:: none - 'all' -> 0.0.0.0/0 'localhost' -> 127.0.0.1/8 'localnetA' -> SERVER_ADDRESS/8 @@ -2101,7 +2098,6 @@ Navigation panel setup Navigation panel width, set to 0 to collapse it by default. - Main panel ---------- @@ -2924,7 +2920,6 @@ Text fields Whether to enable autocomplete for table and column names in any SQL query box. - SQL query box settings ---------------------- @@ -3256,7 +3251,6 @@ Default queries Default queries that will be displayed in query boxes when user didn't specify any. You can use standard :ref:`faq6_27`. - MySQL settings -------------- @@ -3452,7 +3446,6 @@ configuration options, only the most frequently used ones. Don't use the controluser 'pma' if it does not yet exist and don't use 'pmapass' as password. - .. _example-signon: Example for signon authentication diff --git a/doc/credits.rst b/doc/credits.rst index 49ba524dac..3369ed2346 100644 --- a/doc/credits.rst +++ b/doc/credits.rst @@ -3,7 +3,6 @@ Credits ======= - Credits, in chronological order +++++++++++++++++++++++++++++++ @@ -433,31 +432,25 @@ Martijn W. van der Lee, Algis Vainauskas, Daniel Villanueva, Vinay, Ignacio Vazquez-Abrams, Chee Wai, Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai". - Translators +++++++++++ Following people have contributed to translation of phpMyAdmin: - - * Albanian * Arben Çokaj - * Arabic * Ahmed Saleh Abd El-Raouf Ismae * Ahmed Saad * hassan mokhtari - * Armenian * Andrey Aleksanyants - * Azerbaijani * Mircəlal <01youknowme\_at\_gmail.com> @@ -465,12 +458,10 @@ Following people have contributed to translation of phpMyAdmin: * Sevdimali İsa * Jafar - * Belarusian * Viktar Palstsiuk - * Bulgarian * Boyan Kehayov @@ -479,13 +470,11 @@ Following people have contributed to translation of phpMyAdmin: * P * krasimir - * Catalan * josep constanti * Xavier Navarro - * Chinese (China) * Vincent Lau <3092849\_at\_qq.com> @@ -499,19 +488,16 @@ Following people have contributed to translation of phpMyAdmin: * Terry Weng * whh - * Chinese (Taiwan) * Albert Song * Chien Wei Lin * Peter Dave Hello - * Colognian * Purodha - * Czech * Aleš Hakl @@ -521,7 +507,6 @@ Following people have contributed to translation of phpMyAdmin: * Jan Palider * Petr Kateřiňák - * Danish * Aputsiaĸ Niels Janussen @@ -529,7 +514,6 @@ Following people have contributed to translation of phpMyAdmin: * Jonas * Claus Svalekjaer - * Dutch * A. Voogt @@ -538,7 +522,6 @@ Following people have contributed to translation of phpMyAdmin: * Dieter Adriaenssens * Niko Strijbol - * English (United Kingdom) * Dries Verschuere @@ -546,39 +529,32 @@ Following people have contributed to translation of phpMyAdmin: * Marc Delisle * Marek Tomaštík - * Esperanto * Eliovir * Robin van der Vliet - * Estonian * Kristjan Räts - * Finnish * Juha Remes * Lari Oesch - * French * Marc Delisle - * Frisian * Robin van der Vliet - * Galician * Xosé Calvo - * German * Julian Ladisch @@ -591,19 +567,16 @@ Following people have contributed to translation of phpMyAdmin: * Phillip Rohmberger * Hauke Henningsen - * Greek * Παναγιώτης Παπάζογλου - * Hebrew * Moshe Harush * Yaron Shahrabani * Eyal Visoker - * Hindi * Atul Pratap Singh @@ -614,7 +587,6 @@ Following people have contributed to translation of phpMyAdmin: * Roohan Kazi * Yugal Pantola - * Hungarian * Akos Eros @@ -622,7 +594,6 @@ Following people have contributed to translation of phpMyAdmin: * Szász Attila * Balázs Úr - * Indonesian * Deky Arifianto @@ -635,19 +606,16 @@ Following people have contributed to translation of phpMyAdmin: * Tommy Surbakti * Zufar Fathi Suhardi - * Interlingua * Giovanni Sora - * Italian * Francesco Saverio Giacobazzi * Marco Pozzato * Stefano Martinelli - * Japanese * k725 @@ -655,13 +623,11 @@ Following people have contributed to translation of phpMyAdmin: * Masahiko HISAKAWA * worldwideskier - * Kannada * Robin van der Vliet * Shameem Ahmed A Mulla - * Korean * Bumsoo Kim @@ -675,7 +641,6 @@ Following people have contributed to translation of phpMyAdmin: * Yoon Bum-Jong * Koo Youngmin - * Kurdish Sorani * Alan Hilal @@ -683,35 +648,29 @@ Following people have contributed to translation of phpMyAdmin: * muhammad * Zrng Abdulla - * Latvian * Latvian TV * Edgars Neimanis * Ukko - * Limburgish * Robin van der Vliet - * Lithuanian * Vytautas Motuzas - * Malay * Amir Hamzah * diprofinfiniti - * Nepali * Nabin Ghimire - * Norwegian Bokmål * Børge Holm-Wennberg @@ -722,13 +681,11 @@ Following people have contributed to translation of phpMyAdmin: * Sebastian * Tomas - * Persian * ashkan shirian * HM - * Polish * Andrzej @@ -737,7 +694,6 @@ Following people have contributed to translation of phpMyAdmin: * Maciej Gryniuk * Michał VonFlynee - * Portuguese * Alexandre Badalo @@ -745,7 +701,6 @@ Following people have contributed to translation of phpMyAdmin: * Pedro Ribeiro * Sandro Amaral - * Portuguese (Brazil) * Alex Rohleder @@ -768,12 +723,10 @@ Following people have contributed to translation of phpMyAdmin: * Washington Bruno Rodrigues Cav * Yan Gabriel - * Punjabi * Robin van der Vliet - * Romanian * Alex @@ -783,7 +736,6 @@ Following people have contributed to translation of phpMyAdmin: * Deleted User * Stefan Murariu - * Russian * Andrey Aleksanyants @@ -794,29 +746,24 @@ Following people have contributed to translation of phpMyAdmin: * Олег Карпов * Egorov Artyom - * Serbian * Smart Kid - * Sinhala * Madhura Jayaratne - * Slovak * Martin Lacina * Patrik Kollmann * Jozef Pistej - * Slovenian * Domen - * Spanish * Luis García Sevillano @@ -828,44 +775,37 @@ Following people have contributed to translation of phpMyAdmin: * FAMMA TV NOTICIAS MEDIOS DE CO * Ronnie Simon - * Swedish * Anders Jonsson - * Tamil * கணேஷ் குமார் * Achchuthan Yogarajah * Rifthy Ahmed - * Thai * * Somthanat W. - * Turkish * Burak Yavuz - * Ukrainian * Сергій Педько * Igor * Vitaliy Perekupka - * Vietnamese * Bao Phan * Xuan Hung * Bao trinh minh - * West Flemish * Robin van der Vliet @@ -879,31 +819,26 @@ Following people have contributed to translation of phpMyAdmin documentation: * Arben Çokaj - * Arabic * Ahmed El Azzabi * Omar Essam - * Armenian * Andrey Aleksanyants - * Azerbaijani * Mircəlal <01youknowme\_at\_gmail.com> * Sevdimali İsa - * Catalan * josep constanti * Joan Montané * Xavier Navarro - * Chinese (China) * Vincent Lau <3092849\_at\_qq.com> @@ -914,13 +849,11 @@ Following people have contributed to translation of phpMyAdmin documentation: * Terry Weng * whh - * Chinese (Taiwan) * Chien Wei Lin * Peter Dave Hello - * Czech * Aleš Hakl @@ -928,13 +861,11 @@ Following people have contributed to translation of phpMyAdmin documentation: * Jan Palider * Petr Kateřiňák - * Danish * Aputsiaĸ Niels Janussen * Claus Svalekjaer - * Dutch * A. Voogt @@ -946,17 +877,14 @@ Following people have contributed to translation of phpMyAdmin documentation: * Dieter Adriaenssens * Tom Hofman - * Estonian * Kristjan Räts - * Finnish * Juha - * French * Cédric Corazza @@ -964,17 +892,14 @@ Following people have contributed to translation of phpMyAdmin documentation: * Marc Delisle * Donavan_Martin - * Frisian * Robin van der Vliet - * Galician * Xosé Calvo - * German * Daniel @@ -986,17 +911,14 @@ Following people have contributed to translation of phpMyAdmin documentation: * Phillip Rohmberger * Hauke Henningsen - * Greek * Παναγιώτης Παπάζογλου - * Hungarian * Balázs Úr - * Italian * Francesco Saverio Giacobazzi @@ -1004,25 +926,21 @@ Following people have contributed to translation of phpMyAdmin documentation: * Stefano Martinelli * TWS - * Japanese * Eshin Kunishima * Hiroshi Chiyokawa - * Lithuanian * Jur Kis * Dovydas - * Norwegian Bokmål * Tor Stokkan * Kurt Eilertsen - * Portuguese (Brazil) * Alexandre Moretti @@ -1036,19 +954,16 @@ Following people have contributed to translation of phpMyAdmin documentation: * Vinícius Araújo * Yan Gabriel - * Slovak * Martin Lacina * Michal Čihař * Jozef Pistej - * Slovenian * Domen - * Spanish * Luis García Sevillano @@ -1056,7 +971,6 @@ Following people have contributed to translation of phpMyAdmin documentation: * Matías Bellone * Ronnie Simon - * Turkish * Burak Yavuz diff --git a/doc/faq.rst b/doc/faq.rst index e23c87adb5..3402919881 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -342,7 +342,6 @@ httpd.conf, like this: .. code-block:: apache - # mod_gzip_item_include file \.php$ # mod_gzip_item_include mime "application/x-httpd-php.*" @@ -394,7 +393,6 @@ directives are used: .. code-block:: apache - SetOutputFilter PHP SetInputFilter PHP @@ -412,7 +410,6 @@ restart Apache: .. code-block:: apache - #SetOutputFilter PHP #SetInputFilter PHP @@ -483,7 +480,6 @@ forget to change directory name inside of it): .. code-block:: apache - RewriteEngine On RewriteBase /path_to_phpMyAdmin RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-z_]+\.php)$ index.php?db=$1&table=$2&target=$3 [R] @@ -501,7 +497,6 @@ following rewrite rule: .. code-block:: apache - RewriteEngine On RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L] @@ -609,7 +604,6 @@ the set-cookie headers. Example from the Apache 2.2 documentation: .. code-block:: apache - ProxyPass /mirror/foo/ http://backend.example.com/ ProxyPassReverse /mirror/foo/ http://backend.example.com/ ProxyPassReverseCookieDomain backend.example.com public.example.com @@ -621,7 +615,6 @@ This is not specific to phpmyadmin, it's just the behavior of Apache. .. code-block:: apache - ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin ProxyPassReverse /mirror/foo/ http://backend.example.com/%7Euser/phpmyadmin ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo @@ -647,7 +640,6 @@ some robots accessing your installation. .. code-block:: apache - RewriteEngine on # Allow only GET and POST verbs @@ -801,7 +793,6 @@ doesn't work in this configuration with port forwarding. If you enter See :ref:`themes`. - .. _faqmissingparameters: 2.8 I get "Missing parameters" errors, what can I do? @@ -889,7 +880,6 @@ comments like this: .. code-block:: mysql - -- MySQL dump 8.22 -- -- Host: localhost Database: database @@ -1152,7 +1142,6 @@ network :term:`IP` blocks. .. code-block:: php - //block root from logging in except from the private networks $cfg['Servers'][$i]['AllowDeny']['order'] = 'deny,allow'; $cfg['Servers'][$i]['AllowDeny']['rules'] = array( @@ -1482,7 +1471,6 @@ create the example tables: .. code-block:: mysql - CREATE TABLE REL_countries ( country_code char(1) NOT NULL default '', description varchar(10) NOT NULL default '', @@ -1718,7 +1706,6 @@ have table exported in file :file:`table.tex`): .. code-block:: latex - \documentclass{article} % or any class you want \usepackage{longtable} % for displaying table \begin{document} % start of document @@ -1753,7 +1740,6 @@ display column. For 100 values or more, a distinct window will appear, to browse foreign key values and choose one. To change the default limit of 100, see :config:option:`$cfg['ForeignKeyMaxLimit']`. - .. _faq6_22: 6.22 Bookmarks: Can I execute a default bookmark automatically when entering Browse mode for a table? @@ -2218,7 +2204,6 @@ If you use Apache web server, phpMyAdmin exports information about authentication to the Apache environment and it can be used in Apache logs. Currently there are two variables available: - ``userID`` User name of currently active user (he does not have to be logged in). ``userStatus`` diff --git a/doc/import_export.rst b/doc/import_export.rst index 04d0757e7d..b7d1151665 100644 --- a/doc/import_export.rst +++ b/doc/import_export.rst @@ -28,7 +28,6 @@ Using upload directory You can specify an upload directory on your web server where phpMyAdmin is installed, after uploading your file into this directory you can select this file in the import dialog of phpMyAdmin, see :config:option:`$cfg['UploadDir']`. - phpMyAdmin can import from several various commonly used formats. CSV @@ -111,7 +110,6 @@ created depending on the contents of the file. The supported xml schemas are not yet documented in this wiki. - Export ++++++ @@ -233,7 +231,6 @@ Sample output: } ] - LaTeX ----- @@ -251,7 +248,6 @@ rendered, for example in following document: .. code-block:: latex - \documentclass{article} \title{phpMyAdmin SQL output} \author{} @@ -268,7 +264,6 @@ rendered, for example in following document: \end{document} - MediaWiki --------- diff --git a/doc/index.rst b/doc/index.rst index 16c6760649..f337241378 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -24,7 +24,6 @@ Contents: credits glossary - Indices and tables ================== diff --git a/doc/intro.rst b/doc/intro.rst index 4395cde61c..43dbbf1768 100644 --- a/doc/intro.rst +++ b/doc/intro.rst @@ -9,7 +9,6 @@ properly set up MySQL user who can read/write only the desired database. It's up to you to look up the appropriate part in the MySQL manual. - Supported features ------------------ @@ -47,7 +46,6 @@ Currently phpMyAdmin can: * communicate in `80 different languages `_ - Shortcut keys ------------- @@ -62,7 +60,6 @@ Currently phpMyAdmin supports following shortcuts: * t + f - Search table (Provided you are in table related page) * backspace - Takes you to older page. - A word about users ------------------ diff --git a/doc/relations.rst b/doc/relations.rst index cf07aff7e5..96643dee9d 100644 --- a/doc/relations.rst +++ b/doc/relations.rst @@ -61,7 +61,6 @@ To fix this, open the relation view of the `category` table and in the drop down .. image:: images/pma-relations-links.png - Designer -------- diff --git a/doc/setup.rst b/doc/setup.rst index 80df17b59d..0aab061739 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -91,7 +91,6 @@ But be aware that the configuration file is maintained in ``/etc/phpMyAdmin/`` and may differ in some ways from the official phpMyAdmin documentation. - Installing on Windows +++++++++++++++++++++ @@ -124,7 +123,6 @@ by invoking: composer update --no-dev - .. _composer: Installing using Composer @@ -493,7 +491,6 @@ Quick Install :file:`config.inc.php` is still a quick way to get started and needed for some advanced features. - Manually creating the file -------------------------- @@ -509,7 +506,6 @@ simple configuration may look like this: .. code-block:: xml+php - or use setup script on our demo server: . - .. _verify: Verifying phpMyAdmin releases @@ -763,7 +757,6 @@ The following three scenarios are covered by the Zero Configuration mode: phpMyAdmin continues to use the tables from the first database; the user is not prompted to create more tables in the new database. - Manual configuration -------------------- @@ -882,7 +875,6 @@ the database *user_base*: GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real_password'; - What the user may now do is controlled entirely by the MySQL user management system. With HTTP or cookie authentication mode, you don't need to fill the user/password fields inside the :config:option:`$cfg['Servers']`. @@ -990,7 +982,6 @@ in :file:`examples/signon-script.php`: :config:option:`$cfg['Servers'][$i]['SignonURL']`, :ref:`example-signon` - .. index:: pair: Config; Authentication mode .. _auth_config: @@ -1016,7 +1007,6 @@ Config authentication mode of which are beyond the scope of this manual but easily searchable with Google). - .. _securing: Securing your phpMyAdmin installation @@ -1134,7 +1124,6 @@ Trouble logging back in after logging out using 'http' authentication When using the 'http' ``auth_type``, it can be impossible to log back in (when the logout comes manually or after a period of inactivity). `Issue 11898 `_. - .. _Composer tool: https://getcomposer.org/ .. _Packagist: https://packagist.org/ .. _Docker image: https://hub.docker.com/r/phpmyadmin/phpmyadmin/ diff --git a/doc/themes.rst b/doc/themes.rst index cdddf717c8..1f22521b68 100644 --- a/doc/themes.rst +++ b/doc/themes.rst @@ -41,7 +41,6 @@ Theme metadata It has been replaced by :file:`theme.json` to allow easier parsing (without need to handle PHP code) and to support additional features. - In theme directory there is file :file:`theme.json` which contains theme metadata. Currently it consists of: