diff --git a/docs/_includes/figures/xdebug/windows/ipconfig.png b/docs/_includes/figures/xdebug/windows/ipconfig.png index 8ead3f12..f5025f13 100644 Binary files a/docs/_includes/figures/xdebug/windows/ipconfig.png and b/docs/_includes/figures/xdebug/windows/ipconfig.png differ diff --git a/docs/_includes/figures/xdebug/windows/virtual-switch-manager.png b/docs/_includes/figures/xdebug/windows/virtual-switch-manager.png index 8ddfa3e7..092b7fcd 100644 Binary files a/docs/_includes/figures/xdebug/windows/virtual-switch-manager.png and b/docs/_includes/figures/xdebug/windows/virtual-switch-manager.png differ diff --git a/docs/intermediate/configure-php-xdebug/windows/atom.rst b/docs/intermediate/configure-php-xdebug/windows/atom.rst index a199916b..3ab703ba 100644 --- a/docs/intermediate/configure-php-xdebug/windows/atom.rst +++ b/docs/intermediate/configure-php-xdebug/windows/atom.rst @@ -36,41 +36,14 @@ Gather Host IP address On Windows you will have to manually retrieve the IP address to which Xdebug should connect to via ``xdebug.remote_host``. -When gathering the Windows host IP address you will need to distinguish between two cases depending -on your configuration: - -1. DockerNat IP address (no custom configuration applied) -2. Virtual Switch IP address (you have created a Virtual Switch to allow Internet access to your container) - -Only one of the options may be valid for your setup. - -DockerNAT IP address -^^^^^^^^^^^^^^^^^^^^ - -1. Open command line -2. Enter ``ipconfig`` -3. Look for the IP4 address in ``DockerNAT`` (e.g.: ``192.168.0.12``) - - .. important:: - ``192.168.0.12`` is meant as an example and will eventually differ on your system. - Ensure you substitute it with the correct IP address. - -.. seealso:: :ref:`howto_open_terminal_on_win` - -Virtual Switch IP address -^^^^^^^^^^^^^^^^^^^^^^^^^ - -When you have created a custom Virtual Switch for you Docker setup, you will have to gather the -Virtual Switch IP address instead of the DockerNat IP address. - -Let's assume you have created the switch by the name **New Virtual Switch** as follows: +When you have done no custom configuration in your Virtual Switch manager, Docker for Windows will +use the ``Default Switch`` automatically. .. include:: /_includes/figures/xdebug/windows/virtual-switch-manager.rst - 1. Open command line 2. Enter ``ipconfig`` -3. Look for the IP4 address in ``New Virtual Switch`` (e.g.: ``192.168.0.12``) +3. Look for the IP4 address in ``Default Switch`` (e.g.: ``192.168.0.12``) .. include:: /_includes/figures/xdebug/windows/ipconfig.rst diff --git a/docs/intermediate/configure-php-xdebug/windows/phpstorm.rst b/docs/intermediate/configure-php-xdebug/windows/phpstorm.rst index b923b131..112af4eb 100644 --- a/docs/intermediate/configure-php-xdebug/windows/phpstorm.rst +++ b/docs/intermediate/configure-php-xdebug/windows/phpstorm.rst @@ -36,41 +36,14 @@ Gather Host IP address On Windows you will have to manually retrieve the IP address to which Xdebug should connect to via ``xdebug.remote_host``. -When gathering the Windows host IP address you will need to distinguish between two cases depending -on your configuration: - -1. DockerNat IP address (no custom configuration applied) -2. Virtual Switch IP address (you have created a Virtual Switch to allow Internet access to your container) - -Only one of the options may be valid for your setup. - -DockerNAT IP address -^^^^^^^^^^^^^^^^^^^^ - -1. Open command line -2. Enter ``ipconfig`` -3. Look for the IP4 address in ``DockerNAT`` (e.g.: ``192.168.0.12``) - - .. important:: - ``192.168.0.12`` is meant as an example and will eventually differ on your system. - Ensure you substitute it with the correct IP address. - - .. seealso:: :ref:`howto_open_terminal_on_win` - -Virtual Switch IP address -^^^^^^^^^^^^^^^^^^^^^^^^^ - -When you have created a custom Virtual Switch for you Docker setup, you will have to gather the -Virtual Switch IP address instead of the DockerNat IP address. - -Let's assume you have created the switch by the name **New Virtual Switch** as follows: +When you have done no custom configuration in your Virtual Switch manager, Docker for Windows will +use the ``Default Switch`` automatically. .. include:: /_includes/figures/xdebug/windows/virtual-switch-manager.rst - 1. Open command line 2. Enter ``ipconfig`` -3. Look for the IP4 address in ``New Virtual Switch`` (e.g.: ``192.168.0.12``) +3. Look for the IP4 address in ``Default Switch`` (e.g.: ``192.168.0.12``) .. include:: /_includes/figures/xdebug/windows/ipconfig.rst diff --git a/docs/intermediate/configure-php-xdebug/windows/sublime.rst b/docs/intermediate/configure-php-xdebug/windows/sublime.rst index 3f642fc1..aed5e28b 100644 --- a/docs/intermediate/configure-php-xdebug/windows/sublime.rst +++ b/docs/intermediate/configure-php-xdebug/windows/sublime.rst @@ -36,41 +36,14 @@ Gather Host IP address On Windows you will have to manually retrieve the IP address to which Xdebug should connect to via ``xdebug.remote_host``. -When gathering the Windows host IP address you will need to distinguish between two cases depending -on your configuration: - -1. DockerNat IP address (no custom configuration applied) -2. Virtual Switch IP address (you have created a Virtual Switch to allow Internet access to your container) - -Only one of the options may be valid for your setup. - -DockerNAT IP address -^^^^^^^^^^^^^^^^^^^^ - -1. Open command line -2. Enter ``ipconfig`` -3. Look for the IP4 address in ``DockerNAT`` (e.g.: ``192.168.0.12``) - - .. important:: - ``192.168.0.12`` is meant as an example and will eventually differ on your system. - Ensure you substitute it with the correct IP address. - - .. seealso:: :ref:`howto_open_terminal_on_win` - -Virtual Switch IP address -^^^^^^^^^^^^^^^^^^^^^^^^^ - -When you have created a custom Virtual Switch for you Docker setup, you will have to gather the -Virtual Switch IP address instead of the DockerNat IP address. - -Let's assume you have created the switch by the name **New Virtual Switch** as follows: +When you have done no custom configuration in your Virtual Switch manager, Docker for Windows will +use the ``Default Switch`` automatically. .. include:: /_includes/figures/xdebug/windows/virtual-switch-manager.rst - 1. Open command line 2. Enter ``ipconfig`` -3. Look for the IP4 address in ``New Virtual Switch`` (e.g.: ``192.168.0.12``) +3. Look for the IP4 address in ``Default Switch`` (e.g.: ``192.168.0.12``) .. include:: /_includes/figures/xdebug/windows/ipconfig.rst diff --git a/docs/intermediate/configure-php-xdebug/windows/vscode.rst b/docs/intermediate/configure-php-xdebug/windows/vscode.rst index cbf76df4..22ee2499 100644 --- a/docs/intermediate/configure-php-xdebug/windows/vscode.rst +++ b/docs/intermediate/configure-php-xdebug/windows/vscode.rst @@ -36,41 +36,14 @@ Gather Host IP address On Windows you will have to manually retrieve the IP address to which Xdebug should connect to via ``xdebug.remote_host``. -When gathering the Windows host IP address you will need to distinguish between two cases depending -on your configuration: - -1. DockerNat IP address (no custom configuration applied) -2. Virtual Switch IP address (you have created a Virtual Switch to allow Internet access to your container) - -Only one of the options may be valid for your setup. - -DockerNAT IP address -^^^^^^^^^^^^^^^^^^^^ - -1. Open command line -2. Enter ``ipconfig`` -3. Look for the IP4 address in ``DockerNAT`` (e.g.: ``192.168.0.12``) - - .. important:: - ``192.168.0.12`` is meant as an example and will eventually differ on your system. - Ensure you substitute it with the correct IP address. - - .. seealso:: :ref:`howto_open_terminal_on_win` - -Virtual Switch IP address -^^^^^^^^^^^^^^^^^^^^^^^^^ - -When you have created a custom Virtual Switch for you Docker setup, you will have to gather the -Virtual Switch IP address instead of the DockerNat IP address. - -Let's assume you have created the switch by the name **New Virtual Switch** as follows: +When you have done no custom configuration in your Virtual Switch manager, Docker for Windows will +use the ``Default Switch`` automatically. .. include:: /_includes/figures/xdebug/windows/virtual-switch-manager.rst - 1. Open command line 2. Enter ``ipconfig`` -3. Look for the IP4 address in ``New Virtual Switch`` (e.g.: ``192.168.0.12``) +3. Look for the IP4 address in ``Default Switch`` (e.g.: ``192.168.0.12``) .. include:: /_includes/figures/xdebug/windows/ipconfig.rst @@ -137,7 +110,7 @@ You will need to configure the path mapping in ``launch.json`` (VSCode configura "request": "launch", "port": 9000, "pathMappings": { - "/shared/httpd/mytest/htdocs": "${workspaceFolder}/htdocs" + "/shared/httpd/mytest/htdocs": "${workspaceRoot}/htdocs" } }, { "name": "Launch currently open script",