Skip to content

Faq general #2139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Nov 1, 2022
Merged

Faq general #2139

Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3d9bc0a
borro espacio
JuliKM Oct 30, 2021
138885e
agrego security warnings
JuliKM Nov 7, 2021
73e52b8
Merge branch 'python-3.10' into 3.10
JuliKM Nov 7, 2021
eda19b8
Arreglo conflicto
JuliKM Dec 18, 2021
cdccbbf
Merge branch 'python:3.10' into 3.10
JuliKM Dec 18, 2021
758524b
Merge branch 'python:3.10' into 3.10
JuliKM Oct 30, 2022
435de3a
Merge branch 'python:3.11' into 3.11
JuliKM Oct 30, 2022
1f0c14e
Merge pull request #3 from python/3.11
JuliKM Oct 31, 2022
ee0930f
Merge branch '3.11' of https://github.com/JuliKM/python-docs-es into …
JuliKM Oct 31, 2022
7f3b18b
remove extra space
JuliKM Oct 31, 2022
c7dbd5f
resolve
JuliKM Oct 31, 2022
49b0183
traducido faq/general
JuliKM Oct 31, 2022
7865931
Merge pull request #7 from JuliKM/3.11
JuliKM Oct 31, 2022
348e1e7
Fix unittest local branch
JuliKM Oct 31, 2022
e1e4b05
Fix again unittest local
JuliKM Oct 31, 2022
492142f
aplico sugerencias de cambios para consistencia
JuliKM Nov 1, 2022
21070fa
Merge branch 'faq-general' of https://github.com/JuliKM/python-docs-e…
JuliKM Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions library/security_warnings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ msgstr ""
"Project-Id-Version: Python en Español 3.10\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-16 21:42+0200\n"
<<<<<<< HEAD
"PO-Revision-Date: 2021-10-30 11:49-0300\n"
=======
"PO-Revision-Date: 2021-10-30 11:31-0300\n"
>>>>>>> 451fe725c28e4b56b001cdc540f2d8a33325cfca
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -49,7 +53,11 @@ msgid ""
msgstr ""
":mod:`hashlib`: :ref:`todos los constructores toman un argumento de solo "
"palabra clave \"usedforsecurity\" que deshabilita algoritmos inseguros y "
<<<<<<< HEAD
"bloqueados conocidos <hashlib-usedforsecurity>`"
=======
"bloqueados conocidos. <hashlib-usedforsecurity>`"
>>>>>>> 451fe725c28e4b56b001cdc540f2d8a33325cfca

#: ../Doc/library/security_warnings.rst:16
msgid ""
Expand Down