[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7e3309: User documentation for Zero Configuration

2015-01-05 Thread Marc Delisle
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7e3309fc2a6ff073b7fcb97cfb699277ad819c51
  
https://github.com/phpmyadmin/phpmyadmin/commit/7e3309fc2a6ff073b7fcb97cfb699277ad819c51
  Author: Isaac Bennetch 
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
M doc/config.rst
M doc/setup.rst

  Log Message:
  ---
  User documentation for Zero Configuration

Signed-off-by: Marc Delisle 


  Commit: c6bf4d61bc69699b5d535038f7270c0f41b10213
  
https://github.com/phpmyadmin/phpmyadmin/commit/c6bf4d61bc69699b5d535038f7270c0f41b10213
  Author: Marc Delisle 
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Clarifications

Signed-off-by: Marc Delisle 


  Commit: 0f3e58bf2e64e0ddd5ecf9b4d85937421d27f24a
  
https://github.com/phpmyadmin/phpmyadmin/commit/0f3e58bf2e64e0ddd5ecf9b4d85937421d27f24a
  Author: Marc Delisle 
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
M doc/config.rst
M doc/setup.rst

  Log Message:
  ---
  Fix merge conflict

Signed-off-by: Marc Delisle 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/495250f8cb39...0f3e58bf2e64--
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git


[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7e3309: User documentation for Zero Configuration

2015-01-05 Thread Marc Delisle
  Branch: refs/heads/QA_4_3
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7e3309fc2a6ff073b7fcb97cfb699277ad819c51
  
https://github.com/phpmyadmin/phpmyadmin/commit/7e3309fc2a6ff073b7fcb97cfb699277ad819c51
  Author: Isaac Bennetch 
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
M doc/config.rst
M doc/setup.rst

  Log Message:
  ---
  User documentation for Zero Configuration

Signed-off-by: Marc Delisle 


  Commit: c6bf4d61bc69699b5d535038f7270c0f41b10213
  
https://github.com/phpmyadmin/phpmyadmin/commit/c6bf4d61bc69699b5d535038f7270c0f41b10213
  Author: Marc Delisle 
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Clarifications

Signed-off-by: Marc Delisle 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/440afe2423bd...c6bf4d61bc69--
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git