Skip to content

Commit

Permalink
Some doc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
takluyver committed Feb 26, 2015
1 parent 1655bd6 commit 5273a84
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion doc/cfgfile.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Application section

.. describe:: icon (optional)

Path to a ``.ico`` file to be used for shortcuts to your application. pynsis
Path to a ``.ico`` file to be used for shortcuts to your application. Pynsist
has a default generic icon, but you probably want to replace it.

.. describe:: console (optional)
Expand Down
8 changes: 4 additions & 4 deletions nsist/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ class InstallerBuilder(object):
:param str appname: Application name
:param str version: Application version
:param list shortcuts: List of dictionaries, with keys matching
:ref:`shortcut_config` in the config file
:param list shortcuts: Dictionary keyed by shortcut name, containing
dictionaries whose keys match the fields of :ref:`shortcut_config`
in the config file
:param str icon: Path to an icon for the application
:param list packages: List of strings for importable packages to include
:param list extra_files: List of 2-tuples (file, destination) of files to include
Expand Down Expand Up @@ -127,7 +128,6 @@ def fetch_python(self):
"""Fetch the MSI for the specified version of Python.
It will be placed in the build directory.
if possible.
"""
version = self.py_version
arch_tag = '.amd64' if (self.py_bitness==64) else ''
Expand Down Expand Up @@ -190,7 +190,7 @@ def excepthook(etype, value, tb):
def write_script(self, entrypt, target, extra_preamble=''):
"""Write a launcher script from a 'module:function' entry point
python_version and bitness are used to write an appropriate shebang line
py_version and py_bitness are used to write an appropriate shebang line
for the PEP 397 Windows launcher.
"""
module, func = entrypt.split(":")
Expand Down

0 comments on commit 5273a84

Please sign in to comment.