Merge pull request Pylons#2507 from stevepiercy/master

replace ps1con with doscon for lexer and syntax highlighting
Cito · Apr 16, 2016 · 545b8b1 · 545b8b1
2 parents 02587c5 + a651b35
commit 545b8b1
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 37 deletions.
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
@@ -292,7 +292,7 @@ Installing Lingua is done with the Python packaging tools. If the
 application lives at the environment variable ``%VENV%``, you can install
 Lingua like so:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    C> %VENV%\Scripts\pip install lingua
 

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
@@ -186,7 +186,7 @@ After installing Python as described previously in
 
 #. Make a :term:`virtual environment` workspace:
 
-   .. code-block:: ps1con
+   .. code-block:: doscon
 
       c:\> set VENV=c:\env
       # replace "x" with your minor version of Python 3

diff --git a/docs/narr/project.rst b/docs/narr/project.rst
@@ -159,7 +159,7 @@ On UNIX:
 
 Or on Windows:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    > cd MyProject
    > %VENV%\Scripts\pip install -e .
@@ -197,7 +197,7 @@ On UNIX:
 
 On Windows:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    > %VENV%\Scripts\pip install -e ".[testing]"
 
@@ -213,7 +213,7 @@ On UNIX:
 
 On Windows:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    > %VENV%\Scripts\py.test myproject\tests.py -q
 

diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
@@ -72,7 +72,7 @@ On UNIX:
 
 On Windows:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut> cd tutorial
    c:\pyramidtut\tutorial> %VENV%\Scripts\pip install -e .

diff --git a/docs/tutorials/wiki/distributing.rst b/docs/tutorials/wiki/distributing.rst
@@ -18,7 +18,7 @@ On UNIX:
 
 On Windows:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut> %VENV%\Scripts\python setup.py sdist
 

diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
@@ -30,7 +30,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> mkdir pyramidtut
 
@@ -53,7 +53,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> set VENV=c:\pyramidtut
 
@@ -62,13 +62,13 @@ path to the command for your Python version.
 
 Python 2.7:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> c:\Python27\Scripts\virtualenv %VENV%
 
 Python 3.5:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> c:\Python35\Scripts\python -m venv %VENV%
 
@@ -86,7 +86,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> %VENV%\Scripts\pip install --upgrade pip setuptools
 
@@ -104,7 +104,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> %VENV%\Scripts\pip install pyramid
 
@@ -124,7 +124,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> cd pyramidtut
 
@@ -157,7 +157,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut> %VENV%\Scripts\pcreate -s zodb tutorial
 
@@ -190,7 +190,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut> cd tutorial
    c:\pyramidtut\tutorial> %VENV%\Scripts\pip install -e .
@@ -240,7 +240,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\pip install -e ".[testing]"
 
@@ -263,7 +263,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\py.test tutorial\tests.py -q
 
@@ -296,7 +296,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\py.test --cov=tutorial \
        --cov-report=term-missing tutorial\tests.py
@@ -344,7 +344,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\pserve development.ini --reload
 

diff --git a/docs/tutorials/wiki2/definingmodels.rst b/docs/tutorials/wiki2/definingmodels.rst
@@ -58,7 +58,7 @@ On UNIX:
 
 On Windows:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut> cd tutorial
    c:\pyramidtut\tutorial> %VENV%\Scripts\pip install -e .

diff --git a/docs/tutorials/wiki2/distributing.rst b/docs/tutorials/wiki2/distributing.rst
@@ -17,7 +17,7 @@ On UNIX:
 
 On Windows:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut> %VENV%\Scripts\python setup.py sdist
 

diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
@@ -30,7 +30,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> mkdir pyramidtut
 
@@ -53,7 +53,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> set VENV=c:\pyramidtut
 
@@ -62,13 +62,13 @@ path to the command for your Python version.
 
 Python 2.7:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> c:\Python27\Scripts\virtualenv %VENV%
 
 Python 3.5:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> c:\Python35\Scripts\python -m venv %VENV%
 
@@ -86,7 +86,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> %VENV%\Scripts\pip install --upgrade pip setuptools
 
@@ -104,7 +104,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> %VENV%\Scripts\pip install pyramid
 
@@ -142,7 +142,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\> cd pyramidtut
 
@@ -178,7 +178,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut> %VENV%\Scripts\pcreate -s alchemy tutorial
 
@@ -211,7 +211,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut> cd tutorial
    c:\pyramidtut\tutorial> %VENV%\Scripts\pip install -e .
@@ -259,7 +259,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\pip install -e ".[testing]"
 
@@ -282,7 +282,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\py.test tutorial\tests.py -q
 
@@ -315,7 +315,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\py.test --cov=tutorial \
        --cov-report=term-missing tutorial\tests.py
@@ -388,7 +388,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\initialize_tutorial_db development.ini
 
@@ -442,7 +442,7 @@ On UNIX
 On Windows
 ^^^^^^^^^^
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\pserve development.ini --reload
 

diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst
@@ -87,7 +87,7 @@ On UNIX:
 
 On Windows:
 
-.. code-block:: ps1con
+.. code-block:: doscon
 
    c:\pyramidtut\tutorial> %VENV%\Scripts\py.test -q